Organize imports

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@791623 13f79535-47bb-0310-9956-ffa450edef68

18 files changed, 13 insertions, 36 deletions

diff --git a/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java b/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java
index ecfe8416b5..d4582374e1 100644
--- a/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java
+++ b/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java
@@ -29,8 +29,8 @@ import org.apache.tuscany.das.rdb.config.Parameters;
 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.
diff --git a/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java b/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java
index 53c8c4ee04..45f0a55719 100644
--- a/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java
+++ b/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java
@@ -21,9 +21,6 @@ package org.apache.tuscany.das.rdb.impl;
 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
diff --git a/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java b/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java
index 841e0f17d6..6b1a2ad179 100644
--- a/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java
+++ b/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java
@@ -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 {
     
diff --git a/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterExtendedImpl.java b/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterExtendedImpl.java
index ccb42edc78..db98b130ba 100644
--- a/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterExtendedImpl.java
+++ b/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterExtendedImpl.java
@@ -20,6 +20,7 @@ package org.apache.tuscany.das.rdb.impl;
 
 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{
diff --git a/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java b/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
index 608ed6122a..c78d91e219 100644
--- a/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
+++ b/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
@@ -22,8 +22,8 @@ import java.io.IOException;
 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;
diff --git a/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java b/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java
index 5ce2ed6992..ee3f3d8faa 100644
--- a/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java
+++ b/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java
@@ -25,9 +25,9 @@ import java.util.List;
 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;
 
diff --git a/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java b/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
index b3e29ee854..2f43a6675f 100644
--- a/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
+++ b/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
@@ -23,8 +23,8 @@ import java.util.HashMap;
 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;
diff --git a/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConnectionTests.java b/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConnectionTests.java
index 49aef70946..42ff57b831 100644
--- a/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConnectionTests.java
+++ b/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConnectionTests.java
@@ -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;

diff --git a/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java b/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java
index f67c856d5f..a1a7b57433 100644
--- a/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java
+++ b/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java
@@ -30,12 +30,12 @@ import org.apache.tuscany.das.rdb.test.customer.AnOrder;
 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;
diff --git a/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/NamedParameterTests.java b/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/NamedParameterTests.java
index 6de2447ead..88e9b201ea 100644
--- a/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/NamedParameterTests.java
+++ b/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/NamedParameterTests.java
@@ -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.ConfigHelper;
 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;
 
diff --git a/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java b/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java
index de856a9a02..df649ad598 100644
--- a/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java
+++ b/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java
@@ -46,7 +46,6 @@ import org.apache.tuscany.das.rdb.test.data.ProductSpecData;
 import org.apache.tuscany.das.rdb.test.framework.DasTest;
 
 import commonj.sdo.DataObject;
-import commonj.sdo.helper.XMLHelper;
 
 public class RelationshipTests extends DasTest {
 
diff --git a/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java b/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java
index 2f607fae76..1dbf8ea5a2 100644
--- a/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java
+++ b/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java
@@ -39,8 +39,8 @@ import org.apache.tuscany.das.rdb.test.GeneratedId;
 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;
diff --git a/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java b/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
index dc1296d92a..c8ebc868da 100644
--- a/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
+++ b/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
@@ -22,9 +22,7 @@ import java.io.InputStream;
 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;
diff --git a/java/das/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/DASQueryProcessor.java b/java/das/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/DASQueryProcessor.java
index 3d14c74786..86b83be235 100644
--- a/java/das/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/DASQueryProcessor.java
+++ b/java/das/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/DASQueryProcessor.java
@@ -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 java.util.Vector;
 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;

 

diff --git a/java/das/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/web/CommandServlet.java b/java/das/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/web/CommandServlet.java
index 26a1f468a7..ffab0d107b 100644
--- a/java/das/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/web/CommandServlet.java
+++ b/java/das/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/web/CommandServlet.java
@@ -20,10 +20,10 @@ package org.apache.tuscany.samples.web;
 

 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;

 

diff --git a/java/das/samples/transaction/src/main/java/org/apache/tuscany/samples/das/tx/sample/MoneyTransfer.java b/java/das/samples/transaction/src/main/java/org/apache/tuscany/samples/das/tx/sample/MoneyTransfer.java
index 144bba385e..650f60f089 100644
--- a/java/das/samples/transaction/src/main/java/org/apache/tuscany/samples/das/tx/sample/MoneyTransfer.java
+++ b/java/das/samples/transaction/src/main/java/org/apache/tuscany/samples/das/tx/sample/MoneyTransfer.java
@@ -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;

diff --git a/java/das/tools/src/main/java/org/apache/tuscany/das/rdb/util/DBToSchemaFile.java b/java/das/tools/src/main/java/org/apache/tuscany/das/rdb/util/DBToSchemaFile.java
index 7288252ae4..1dfa7919fd 100644
--- a/java/das/tools/src/main/java/org/apache/tuscany/das/rdb/util/DBToSchemaFile.java
+++ b/java/das/tools/src/main/java/org/apache/tuscany/das/rdb/util/DBToSchemaFile.java
@@ -25,8 +25,8 @@ import javax.xml.stream.XMLInputFactory;
 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);

diff --git a/java/das/tools/src/main/java/org/apache/tuscany/das/rdb/util/ModelXSDGenOption.java b/java/das/tools/src/main/java/org/apache/tuscany/das/rdb/util/ModelXSDGenOption.java
index 24c848c33f..e9ac04cb5e 100644
--- a/java/das/tools/src/main/java/org/apache/tuscany/das/rdb/util/ModelXSDGenOption.java
+++ b/java/das/tools/src/main/java/org/apache/tuscany/das/rdb/util/ModelXSDGenOption.java
@@ -19,7 +19,6 @@
  */

 package org.apache.tuscany.das.rdb.util;

 

-import java.io.File;

 

 public class ModelXSDGenOption {