Format code and clean up imports

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

6 files changed, 338 insertions, 330 deletions

diff --git a/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/AssemblyHelper.java b/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/AssemblyHelper.java
index 224180ff5a..12a20b0b6e 100644
--- a/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/AssemblyHelper.java
+++ b/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/AssemblyHelper.java
@@ -52,90 +52,97 @@ import org.apache.tuscany.sca.policy.PolicyFactory;
 public class AssemblyHelper {
     private static AssemblyFactory af = new DefaultAssemblyFactory();
     private static JavaInterfaceFactory jif = new DefaultJavaInterfaceFactory();
-    
+
     public static final Map<String, QName> ALLOWED_ENV_ENTRY_TYPES;
     public static Intent CONVERSATIONAL_INTENT;
     static {
         ALLOWED_ENV_ENTRY_TYPES = new HashMap<String, QName>();
-        ALLOWED_ENV_ENTRY_TYPES.put(String.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "string", "xsd"));
-        ALLOWED_ENV_ENTRY_TYPES.put(Character.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "string", "xsd"));
+        ALLOWED_ENV_ENTRY_TYPES.put(String.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "string",
+                                                                      "xsd"));
+        ALLOWED_ENV_ENTRY_TYPES.put(Character.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "string",
+                                                                         "xsd"));
         ALLOWED_ENV_ENTRY_TYPES.put(Byte.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "byte", "xsd"));
-        ALLOWED_ENV_ENTRY_TYPES.put(Short.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "short", "xsd"));
-        ALLOWED_ENV_ENTRY_TYPES.put(Integer.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "int", "xsd"));
+        ALLOWED_ENV_ENTRY_TYPES.put(Short.class.getName(),
+                                    new QName("http://www.w3.org/2001/XMLSchema", "short", "xsd"));
+        ALLOWED_ENV_ENTRY_TYPES.put(Integer.class.getName(),
+                                    new QName("http://www.w3.org/2001/XMLSchema", "int", "xsd"));
         ALLOWED_ENV_ENTRY_TYPES.put(Long.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "long", "xsd"));
-        ALLOWED_ENV_ENTRY_TYPES.put(Boolean.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "boolean", "xsd"));
-        ALLOWED_ENV_ENTRY_TYPES.put(Double.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "double", "xsd"));
-        ALLOWED_ENV_ENTRY_TYPES.put(Float.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "float", "xsd"));        
+        ALLOWED_ENV_ENTRY_TYPES.put(Boolean.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "boolean",
+                                                                       "xsd"));
+        ALLOWED_ENV_ENTRY_TYPES.put(Double.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "double",
+                                                                      "xsd"));
+        ALLOWED_ENV_ENTRY_TYPES.put(Float.class.getName(),
+                                    new QName("http://www.w3.org/2001/XMLSchema", "float", "xsd"));
     }
 
     static {
         PolicyFactory dpf = new DefaultPolicyFactory();
         CONVERSATIONAL_INTENT = dpf.createIntent();
         CONVERSATIONAL_INTENT.setName(new QName("http://www.osoa.org/xmlns/sca/1.0", "conversational"));
-    	
+
     }
 
     public static JavaInterfaceContract createInterfaceContract(Class<?> clazz) throws InvalidInterfaceException {
-    	JavaInterface ji = jif.createJavaInterface(clazz);
-    	JavaInterfaceContract jic = jif.createJavaInterfaceContract();
+        JavaInterface ji = jif.createJavaInterface(clazz);
+        JavaInterfaceContract jic = jif.createJavaInterfaceContract();
         jic.setInterface(ji);
-        
+
         return jic;
     }
-    
+
     public static ComponentService createComponentService() {
-    	return af.createComponentService();
+        return af.createComponentService();
     }
-    
+
     public static ComponentReference createComponentReference() {
-    	return af.createComponentReference();    	
+        return af.createComponentReference();
     }
-    
+
     public static ComponentProperty createComponentProperty() {
-    	return af.createComponentProperty();
+        return af.createComponentProperty();
     }
