Author: lresende
Date: Mon Jul 6 21:47:50 2009
New Revision: 791623
URL: http://svn.apache.org/viewvc?rev=791623&view=rev
Log:
Organize imports
Modified:
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterExtendedImpl.java
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConnectionTests.java
tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java
tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/NamedParameterTests.java
tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java
tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java
tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
tuscany/java/das/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/DASQueryProcessor.java
tuscany/java/das/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/web/CommandServlet.java
tuscany/java/das/samples/transaction/src/main/java/org/apache/tuscany/samples/das/tx/sample/MoneyTransfer.java
tuscany/java/das/tools/src/main/java/org/apache/tuscany/das/rdb/util/DBToSchemaFile.java
tuscany/java/das/tools/src/main/java/org/apache/tuscany/das/rdb/util/ModelXSDGenOption.java
Modified:
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java
URL:
http://svn.apache.org/viewvc/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java?rev=791623&r1=791622&r2=791623&view=diff
==============================================================================
---
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java
(original)
+++
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java
Mon Jul 6 21:47:50 2009
@@ -29,8 +29,8 @@
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.util.ConfigUtil;
import org.apache.tuscany.das.rdb.impl.ParametersExtendedImpl;
+import org.apache.tuscany.das.rdb.util.ConfigUtil;
/**
* A ConfigHelper is used as an aid in programmatic construction of Config
instances.
Modified:
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java
URL:
http://svn.apache.org/viewvc/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java?rev=791623&r1=791622&r2=791623&view=diff
==============================================================================
---
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java
(original)
+++
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java
Mon Jul 6 21:47:50 2009
@@ -21,9 +21,6 @@
import java.util.Iterator;
import java.util.List;
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.XMLHelper;
-
/**
* Manages a set of graph-change operations. This simple implementaiton can be
* replaced with a version that provides R/I sorting
Modified:
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java?rev=791623&r1=791622&r2=791623&view=diff
==============================================================================
---
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java
(original)
+++
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java
Mon Jul 6 21:47:50 2009
@@ -18,16 +18,12 @@
*/
package org.apache.tuscany.das.rdb.impl;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
import java.util.Iterator;
import java.util.List;
import org.apache.tuscany.das.rdb.Command;
import commonj.sdo.DataObject;
-import commonj.sdo.helper.XSDHelper;
public abstract class CommandImpl extends BaseCommandImpl implements Command {
Modified:
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterExtendedImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterExtendedImpl.java?rev=791623&r1=791622&r2=791623&view=diff
==============================================================================
---
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterExtendedImpl.java
(original)
+++
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterExtendedImpl.java
Mon Jul 6 21:47:50 2009
@@ -20,6 +20,7 @@
import org.apache.tuscany.das.rdb.Converter;
import org.apache.tuscany.das.rdb.config.impl.ParameterImpl;
+
import commonj.sdo.Type;
public class ParameterExtendedImpl extends ParameterImpl{
Modified:
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java?rev=791623&r1=791622&r2=791623&view=diff
==============================================================================
---
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
(original)
+++
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
Mon Jul 6 21:47:50 2009
@@ -22,8 +22,8 @@
import java.io.OutputStream;
import java.sql.SQLException;
import java.util.ArrayList;
-import java.util.List;
import java.util.Iterator;
+import java.util.List;
import org.apache.tuscany.das.rdb.config.ResultDescriptor;
import org.apache.tuscany.das.rdb.config.impl.ResultDescriptorImpl;
Modified:
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java?rev=791623&r1=791622&r2=791623&view=diff
==============================================================================
---
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java
(original)
+++
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java
Mon Jul 6 21:47:50 2009
@@ -25,9 +25,9 @@
import java.util.TreeMap;
import org.apache.tuscany.das.rdb.config.Config;
+import org.apache.tuscany.das.rdb.config.Parameters;
import org.apache.tuscany.das.rdb.config.ResultDescriptor;
import org.apache.tuscany.das.rdb.config.impl.ParameterImpl;
-import org.apache.tuscany.das.rdb.config.Parameters;
import commonj.sdo.DataObject;
Modified:
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
URL:
http://svn.apache.org/viewvc/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java?rev=791623&r1=791622&r2=791623&view=diff
==============================================================================
---
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
(original)
+++
tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
Mon Jul 6 21:47:50 2009
@@ -23,8 +23,8 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.apache.log4j.Logger;
import org.apache.tuscany.das.rdb.config.Config;
import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
import org.apache.tuscany.das.rdb.config.wrapper.QualifiedColumn;
Modified:
tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConnectionTests.java
URL:
http://svn.apache.org/viewvc/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConnectionTests.java?rev=791623&r1=791622&r2=791623&view=diff
==============================================================================
---
tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConnectionTests.java
(original)
+++
tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConnectionTests.java
Mon Jul 6 21:47:50 2009
@@ -18,8 +18,8 @@
*/
package org.apache.tuscany.das.rdb.test;
-import java.sql.Statement;
import java.sql.Connection;
+import java.sql.Statement;
import java.util.Properties;
import org.apache.derby.jdbc.EmbeddedDataSource;
Modified:
tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java
URL:
http://svn.apache.org/viewvc/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java?rev=791623&r1=791622&r2=791623&view=diff
==============================================================================
---
tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java
(original)
+++
tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java
Mon Jul 6 21:47:50 2009
@@ -30,12 +30,12 @@
import org.apache.tuscany.das.rdb.test.customer.Customer;
import org.apache.tuscany.das.rdb.test.customer.CustomerFactory;
import org.apache.tuscany.das.rdb.test.customer.impl.CustomerFactoryImpl;
-import org.apache.tuscany.das.rdb.test.singer.impl.SingerFactoryImpl;
-import org.apache.tuscany.das.rdb.test.singer.SINGER;
import org.apache.tuscany.das.rdb.test.data.CustomerData;
-import org.apache.tuscany.das.rdb.test.data.SingerData;
import org.apache.tuscany.das.rdb.test.data.OrderData;
+import org.apache.tuscany.das.rdb.test.data.SingerData;
import org.apache.tuscany.das.rdb.test.framework.DasTest;
+import org.apache.tuscany.das.rdb.test.singer.SINGER;
+import org.apache.tuscany.das.rdb.test.singer.impl.SingerFactoryImpl;
import org.apache.tuscany.sdo.api.SDOUtil;
import commonj.sdo.DataObject;
Modified:
tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/NamedParameterTests.java
URL:
http://svn.apache.org/viewvc/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/NamedParameterTests.java?rev=791623&r1=791622&r2=791623&view=diff
==============================================================================
---
tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/NamedParameterTests.java
(original)
+++
tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/NamedParameterTests.java
Mon Jul 6 21:47:50 2009
@@ -18,7 +18,6 @@
*/
package org.apache.tuscany.das.rdb.test;
-import java.util.Iterator;
import java.util.List;
import org.apache.tuscany.das.rdb.Command;
@@ -26,13 +25,7 @@
import org.apache.tuscany.das.rdb.DAS;
import org.apache.tuscany.das.rdb.config.Config;
import org.apache.tuscany.das.rdb.config.ConfigFactory;
-import org.apache.tuscany.das.rdb.config.Create;
-import org.apache.tuscany.das.rdb.config.Delete;
import org.apache.tuscany.das.rdb.config.Parameter;
-import org.apache.tuscany.das.rdb.config.Parameters;
-import org.apache.tuscany.das.rdb.config.Table;
-import org.apache.tuscany.das.rdb.config.Update;
-import org.apache.tuscany.das.rdb.test.data.BookData;
import org.apache.tuscany.das.rdb.test.data.CustomerData;
import org.apache.tuscany.das.rdb.test.framework.DasTest;
Modified:
tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java
URL:
http://svn.apache.org/viewvc/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java?rev=791623&r1=791622&r2=791623&view=diff
==============================================================================
---
tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java
(original)
+++
tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java
Mon Jul 6 21:47:50 2009
@@ -46,7 +46,6 @@
import org.apache.tuscany.das.rdb.test.framework.DasTest;
import commonj.sdo.DataObject;
-import commonj.sdo.helper.XMLHelper;
public class RelationshipTests extends DasTest {
Modified:
tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java
URL:
http://svn.apache.org/viewvc/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java?rev=791623&r1=791622&r2=791623&view=diff
==============================================================================
---
tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java
(original)
+++
tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java
Mon Jul 6 21:47:50 2009
@@ -39,8 +39,8 @@
import org.apache.tuscany.das.rdb.test.GraphMergeTests;
import org.apache.tuscany.das.rdb.test.ImpliedRelationshipTests;
import org.apache.tuscany.das.rdb.test.KennelTests;
-import org.apache.tuscany.das.rdb.test.MissingPKTests;
import org.apache.tuscany.das.rdb.test.LOBTests;
+import org.apache.tuscany.das.rdb.test.MissingPKTests;
import org.apache.tuscany.das.rdb.test.MultiSchemaTests;
import org.apache.tuscany.das.rdb.test.NamedParameterTests;
import org.apache.tuscany.das.rdb.test.OCCTests;
Modified:
tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
URL:
http://svn.apache.org/viewvc/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java?rev=791623&r1=791622&r2=791623&view=diff
==============================================================================
---
tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
(original)
+++
tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
Mon Jul 6 21:47:50 2009
@@ -22,9 +22,7 @@
import java.util.Collection;
import org.apache.tuscany.das.rdb.Command;
-import org.apache.tuscany.das.rdb.ConfigHelper;
import org.apache.tuscany.das.rdb.DAS;
-import org.apache.tuscany.das.rdb.merge.impl.GraphMerger;
import org.apache.tuscany.das.rdb.test.customer.CustomerFactory;
import org.apache.tuscany.das.rdb.test.data.CustomerData;
import org.apache.tuscany.das.rdb.test.framework.DasTest;
Modified:
tuscany/java/das/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/DASQueryProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/das/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/DASQueryProcessor.java?rev=791623&r1=791622&r2=791623&view=diff
==============================================================================
---
tuscany/java/das/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/DASQueryProcessor.java
(original)
+++
tuscany/java/das/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/DASQueryProcessor.java
Mon Jul 6 21:47:50 2009
@@ -19,11 +19,7 @@
package org.apache.tuscany.samples.das;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.ObjectOutputStream;
import java.lang.reflect.Method;
import java.text.DateFormat;
import java.text.ParseException;
@@ -39,10 +35,8 @@
import org.apache.tuscany.das.rdb.Command;
import org.apache.tuscany.das.rdb.DAS;
import org.apache.tuscany.das.rdb.exception.OptimisticConcurrencyException;
-import org.apache.tuscany.samples.das.util.XmlUtil;
import org.apache.tuscany.samples.web.ServiceProcessor;
-import commonj.sdo.DataGraph;
import commonj.sdo.DataObject;
import commonj.sdo.helper.XMLHelper;
Modified:
tuscany/java/das/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/web/CommandServlet.java
URL:
http://svn.apache.org/viewvc/tuscany/java/das/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/web/CommandServlet.java?rev=791623&r1=791622&r2=791623&view=diff
==============================================================================
---
tuscany/java/das/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/web/CommandServlet.java
(original)
+++
tuscany/java/das/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/web/CommandServlet.java
Mon Jul 6 21:47:50 2009
@@ -20,10 +20,10 @@
import java.io.IOException;
-import javax.servlet.http.HttpServlet;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified:
tuscany/java/das/samples/transaction/src/main/java/org/apache/tuscany/samples/das/tx/sample/MoneyTransfer.java
URL:
http://svn.apache.org/viewvc/tuscany/java/das/samples/transaction/src/main/java/org/apache/tuscany/samples/das/tx/sample/MoneyTransfer.java?rev=791623&r1=791622&r2=791623&view=diff
==============================================================================
---
tuscany/java/das/samples/transaction/src/main/java/org/apache/tuscany/samples/das/tx/sample/MoneyTransfer.java
(original)
+++
tuscany/java/das/samples/transaction/src/main/java/org/apache/tuscany/samples/das/tx/sample/MoneyTransfer.java
Mon Jul 6 21:47:50 2009
@@ -18,10 +18,10 @@
*/
package org.apache.tuscany.samples.das.tx.sample;
+import java.io.InputStream;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.Statement;
-import java.io.InputStream;
import org.apache.tuscany.das.rdb.Command;
import org.apache.tuscany.das.rdb.DAS;
Modified:
tuscany/java/das/tools/src/main/java/org/apache/tuscany/das/rdb/util/DBToSchemaFile.java
URL:
http://svn.apache.org/viewvc/tuscany/java/das/tools/src/main/java/org/apache/tuscany/das/rdb/util/DBToSchemaFile.java?rev=791623&r1=791622&r2=791623&view=diff
==============================================================================
---
tuscany/java/das/tools/src/main/java/org/apache/tuscany/das/rdb/util/DBToSchemaFile.java
(original)
+++
tuscany/java/das/tools/src/main/java/org/apache/tuscany/das/rdb/util/DBToSchemaFile.java
Mon Jul 6 21:47:50 2009
@@ -25,8 +25,8 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.log4j.Logger;
-import org.apache.torque.task.TorqueJDBCTransformTask;
import org.apache.tools.ant.Project;
+import org.apache.torque.task.TorqueJDBCTransformTask;
public class DBToSchemaFile {
private static final Logger logger =
Logger.getLogger(DBToSchemaFile.class);
Modified:
tuscany/java/das/tools/src/main/java/org/apache/tuscany/das/rdb/util/ModelXSDGenOption.java
URL:
http://svn.apache.org/viewvc/tuscany/java/das/tools/src/main/java/org/apache/tuscany/das/rdb/util/ModelXSDGenOption.java?rev=791623&r1=791622&r2=791623&view=diff
==============================================================================
---
tuscany/java/das/tools/src/main/java/org/apache/tuscany/das/rdb/util/ModelXSDGenOption.java
(original)
+++
tuscany/java/das/tools/src/main/java/org/apache/tuscany/das/rdb/util/ModelXSDGenOption.java
Mon Jul 6 21:47:50 2009
@@ -19,7 +19,6 @@
*/
package org.apache.tuscany.das.rdb.util;
-import java.io.File;
public class ModelXSDGenOption {