2 files changed, 0 insertions, 137 deletions
diff --git a/das-java/tags/1.0-incubating-beta1-rc1/rdb/src/main/java/org/apache/tuscany/das/rdb/util/ConfigUtil.java b/das-java/tags/1.0-incubating-beta1-rc1/rdb/src/main/java/org/apache/tuscany/das/rdb/util/ConfigUtil.java
deleted file mode 100644
index e3ae306485..0000000000
--- a/das-java/tags/1.0-incubating-beta1-rc1/rdb/src/main/java/org/apache/tuscany/das/rdb/util/ConfigUtil.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.io.IOException;
-import java.io.InputStream;
-
-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.XMLHelper;
-
-/**
- * Config util provides config-related utilities such as loading a Config
- * instance from an InputStream
- * 
- */
-public final class ConfigUtil {
-
-    private ConfigUtil() {
-        
-    }
-    
-    public static Config loadConfig(InputStream configStream) {
-
-        if (configStream == null) {
-            throw new RuntimeException("Cannot load configuration from a null InputStream. "
-                    + "Possibly caused by an incorrect config xml file name");
-        }
-
-        SDOUtil.registerStaticTypes(ConfigFactory.class);
-        XMLHelper helper = XMLHelper.INSTANCE;
-
-        try {
-            return (Config) helper.load(configStream).getRootObject();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-}
diff --git a/das-java/tags/1.0-incubating-beta1-rc1/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DataObjectUtil.java b/das-java/tags/1.0-incubating-beta1-rc1/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DataObjectUtil.java
deleted file mode 100644
index b9649669e5..0000000000
--- a/das-java/tags/1.0-incubating-beta1-rc1/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DataObjectUtil.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 final class DataObjectUtil {
-
-    private 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());
-            }
-        }
-    }
-
-}