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/05/26 22:38:06 UTC
svn commit: r409738 - in
/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb:
CommandGroupFactory.java graphbuilder/schema/ESchemaMaker.java
impl/CommandGroupFactoryImpl.java impl/CommandGroupImpl.java
Author: kwilliams
Date: Fri May 26 13:38:05 2006
New Revision: 409738
URL: http://svn.apache.org/viewvc?rev=409738&view=rev
Log:
Appication of patches for Tuscany-186,213
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/CommandGroupFactory.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupFactoryImpl.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupImpl.java
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/CommandGroupFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/CommandGroupFactory.java?rev=409738&r1=409737&r2=409738&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/CommandGroupFactory.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/CommandGroupFactory.java Fri May 26 13:38:05 2006
@@ -18,6 +18,8 @@
import java.io.InputStream;
+import org.apache.tuscany.das.rdb.config.Config;
+
/**
* A CommandGroupFactory produces {@link CommandGroup} instances.
*
@@ -33,5 +35,15 @@
* @return returns a CommandGroup instance
*/
public CommandGroup createCommandGroup(InputStream configStream);
+
+
+ /**
+ * Creates a CommandGroup based on the provided config
+ *
+ * @param config
+ * A DAS config object
+ * @return returns a CommandGroup instance
+ */
+ public CommandGroup createCommandGroup(Config config);
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java?rev=409738&r1=409737&r2=409738&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java Fri May 26 13:38:05 2006
@@ -130,23 +130,38 @@
while (i.hasNext()) {
Relationship r = (Relationship) i.next();
- Type parent = rootType.getProperty(
- wrapper.getTablePropertyName(r.getPrimaryKeyTable())).getType();
- Type child = rootType.getProperty(
- wrapper.getTablePropertyName(r.getForeignKeyTable())).getType();
- if (parent == null) {
+ String parentName = wrapper.getTablePropertyName(r.getPrimaryKeyTable());
+ String childName = wrapper.getTablePropertyName(r.getForeignKeyTable());
+
+ if (parentName == null) {
throw new RuntimeException("The parent table ("
+ r.getPrimaryKeyTable() + ") in relationship "
+ r.getName()
+ " was not found in the mapping information.");
- } else if (child == null) {
+ } else if (childName == 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, parent, child);
+
+ Property parentProperty = rootType.getProperty(parentName);
+ Property childProperty = rootType.getProperty(childName);
+
+ if (parentProperty == null) {
+ throw new RuntimeException("The parent table ("
+ + parentName + ") in relationship "
+ + r.getName()
+ + " was not found.");
+ } else if (childProperty == null) {
+ throw new RuntimeException("The child table ("
+ + childName + ") in relationship "
+ + r.getName()
+ + " was not found.");
+ }
+
+ Type parent = parentProperty.getType();
+ Type child = childProperty.getType();
Property parentProp = SDOUtil.createProperty(parent, r.getName(), child);
Property childProp = SDOUtil.createProperty(child, r.getName() + "_opposite", parent);
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupFactoryImpl.java?rev=409738&r1=409737&r2=409738&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupFactoryImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupFactoryImpl.java Fri May 26 13:38:05 2006
@@ -20,6 +20,7 @@
import org.apache.tuscany.das.rdb.CommandGroup;
import org.apache.tuscany.das.rdb.CommandGroupFactory;
+import org.apache.tuscany.das.rdb.config.Config;
public class CommandGroupFactoryImpl implements CommandGroupFactory {
@@ -27,5 +28,9 @@
public CommandGroup createCommandGroup(InputStream configStream) {
return new CommandGroupImpl(configStream);
}
+
+ public CommandGroup createCommandGroup(Config config) {
+ return new CommandGroupImpl(config);
+ }
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupImpl.java?rev=409738&r1=409737&r2=409738&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupImpl.java Fri May 26 13:38:05 2006
@@ -50,12 +50,12 @@
private Map commands = new HashMap();
public CommandGroupImpl(InputStream stream) {
- super();
- config = ConfigUtil.loadConfig(stream);
- initialize();
+ this(ConfigUtil.loadConfig(stream));
+
}
- private void initialize() {
+ public CommandGroupImpl(Config inConfig) {
+ this.config = inConfig;
Iterator i = config.getCommand().iterator();
while (i.hasNext()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org