Convert, clean and bring up a set of itests

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

6 files changed, 10 insertions, 18 deletions

diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
index c0c068d12e..87f87d6c22 100644
--- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
+++ b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
@@ -97,7 +97,7 @@ public class ComplexPropertyBean {
     /**

      * It is a method which implements toString() function

      */

-    @Override

+

     public String toString() {

         return Double.toString(integerNumber) + " - "

             + Double.toString(floatNumber)

diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
index 17b4e582d6..5217ede572 100644
--- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
+++ b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
@@ -21,9 +21,10 @@ package org.apache.tuscany.sca.itest;
 

 import java.util.Collection;

 

+import test.jaxb.props.ReturnCodeProperties;

+

 import commonj.sdo.DataObject;

 

-import test.jaxb.props.ReturnCodeProperties;

 /**

  * It is an Interface which has method declarations. Methods which are to be accessed as a service are declared in this

  * interface. Implementation for these methods is provided in PropertyComponentImpl Class

@@ -113,7 +114,7 @@ public interface PropertyComponent {
      * PropertyComponentImpl

      */

     public DataObject getCustomerSdo();

-    

+

     /**

      * This is a method to get a property value from the SCA runtime environment. It is implemented in the class

      * PropertyComponentImpl

diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
index eb642b6637..16029a6584 100644
--- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
+++ b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
@@ -25,11 +25,11 @@ import org.osoa.sca.ComponentContext;
 import org.osoa.sca.annotations.Context;

 import org.osoa.sca.annotations.Property;

 

+import test.jaxb.props.ReturnCodeProperties;

+

 import com.example.customer.sdo.impl.CustomerImpl;

 import commonj.sdo.DataObject;

 

-import test.jaxb.props.ReturnCodeProperties;

-

 /**

  * This class Implements the interface PropertyComponent and gives implementation for all methods which are declared in

  * that interface.

@@ -37,7 +37,7 @@ import test.jaxb.props.ReturnCodeProperties;
 public class PropertyComponentImpl implements PropertyComponent {

     @Context

     protected ComponentContext context;

-    

+

     @Property

     protected CustomerImpl customerSdo;

 

@@ -173,7 +173,7 @@ public class PropertyComponentImpl implements PropertyComponent {
     public DataObject[] getSdoArrayProperty() {

         return sdoArray;

     }

-    

+

     public String getLocationFromComponentContext() {

         return context.getProperty(String.class, "location");

     }

diff --git a/java/sca/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java b/java/sca/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
index 76bcd06fca..15fb49ea4e 100644
--- a/java/sca/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
+++ b/java/sca/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
@@ -22,8 +22,6 @@
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2008.06.07 at 03:30:47 PM EDT 
 //
-
-
 package test.jaxb.props;
 
 import javax.xml.bind.JAXBElement;
@@ -31,7 +29,6 @@ import javax.xml.bind.annotation.XmlElementDecl;
 import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 
-
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
diff --git a/java/sca/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java b/java/sca/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
index 7a809ebf1e..0a1d4a34a3 100644
--- a/java/sca/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
+++ b/java/sca/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
@@ -22,8 +22,6 @@
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2008.06.07 at 03:30:47 PM EDT 
 //
-
-
 package test.jaxb.props;
 
 import java.math.BigInteger;
@@ -33,7 +31,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for ReturnCodeProperties complex type.
  * 
@@ -55,10 +52,7 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ReturnCodeProperties", namespace = "http://test.sca.jaxb/rcprops", propOrder = {
-    "a",
-    "b"
-})
+@XmlType(name = "ReturnCodeProperties", namespace = "http://test.sca.jaxb/rcprops", propOrder = {"a", "b"})
 public class ReturnCodeProperties {
 
     @XmlElement(name = "AInt")
diff --git a/java/sca/itest/properties/src/main/java/test/jaxb/props/package-info.java b/java/sca/itest/properties/src/main/java/test/jaxb/props/package-info.java
index f726552a62..6a6fdd00cc 100644
--- a/java/sca/itest/properties/src/main/java/test/jaxb/props/package-info.java
+++ b/java/sca/itest/properties/src/main/java/test/jaxb/props/package-info.java
@@ -22,6 +22,6 @@
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2008.06.07 at 03:30:47 PM EDT 
 //
-
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://test.sca.jaxb/rcprops", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package test.jaxb.props;
+