You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/08/14 21:23:22 UTC
svn commit: r431413 - in
/incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring:
./ config/
Author: jmarino
Date: Mon Aug 14 12:23:21 2006
New Revision: 431413
URL: http://svn.apache.org/viewvc?rev=431413&view=rev
Log:
code reformatting
Modified:
incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeBuilder.java
incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringImplementationLoader.java
incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringInvoker.java
incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCABeanDefinitionReader.java
incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCANamespaceHandler.java
incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCANamespaceHandlerResolver.java
incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCAReference.java
incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCARootDefinitionParser.java
incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/ScaCompositeBeanDefinitionParser.java
incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/ScaPropertyBeanDefinitionParser.java
incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/ScaReferenceBeanDefinitionParser.java
incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/ScaServiceBeanDefinitionParser.java
Modified: incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeBuilder.java?rev=431413&r1=431412&r2=431413&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeBuilder.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeBuilder.java Mon Aug 14 12:23:21 2006
@@ -64,8 +64,8 @@
CompositeComponentType<BoundServiceDefinition<? extends Binding>,
BoundReferenceDefinition<? extends Binding>,
? extends Property> componentType = implementation.getComponentType();
-
- // We still need to set the target invoker as opposed to havign the connector do it since the
+
+ // We still need to set the target invoker as opposed to having the connector do it since the
// Spring context is "opaque" to the wiring fabric. In other words, the Spring context does not expose
// its beans as SCA components to the connector t wire the services to
for (BoundServiceDefinition<? extends Binding> serviceDefinition : componentType.getServices().values()) {
Modified: incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringImplementationLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringImplementationLoader.java?rev=431413&r1=431412&r2=431413&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringImplementationLoader.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringImplementationLoader.java Mon Aug 14 12:23:21 2006
@@ -65,6 +65,7 @@
public class SpringImplementationLoader extends LoaderExtension<SpringImplementation> {
private static final QName IMPLEMENTATION_SPRING = new QName("http://tuscany.apache.org/xmlns/spring/1.0",
"implementation.spring");
+ private static final String APPLICATION_CONTEXT = "META-INF/application-context.xml";
private final RuntimeInfo runtimeInfo;
@@ -78,7 +79,8 @@
return IMPLEMENTATION_SPRING;
}
- public SpringImplementation load(CompositeComponent parent, XMLStreamReader reader,
+ public SpringImplementation load(CompositeComponent parent,
+ XMLStreamReader reader,
DeploymentContext deploymentContext)
throws XMLStreamException, LoaderException {
@@ -126,7 +128,7 @@
}
}
// no manifest-specified Spring context, use default
- appXmlFile = new File(locationFile, "META-INF/application-context.xml");
+ appXmlFile = new File(locationFile, APPLICATION_CONTEXT);
if (appXmlFile.exists()) {
return appXmlFile.toURL();
}
@@ -148,15 +150,16 @@
}
}
}
- je = jf.getJarEntry("META-INF/application-context.xml");
+ je = jf.getJarEntry(APPLICATION_CONTEXT);
if (je != null) {
- return new URL("jar:" + locationFile.toURL() + "!/META-INF/application-context.xml");
+ return new URL("jar:" + locationFile.toURI().toURL() + "!"+APPLICATION_CONTEXT);
}
} catch (IOException e) {
// bad archive
- throw new MissingResourceException(locationAttr); // TODO: create a more appropriate exception type
+ // TODO: create a more appropriate exception type
+ throw new MissingResourceException(locationAttr);
}
}
- throw new MissingResourceException("META-INF/application-context.xml");
+ throw new MissingResourceException(APPLICATION_CONTEXT);
}
}
Modified: incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringInvoker.java?rev=431413&r1=431412&r2=431413&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringInvoker.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringInvoker.java Mon Aug 14 12:23:21 2006
@@ -22,9 +22,10 @@
import java.lang.reflect.Method;
import org.apache.tuscany.spi.component.TargetException;
-import org.apache.tuscany.spi.wire.TargetInvoker;
-import org.apache.tuscany.spi.wire.Message;
import org.apache.tuscany.spi.wire.InvocationRuntimeException;
+import org.apache.tuscany.spi.wire.Message;
+import org.apache.tuscany.spi.wire.TargetInvoker;
+
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
Modified: incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCABeanDefinitionReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCABeanDefinitionReader.java?rev=431413&r1=431412&r2=431413&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCABeanDefinitionReader.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCABeanDefinitionReader.java Mon Aug 14 12:23:21 2006
@@ -19,6 +19,7 @@
package org.apache.tuscany.container.spring.config;
import org.apache.tuscany.spi.model.CompositeComponentType;
+
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.xml.BeanDefinitionDocumentReader;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
Modified: incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCANamespaceHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCANamespaceHandler.java?rev=431413&r1=431412&r2=431413&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCANamespaceHandler.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCANamespaceHandler.java Mon Aug 14 12:23:21 2006
@@ -18,10 +18,10 @@
*/
package org.apache.tuscany.container.spring.config;
-import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
-
import org.apache.tuscany.spi.model.CompositeComponentType;
+import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+
/**
* Handler for processing elements defined in a Spring configuration with the SCA namespace
*
@@ -38,8 +38,8 @@
public void init() {
registerBeanDefinitionParser(ScaReferenceBeanDefinitionParser.REFERENCE_ELEMENT,
- new ScaReferenceBeanDefinitionParser());
+ new ScaReferenceBeanDefinitionParser());
registerBeanDefinitionParser(ScaServiceBeanDefinitionParser.SERVICE_ELEMENT,
- new ScaServiceBeanDefinitionParser());
+ new ScaServiceBeanDefinitionParser());
}
}
Modified: incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCANamespaceHandlerResolver.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCANamespaceHandlerResolver.java?rev=431413&r1=431412&r2=431413&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCANamespaceHandlerResolver.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCANamespaceHandlerResolver.java Mon Aug 14 12:23:21 2006
@@ -18,14 +18,14 @@
*/
package org.apache.tuscany.container.spring.config;
+import org.apache.tuscany.spi.model.CompositeComponentType;
+
import org.springframework.beans.factory.xml.DefaultNamespaceHandlerResolver;
import org.springframework.beans.factory.xml.NamespaceHandler;
-import org.apache.tuscany.spi.model.CompositeComponentType;
-
/**
- * Overrides the default Spring namespace resolver to automatically register {@link SCANamespaceHandler} instead
- * of requiring a value to be supplied in a Spring configuration
+ * Overrides the default Spring namespace resolver to automatically register {@link SCANamespaceHandler} instead of
+ * requiring a value to be supplied in a Spring configuration
* <p/>
* TODO: Figure out how to activate this impl
*
Modified: incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCAReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCAReference.java?rev=431413&r1=431412&r2=431413&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCAReference.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCAReference.java Mon Aug 14 12:23:21 2006
@@ -20,6 +20,7 @@
/**
* Bean impl for the Spring sca:reference XML configuration element
+ *
* @version $$Rev$$ $$Date$$
*/
@@ -33,9 +34,19 @@
this.type = type;
}
- public String getName() { return name; }
- public String getType() { return type; }
+ public String getName() {
+ return name;
+ }
+
+ public String getType() {
+ return type;
+ }
- public String getDefault() { return defaultService; }
- public void setDefault(String s) { this.defaultService = s; }
+ public String getDefault() {
+ return defaultService;
+ }
+
+ public void setDefault(String s) {
+ this.defaultService = s;
+ }
}
Modified: incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCARootDefinitionParser.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCARootDefinitionParser.java?rev=431413&r1=431412&r2=431413&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCARootDefinitionParser.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/SCARootDefinitionParser.java Mon Aug 14 12:23:21 2006
@@ -19,12 +19,12 @@
package org.apache.tuscany.container.spring.config;
import org.apache.tuscany.spi.model.CompositeComponentType;
+
import org.springframework.beans.factory.xml.DefaultBeanDefinitionDocumentReader;
import org.springframework.beans.factory.xml.NamespaceHandlerResolver;
/**
- * Overrides the default top-level Spring parser to use
- * {@link org.apache.tuscany.container.spring.config.SCANamespaceHandlerResolver}
+ * Overrides the default top-level Spring parser to use {@link SCANamespaceHandlerResolver}
* for resolving namespace handlers
*
* @version $$Rev$$ $$Date$$
Modified: incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/ScaCompositeBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/ScaCompositeBeanDefinitionParser.java?rev=431413&r1=431412&r2=431413&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/ScaCompositeBeanDefinitionParser.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/ScaCompositeBeanDefinitionParser.java Mon Aug 14 12:23:21 2006
@@ -18,10 +18,11 @@
*/
package org.apache.tuscany.container.spring.config;
+import org.w3c.dom.Element;
+
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.xml.BeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
/**
* Processes <code>composite</code> elements in a Spring configuration
Modified: incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/ScaPropertyBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/ScaPropertyBeanDefinitionParser.java?rev=431413&r1=431412&r2=431413&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/ScaPropertyBeanDefinitionParser.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/ScaPropertyBeanDefinitionParser.java Mon Aug 14 12:23:21 2006
@@ -18,10 +18,11 @@
*/
package org.apache.tuscany.container.spring.config;
+import org.w3c.dom.Element;
+
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.xml.BeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
/**
* Processes <code>property</code> elements in a Spring configuration
Modified: incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/ScaReferenceBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/ScaReferenceBeanDefinitionParser.java?rev=431413&r1=431412&r2=431413&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/ScaReferenceBeanDefinitionParser.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/ScaReferenceBeanDefinitionParser.java Mon Aug 14 12:23:21 2006
@@ -18,14 +18,15 @@
*/
package org.apache.tuscany.container.spring.config;
+import org.w3c.dom.Element;
+
import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.ConstructorArgumentValues;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
+import org.springframework.beans.factory.config.ConstructorArgumentValues;
+import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
+import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.factory.xml.BeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
-import org.w3c.dom.Element;
/**
* Processes <code>reference</code> elements in a Spring configuration
@@ -34,9 +35,9 @@
*/
public class ScaReferenceBeanDefinitionParser implements BeanDefinitionParser {
- public static final String REFERENCE_ELEMENT = "reference";
- private static final String REFERENCE_NAME_ATTRIBUTE = "name";
- private static final String TYPE_ATTRIBUTE = "type";
+ public static final String REFERENCE_ELEMENT = "reference";
+ private static final String REFERENCE_NAME_ATTRIBUTE = "name";
+ private static final String TYPE_ATTRIBUTE = "type";
private static final String DEFAULT_SERVICE_ATTRIBUTE = "default";
public ScaReferenceBeanDefinitionParser() {
Modified: incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/ScaServiceBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/ScaServiceBeanDefinitionParser.java?rev=431413&r1=431412&r2=431413&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/ScaServiceBeanDefinitionParser.java (original)
+++ incubator/tuscany/java/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/config/ScaServiceBeanDefinitionParser.java Mon Aug 14 12:23:21 2006
@@ -18,12 +18,13 @@
*/
package org.apache.tuscany.container.spring.config;
+import org.w3c.dom.Element;
+
+import org.springframework.aop.framework.ProxyFactoryBean;
import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.BeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.aop.framework.ProxyFactoryBean;
-import org.w3c.dom.Element;
/**
* Processes <code>service</code> elements in a Spring configuration
@@ -65,7 +66,7 @@
//
// REVIEW: this is a hack that can be removed once a more sophisticated introspection
// mechanism is defined for Spring app contexts. See SpringComponentTypeLoader.
-
+
BeanDefinitionBuilder serviceBean = BeanDefinitionBuilder.rootBeanDefinition(SCAService.class);
serviceBean.addConstructorArg(name);
serviceBean.addConstructorArg(type);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org