You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by kw...@apache.org on 2006/08/17 00:37:48 UTC
svn commit: r432056 - in /incubator/tuscany/java/das/rdb/src:
main/java/org/apache/tuscany/das/rdb/
main/java/org/apache/tuscany/das/rdb/config/wrapper/
test/java/org/apache/tuscany/das/rdb/test/commands/
Author: kwilliams
Date: Wed Aug 16 15:37:47 2006
New Revision: 432056
URL: http://svn.apache.org/viewvc?rev=432056&view=rev
Log:
Applying Hasan's patch for TUSCANY-624:remove references to ConfigFactory.eINSTANCE. Thanks Hasan!
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersWithShapeCommand.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/SimpleReadCustomersWithShapeCommand.java
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java?rev=432056&r1=432055&r2=432056&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java Wed Aug 16 15:37:47 2006
@@ -36,7 +36,7 @@
private MappingWrapper configWrapper;
- private ConfigFactory factory = ConfigFactoryImpl.eINSTANCE;
+ private ConfigFactory factory = ConfigFactory.INSTANCE;
public ConfigHelper() {
config = factory.createConfig();
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java?rev=432056&r1=432055&r2=432056&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java Wed Aug 16 15:37:47 2006
@@ -43,7 +43,7 @@
public class MappingWrapper {
- private static final ConfigFactory factory = ConfigFactoryImpl.eINSTANCE;
+ private static final ConfigFactory factory = ConfigFactory.INSTANCE;
private static final boolean debug = false;
@@ -201,7 +201,7 @@
if (table != null)
throw new RuntimeException("Table " + tableName + "already exists");
- table = ConfigFactoryImpl.eINSTANCE.createTable();
+ table = ConfigFactory.INSTANCE.createTable();
table.setTableName(tableName);
table.setTypeName(typeName);
config.getTable().add(table);
@@ -212,7 +212,7 @@
private Table findOrCreateTable(String tableName) {
Table table = getTable(tableName);
if (table == null) {
- table = ConfigFactoryImpl.eINSTANCE.createTable();
+ table = ConfigFactory.INSTANCE.createTable();
table.setTableName(tableName);
config.getTable().add(table);
}
@@ -228,7 +228,7 @@
return c;
}
- Column c = ConfigFactoryImpl.eINSTANCE.createColumn();
+ Column c = ConfigFactory.INSTANCE.createColumn();
c.setColumnName(name);
t.getColumn().add(c);
return c;
@@ -364,7 +364,7 @@
public void addUpdateStatement(Table table, String statement, String parameters) {
- Update update = ConfigFactoryImpl.eINSTANCE.createUpdate();
+ Update update = ConfigFactory.INSTANCE.createUpdate();
update.setSql(statement);
update.setParameters(parameters);
table.setUpdate(update);
@@ -374,7 +374,7 @@
public void addDeleteStatement(Table table, String statement,
String parameters) {
- Delete delete = ConfigFactoryImpl.eINSTANCE.createDelete();
+ Delete delete = ConfigFactory.INSTANCE.createDelete();
delete.setSql(statement);
delete.setParameters(parameters);
table.setDelete(delete);
@@ -385,21 +385,21 @@
public void addCreateStatement(Table table, String statement,
String parameters) {
- Create create = ConfigFactoryImpl.eINSTANCE.createCreate();
+ Create create = ConfigFactory.INSTANCE.createCreate();
create.setSql(statement);
create.setParameters(parameters);
table.setCreate(create);
}
public void addConnectionInfo(String dataSourceName, boolean managedtx) {
- ConnectionInfo info = ConfigFactoryImpl.eINSTANCE.createConnectionInfo();
+ ConnectionInfo info = ConfigFactory.INSTANCE.createConnectionInfo();
info.setDataSource(dataSourceName);
info.setManagedtx(managedtx);
config.setConnectionInfo(info);
}
public Command addCommand(String name, String sql, String kind) {
- Command cmd = ConfigFactoryImpl.eINSTANCE.createCommand();
+ Command cmd = ConfigFactory.INSTANCE.createCommand();
cmd.setName(name);
cmd.setKind(kind);
cmd.setSQL(sql);
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java?rev=432056&r1=432055&r2=432056&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java Wed Aug 16 15:37:47 2006
@@ -32,7 +32,7 @@
private static final Config mapping;
static {
- ConfigFactory factory = ConfigFactoryImpl.eINSTANCE;
+ ConfigFactory factory = ConfigFactory.INSTANCE;
mapping = factory.createConfig();
Table t = factory.createTable();
Column id = factory.createColumn();
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.java?rev=432056&r1=432055&r2=432056&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.java Wed Aug 16 15:37:47 2006
@@ -32,7 +32,7 @@
private static final Config mapping;
static {
- ConfigFactory factory = ConfigFactoryImpl.eINSTANCE;
+ ConfigFactory factory = ConfigFactory.INSTANCE;
mapping = factory.createConfig();
Table t = factory.createTable();
Column id = factory.createColumn();
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java?rev=432056&r1=432055&r2=432056&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java Wed Aug 16 15:37:47 2006
@@ -32,7 +32,7 @@
private static final Config mapping;
static {
- ConfigFactory factory = ConfigFactoryImpl.eINSTANCE;
+ ConfigFactory factory = ConfigFactory.INSTANCE;
mapping = factory.createConfig();
Table t = factory.createTable();
Column id = factory.createColumn();
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersWithShapeCommand.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersWithShapeCommand.java?rev=432056&r1=432055&r2=432056&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersWithShapeCommand.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersWithShapeCommand.java Wed Aug 16 15:37:47 2006
@@ -31,7 +31,7 @@
static ArrayList descriptor = new ArrayList();
static {
- ConfigFactory factory = ConfigFactoryImpl.eINSTANCE;
+ ConfigFactory factory = ConfigFactory.INSTANCE;
ResultDescriptor desc1 = factory.createResultDescriptor();
desc1.setColumnName("ID");
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/SimpleReadCustomersWithShapeCommand.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/SimpleReadCustomersWithShapeCommand.java?rev=432056&r1=432055&r2=432056&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/SimpleReadCustomersWithShapeCommand.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/SimpleReadCustomersWithShapeCommand.java Wed Aug 16 15:37:47 2006
@@ -37,7 +37,7 @@
private static final Config config;
static {
- ConfigFactory factory = ConfigFactoryImpl.eINSTANCE;
+ ConfigFactory factory = ConfigFactory.INSTANCE;
config = factory.createConfig();
Table t = factory.createTable();
Column id = factory.createColumn();
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org