Author: rfeng
Date: Sat Jul 21 15:46:59 2007
New Revision: 558390
URL: http://svn.apache.org/viewvc?view=rev&rev=558390
Log:
Fix the DAS break by using the HelperContext for type registration
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/ConfigUtil.java
incubator/tuscany/java/das/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConfigUtil.java
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/ConfigUtil.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/ConfigUtil.java?view=diff&rev=558390&r1=558389&r2=558390
==============================================================================
---
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/ConfigUtil.java
(original)
+++
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/ConfigUtil.java
Sat Jul 21 15:46:59 2007
@@ -23,9 +23,10 @@
import org.apache.tuscany.das.rdb.config.Config;
import org.apache.tuscany.das.rdb.config.ConfigFactory;
-import org.apache.tuscany.sdo.util.SDOUtil;
+import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.XMLHelper;
+import commonj.sdo.impl.HelperProvider;
/**
* Config util provides config-related utilities such as loading a Config
@@ -45,8 +46,9 @@
+ "Possibly caused by an incorrect config xml file name");
}
- SDOUtil.registerStaticTypes(ConfigFactory.class);
- XMLHelper helper = XMLHelper.INSTANCE;
+ HelperContext context = HelperProvider.getDefaultContext();
+ ConfigFactory.INSTANCE.register(context);
+ XMLHelper helper = context.getXMLHelper();
try {
return (Config) helper.load(configStream).getRootObject();
Modified:
incubator/tuscany/java/das/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConfigUtil.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConfigUtil.java?view=diff&rev=558390&r1=558389&r2=558390
==============================================================================
---
incubator/tuscany/java/das/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConfigUtil.java
(original)
+++
incubator/tuscany/java/das/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConfigUtil.java
Sat Jul 21 15:46:59 2007
@@ -22,9 +22,9 @@
import java.io.IOException;
import java.io.InputStream;
-import org.apache.tuscany.sdo.util.SDOUtil;
-
+import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.XMLHelper;
+import commonj.sdo.impl.HelperProvider;
/**
* Config util provides config-related utilities such as loading a Config
@@ -43,8 +43,9 @@
+ "Possibly caused by an incorrect config xml file name");
}
- SDOUtil.registerStaticTypes(DbconfigFactory.class);
- XMLHelper helper = XMLHelper.INSTANCE;
+ HelperContext context = HelperProvider.getDefaultContext();
+ DbconfigFactory.INSTANCE.register(context);
+ XMLHelper helper = context.getXMLHelper();
try {
return (DBConfig) helper.load(dbconfigStream).getRootObject();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]