tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rf...@apache.org
Subject svn commit: r561857 [2/2] - in /incubator/tuscany/java/sca/modules/implementation-spring/src: main/java/org/apache/tuscany/sca/implementation/spring/ main/java/org/apache/tuscany/sca/implementation/spring/xml/ main/resources/org/springframework/sca/xml...
Date Wed, 01 Aug 2007 16:22:40 GMT
Modified: incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java?view=diff&rev=561857&r1=561856&r2=561857
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java Wed Aug  1 09:22:29 2007
@@ -77,25 +77,25 @@
     private static final QName PROPERTY_ELEMENT = new QName(SPRING_NS, "property");
     private static final String APPLICATION_CONTEXT = "application-context.xml";
 
-    private AssemblyFactory 			assemblyFactory;
-    private JavaInterfaceIntrospector 	interfaceIntrospector;
-    private JavaInterfaceFactory 		javaFactory;
-    private PolicyFactory 				policyFactory;
-    private ClassLoader 				cl;
-    
-    private SpringBeanIntrospector		beanIntrospector;
-
-    public SpringXMLComponentTypeLoader( AssemblyFactory 	  assemblyFactory,
-    									 JavaInterfaceIntrospector interfaceIntrospector,
-    									 JavaInterfaceFactory javaFactory,
-    									 PolicyFactory 		  policyFactory) {
+    private AssemblyFactory assemblyFactory;
+    private JavaInterfaceIntrospector interfaceIntrospector;
+    private JavaInterfaceFactory javaFactory;
+    private PolicyFactory policyFactory;
+    private ClassLoader cl;
+
+    private SpringBeanIntrospector beanIntrospector;
+
+    public SpringXMLComponentTypeLoader(AssemblyFactory assemblyFactory,
+                                        JavaInterfaceIntrospector interfaceIntrospector,
+                                        JavaInterfaceFactory javaFactory,
+                                        PolicyFactory policyFactory) {
         super();
-        this.assemblyFactory 		= assemblyFactory;
-        this.interfaceIntrospector 	= interfaceIntrospector;
-        this.javaFactory 			= javaFactory;
-        this.policyFactory			= policyFactory;
-        beanIntrospector = new SpringBeanIntrospector( assemblyFactory,
-   			 interfaceIntrospector, javaFactory, policyFactory );
+        this.assemblyFactory = assemblyFactory;
+        this.interfaceIntrospector = interfaceIntrospector;
+        this.javaFactory = javaFactory;
+        this.policyFactory = policyFactory;
+        beanIntrospector =
+            new SpringBeanIntrospector(assemblyFactory, interfaceIntrospector, javaFactory, policyFactory);
     }
 
     protected Class<SpringImplementation> getImplementationClass() {
@@ -107,19 +107,20 @@
      * Spring implementation
      * 
      */
-    public void load( SpringImplementation implementation ) throws ContributionReadException {
-    	//System.out.println("Spring TypeLoader - load method start");
-    	ComponentType componentType = implementation.getComponentType();
-    	/* Check that there is a component type object already set	*/
-        if ( componentType == null) {
+    public void load(SpringImplementation implementation) throws ContributionReadException {
+        //System.out.println("Spring TypeLoader - load method start");
+        ComponentType componentType = implementation.getComponentType();
+        /* Check that there is a component type object already set	*/
+        if (componentType == null) {
             throw new ContributionReadException("SpringXMLLoader load: implementation has no ComponentType object");
-        } 
-    	if ( componentType.isUnresolved() ) {
-	    	/* Fetch the location of the application-context file from the implementation */
-	        loadFromXML( implementation );
-	        if( !componentType.isUnresolved() ) implementation.setUnresolved( false );
-    	} // end if
-    	//System.out.println("Spring TypeLoader - load method complete");
+        }
+        if (componentType.isUnresolved()) {
+            /* Fetch the location of the application-context file from the implementation */
+            loadFromXML(implementation);
+            if (!componentType.isUnresolved())
+                implementation.setUnresolved(false);
+        } // end if
+        //System.out.println("Spring TypeLoader - load method complete");
     } // end method load
 
     /**
@@ -130,75 +131,73 @@
      * @return a Spring Resource for the application-context
      * file
      */
-    private void loadFromXML( SpringImplementation implementation )
-        throws ContributionReadException {
+    private void loadFromXML(SpringImplementation implementation) throws ContributionReadException {
         XMLStreamReader reader;
         List<SpringBeanElement> beans = new ArrayList<SpringBeanElement>();
         List<SpringSCAServiceElement> services = new ArrayList<SpringSCAServiceElement>();
         List<SpringSCAReferenceElement> references = new ArrayList<SpringSCAReferenceElement>();
         List<SpringSCAPropertyElement> scaproperties = new ArrayList<SpringSCAPropertyElement>();
         SpringBeanElement bean = null;
-        
+
         Resource resource;
-        
+
         String location = implementation.getSpringLocation();
-        
+
         try {
             // FIXME - is the ContextClassLoader the right place to start the search?
-        	cl = Thread.currentThread().getContextClassLoader();
+            cl = Thread.currentThread().getContextClassLoader();
 
-            resource = getApplicationContextResource( location, cl );
-            implementation.setResource( resource );
+            resource = getApplicationContextResource(location, cl);
+            implementation.setResource(resource);
             // The URI is used to uniquely identify the Implementation
-            implementation.setURI( resource.getURL().toString() );
-        	// FIXME - need a better way to handle the XMLInputFactory than allocating a new one every time
+            implementation.setURI(resource.getURL().toString());
+            // FIXME - need a better way to handle the XMLInputFactory than allocating a new one every time
             XMLInputFactory xmlFactory = XMLInputFactory.newInstance();
             reader = xmlFactory.createXMLStreamReader(resource.getInputStream());
-            
+
             // System.out.println("Spring TypeLoader - starting to read context file");
-            
+
             boolean completed = false;
-            while ( !completed ) {
+            while (!completed) {
                 switch (reader.next()) {
-                case START_ELEMENT:
-                    QName qname = reader.getName();
-                    //System.out.println("Spring TypeLoader - found element with name: " + qname.toString());
-                    if (SERVICE_ELEMENT.equals(qname)) {
-                        SpringSCAServiceElement service = new SpringSCAServiceElement(
-                        		reader.getAttributeValue(null, "name"),
-                        		reader.getAttributeValue(null, "type"),
-                        		reader.getAttributeValue(null, "target") );
-                        services.add( service );
-                    } else if (REFERENCE_ELEMENT.equals(qname)) {
-                        SpringSCAReferenceElement reference = new SpringSCAReferenceElement(
-                        		reader.getAttributeValue(null, "name"),
-                        		reader.getAttributeValue(null, "type") );
-                        references.add( reference );
-                    } else if (SCAPROPERTY_ELEMENT.equals(qname)) {
-                    	SpringSCAPropertyElement scaproperty = new SpringSCAPropertyElement(
-                    			reader.getAttributeValue(null, "name"),
-                    			reader.getAttributeValue(null, "type"));
-                    	scaproperties.add( scaproperty );
-                    } else if (BEAN_ELEMENT.equals(qname)) {
-                    	// TODO FIX THIS !!
-                    	int count=reader.getAttributeCount();
-                    	bean = new SpringBeanElement(
-                    			reader.getAttributeValue( null, "id"),
-                    			reader.getAttributeValue( null, "class") );
-                    	beans.add( bean );
-                    } else if (PROPERTY_ELEMENT.equals(qname)) {
-                    	SpringPropertyElement property = new SpringPropertyElement(
-                    			reader.getAttributeValue(null, "name"),
-                    			reader.getAttributeValue(null, "ref"));
-                    	bean.addProperty( property );
-                    } // end if
-                    break;
-                case END_ELEMENT:
-                    if (BEANS_ELEMENT.equals(reader.getName())) {
-                    	//System.out.println("Spring TypeLoader - finished read of context file");
-                        completed = true;
+                    case START_ELEMENT:
+                        QName qname = reader.getName();
+                        //System.out.println("Spring TypeLoader - found element with name: " + qname.toString());
+                        if (SERVICE_ELEMENT.equals(qname)) {
+                            SpringSCAServiceElement service =
+                                new SpringSCAServiceElement(reader.getAttributeValue(null, "name"), reader
+                                    .getAttributeValue(null, "type"), reader.getAttributeValue(null, "target"));
+                            services.add(service);
+                        } else if (REFERENCE_ELEMENT.equals(qname)) {
+                            SpringSCAReferenceElement reference =
+                                new SpringSCAReferenceElement(reader.getAttributeValue(null, "name"), reader
+                                    .getAttributeValue(null, "type"));
+                            references.add(reference);
+                        } else if (SCAPROPERTY_ELEMENT.equals(qname)) {
+                            SpringSCAPropertyElement scaproperty =
+                                new SpringSCAPropertyElement(reader.getAttributeValue(null, "name"), reader
+                                    .getAttributeValue(null, "type"));
+                            scaproperties.add(scaproperty);
+                        } else if (BEAN_ELEMENT.equals(qname)) {
+                            // TODO FIX THIS !!
+                            int count = reader.getAttributeCount();
+                            bean =
+                                new SpringBeanElement(reader.getAttributeValue(null, "id"), reader
+                                    .getAttributeValue(null, "class"));
+                            beans.add(bean);
+                        } else if (PROPERTY_ELEMENT.equals(qname)) {
+                            SpringPropertyElement property =
+                                new SpringPropertyElement(reader.getAttributeValue(null, "name"), reader
+                                    .getAttributeValue(null, "ref"));
+                            bean.addProperty(property);
+                        } // end if
                         break;
-                    } // end if
+                    case END_ELEMENT:
+                        if (BEANS_ELEMENT.equals(reader.getName())) {
+                            //System.out.println("Spring TypeLoader - finished read of context file");
+                            completed = true;
+                            break;
+                        } // end if
                 } // end switch
             } // end while
 
@@ -207,188 +206,185 @@
         } catch (XMLStreamException e) {
             throw new ContributionReadException(e);
         }
-        
+
         /* At this point, the complete application-context.xml file has been read and its contents  */
         /* stored in the lists of beans, services, references.  These are now used to generate      */
         /* the implied componentType for the application context								    */
-        generateComponentType( implementation, beans, services, references, scaproperties );
-        
+        generateComponentType(implementation, beans, services, references, scaproperties);
+
         return;
     } // end method loadFromXML
-    
+
     /**
      * Generates the Spring implementation component type from the configuration contained in the
      * lists of beans, services, references and scaproperties derived from the application context
      */
-    private void generateComponentType( SpringImplementation implementation,
-    		                                     List<SpringBeanElement> beans,
-    		                                     List<SpringSCAServiceElement> services,
-    		                                     List<SpringSCAReferenceElement> references,
-    		                                     List<SpringSCAPropertyElement> scaproperties )
-    	throws ContributionReadException {
-    	/*
-    	 * 1. Each service becomes a service in the component type
-    	 * 2. Each reference becomes a reference in the component type
-    	 * 3. IF there are no explicit service elements, each bean becomes a service
-    	 * 4. Each bean property which is a reference not pointing at another bean in the 
-    	 *    application context becomes a reference unless it is pointing at one of the references
-    	 * 5. Each scaproperty becomes a property in the component type
-    	 * 6. Each bean property which is not a reference and which is not pointing 
-    	 *    at another bean in the application context becomes a property in the component type
-    	 */
-    	
-    	ComponentType componentType = implementation.getComponentType();
-    	
-    	try {
-	    	// Deal with the services first....												
-	    	Iterator<SpringSCAServiceElement> its = services.iterator(); 
-	    	while( its.hasNext() ) {
-	    		SpringSCAServiceElement serviceElement = its.next();
-	    		Class<?> interfaze = cl.loadClass( serviceElement.getType() );
-	    		Service theService = createService( interfaze, serviceElement.getName() );
-	    		componentType.getServices().add( theService );
-	    		// Add this service to the Service / Bean map
-	    		String beanName = serviceElement.getTarget();
-	    		for( SpringBeanElement beanElement : beans ) {
-	    			if( beanName.equals( beanElement.getId() ) ) {
-	    				implementation.setBeanForService( theService, beanElement );
-	    			}
-	    		} // end for
-	    	} // end while
-	    	
-	    	// Next handle the references
-	    	Iterator<SpringSCAReferenceElement> itr = references.iterator(); 
-	    	while( itr.hasNext() ) {
-	    		SpringSCAReferenceElement referenceElement = itr.next();
-	    		Class<?> interfaze = cl.loadClass( referenceElement.getType() );
-	    		Reference theReference = createReference( interfaze, referenceElement.getName() );
-	    		componentType.getReferences().add( theReference );
-	    	} // end while
-	    	
-	    	// Finally deal with the beans
-	    	Iterator<SpringBeanElement> itb;
-	    	// If there are no explicit service elements, then expose all the beans
-	    	if( services.isEmpty() ) {
-	    		itb = beans.iterator();
-	    		// Loop through all the beans found
-	    		while( itb.hasNext() ) {
-	    			SpringBeanElement beanElement = itb.next();
-	    			// Load the Spring bean class
-	    			Class<?> beanClass = cl.loadClass( beanElement.getClassName() );
-	    			// Introspect the bean 
-	    			ComponentType beanComponentType = assemblyFactory.createComponentType();
-	    			beanIntrospector.introspectBean( beanClass, beanComponentType );
-	    			// Get the service interface defined by this Spring Bean and add to
-	    			// the component type of the Spring Assembly
-	    			List<Service> beanServices = beanComponentType.getServices();
-	    			componentType.getServices().addAll( beanServices );
-	    			// Add these services to the Service / Bean map
-	    			for( Service beanService : beanServices ) {
-	    			    implementation.setBeanForService( beanService, beanElement );
-	    			}
-	    		} // end while
-	    	} // end if
-	    	// Now check to see if there are any more references from beans that are not satisfied
-	    	itb = beans.iterator();
-	    	while( itb.hasNext() ) {
-	    		SpringBeanElement beanElement = itb.next();
-	    		boolean unresolvedProperties = false;
-	    		if( !beanElement.getProperties().isEmpty() ) {
-	    			// Scan through the properties
-	    			Iterator<SpringPropertyElement> itp = beanElement.getProperties().iterator();
-	    			while( itp.hasNext() ) {
-	    				SpringPropertyElement propertyElement = itp.next();
-	    				if( propertyRefUnresolved( propertyElement.getRef(), beans, 
-	    						references, scaproperties ) ) {
-	    					// This means an unresolved reference from the spring bean...
-	    					unresolvedProperties = true;
-	    				} // end if
-	    			} // end while 
-	    			// If there are unresolved properties, then find which ones are references
-	    			if( unresolvedProperties ) {
-		    			Class<?> beanClass = cl.loadClass( beanElement.getClassName() );
-		    			// Introspect the bean 
-		    			ComponentType beanComponentType = assemblyFactory.createComponentType();
-		    			Map<String, JavaElementImpl> propertyMap = 
-		    				beanIntrospector.introspectBean( beanClass, beanComponentType );
-		    			// Get the references by this Spring Bean and add the unresolved ones to
-		    			// the component type of the Spring Assembly
-		    			List<Reference> beanReferences = beanComponentType.getReferences();
-		    			List<Property> beanProperties = beanComponentType.getProperties();
-		    			itp = beanElement.getProperties().iterator();
-		    			while( itp.hasNext() ) {
-		    				SpringPropertyElement propertyElement = itp.next();
-		    				if( propertyRefUnresolved( propertyElement.getRef(), beans, 
-		    						references, scaproperties ) ) {
-		    					boolean resolved = false;
-		    					// This means an unresolved reference from the spring bean...add it to
-		    					// the references for the Spring application context
-		    					for ( Reference reference : beanReferences ) {
-		    						if( propertyElement.getName().equals(reference.getName()) ) {
-		    							// The name of the reference in this case is the string in
-		    							// the @ref attribute of the Spring property element, NOT the
-		    							// name of the field in the Spring bean....
-		    							reference.setName(propertyElement.getRef());
-		    							componentType.getReferences().add( reference );
-		    							resolved = true;
-		    						} // end if
-		    					} // end for
-		    					if( !resolved ) {
-		    						// If the bean property is not already resolved as a reference
-		    						// then it must be an SCA property...
-		    						for ( Property scaproperty : beanProperties ) {
-		    							if( propertyElement.getName().equals(scaproperty.getName()) ) {
-			    							// The name of the reference in this case is the string in
-			    							// the @ref attribute of the Spring property element, NOT the
-			    							// name of the field in the Spring bean....
-			    							scaproperty.setName(propertyElement.getRef());
-			    							componentType.getProperties().add( scaproperty );
-			    							// Fetch and store the type of the property
-			    							implementation.setPropertyClass( scaproperty.getName(),
-			    									propertyMap.get(scaproperty.getName()).getType() );
-			    							resolved = true;
-			    						} // end if
-		    						} // end for
-		    					} // end if
-		    				} // end if
-		    			} // end while 
-	    			} // end if
-	    		} // end if
-	    		
-	    	} // end while
-	    	
-	    	Iterator<SpringSCAPropertyElement> itsp = scaproperties.iterator(); 
-	    	while( itsp.hasNext() ) {
-	    		SpringSCAPropertyElement scaproperty = itsp.next();
-	    		// Create a component type property if the SCA property element has a name
-	    		// and a type declared...
-	    		if( scaproperty.getType() != null && scaproperty.getName() != null ) {
-	    			Property theProperty = assemblyFactory.createProperty();
-	    			theProperty.setName( scaproperty.getName() );
-	    			// Get the Java class and then an XSD element type for the property
-	    			Class<?> propType = Class.forName( scaproperty.getType() );
-	    			theProperty.setXSDType( JavaXMLMapper.getXMLType(propType) );
-	    			componentType.getProperties().add( theProperty );
-	    			// Remember the Java Class (ie the type) for this property
-	    			implementation.setPropertyClass( theProperty.getName(), propType );
-	    		} // end if 
-	    	} // end while
-		
-    	} catch ( ClassNotFoundException e ) {
-    		// Means that either an interface class, property class or a bean was not found
-    		throw new ContributionReadException( e );
-    	} catch ( InvalidInterfaceException e ) {
-    		throw new ContributionReadException( e );
-    	} catch ( ContributionResolveException e ) {
-    		
-    	} // end try
-    	
-    	// If we get here, the Spring assembly component type is resolved
-    	componentType.setUnresolved( false );
-    	implementation.setComponentType( componentType );
-    	return;
+    private void generateComponentType(SpringImplementation implementation,
+                                       List<SpringBeanElement> beans,
+                                       List<SpringSCAServiceElement> services,
+                                       List<SpringSCAReferenceElement> references,
+                                       List<SpringSCAPropertyElement> scaproperties) throws ContributionReadException {
+        /*
+         * 1. Each service becomes a service in the component type
+         * 2. Each reference becomes a reference in the component type
+         * 3. IF there are no explicit service elements, each bean becomes a service
+         * 4. Each bean property which is a reference not pointing at another bean in the 
+         *    application context becomes a reference unless it is pointing at one of the references
+         * 5. Each scaproperty becomes a property in the component type
+         * 6. Each bean property which is not a reference and which is not pointing 
+         *    at another bean in the application context becomes a property in the component type
+         */
+
+        ComponentType componentType = implementation.getComponentType();
+
+        try {
+            // Deal with the services first....												
+            Iterator<SpringSCAServiceElement> its = services.iterator();
+            while (its.hasNext()) {
+                SpringSCAServiceElement serviceElement = its.next();
+                Class<?> interfaze = cl.loadClass(serviceElement.getType());
+                Service theService = createService(interfaze, serviceElement.getName());
+                componentType.getServices().add(theService);
+                // Add this service to the Service / Bean map
+                String beanName = serviceElement.getTarget();
+                for (SpringBeanElement beanElement : beans) {
+                    if (beanName.equals(beanElement.getId())) {
+                        implementation.setBeanForService(theService, beanElement);
+                    }
+                } // end for
+            } // end while
+
+            // Next handle the references
+            Iterator<SpringSCAReferenceElement> itr = references.iterator();
+            while (itr.hasNext()) {
+                SpringSCAReferenceElement referenceElement = itr.next();
+                Class<?> interfaze = cl.loadClass(referenceElement.getType());
+                Reference theReference = createReference(interfaze, referenceElement.getName());
+                componentType.getReferences().add(theReference);
+            } // end while
+
+            // Finally deal with the beans
+            Iterator<SpringBeanElement> itb;
+            // If there are no explicit service elements, then expose all the beans
+            if (services.isEmpty()) {
+                itb = beans.iterator();
+                // Loop through all the beans found
+                while (itb.hasNext()) {
+                    SpringBeanElement beanElement = itb.next();
+                    // Load the Spring bean class
+                    Class<?> beanClass = cl.loadClass(beanElement.getClassName());
+                    // Introspect the bean 
+                    ComponentType beanComponentType = assemblyFactory.createComponentType();
+                    beanIntrospector.introspectBean(beanClass, beanComponentType);
+                    // Get the service interface defined by this Spring Bean and add to
+                    // the component type of the Spring Assembly
+                    List<Service> beanServices = beanComponentType.getServices();
+                    componentType.getServices().addAll(beanServices);
+                    // Add these services to the Service / Bean map
+                    for (Service beanService : beanServices) {
+                        implementation.setBeanForService(beanService, beanElement);
+                    }
+                } // end while
+            } // end if
+            // Now check to see if there are any more references from beans that are not satisfied
+            itb = beans.iterator();
+            while (itb.hasNext()) {
+                SpringBeanElement beanElement = itb.next();
+                boolean unresolvedProperties = false;
+                if (!beanElement.getProperties().isEmpty()) {
+                    // Scan through the properties
+                    Iterator<SpringPropertyElement> itp = beanElement.getProperties().iterator();
+                    while (itp.hasNext()) {
+                        SpringPropertyElement propertyElement = itp.next();
+                        if (propertyRefUnresolved(propertyElement.getRef(), beans, references, scaproperties)) {
+                            // This means an unresolved reference from the spring bean...
+                            unresolvedProperties = true;
+                        } // end if
+                    } // end while 
+                    // If there are unresolved properties, then find which ones are references
+                    if (unresolvedProperties) {
+                        Class<?> beanClass = cl.loadClass(beanElement.getClassName());
+                        // Introspect the bean 
+                        ComponentType beanComponentType = assemblyFactory.createComponentType();
+                        Map<String, JavaElementImpl> propertyMap =
+                            beanIntrospector.introspectBean(beanClass, beanComponentType);
+                        // Get the references by this Spring Bean and add the unresolved ones to
+                        // the component type of the Spring Assembly
+                        List<Reference> beanReferences = beanComponentType.getReferences();
+                        List<Property> beanProperties = beanComponentType.getProperties();
+                        itp = beanElement.getProperties().iterator();
+                        while (itp.hasNext()) {
+                            SpringPropertyElement propertyElement = itp.next();
+                            if (propertyRefUnresolved(propertyElement.getRef(), beans, references, scaproperties)) {
+                                boolean resolved = false;
+                                // This means an unresolved reference from the spring bean...add it to
+                                // the references for the Spring application context
+                                for (Reference reference : beanReferences) {
+                                    if (propertyElement.getName().equals(reference.getName())) {
+                                        // The name of the reference in this case is the string in
+                                        // the @ref attribute of the Spring property element, NOT the
+                                        // name of the field in the Spring bean....
+                                        reference.setName(propertyElement.getRef());
+                                        componentType.getReferences().add(reference);
+                                        resolved = true;
+                                    } // end if
+                                } // end for
+                                if (!resolved) {
+                                    // If the bean property is not already resolved as a reference
+                                    // then it must be an SCA property...
+                                    for (Property scaproperty : beanProperties) {
+                                        if (propertyElement.getName().equals(scaproperty.getName())) {
+                                            // The name of the reference in this case is the string in
+                                            // the @ref attribute of the Spring property element, NOT the
+                                            // name of the field in the Spring bean....
+                                            scaproperty.setName(propertyElement.getRef());
+                                            componentType.getProperties().add(scaproperty);
+                                            // Fetch and store the type of the property
+                                            implementation.setPropertyClass(scaproperty.getName(), propertyMap
+                                                .get(scaproperty.getName()).getType());
+                                            resolved = true;
+                                        } // end if
+                                    } // end for
+                                } // end if
+                            } // end if
+                        } // end while 
+                    } // end if
+                } // end if
+
+            } // end while
+
+            Iterator<SpringSCAPropertyElement> itsp = scaproperties.iterator();
+            while (itsp.hasNext()) {
+                SpringSCAPropertyElement scaproperty = itsp.next();
+                // Create a component type property if the SCA property element has a name
+                // and a type declared...
+                if (scaproperty.getType() != null && scaproperty.getName() != null) {
+                    Property theProperty = assemblyFactory.createProperty();
+                    theProperty.setName(scaproperty.getName());
+                    // Get the Java class and then an XSD element type for the property
+                    Class<?> propType = Class.forName(scaproperty.getType());
+                    theProperty.setXSDType(JavaXMLMapper.getXMLType(propType));
+                    componentType.getProperties().add(theProperty);
+                    // Remember the Java Class (ie the type) for this property
+                    implementation.setPropertyClass(theProperty.getName(), propType);
+                } // end if 
+            } // end while
+
+        } catch (ClassNotFoundException e) {
+            // Means that either an interface class, property class or a bean was not found
+            throw new ContributionReadException(e);
+        } catch (InvalidInterfaceException e) {
+            throw new ContributionReadException(e);
+        } catch (ContributionResolveException e) {
+
+        } // end try
+
+        // If we get here, the Spring assembly component type is resolved
+        componentType.setUnresolved(false);
+        implementation.setComponentType(componentType);
+        return;
     } // end method generateComponentType
-    
+
     /*
      * Determines whether a reference attribute of a Spring property element is resolved either
      * by a bean in the application context or by an SCA reference element or by an SCA property
@@ -398,74 +394,75 @@
      * @param references - a List of SCA reference elements
      * @return true if the property is not resolved, false if it is resolved
      */
-    private boolean propertyRefUnresolved( String ref, 
-    									   List<SpringBeanElement> beans, 
-    									   List<SpringSCAReferenceElement> references,
-    									   List<SpringSCAPropertyElement> scaproperties ) {
-    	boolean unresolved = true;
-    	
-    	if( ref != null ) {
-    		// Scan over the beans looking for a match
-	    	Iterator<SpringBeanElement> itb = beans.iterator();
-    		while( itb.hasNext() ) {
-    			SpringBeanElement beanElement = itb.next();
-    			// Does the bean name match the ref?
-    			if( ref.equals(beanElement.getId()) ) { 
-    				unresolved = false;
-    				break;
-    			} // end if
-    		} // end while
-	    	// Scan over the SCA reference elements looking for a match
-    		if( unresolved ) {
-    			Iterator<SpringSCAReferenceElement> itr = references.iterator();
-    			while( itr.hasNext() ) {
-    				SpringSCAReferenceElement referenceElement = itr.next();
-    				if( ref.equals(referenceElement.getName()) ) {
-    					unresolved = false;
-    					break;
-    				} // end if
-    			} // end while
-    		} // end if
-	    	// Scan over the SCA property elements looking for a match
-    		if( unresolved ) {
-    			Iterator<SpringSCAPropertyElement> itsp = scaproperties.iterator();
-    			while( itsp.hasNext() ) {
-    				SpringSCAPropertyElement propertyElement = itsp.next();
-    				if( ref.equals(propertyElement.getName()) ) {
-    					unresolved = false;
-    					break;
-    				} // end if
-    			} // end while
-    		} // end if
-    	} else {
-    		// In the case where ref = null, the property is not going to be a reference of any
-    		// kind and can be ignored
-    		unresolved = false;
-    	} // end if
-    	
-    	return unresolved;
-    	
+    private boolean propertyRefUnresolved(String ref,
+                                          List<SpringBeanElement> beans,
+                                          List<SpringSCAReferenceElement> references,
+                                          List<SpringSCAPropertyElement> scaproperties) {
+        boolean unresolved = true;
+
+        if (ref != null) {
+            // Scan over the beans looking for a match
+            Iterator<SpringBeanElement> itb = beans.iterator();
+            while (itb.hasNext()) {
+                SpringBeanElement beanElement = itb.next();
+                // Does the bean name match the ref?
+                if (ref.equals(beanElement.getId())) {
+                    unresolved = false;
+                    break;
+                } // end if
+            } // end while
+            // Scan over the SCA reference elements looking for a match
+            if (unresolved) {
+                Iterator<SpringSCAReferenceElement> itr = references.iterator();
+                while (itr.hasNext()) {
+                    SpringSCAReferenceElement referenceElement = itr.next();
+                    if (ref.equals(referenceElement.getName())) {
+                        unresolved = false;
+                        break;
+                    } // end if
+                } // end while
+            } // end if
+            // Scan over the SCA property elements looking for a match
+            if (unresolved) {
+                Iterator<SpringSCAPropertyElement> itsp = scaproperties.iterator();
+                while (itsp.hasNext()) {
+                    SpringSCAPropertyElement propertyElement = itsp.next();
+                    if (ref.equals(propertyElement.getName())) {
+                        unresolved = false;
+                        break;
+                    } // end if
+                } // end while
+            } // end if
+        } else {
+            // In the case where ref = null, the property is not going to be a reference of any
+            // kind and can be ignored
+            unresolved = false;
+        } // end if
+
+        return unresolved;
+
     } // end method propertyRefUnresolved
-    
+
     /**
      * Gets hold of the application-context.xml file as a Spring resource
      * @param locationAttr - the location attribute from the <implementation.spring../> element
      * @param cl - the classloader for the Spring implementation
      */
-    protected Resource getApplicationContextResource( String locationAttr, ClassLoader cl ) 
-    	throws ContributionReadException {
+    protected Resource getApplicationContextResource(String locationAttr, ClassLoader cl)
+        throws ContributionReadException {
         File manifestFile = null;
         File appXmlFile;
         File locationFile = new File(locationAttr);
-        
+
         if (!locationFile.exists()) {
             // FIXME hack
             URL url = cl.getResource(locationAttr);
             if (url != null) {
                 return new UrlResource(url);
             }
-            throw new ContributionReadException("SpringXMLLoader getApplicationContextResource: "
-            		+ "unable to find resource file " + locationFile.toString());
+            throw new ContributionReadException(
+                                                "SpringXMLLoader getApplicationContextResource: " + "unable to find resource file "
+                                                    + locationFile.toString());
         }
 
         if (locationFile.isDirectory()) {
@@ -513,26 +510,26 @@
             } catch (IOException e) {
                 // bad archive
                 // TODO: create a more appropriate exception type
-                throw new ContributionReadException("SpringXMLLoader getApplicationContextResource: "
-                		+ " IO exception reading context file.", e);
+                throw new ContributionReadException(
+                                                    "SpringXMLLoader getApplicationContextResource: " + " IO exception reading context file.",
+                                                    e);
             }
         }
 
-        throw new ContributionReadException("SpringXMLLoader getApplicationContextResource: "
-        		+ APPLICATION_CONTEXT + "not found");
+        throw new ContributionReadException("SpringXMLLoader getApplicationContextResource: " + APPLICATION_CONTEXT
+            + "not found");
     } // end method getApplicationContextResource
-    
+
     /**
      * Creates a Service for the component type based on its name and Java interface
      */
-    public Service createService( Class<?> interfaze, String name ) 
-    	throws InvalidInterfaceException {
+    public Service createService(Class<?> interfaze, String name) throws InvalidInterfaceException {
         Service service = assemblyFactory.createService();
         JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
         service.setInterfaceContract(interfaceContract);
 
         // Set the name for the service
-        service.setName( name );
+        service.setName(name);
 
         // Set the call interface and, if present, the callback interface
         JavaInterface callInterface = interfaceIntrospector.introspect(interfaze);
@@ -543,30 +540,29 @@
         }
         return service;
     } // end method createService
-    
+
     /**
      * Creates a Reference for the component type based on its name and Java interface
      */
-    private org.apache.tuscany.sca.assembly.Reference createReference( Class<?> interfaze, String name ) 
-    	throws InvalidInterfaceException {
+    private org.apache.tuscany.sca.assembly.Reference createReference(Class<?> interfaze, String name)
+        throws InvalidInterfaceException {
         org.apache.tuscany.sca.assembly.Reference reference = assemblyFactory.createReference();
         JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
         reference.setInterfaceContract(interfaceContract);
-        
+
         // Set the name of the reference to the supplied name and the multiplicity of the reference
         // to 1..1 - for Spring implementations, this is the only multiplicity supported
         reference.setName(name);
         reference.setMultiplicity(Multiplicity.ONE_ONE);
-        
+
         // Set the call interface and, if present, the callback interface
-        JavaInterface callInterface = interfaceIntrospector.introspect( interfaze );
-        reference.getInterfaceContract().setInterface( callInterface );
+        JavaInterface callInterface = interfaceIntrospector.introspect(interfaze);
+        reference.getInterfaceContract().setInterface(callInterface);
         if (callInterface.getCallbackClass() != null) {
-            JavaInterface callbackInterface = 
-            	interfaceIntrospector.introspect(callInterface.getCallbackClass());
+            JavaInterface callbackInterface = interfaceIntrospector.introspect(callInterface.getCallbackClass());
             reference.getInterfaceContract().setCallbackInterface(callbackInterface);
         }
-    
+
         return reference;
     }
-} // end class SpringXMLComponentTypeLoader
\ No newline at end of file
+} // end class SpringXMLComponentTypeLoader

Modified: incubator/tuscany/java/sca/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd?view=diff&rev=561857&r1=561856&r2=561857
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd (original)
+++ incubator/tuscany/java/sca/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd Wed Aug  1 09:22:29 2007
@@ -17,22 +17,20 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<xsd:schema xmlns="http://www.springframework.org/schema/sca"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            attributeFormDefault="unqualified"
-            elementFormDefault="qualified"
-            targetNamespace="http://www.springframework.org/schema/sca">
+<xsd:schema xmlns="http://www.springframework.org/schema/sca" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    attributeFormDefault="unqualified" elementFormDefault="qualified"
+    targetNamespace="http://www.springframework.org/schema/sca">
 
     <xsd:element name="composite">
         <xsd:complexType>
             <xsd:attribute name="component" use="required">
                 <xsd:simpleType>
-                    <xsd:restriction base="xsd:string"/>
+                    <xsd:restriction base="xsd:string" />
                 </xsd:simpleType>
             </xsd:attribute>
             <xsd:attribute name="sca-adapter-class" use="optional">
                 <xsd:simpleType>
-                    <xsd:restriction base="xsd:string"/>
+                    <xsd:restriction base="xsd:string" />
                 </xsd:simpleType>
             </xsd:attribute>
         </xsd:complexType>
@@ -42,17 +40,17 @@
         <xsd:complexType>
             <xsd:attribute name="name" use="required">
                 <xsd:simpleType>
-                    <xsd:restriction base="xsd:string"/>
+                    <xsd:restriction base="xsd:string" />
                 </xsd:simpleType>
             </xsd:attribute>
             <xsd:attribute name="type" use="required">
                 <xsd:simpleType>
-                    <xsd:restriction base="xsd:string"/>
+                    <xsd:restriction base="xsd:string" />
                 </xsd:simpleType>
             </xsd:attribute>
             <xsd:attribute name="default" use="optional">
                 <xsd:simpleType>
-                    <xsd:restriction base="xsd:string"/>
+                    <xsd:restriction base="xsd:string" />
                 </xsd:simpleType>
             </xsd:attribute>
         </xsd:complexType>
@@ -62,17 +60,17 @@
         <xsd:complexType>
             <xsd:attribute name="id" use="required">
                 <xsd:simpleType>
-                    <xsd:restriction base="xsd:string"/>
+                    <xsd:restriction base="xsd:string" />
                 </xsd:simpleType>
             </xsd:attribute>
             <xsd:attribute name="name" use="required">
                 <xsd:simpleType>
-                    <xsd:restriction base="xsd:string"/>
+                    <xsd:restriction base="xsd:string" />
                 </xsd:simpleType>
             </xsd:attribute>
             <xsd:attribute name="type" use="required">
                 <xsd:simpleType>
-                    <xsd:restriction base="xsd:string"/>
+                    <xsd:restriction base="xsd:string" />
                 </xsd:simpleType>
             </xsd:attribute>
         </xsd:complexType>
@@ -82,17 +80,17 @@
         <xsd:complexType>
             <xsd:attribute name="name" use="required">
                 <xsd:simpleType>
-                    <xsd:restriction base="xsd:string"/>
+                    <xsd:restriction base="xsd:string" />
                 </xsd:simpleType>
             </xsd:attribute>
             <xsd:attribute name="type" use="required">
                 <xsd:simpleType>
-                    <xsd:restriction base="xsd:string"/>
+                    <xsd:restriction base="xsd:string" />
                 </xsd:simpleType>
             </xsd:attribute>
             <xsd:attribute name="target" use="required">
                 <xsd:simpleType>
-                    <xsd:restriction base="xsd:string"/>
+                    <xsd:restriction base="xsd:string" />
                 </xsd:simpleType>
             </xsd:attribute>
         </xsd:complexType>

Modified: incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java?view=diff&rev=561857&r1=561856&r2=561857
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java Wed Aug  1 09:22:29 2007
@@ -30,9 +30,9 @@
 
     protected void setUp() throws Exception {
         domain = SCADomain.newInstance(getCompositeName());
-        service = (T) domain.getService(getServiceClass(), "ClientComponent");
+        service = (T)domain.getService(getServiceClass(), "ClientComponent");
     }
-    
+
     abstract protected Class getServiceClass();
 
     protected void tearDown() throws Exception {
@@ -42,8 +42,8 @@
     protected String getCompositeName() {
         String className = this.getClass().getName();
         String compositeName = className.substring(0, className.length() - 8).replace('.', '/') + ".composite";
-        System.out.println( "Using composite: " + compositeName );
-        return compositeName; 
+        System.out.println("Using composite: " + compositeName);
+        return compositeName;
     }
 
 }

Modified: incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java?view=diff&rev=561857&r1=561856&r2=561857
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java Wed Aug  1 09:22:29 2007
@@ -27,9 +27,9 @@
  */
 public abstract class AbstractHelloWorldTestCase extends AbstractSCATestCase<HelloWorld> {
 
-	/**
-	 * Calls the hello world service and checks that it gives the right response...
-	 */
+    /**
+     * Calls the hello world service and checks that it gives the right response...
+     */
     public void testCalculator() throws Exception {
         assertEquals("Hello petra", service.sayHello("petra"));
     }

Modified: incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java?view=diff&rev=561857&r1=561856&r2=561857
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java Wed Aug  1 09:22:29 2007
@@ -26,11 +26,11 @@
  */
 public class HelloWorldImpl implements HelloWorld {
 
-	static String hello = "Hello ";
+    static String hello = "Hello ";
 
     public String sayHello(String s) {
-    	// Simply call the reference to satisfy the service request...
-    	System.out.println("HelloWorldImpl - sayHello called");
+        // Simply call the reference to satisfy the service request...
+        System.out.println("HelloWorldImpl - sayHello called");
         return (hello + s);
     }
 

Modified: incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java?view=diff&rev=561857&r1=561856&r2=561857
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java Wed Aug  1 09:22:29 2007
@@ -28,13 +28,13 @@
  */
 public class HelloWorldProxy implements HelloWorld {
 
-	// Here is the reference "delegate" - it implements the HelloWorld interface...
+    // Here is the reference "delegate" - it implements the HelloWorld interface...
     @Reference
     public HelloWorld delegate;
 
     public String sayHello(String s) {
-    	// Simply call the reference to satisfy the service request...
-    	System.out.println("HelloWorldProxy - calling sayHello");
+        // Simply call the reference to satisfy the service request...
+        System.out.println("HelloWorldProxy - calling sayHello");
         return delegate.sayHello(s);
     }
 

Modified: incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java?view=diff&rev=561857&r1=561856&r2=561857
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java Wed Aug  1 09:22:29 2007
@@ -27,12 +27,12 @@
 
 public class TestHelloWorldBean implements HelloWorld {
 
-	static String hello = "Hello ";
+    static String hello = "Hello ";
 
-	// Classic "Hello xxx" response to any input message
-	public String sayHello( String message ) {
-		System.out.println("TestHelloWorldBean - sayHello called");
-		return( hello + message );
-	}
+    // Classic "Hello xxx" response to any input message
+    public String sayHello(String message) {
+        System.out.println("TestHelloWorldBean - sayHello called");
+        return (hello + message);
+    }
 
 } // end class TestHelloWorldBean

Modified: incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java?view=diff&rev=561857&r1=561856&r2=561857
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java Wed Aug  1 09:22:29 2007
@@ -28,29 +28,29 @@
 
 public class TestReferenceBean implements HelloWorld {
 
-	// The reference
-	private HelloWorld bean;
+    // The reference
+    private HelloWorld bean;
 
-	// Classic "Hello xxx" response to any input message
-	public String sayHello( String message ) {
-		System.out.println("TestReferenceBean - sayHello called");
-		return( bean.sayHello( message ) );
-	}
+    // Classic "Hello xxx" response to any input message
+    public String sayHello(String message) {
+        System.out.println("TestReferenceBean - sayHello called");
+        return (bean.sayHello(message));
+    }
 
-	/**
-	 * Setter for the bean reference
-	 * @param theBean
-	 */
-	public void setBean( HelloWorld theBean ) {
-		this.bean = theBean;
-	}
+    /**
+     * Setter for the bean reference
+     * @param theBean
+     */
+    public void setBean(HelloWorld theBean) {
+        this.bean = theBean;
+    }
 
-	/**
-	 * Getter for the reference
-	 * @return
-	 */
-	public HelloWorld getBean( ) {
-		return this.bean;
-	}
+    /**
+     * Getter for the reference
+     * @return
+     */
+    public HelloWorld getBean() {
+        return this.bean;
+    }
 
 } // end class TestReferenceBean

Modified: incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java?view=diff&rev=561857&r1=561856&r2=561857
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java Wed Aug  1 09:22:29 2007
@@ -30,25 +30,25 @@
 
 public class TestSCAPropertyBean implements HelloWorld {
 
-	private String hello = "Go away";
+    private String hello = "Go away";
 
-	/**
-	 * Provides the operation of the "HelloWorld" interface - a simple string response
-	 * to a string input message, where the response is a greeting followed by the original
-	 * input message.
-	 */
-	public String sayHello( String message ) {
-		System.out.println("TestHelloWorldBean - sayHello called");
-		return( hello + " " + message );
-	}
+    /**
+     * Provides the operation of the "HelloWorld" interface - a simple string response
+     * to a string input message, where the response is a greeting followed by the original
+     * input message.
+     */
+    public String sayHello(String message) {
+        System.out.println("TestHelloWorldBean - sayHello called");
+        return (hello + " " + message);
+    }
 
-	/**
-	 * Public setter for the (unannotated) field "hello" which constitutes an SCA
-	 * property
-	 * @param message - the message to use for the response to "sayHello"
-	 */
-	public void setHello( String message ) {
-		hello = message;
-	}
+    /**
+     * Public setter for the (unannotated) field "hello" which constitutes an SCA
+     * property
+     * @param message - the message to use for the response to "sayHello"
+     */
+    public void setHello(String message) {
+        hello = message;
+    }
 
 } // end class TestSCAPropertyBean

Modified: incubator/tuscany/java/sca/modules/implementation-spring/src/test/resources/test.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-spring/src/test/resources/test.xml?view=diff&rev=561857&r1=561856&r2=561857
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-spring/src/test/resources/test.xml (original)
+++ incubator/tuscany/java/sca/modules/implementation-spring/src/test/resources/test.xml Wed Aug  1 09:22:29 2007
@@ -17,13 +17,11 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:sca="http://www.springframework.org/schema/sca"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 http://www.springframework.org/schema/sca http://www.springframework.org/schema/sca/spring-sca.xsd">
 
-    <bean id="testBean" class="org.apache.tuscany.sca.implementation.spring.itests.mock.TestBeanImpl"/>
+    <bean id="testBean" class="org.apache.tuscany.sca.implementation.spring.itests.mock.TestBeanImpl" />
 
 </beans>



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message