-    
+
     public static ComponentType createComponentType() {
-    	return af.createComponentType();
+        return af.createComponentType();
     }
 
     public static Component createComponentFromComponentType(ComponentType componentType, String componentName) {
         Component component = af.createComponent();
         component.setName(componentName);
-   	
-        for(Service service : componentType.getServices()) {
-        	ComponentService compService = af.createComponentService();
-        	compService.setService(service);
-        	component.getServices().add(compService);
+
+        for (Service service : componentType.getServices()) {
+            ComponentService compService = af.createComponentService();
+            compService.setService(service);
+            component.getServices().add(compService);
         }
-        
-        for(Reference reference : componentType.getReferences()) {
-        	ComponentReference compReference = af.createComponentReference();
-        	compReference.setReference(reference);
-        	component.getReferences().add(compReference);
+
+        for (Reference reference : componentType.getReferences()) {
+            ComponentReference compReference = af.createComponentReference();
+            compReference.setReference(reference);
+            component.getReferences().add(compReference);
         }
-        
-        for(Property property : componentType.getProperties()) {
-        	ComponentProperty compProperty = af.createComponentProperty();
-        	compProperty.setProperty(property);
-        	component.getProperties().add(compProperty);
+
+        for (Property property : componentType.getProperties()) {
+            ComponentProperty compProperty = af.createComponentProperty();
+            compProperty.setProperty(property);
+            component.getProperties().add(compProperty);
         }
         return component;
     }
-    
+
     public static Composite createComposite() {
-    	return af.createComposite();
+        return af.createComposite();
     }
 
-	public static Component createComponent() {
-		return af.createComponent();
-	}
+    public static Component createComponent() {
+        return af.createComponent();
+    }
 
-	public static CompositeReference createCompositeReference() {
-		return af.createCompositeReference();
-	}
+    public static CompositeReference createCompositeReference() {
+        return af.createCompositeReference();
+    }
 
-	public static CompositeService createCompositeService() {
-		return af.createCompositeService();
-	}
+    public static CompositeService createCompositeService() {
+        return af.createCompositeService();
+    }
 }
diff --git a/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java b/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java
index 970d1baad6..4d25fdeff0 100644
--- a/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java
+++ b/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java
@@ -57,218 +57,219 @@ import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
  */
 public class EJBModuleProcessor {
 
-	private EjbModule ejbModule;
-	
+    private EjbModule ejbModule;
+
     private Map<String, List<String>> intfToBean = new HashMap<String, List<String>>();
     private List<String> statefulBeans = new ArrayList<String>();
-    
+
     public EJBModuleProcessor(EjbModule ejbModule) {
-    	this.ejbModule = ejbModule;
+        this.ejbModule = ejbModule;
+    }
+
+    public Map<String, ComponentType> getEjbComponentTypes() throws ContributionException {
+        intfToBean.clear();
+        statefulBeans.clear();
+        Map<String, ComponentType> ejbComponentTypes = new HashMap<String, ComponentType>();
+
+        EjbJar ejbJar = ejbModule.getEjbJar();
+        if (!ejbJar.getVersion().startsWith("3")) {
+            // Not an EJB3 module
+            // TODO: should throw an exception
+        }
+
+        Map<String, EnterpriseBean> beansMap = ejbJar.getEnterpriseBeansByEjbName();
+        for (Map.Entry<String, EnterpriseBean> entry : beansMap.entrySet()) {
+            EnterpriseBean bean = entry.getValue();
+            ComponentType ct = null;
+            if (bean instanceof SessionBean) {
+                SessionBean sbean = (SessionBean)bean;
+                ct = getEjbComponentType(sbean, ejbModule.getClassLoader());
+            } else if (bean instanceof MessageDrivenBean) {
+                MessageDrivenBean mdbean = (MessageDrivenBean)bean;
+                ct = getEjbComponentType(mdbean, ejbModule.getClassLoader());
+            } else {
+                continue;
+            }
+            ejbComponentTypes.put(bean.getEjbName(), ct);
+        }
+
+        // Adjust the references to STATEFUL beans
+        for (Map.Entry<String, ComponentType> entry : ejbComponentTypes.entrySet()) {
+            ComponentType ct = entry.getValue();
+            for (Reference reference : ct.getReferences()) {
+                String intf = ((JavaInterface)reference.getInterfaceContract().getInterface()).getName();
+                for (String bean : intfToBean.get(intf)) {
+                    if (statefulBeans.contains(bean)) {
+                        reference.getRequiredIntents().add(AssemblyHelper.CONVERSATIONAL_INTENT);
+                        break;
+                    }
+                }
+            }
+        }
+
+        return ejbComponentTypes;
     }
 
-	public Map<String, ComponentType> getEjbComponentTypes() throws ContributionException {
-		intfToBean.clear();
-		statefulBeans.clear();
-		Map<String, ComponentType> ejbComponentTypes = new HashMap<String, ComponentType>();
-
-		EjbJar ejbJar = ejbModule.getEjbJar();
-		if(!ejbJar.getVersion().startsWith("3")) {
-			// Not an EJB3 module
-			// TODO: should throw an exception
-		}
-
-		Map<String, EnterpriseBean> beansMap = ejbJar.getEnterpriseBeansByEjbName();
-		for (Map.Entry<String, EnterpriseBean> entry : beansMap.entrySet()) {
-			EnterpriseBean bean = entry.getValue();
-			ComponentType ct = null;
-			if (bean instanceof SessionBean) {
-				SessionBean sbean = (SessionBean) bean;
-				ct = getEjbComponentType(sbean, ejbModule.getClassLoader());
-			} else if (bean instanceof MessageDrivenBean) {
-				MessageDrivenBean mdbean = (MessageDrivenBean) bean;
-				ct = getEjbComponentType(mdbean, ejbModule.getClassLoader());
-			} else {
-				continue;
-			}
-			ejbComponentTypes.put(bean.getEjbName(), ct);
-		}
-
-		// Adjust the references to STATEFUL beans
-		for (Map.Entry<String, ComponentType> entry : ejbComponentTypes
-				.entrySet()) {
-			ComponentType ct = entry.getValue();
-			for (Reference reference : ct.getReferences()) {
-				String intf = ((JavaInterface) reference.getInterfaceContract().getInterface()).getName();
-				for (String bean : intfToBean.get(intf)) {
-					if (statefulBeans.contains(bean)) {
-						reference.getRequiredIntents().add(AssemblyHelper.CONVERSATIONAL_INTENT);
-						break;
-					}
-				}
-			}
-		}
-
-		return ejbComponentTypes;
-	}
-    
-	public ComponentType getEjbAppComponentType() throws ContributionException {
-		ComponentType componentType = AssemblyHelper.createComponentType();
-		
-		Map<String, ComponentType> ejbComponentTypes = getEjbComponentTypes();
-		
-		for(Map.Entry<String, ComponentType> entry : ejbComponentTypes.entrySet()) {
-			String beanName = entry.getKey();
-			ComponentType ejbComponentType = entry.getValue();
-
-			for(Service service : ejbComponentType.getServices()) {
-				Service service2 = AssemblyHelper.createComponentService();
-				service2.setName(beanName+"_"+service.getName());
-				service2.setInterfaceContract(service.getInterfaceContract());
-				service2.getRequiredIntents().addAll(service.getRequiredIntents());
-
-				componentType.getServices().add(service2);
-			}
-			
-			for(Reference reference : ejbComponentType.getReferences()) {
-				Reference reference2 = AssemblyHelper.createComponentReference();
-				reference2.setName(beanName+"_"+reference.getName());
-				reference2.setInterfaceContract(reference.getInterfaceContract());
-				reference2.getRequiredIntents().addAll(reference.getRequiredIntents());
-				
-				componentType.getReferences().add(reference2);
-			}
-		}
-		
-		return componentType;
-	}
-	
-	public Composite getEjbAppComposite() throws ContributionException {
-		Composite composite = AssemblyHelper.createComposite();
-		
-		Map<String, ComponentType> ejbComponentTypes = getEjbComponentTypes();
-		
+    public ComponentType getEjbAppComponentType() throws ContributionException {
+        ComponentType componentType = AssemblyHelper.createComponentType();
+
+        Map<String, ComponentType> ejbComponentTypes = getEjbComponentTypes();
+
+        for (Map.Entry<String, ComponentType> entry : ejbComponentTypes.entrySet()) {
+            String beanName = entry.getKey();
+            ComponentType ejbComponentType = entry.getValue();
+
+            for (Service service : ejbComponentType.getServices()) {
+                Service service2 = AssemblyHelper.createComponentService();
+                service2.setName(beanName + "_" + service.getName());
+                service2.setInterfaceContract(service.getInterfaceContract());
+                service2.getRequiredIntents().addAll(service.getRequiredIntents());
+
+                componentType.getServices().add(service2);
+            }
+
+            for (Reference reference : ejbComponentType.getReferences()) {
+                Reference reference2 = AssemblyHelper.createComponentReference();
+                reference2.setName(beanName + "_" + reference.getName());
+                reference2.setInterfaceContract(reference.getInterfaceContract());
+                reference2.getRequiredIntents().addAll(reference.getRequiredIntents());
+
+                componentType.getReferences().add(reference2);
+            }
+        }
+
+        return componentType;
+    }
+
+    public Composite getEjbAppComposite() throws ContributionException {
+        Composite composite = AssemblyHelper.createComposite();
+
+        Map<String, ComponentType> ejbComponentTypes = getEjbComponentTypes();
+
         ModelFactoryExtensionPoint mfep = new DefaultModelFactoryExtensionPoint();
         EJBImplementationFactory eif = mfep.getFactory(EJBImplementationFactory.class);
 
-        for(Map.Entry<String, ComponentType> entry : ejbComponentTypes.entrySet()) {
-			String ejbName = entry.getKey();
-			ComponentType componentType = entry.getValue();
-			
-	        EJBImplementation impl = eif.createEJBImplementation();
-	        impl.setEJBLink(ejbModule.getModuleId()+"#"+ejbName);
-	        // Create component
-	        Component component = AssemblyHelper.createComponent();
-	        String componentName = ejbName;
-	        component.setName(componentName);
-	        component.setImplementation(impl);
-	        
-	        // Add services
-	        for(Service service : componentType.getServices()) {
-	        	ComponentService componentService = AssemblyHelper.createComponentService();
-	        	componentService.setService(service);
-	            component.getServices().add(componentService);
-	        }
-	        
-	        // Add references
-	        for(Reference reference : componentType.getReferences()) {
-	        	ComponentReference componentReference = AssemblyHelper.createComponentReference();
-	        	componentReference.setReference(reference);
-	            component.getReferences().add(componentReference);
-	        }
-	        
-	        // Add properties
-	        for(Property property : componentType.getProperties()) {
-	        	ComponentProperty componentProperty = AssemblyHelper.createComponentProperty();
-	        	componentProperty.setProperty(property);
-	        	component.getProperties().add(componentProperty);
-	        }
-			
-	        // Add component
-	        composite.getComponents().add(component);
-	        
-	        // Add composite services
-	        for(ComponentService service : component.getServices()) {
-	        	CompositeService compositeService = AssemblyHelper.createCompositeService();
-	        	compositeService.setInterfaceContract(service.getInterfaceContract());
-	        	compositeService.setPromotedComponent(component);
-	        	compositeService.setPromotedService(service);
-	            composite.getServices().add(compositeService);
-	        }        
-	        
-	        // Add composite references
-	        for(ComponentReference reference : component.getReferences()) {
-	        	CompositeReference compositeReference = AssemblyHelper.createCompositeReference();
-	        	compositeReference.setInterfaceContract(reference.getInterfaceContract());
-	        	compositeReference.getPromotedReferences().add(reference);
-	            composite.getReferences().add(compositeReference);
-	        }        
-		}
-		return composite;
-	}
-
-	private ComponentType getEjbComponentType(SessionBean bean, ClassLoader cl) throws ContributionException {
+        for (Map.Entry<String, ComponentType> entry : ejbComponentTypes.entrySet()) {
+            String ejbName = entry.getKey();
+            ComponentType componentType = entry.getValue();
+
+            EJBImplementation impl = eif.createEJBImplementation();
+            impl.setEJBLink(ejbModule.getModuleId() + "#" + ejbName);
+            // Create component
+            Component component = AssemblyHelper.createComponent();
+            String componentName = ejbName;
+            component.setName(componentName);
+            component.setImplementation(impl);
+
+            // Add services
+            for (Service service : componentType.getServices()) {
+                ComponentService componentService = AssemblyHelper.createComponentService();
+                componentService.setService(service);
+                component.getServices().add(componentService);
+            }
+
+            // Add references
+            for (Reference reference : componentType.getReferences()) {
+                ComponentReference componentReference = AssemblyHelper.createComponentReference();
+                componentReference.setReference(reference);
+                component.getReferences().add(componentReference);
+            }
+
+            // Add properties
+            for (Property property : componentType.getProperties()) {
+                ComponentProperty componentProperty = AssemblyHelper.createComponentProperty();
+                componentProperty.setProperty(property);
+                component.getProperties().add(componentProperty);
+            }
+
+            // Add component
+            composite.getComponents().add(component);
+
+            // Add composite services
+            for (ComponentService service : component.getServices()) {
+                CompositeService compositeService = AssemblyHelper.createCompositeService();
+                compositeService.setInterfaceContract(service.getInterfaceContract());
+                compositeService.setPromotedComponent(component);
+                compositeService.setPromotedService(service);
+                composite.getServices().add(compositeService);
+            }
+
+            // Add composite references
+            for (ComponentReference reference : component.getReferences()) {
+                CompositeReference compositeReference = AssemblyHelper.createCompositeReference();
+                compositeReference.setInterfaceContract(reference.getInterfaceContract());
+                compositeReference.getPromotedReferences().add(reference);
+                composite.getReferences().add(compositeReference);
+            }
+        }
+        return composite;
+    }
+
+    private ComponentType getEjbComponentType(SessionBean bean, ClassLoader cl) throws ContributionException {
         ComponentType componentType = AssemblyHelper.createComponentType();
-        
+
         boolean conversational = bean.getSessionType().equals(SessionType.STATEFUL);
-        if(conversational) {
-        	statefulBeans.add(bean.getEjbName());
+        if (conversational) {
+            statefulBeans.add(bean.getEjbName());
         }
 
         // Process Remote Business interfaces of the SessionBean
-        for(String intfName : bean.getBusinessRemote()) {
+        for (String intfName : bean.getBusinessRemote()) {
             // This code is added to take care of EJB references to STATEFUL beans that are injected
-        	// without a beanname in @EJB annotation
-        	List<String> beansList = intfToBean.get(intfName);
-        	if(beansList == null) {
-        		beansList = new ArrayList<String>();
-        		intfToBean.put(intfName, beansList);
-        	}
-        	beansList.add(bean.getEjbName());
-        	
-            String serviceName = intfName.lastIndexOf(".") != -1 ? intfName.substring(intfName.lastIndexOf(".")+1) : intfName;
+            // without a beanname in @EJB annotation
+            List<String> beansList = intfToBean.get(intfName);
+            if (beansList == null) {
+                beansList = new ArrayList<String>();
+                intfToBean.put(intfName, beansList);
+            }
+            beansList.add(bean.getEjbName());
+
+            String serviceName =
+                intfName.lastIndexOf(".") != -1 ? intfName.substring(intfName.lastIndexOf(".") + 1) : intfName;
             Service service = AssemblyHelper.createComponentService();
             service.setName(serviceName);
             InterfaceContract ic = null;
             try {
-            	Class<?> clazz = cl.loadClass(intfName);
-            	ic = AssemblyHelper.createInterfaceContract(clazz);
-            	ic.getInterface().setConversational(conversational);
-            	ic.getInterface().setRemotable(true);
+                Class<?> clazz = cl.loadClass(intfName);
+                ic = AssemblyHelper.createInterfaceContract(clazz);
+                ic.getInterface().setConversational(conversational);
+                ic.getInterface().setRemotable(true);
             } catch (Exception e) {
                 throw new ContributionException(e);
             }
             service.setInterfaceContract(ic);
-            if(conversational) {
-            	service.getRequiredIntents().add(AssemblyHelper.CONVERSATIONAL_INTENT);
+            if (conversational) {
+                service.getRequiredIntents().add(AssemblyHelper.CONVERSATIONAL_INTENT);
             }
             componentType.getServices().add(service);
         }
 
         // Process Local Business interfaces of the SessionBean
-        for(String intfName : bean.getBusinessLocal()) {
-            String serviceName = intfName.lastIndexOf(".") != -1 ? intfName.substring(intfName.lastIndexOf(".")+1) : intfName;
+        for (String intfName : bean.getBusinessLocal()) {
+            String serviceName =
+                intfName.lastIndexOf(".") != -1 ? intfName.substring(intfName.lastIndexOf(".") + 1) : intfName;
             Service service = AssemblyHelper.createComponentService();
             service.setName(serviceName);
             InterfaceContract ic = null;
             try {
-            	Class<?> clazz = cl.loadClass(intfName);
-            	ic = AssemblyHelper.createInterfaceContract(clazz);
-            	ic.getInterface().setConversational(conversational);
+                Class<?> clazz = cl.loadClass(intfName);
+                ic = AssemblyHelper.createInterfaceContract(clazz);
+                ic.getInterface().setConversational(conversational);
             } catch (Exception e) {
                 throw new ContributionException(e);
             }
             service.setInterfaceContract(ic);
-            if(conversational) {
-            	service.getRequiredIntents().add(AssemblyHelper.CONVERSATIONAL_INTENT);
+            if (conversational) {
+                service.getRequiredIntents().add(AssemblyHelper.CONVERSATIONAL_INTENT);
             }
             componentType.getServices().add(service);
         }
 
         // Process Remote EJB References
-        for(Map.Entry<String, EjbRef> entry: bean.getEjbRefMap().entrySet()) {
+        for (Map.Entry<String, EjbRef> entry : bean.getEjbRefMap().entrySet()) {
             EjbRef ejbRef = entry.getValue();
-            if(ejbRef.getRefType().compareTo(EjbReference.Type.REMOTE) != 0) {
-            	continue;
+            if (ejbRef.getRefType().compareTo(EjbReference.Type.REMOTE) != 0) {
+                continue;
             }
             String referenceName = entry.getKey();
             referenceName = referenceName.replace("/", "_");
@@ -276,8 +277,8 @@ public class EJBModuleProcessor {
             reference.setName(referenceName);
             InterfaceContract ic = null;
             try {
-            	Class<?> clazz = cl.loadClass(ejbRef.getInterface());
-            	ic = AssemblyHelper.createInterfaceContract(clazz);
+                Class<?> clazz = cl.loadClass(ejbRef.getInterface());
+                ic = AssemblyHelper.createInterfaceContract(clazz);
             } catch (Exception e) {
                 throw new ContributionException(e);
             }
@@ -286,10 +287,10 @@ public class EJBModuleProcessor {
         }
 
         // Process env-entries to compute properties
-        for(Map.Entry<String, EnvEntry> entry : bean.getEnvEntryMap().entrySet()) {
+        for (Map.Entry<String, EnvEntry> entry : bean.getEnvEntryMap().entrySet()) {
             EnvEntry envEntry = entry.getValue();
             String type = envEntry.getEnvEntryType();
-            if(!AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) {
+            if (!AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) {
                 continue;
             }
             String propertyName = entry.getKey();
@@ -305,14 +306,14 @@ public class EJBModuleProcessor {
         return componentType;
     }
 
-	private ComponentType getEjbComponentType(MessageDrivenBean bean, ClassLoader cl) throws ContributionException {
+    private ComponentType getEjbComponentType(MessageDrivenBean bean, ClassLoader cl) throws ContributionException {
         ComponentType componentType = AssemblyHelper.createComponentType();
 
         // Process Remote EJB References
-        for(Map.Entry<String, EjbRef> entry: bean.getEjbRefMap().entrySet()) {
+        for (Map.Entry<String, EjbRef> entry : bean.getEjbRefMap().entrySet()) {
             EjbRef ejbRef = entry.getValue();
-            if(ejbRef.getRefType().compareTo(EjbReference.Type.REMOTE) != 0) {
-            	continue;
+            if (ejbRef.getRefType().compareTo(EjbReference.Type.REMOTE) != 0) {
+                continue;
             }
             String referenceName = entry.getKey();
             referenceName = referenceName.replace("/", "_");
@@ -320,20 +321,20 @@ public class EJBModuleProcessor {
             reference.setName(referenceName);
             InterfaceContract ic = null;
             try {
-            	Class<?> clazz = cl.loadClass(ejbRef.getInterface());
-            	ic = AssemblyHelper.createInterfaceContract(clazz);
+                Class<?> clazz = cl.loadClass(ejbRef.getInterface());
+                ic = AssemblyHelper.createInterfaceContract(clazz);
             } catch (Exception e) {
                 throw new ContributionException(e);
-             }
+            }
             reference.setInterfaceContract(ic);
             componentType.getReferences().add(reference);
         }
 
         // Process env-entries to compute properties
-        for(Map.Entry<String, EnvEntry> entry : bean.getEnvEntryMap().entrySet()) {
+        for (Map.Entry<String, EnvEntry> entry : bean.getEnvEntryMap().entrySet()) {
             EnvEntry envEntry = entry.getValue();
             String type = envEntry.getEnvEntryType();
-            if(!AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) {
+            if (!AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) {
                 continue;
             }
             String propertyName = entry.getKey();
diff --git a/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEModuleHelper.java b/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEModuleHelper.java
index 646067b933..1187d1ed00 100644
--- a/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEModuleHelper.java
+++ b/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEModuleHelper.java
@@ -39,7 +39,7 @@ public class JavaEEModuleHelper {
         try {
             appModule = loader.load(new File(jarFilePath));
         } catch (OpenEJBException e) {
-        	throw new ContributionException(e);
+            throw new ContributionException(e);
         }
 
         // Process deployment descriptor files
@@ -47,7 +47,7 @@ public class JavaEEModuleHelper {
         try {
             readDescriptors.deploy(appModule);
         } catch (OpenEJBException e) {
-        	throw new ContributionException(e);
+            throw new ContributionException(e);
         }
 
         // Process annotations
@@ -55,7 +55,7 @@ public class JavaEEModuleHelper {
         try {
             annDeployer.deploy(appModule);
         } catch (OpenEJBException e) {
-        	throw new ContributionException(e);
+            throw new ContributionException(e);
         }
 
         return appModule;
diff --git a/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java b/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java
index 5f592c6dce..b7641bb31f 100644
--- a/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java
+++ b/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java
@@ -42,29 +42,29 @@ import org.apache.tuscany.sca.implementation.web.WebImplementationFactory;
 import org.apache.tuscany.sca.interfacedef.InterfaceContract;
 
 public class WebModuleProcessor {
-	private WebModule webModule;
-	private ComponentType componentType;
-	
-	public WebModuleProcessor(WebModule module) {
-		webModule = module;
-	}
-
-	public ComponentType getWebAppComponentType() throws ContributionException {
-		if(componentType != null) {
-			return componentType;
-		}
+    private WebModule webModule;
+    private ComponentType componentType;
+
+    public WebModuleProcessor(WebModule module) {
+        webModule = module;
+    }
+
+    public ComponentType getWebAppComponentType() throws ContributionException {
+        if (componentType != null) {
+            return componentType;
+        }
         componentType = AssemblyHelper.createComponentType();
-        
+
         WebApp webApp = webModule.getWebApp();
         ClassLoader classLoader = webModule.getClassLoader();
 
         // Process Remote EJB References
-        for(Map.Entry<String, EjbRef> entry: webApp.getEjbRefMap().entrySet()) {
+        for (Map.Entry<String, EjbRef> entry : webApp.getEjbRefMap().entrySet()) {
             EjbRef ejbRef = entry.getValue();
-            if(ejbRef.getRefType().compareTo(EjbReference.Type.REMOTE) != 0) {
-            	// Only Remote EJB references need to be considered.
-            	// Skip the current one as it is a remote reference.
-            	continue;
+            if (ejbRef.getRefType().compareTo(EjbReference.Type.REMOTE) != 0) {
+                // Only Remote EJB references need to be considered.
+                // Skip the current one as it is a remote reference.
+                continue;
             }
             String referenceName = entry.getKey();
             referenceName = referenceName.replace("/", "_");
@@ -72,21 +72,21 @@ public class WebModuleProcessor {
             reference.setName(referenceName);
             InterfaceContract ic = null;
             try {
-            	Class<?> clazz = classLoader.loadClass(ejbRef.getInterface());
-            	ic = AssemblyHelper.createInterfaceContract(clazz);
+                Class<?> clazz = classLoader.loadClass(ejbRef.getInterface());
+                ic = AssemblyHelper.createInterfaceContract(clazz);
             } catch (Exception e) {
-            	componentType = null;
+                componentType = null;
                 throw new ContributionException(e);
             }
             reference.setInterfaceContract(ic);
             componentType.getReferences().add(reference);
         }
-        
+
         // Process env-entries to compute properties
-        for(Map.Entry<String, EnvEntry> entry : webApp.getEnvEntryMap().entrySet()) {
+        for (Map.Entry<String, EnvEntry> entry : webApp.getEnvEntryMap().entrySet()) {
             EnvEntry envEntry = entry.getValue();
             String type = envEntry.getEnvEntryType();
-            if(!AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) {
+            if (!AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) {
                 continue;
             }
             String propertyName = entry.getKey();
@@ -101,12 +101,12 @@ public class WebModuleProcessor {
 
         return componentType;
     }
-	
-	public Composite getWebAppComposite() throws ContributionException {
-		getWebAppComponentType();
-		
-		Composite composite = AssemblyHelper.createComposite();
-		
+
+    public Composite getWebAppComposite() throws ContributionException {
+        getWebAppComponentType();
+
+        Composite composite = AssemblyHelper.createComposite();
+
         ModelFactoryExtensionPoint mfep = new DefaultModelFactoryExtensionPoint();
         WebImplementationFactory wif = mfep.getFactory(WebImplementationFactory.class);
         WebImplementation impl = wif.createWebImplementation();
@@ -117,32 +117,32 @@ public class WebModuleProcessor {
         String componentName = webModule.getModuleId();
         component.setName(componentName);
         component.setImplementation(impl);
-        
+
         // Add references
-        for(Reference reference : componentType.getReferences()) {
-        	ComponentReference componentReference = AssemblyHelper.createComponentReference();
-        	componentReference.setReference(reference);
+        for (Reference reference : componentType.getReferences()) {
+            ComponentReference componentReference = AssemblyHelper.createComponentReference();
+            componentReference.setReference(reference);
             component.getReferences().add(componentReference);
         }
-        
+
         // Add properties
-        for(Property property : componentType.getProperties()) {
-        	ComponentProperty componentProperty = AssemblyHelper.createComponentProperty();
-        	componentProperty.setProperty(property);
-        	component.getProperties().add(componentProperty);
+        for (Property property : componentType.getProperties()) {
+            ComponentProperty componentProperty = AssemblyHelper.createComponentProperty();
+            componentProperty.setProperty(property);
+            component.getProperties().add(componentProperty);
         }
-        
+
         // Add component to composite
         composite.getComponents().add(component);
-        
+
         // Add composite references
-        for(ComponentReference reference : component.getReferences()) {
-        	CompositeReference compositeReference = AssemblyHelper.createCompositeReference();
-        	compositeReference.setInterfaceContract(reference.getInterfaceContract());
-        	compositeReference.getPromotedReferences().add(reference);
+        for (ComponentReference reference : component.getReferences()) {
+            CompositeReference compositeReference = AssemblyHelper.createCompositeReference();
+            compositeReference.setInterfaceContract(reference.getInterfaceContract());
+            compositeReference.getPromotedReferences().add(reference);
             composite.getReferences().add(compositeReference);
-        }        
+        }
 
         return composite;
-	}
+    }
 }
diff --git a/java/sca/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessorTestCase.java b/java/sca/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessorTestCase.java
index 5cf76d29d6..b062187afb 100644
--- a/java/sca/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessorTestCase.java
+++ b/java/sca/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessorTestCase.java
@@ -36,37 +36,37 @@ import org.junit.Test;
  */
 public class EJBModuleProcessorTestCase {
 
-	EjbModule ejbModule;
-	
+    EjbModule ejbModule;
+
     @Before
     public void setUp() throws Exception {
-    	String jarFilePath = "target/test-classes/ejb-injection-sample.jar";
-    	JavaEEModuleHelper jmh = new JavaEEModuleHelper();
-    	AppModule appModule = jmh.getMetadataCompleteModules(jarFilePath);
-    	ejbModule = appModule.getEjbModules().get(0);
+        String jarFilePath = "target/test-classes/ejb-injection-sample.jar";
+        JavaEEModuleHelper jmh = new JavaEEModuleHelper();
+        AppModule appModule = jmh.getMetadataCompleteModules(jarFilePath);
+        ejbModule = appModule.getEjbModules().get(0);
     }
-    
+
     @Test
     public void testEjbContribution() throws Exception {
-    	EJBModuleProcessor emp = new EJBModuleProcessor(ejbModule);
-    	Map<String, ComponentType> ejbComponentTypes = emp.getEjbComponentTypes();
-    	Assert.assertEquals(3, ejbComponentTypes.size());
-    	
-    	Assert.assertTrue(ejbComponentTypes.containsKey("DataStoreImpl"));
-    	Assert.assertTrue(ejbComponentTypes.containsKey("DataStoreStatefulImpl"));
-    	Assert.assertTrue(ejbComponentTypes.containsKey("DataReaderImpl"));
-    	
-    	ComponentType ct = ejbComponentTypes.get("DataStoreImpl");
-    	Assert.assertEquals(2, ct.getServices().size());
-    	Set<String> serviceNames = new HashSet<String>();
-    	for(Service s : ct.getServices()) {
-    		serviceNames.add(s.getName());
-    	}
-    	
-    	Assert.assertEquals(2, serviceNames.size());
-    	Assert.assertTrue(serviceNames.contains("DataStoreRemote"));
-    	Assert.assertTrue(serviceNames.contains("DataStoreLocal"));
-    	
-    	Assert.assertEquals(0, ct.getReferences().size());
+        EJBModuleProcessor emp = new EJBModuleProcessor(ejbModule);
+        Map<String, ComponentType> ejbComponentTypes = emp.getEjbComponentTypes();
+        Assert.assertEquals(3, ejbComponentTypes.size());
+
+        Assert.assertTrue(ejbComponentTypes.containsKey("DataStoreImpl"));
+        Assert.assertTrue(ejbComponentTypes.containsKey("DataStoreStatefulImpl"));
+        Assert.assertTrue(ejbComponentTypes.containsKey("DataReaderImpl"));
+
+        ComponentType ct = ejbComponentTypes.get("DataStoreImpl");
+        Assert.assertEquals(2, ct.getServices().size());
+        Set<String> serviceNames = new HashSet<String>();
+        for (Service s : ct.getServices()) {
+            serviceNames.add(s.getName());
+        }
+
+        Assert.assertEquals(2, serviceNames.size());
+        Assert.assertTrue(serviceNames.contains("DataStoreRemote"));
+        Assert.assertTrue(serviceNames.contains("DataStoreLocal"));
+
+        Assert.assertEquals(0, ct.getReferences().size());
     }
 }
diff --git a/java/sca/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessorTestCase.java b/java/sca/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessorTestCase.java
index f7e8c56899..030fdc3d19 100644
--- a/java/sca/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessorTestCase.java
+++ b/java/sca/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessorTestCase.java
@@ -36,34 +36,34 @@ import org.junit.Test;
  */
 public class WebModuleProcessorTestCase {
 
-	WebModule webModule;
-	
+    WebModule webModule;
+
     @Before
     public void setUp() throws Exception {
-    	String jarFilePath = "target/test-classes/ejb-injection-sample.ear";
-    	JavaEEModuleHelper jmh = new JavaEEModuleHelper();
-    	AppModule appModule = jmh.getMetadataCompleteModules(jarFilePath);
-    	webModule = appModule.getWebModules().get(0);
+        String jarFilePath = "target/test-classes/ejb-injection-sample.ear";
+        JavaEEModuleHelper jmh = new JavaEEModuleHelper();
+        AppModule appModule = jmh.getMetadataCompleteModules(jarFilePath);
+        webModule = appModule.getWebModules().get(0);
     }
-    
+
     @Test
     public void testWebAppContribution() throws Exception {
-    	WebModuleProcessor wmp = new WebModuleProcessor(webModule);
-    	
-    	ComponentType ct = wmp.getWebAppComponentType();
-    	Assert.assertEquals(2, ct.getReferences().size());
-    	Set<String> referenceNames = new HashSet<String>();
-    	for(Reference r : ct.getReferences()) {
-    		referenceNames.add(r.getName());
-    	}
-    	
-    	Assert.assertEquals(2, referenceNames.size());
-    	Assert.assertTrue(referenceNames.contains("org.myorg.MyServlet_bank"));
-    	Assert.assertTrue(referenceNames.contains("org.myorg.MyServlet_converter"));
-    	
-    	Assert.assertEquals(0, ct.getServices().size());
-    	
-    	Composite composite = wmp.getWebAppComposite();
-    	Assert.assertEquals(2, composite.getReferences().size());
+        WebModuleProcessor wmp = new WebModuleProcessor(webModule);
+
+        ComponentType ct = wmp.getWebAppComponentType();
+        Assert.assertEquals(2, ct.getReferences().size());
+        Set<String> referenceNames = new HashSet<String>();
+        for (Reference r : ct.getReferences()) {
+            referenceNames.add(r.getName());
+        }
+
+        Assert.assertEquals(2, referenceNames.size());
+        Assert.assertTrue(referenceNames.contains("org.myorg.MyServlet_bank"));
+        Assert.assertTrue(referenceNames.contains("org.myorg.MyServlet_converter"));
+
+        Assert.assertEquals(0, ct.getServices().size());
+
+        Composite composite = wmp.getWebAppComposite();
+        Assert.assertEquals(2, composite.getReferences().size());
     }
 }