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/09/10 05:41:14 UTC
svn commit: r441893 [2/4] - in /incubator/tuscany/java/sca:
bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/
bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/
bindings/binding.celtix/src/main/java/org/apache/t...
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBindlessBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBindlessBuilder.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBindlessBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBindlessBuilder.java Sat Sep 9 20:41:09 2006
@@ -59,7 +59,7 @@
}
@SuppressWarnings("unchecked")
- public Service<?> build(CompositeComponent parent,
+ public Service build(CompositeComponent parent,
BindlessServiceDefinition definition,
DeploymentContext deploymentContext) {
return new CompositeService(definition.getName(),
@@ -69,7 +69,7 @@
workContext);
}
- public Reference<?> build(CompositeComponent parent,
+ public Reference build(CompositeComponent parent,
ReferenceDefinition definition,
DeploymentContext deploymentContext) {
return new CompositeReference(definition.getName(),
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBuilder.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBuilder.java Sat Sep 9 20:41:09 2006
@@ -45,7 +45,7 @@
*/
public class CompositeBuilder extends ComponentBuilderExtension<CompositeImplementation> {
- public Component<?> build(CompositeComponent<?> parent,
+ public Component build(CompositeComponent parent,
ComponentDefinition<CompositeImplementation> componentDefinition,
DeploymentContext deploymentContext) throws BuilderConfigException {
CompositeImplementation implementation = componentDefinition.getImplementation();
@@ -97,8 +97,7 @@
}
String name = componentDefinition.getName();
- CompositeComponentImpl<Object> component =
- new CompositeComponentImpl<Object>(name, parent, null, connector, null);
+ CompositeComponentImpl component = new CompositeComponentImpl(name, parent, null, connector, null);
for (BoundReferenceDefinition<? extends Binding> referenceDefinition : allBoundReferences) {
component.register(builderRegistry.build(component, referenceDefinition, deploymentContext));
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImpl.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImpl.java Sat Sep 9 20:41:09 2006
@@ -32,7 +32,7 @@
*
* @version $Rev$ $Date$
*/
-public class CompositeComponentImpl<T> extends AbstractCompositeComponent<T> {
+public class CompositeComponentImpl extends AbstractCompositeComponent {
private String uri;
public CompositeComponentImpl(String name,
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTypeLoader.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTypeLoader.java Sat Sep 9 20:41:09 2006
@@ -47,7 +47,7 @@
return CompositeImplementation.class;
}
- public void load(CompositeComponent<?> parent, CompositeImplementation implementation,
+ public void load(CompositeComponent parent, CompositeImplementation implementation,
DeploymentContext deploymentContext)
throws LoaderException {
URL scdlLocation = implementation.getScdlLocation();
@@ -57,7 +57,7 @@
implementation.setComponentType(componentType);
}
- protected CompositeComponentType loadFromSidefile(CompositeComponent<?> parent,
+ protected CompositeComponentType loadFromSidefile(CompositeComponent parent,
URL url,
DeploymentContext deploymentContext)
throws LoaderException {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeReference.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeReference.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeReference.java Sat Sep 9 20:41:09 2006
@@ -20,24 +20,24 @@
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.extension.ReferenceExtension;
+import org.apache.tuscany.spi.idl.java.JavaIDLUtils;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.wire.TargetInvoker;
import org.apache.tuscany.spi.wire.WireService;
-import org.apache.tuscany.spi.idl.java.JavaIDLUtils;
import org.apache.tuscany.core.injection.WireObjectFactory;
-public class CompositeReference<T> extends ReferenceExtension<T> {
+public class CompositeReference extends ReferenceExtension {
private WorkContext workContext;
public CompositeReference(String name,
- CompositeComponent<?> parent,
+ CompositeComponent parent,
WireService wireService,
ServiceContract contract,
WorkContext workContext) {
- super(name, (Class<T>) contract.getInterfaceClass(), parent, wireService);
+ super(name, contract.getInterfaceClass(), parent, wireService);
this.workContext = workContext;
}
@@ -46,7 +46,7 @@
Method method = JavaIDLUtils.findMethod(operation, contract.getInterfaceClass().getMethods());
return new CompositeReferenceTargetInvoker(method, inboundWire, wireFactory, workContext);
}
-
+
public TargetInvoker createCallbackTargetInvoker(ServiceContract contract, Operation operation) {
Method method = JavaIDLUtils.findMethod(operation, contract.getCallbackClass().getMethods());
return new CompositeReferenceCallbackTargetInvoker(method, contract, inboundWire, wireService, workContext);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeService.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeService.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeService.java Sat Sep 9 20:41:09 2006
@@ -27,12 +27,12 @@
import org.apache.tuscany.spi.wire.TargetInvoker;
import org.apache.tuscany.spi.wire.WireService;
-public class CompositeService<T> extends ServiceExtension<T> {
+public class CompositeService extends ServiceExtension {
private WorkContext workContext;
public CompositeService(String name,
- Class<T> interfaze,
+ Class<?> interfaze,
CompositeComponent parent,
WireService wireService,
WorkContext workContext) throws CoreRuntimeException {
@@ -62,7 +62,7 @@
return new CompositeReferenceCallbackTargetInvoker(method, contract, inboundWire, wireService, workContext);
}
- public T getServiceInstance() throws TargetException {
+ public Object getServiceInstance() throws TargetException {
return interfaze.cast(wireService.createProxy(outboundWire));
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java Sat Sep 9 20:41:09 2006
@@ -46,7 +46,7 @@
*
* @version $Rev$ $Date$
*/
-public class JavaAtomicComponent<T> extends PojoAtomicComponent<T> {
+public class JavaAtomicComponent extends PojoAtomicComponent {
private AsyncMonitor monitor;
@@ -68,7 +68,7 @@
return wireService.createProxy(wire);
}
- public T getServiceInstance() throws TargetException {
+ public Object getServiceInstance() throws TargetException {
if (serviceInterfaces.size() == 0) {
return getTargetInstance();
} else if (serviceInterfaces.size() == 1) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java Sat Sep 9 20:41:09 2006
@@ -58,7 +58,7 @@
}
@SuppressWarnings("unchecked")
- public AtomicComponent<?> build(CompositeComponent<?> parent,
+ public AtomicComponent build(CompositeComponent parent,
ComponentDefinition<JavaImplementation> definition,
DeploymentContext deployment)
throws BuilderConfigException {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentTypeLoader.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentTypeLoader.java Sat Sep 9 20:41:09 2006
@@ -59,7 +59,7 @@
return JavaImplementation.class;
}
- public void load(CompositeComponent<?> parent,
+ public void load(CompositeComponent parent,
JavaImplementation implementation,
DeploymentContext deploymentContext) throws LoaderException {
Class<?> implClass = implementation.getImplementationClass();
@@ -73,7 +73,7 @@
implementation.setComponentType(componentType);
}
- protected PojoComponentType loadByIntrospection(CompositeComponent<?> parent,
+ protected PojoComponentType loadByIntrospection(CompositeComponent parent,
JavaImplementation implementation,
DeploymentContext deploymentContext) throws ProcessingException {
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> componentType =
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/AbstractPropertyProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/AbstractPropertyProcessor.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/AbstractPropertyProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/AbstractPropertyProcessor.java Sat Sep 9 20:41:09 2006
@@ -54,7 +54,7 @@
this.service = service;
}
- public void visitMethod(CompositeComponent<?> parent,
+ public void visitMethod(CompositeComponent parent,
Method method,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
@@ -94,7 +94,7 @@
properties.put(name, property);
}
- public void visitField(CompositeComponent<?> parent,
+ public void visitField(CompositeComponent parent,
Field field,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
@@ -120,7 +120,7 @@
properties.put(name, property);
}
- public void visitConstructor(CompositeComponent<?> parent, Constructor<?> constructor,
+ public void visitConstructor(CompositeComponent parent, Constructor<?> constructor,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
@@ -155,7 +155,7 @@
protected <T> void initProperty(JavaMappedProperty<T> property,
A annotation,
- CompositeComponent<?> parent,
+ CompositeComponent parent,
DeploymentContext context) {
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessor.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessor.java Sat Sep 9 20:41:09 2006
@@ -48,7 +48,7 @@
this.service = service;
}
- public void visitClass(CompositeComponent<?> parent, Class<?> clazz,
+ public void visitClass(CompositeComponent parent, Class<?> clazz,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
Constructor[] ctors = clazz.getConstructors();
@@ -66,7 +66,7 @@
}
}
- public void visitConstructor(CompositeComponent<?> parent, Constructor<?> constructor,
+ public void visitConstructor(CompositeComponent parent, Constructor<?> constructor,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
org.osoa.sca.annotations.Constructor annotation =
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ContextProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ContextProcessor.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ContextProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ContextProcessor.java Sat Sep 9 20:41:09 2006
@@ -43,7 +43,7 @@
*/
public class ContextProcessor extends ImplementationProcessorExtension {
- public void visitMethod(CompositeComponent<?> parent, Method method,
+ public void visitMethod(CompositeComponent parent, Method method,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context)
throws ProcessingException {
@@ -87,7 +87,7 @@
}
- public void visitField(CompositeComponent<?> parent, Field field,
+ public void visitField(CompositeComponent parent, Field field,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
super.visitField(parent, field, type, context);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DestroyProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DestroyProcessor.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DestroyProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DestroyProcessor.java Sat Sep 9 20:41:09 2006
@@ -41,7 +41,7 @@
*/
public class DestroyProcessor extends ImplementationProcessorExtension {
- public void visitMethod(CompositeComponent<?> parent, Method method,
+ public void visitMethod(CompositeComponent parent, Method method,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context)
throws ProcessingException {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessor.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessor.java Sat Sep 9 20:41:09 2006
@@ -73,7 +73,7 @@
}
public void visitEnd(
- CompositeComponent<?> parent,
+ CompositeComponent parent,
Class<?> clazz,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InitProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InitProcessor.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InitProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InitProcessor.java Sat Sep 9 20:41:09 2006
@@ -40,7 +40,7 @@
*/
public class InitProcessor extends ImplementationProcessorExtension {
- public void visitMethod(CompositeComponent<?> parent, Method method,
+ public void visitMethod(CompositeComponent parent, Method method,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context)
throws ProcessingException {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/MonitorProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/MonitorProcessor.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/MonitorProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/MonitorProcessor.java Sat Sep 9 20:41:09 2006
@@ -47,7 +47,7 @@
protected <T> void initProperty(JavaMappedProperty<T> property,
Monitor annotation,
- CompositeComponent<?> parent,
+ CompositeComponent parent,
DeploymentContext context) {
Class<T> javaType = property.getJavaType();
property.setDefaultValueFactory(new SingletonObjectFactory<T>(monitorFactory.getMonitor(javaType)));
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/PropertyProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/PropertyProcessor.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/PropertyProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/PropertyProcessor.java Sat Sep 9 20:41:09 2006
@@ -50,12 +50,12 @@
protected <T> void initProperty(JavaMappedProperty<T> property,
Property annotation,
- CompositeComponent<?> parent,
+ CompositeComponent parent,
DeploymentContext context) {
property.setRequired(annotation.required());
}
- public void visitConstructor(CompositeComponent<?> parent, Constructor<?> constructor,
+ public void visitConstructor(CompositeComponent parent, Constructor<?> constructor,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
// override since heuristic pojo processor evalautes properties
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ReferenceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ReferenceProcessor.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ReferenceProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ReferenceProcessor.java Sat Sep 9 20:41:09 2006
@@ -53,7 +53,7 @@
this.regsitry = registry;
}
- public void visitMethod(CompositeComponent<?> parent, Method method,
+ public void visitMethod(CompositeComponent parent, Method method,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context)
throws ProcessingException {
@@ -117,7 +117,7 @@
// }
}
- public void visitField(CompositeComponent<?> parent, Field field,
+ public void visitField(CompositeComponent parent, Field field,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
Reference annotation = field.getAnnotation(Reference.class);
@@ -166,7 +166,7 @@
}
- public void visitConstructor(CompositeComponent<?> parent, Constructor<?> constructor,
+ public void visitConstructor(CompositeComponent parent, Constructor<?> constructor,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ScopeProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ScopeProcessor.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ScopeProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ScopeProcessor.java Sat Sep 9 20:41:09 2006
@@ -37,7 +37,7 @@
*/
public class ScopeProcessor extends ImplementationProcessorExtension {
- public void visitClass(CompositeComponent<?> parent, Class<?> clazz,
+ public void visitClass(CompositeComponent parent, Class<?> clazz,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context)
throws ProcessingException {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ServiceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ServiceProcessor.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ServiceProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ServiceProcessor.java Sat Sep 9 20:41:09 2006
@@ -54,7 +54,7 @@
this.implService = implService;
}
- public void visitClass(CompositeComponent<?> parent, Class<?> clazz,
+ public void visitClass(CompositeComponent parent, Class<?> clazz,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
org.osoa.sca.annotations.Service annotation = clazz.getAnnotation(org.osoa.sca.annotations.Service.class);
@@ -101,7 +101,7 @@
}
- public void visitMethod(CompositeComponent<?> parent,
+ public void visitMethod(CompositeComponent parent,
Method method,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
@@ -132,7 +132,7 @@
callbackService.setCallbackMember(method);
}
- public void visitField(CompositeComponent<?> parent, Field field,
+ public void visitField(CompositeComponent parent, Field field,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java Sat Sep 9 20:41:09 2006
@@ -54,7 +54,7 @@
DeploymentContext deploymentContext) {
Class<Object> interfaze = (Class<Object>) boundServiceDefinition.getServiceContract().getInterfaceClass();
QualifiedName targetName = new QualifiedName(boundServiceDefinition.getTarget().getPath());
- Component<?> target = (Component) parent.getChild(targetName.getPartName());
+ Component target = (Component) parent.getChild(targetName.getPartName());
if (target == null) {
throw new BuilderConfigException("Target not found: [" + targetName + ']');
}
@@ -63,7 +63,7 @@
new SystemInboundWireImpl(name, interfaze, target);
SystemOutboundWire outboundWire =
new SystemOutboundWireImpl(name, targetName, interfaze);
- SystemService<Object> service = new SystemServiceImpl<Object>(boundServiceDefinition.getName(), parent);
+ SystemService service = new SystemServiceImpl(boundServiceDefinition.getName(), parent);
service.setInboundWire(inboundWire);
service.setOutboundWire(outboundWire);
return service;
@@ -77,7 +77,7 @@
AutowireComponent autowireComponent = (AutowireComponent) parent.getParent();
Class<?> interfaze = boundReferenceDefinition.getServiceContract().getInterfaceClass();
String name = boundReferenceDefinition.getName();
- SystemReferenceImpl<?> reference = new SystemReferenceImpl(name, interfaze, parent);
+ SystemReferenceImpl reference = new SystemReferenceImpl(name, interfaze, parent);
SystemInboundWire inboundWire = new SystemInboundWireImpl(name, interfaze);
String refName = boundReferenceDefinition.getName();
boolean required = boundReferenceDefinition.isRequired();
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java Sat Sep 9 20:41:09 2006
@@ -65,7 +65,7 @@
}
@SuppressWarnings("unchecked")
- public AtomicComponent<?> build(CompositeComponent<?> parent,
+ public AtomicComponent build(CompositeComponent parent,
ComponentDefinition<SystemImplementation> definition,
DeploymentContext deploymentContext) throws BuilderConfigException {
assert parent instanceof AutowireComponent : "Parent must implement " + AutowireComponent.class.getName();
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java Sat Sep 9 20:41:09 2006
@@ -59,7 +59,7 @@
return SystemCompositeImplementation.class;
}
- public Component<?> build(CompositeComponent<?> parent,
+ public Component build(CompositeComponent parent,
ComponentDefinition<SystemCompositeImplementation> componentDefinition,
DeploymentContext deploymentContext) throws BuilderConfigException {
SystemCompositeImplementation impl = componentDefinition.getImplementation();
@@ -96,7 +96,7 @@
// create the composite component
String name = componentDefinition.getName();
AutowireComponent autowireContext = getAutowireComponent(parent);
- SystemCompositeComponent<?> component =
+ SystemCompositeComponent component =
new SystemCompositeComponentImpl(name, parent, autowireContext, connector, null);
for (ComponentDefinition<? extends Implementation> childComponentDefinition : allComponents) {
component.register(builderRegistry.build(component, childComponentDefinition, deploymentContext));
@@ -114,7 +114,7 @@
* @param parent the parent for a new context
* @return the autowire context for the parent or null if it does not support autowire
*/
- protected AutowireComponent getAutowireComponent(CompositeComponent<?> parent) {
+ protected AutowireComponent getAutowireComponent(CompositeComponent parent) {
if (parent instanceof AutowireComponent) {
return (AutowireComponent) parent;
} else {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponent.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponent.java Sat Sep 9 20:41:09 2006
@@ -26,7 +26,7 @@
*
* @version $$Rev$$ $$Date$$
*/
-public interface SystemAtomicComponent<T> extends AtomicComponent<T> {
+public interface SystemAtomicComponent extends AtomicComponent {
/**
* Returns the target instance associated with the component. A target instance is the actual object a request is
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java Sat Sep 9 20:41:09 2006
@@ -34,7 +34,7 @@
*
* @version $$Rev$$ $$Date$$
*/
-public class SystemAtomicComponentImpl<T> extends PojoAtomicComponent<T> implements SystemAtomicComponent<T> {
+public class SystemAtomicComponentImpl extends PojoAtomicComponent implements SystemAtomicComponent {
public SystemAtomicComponentImpl(String name, PojoConfiguration configuration) {
super(name, configuration);
@@ -45,7 +45,7 @@
return getTargetInstance();
}
- public T getServiceInstance() throws TargetException {
+ public Object getServiceInstance() throws TargetException {
return getTargetInstance();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemCompositeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemCompositeComponent.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemCompositeComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemCompositeComponent.java Sat Sep 9 20:41:09 2006
@@ -26,7 +26,7 @@
*
* @version $Rev$ $Date$
*/
-public interface SystemCompositeComponent<T> extends AutowireComponent<T> {
+public interface SystemCompositeComponent extends AutowireComponent {
/**
* Register a simple Java Object as a system component. This is primarily intended for use by bootstrap code to
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemCompositeComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemCompositeComponentImpl.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemCompositeComponentImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemCompositeComponentImpl.java Sat Sep 9 20:41:09 2006
@@ -36,8 +36,8 @@
*
* @version $Rev$ $Date$
*/
-public class SystemCompositeComponentImpl<S> extends AbstractCompositeComponent<S>
- implements SystemCompositeComponent<S> {
+public class SystemCompositeComponentImpl extends AbstractCompositeComponent
+ implements SystemCompositeComponent {
public SystemCompositeComponentImpl(String name,
CompositeComponent parent,
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReference.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReference.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReference.java Sat Sep 9 20:41:09 2006
@@ -26,5 +26,5 @@
*
* @version $$Rev$$ $$Date$$
*/
-public interface SystemReference<T> extends Reference<T> {
+public interface SystemReference extends Reference {
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReferenceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReferenceImpl.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReferenceImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReferenceImpl.java Sat Sep 9 20:41:09 2006
@@ -38,14 +38,14 @@
*
* @version $Rev$ $Date$
*/
-public class SystemReferenceImpl<T> extends AbstractSCAObject<T> implements SystemReference<T> {
+public class SystemReferenceImpl extends AbstractSCAObject implements SystemReference {
protected SystemInboundWire inboundWire;
protected SystemOutboundWire outboundWire;
- protected Class<T> referenceInterface;
+ protected Class<?> referenceInterface;
- public SystemReferenceImpl(String name, Class<T> referenceInterface, CompositeComponent parent) {
+ public SystemReferenceImpl(String name, Class<?> referenceInterface, CompositeComponent parent) {
super(name, parent);
assert referenceInterface != null : "Reference interface was null";
this.referenceInterface = referenceInterface;
@@ -73,15 +73,15 @@
this.outboundWire = (SystemOutboundWire) wire;
}
- public Class<T> getInterface() {
+ public Class<?> getInterface() {
return referenceInterface;
}
- public void setInterface(Class<T> referenceInterface) {
+ public void setInterface(Class<?> referenceInterface) {
this.referenceInterface = referenceInterface;
}
- public T getServiceInstance() throws TargetException {
+ public Object getServiceInstance() throws TargetException {
return referenceInterface.cast(inboundWire.getTargetService());
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemService.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemService.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemService.java Sat Sep 9 20:41:09 2006
@@ -25,7 +25,7 @@
*
* @version $$Rev$$ $$Date$$
*/
-public interface SystemService<T> extends Service<T> {
+public interface SystemService extends Service {
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemServiceImpl.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemServiceImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemServiceImpl.java Sat Sep 9 20:41:09 2006
@@ -39,7 +39,7 @@
*
* @version $$Rev$$ $$Date$$
*/
-public class SystemServiceImpl<T> extends AbstractSCAObject<T> implements SystemService<T> {
+public class SystemServiceImpl extends AbstractSCAObject implements SystemService {
protected SystemInboundWire inboundWire;
protected SystemOutboundWire outboundWire;
@@ -70,9 +70,8 @@
this.outboundWire = (SystemOutboundWire) wire;
}
- @SuppressWarnings("unchecked")
- public Class<T> getInterface() {
- return (Class<T>) inboundWire.getServiceContract().getInterfaceClass();
+ public Class<?> getInterface() {
+ return inboundWire.getServiceContract().getInterfaceClass();
}
public WireInvocationHandler getHandler() {
@@ -80,8 +79,8 @@
throw new UnsupportedOperationException();
}
- public T getServiceInstance() throws TargetException {
- return (T) inboundWire.getTargetService();
+ public Object getServiceInstance() throws TargetException {
+ return inboundWire.getTargetService();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponent.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponent.java Sat Sep 9 20:41:09 2006
@@ -38,13 +38,13 @@
*
* @version $$Rev$$ $$Date$$
*/
-public class SystemSingletonAtomicComponent<S, T extends S> extends AbstractSCAObject<S>
- implements SystemAtomicComponent<S> {
+public class SystemSingletonAtomicComponent<S, T extends S> extends AbstractSCAObject
+ implements SystemAtomicComponent {
private T instance;
private List<Class<?>> serviceInterfaces;
- public SystemSingletonAtomicComponent(String name, CompositeComponent<?> parent, Class<S> interfaze, T instance) {
+ public SystemSingletonAtomicComponent(String name, CompositeComponent parent, Class<S> interfaze, T instance) {
super(name, parent);
this.instance = instance;
serviceInterfaces = new ArrayList<Class<?>>(1);
@@ -75,7 +75,7 @@
return getTargetInstance();
}
- public S getServiceInstance() throws TargetException {
+ public Object getServiceInstance() throws TargetException {
return getTargetInstance();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoader.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoader.java Sat Sep 9 20:41:09 2006
@@ -63,7 +63,7 @@
this.introspector = introspector;
}
- public void load(CompositeComponent<?> parent, SystemImplementation implementation,
+ public void load(CompositeComponent parent, SystemImplementation implementation,
DeploymentContext deploymentContext) throws LoaderException {
Class<?> implClass = implementation.getImplementationClass();
URL sidefile = implClass.getResource(JavaIntrospectionHelper.getBaseName(implClass) + ".componentType");
@@ -80,7 +80,7 @@
return SystemImplementation.class;
}
- protected PojoComponentType loadByIntrospection(CompositeComponent<?> parent,
+ protected PojoComponentType loadByIntrospection(CompositeComponent parent,
SystemImplementation implementation,
DeploymentContext deploymentContext) throws ProcessingException {
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> componentType =
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemCompositeComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemCompositeComponentTypeLoader.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemCompositeComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemCompositeComponentTypeLoader.java Sat Sep 9 20:41:09 2006
@@ -47,7 +47,7 @@
return SystemCompositeImplementation.class;
}
- public void load(CompositeComponent<?> parent, SystemCompositeImplementation implementation,
+ public void load(CompositeComponent parent, SystemCompositeImplementation implementation,
DeploymentContext deploymentContext)
throws LoaderException {
URL scdlLocation = implementation.getScdlLocation();
@@ -61,7 +61,7 @@
}
- protected CompositeComponentType loadFromSidefile(CompositeComponent<?> parent,
+ protected CompositeComponentType loadFromSidefile(CompositeComponent parent,
URL url,
DeploymentContext deploymentContext)
throws LoaderException {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemInboundWireImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemInboundWireImpl.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemInboundWireImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemInboundWireImpl.java Sat Sep 9 20:41:09 2006
@@ -38,7 +38,7 @@
public class SystemInboundWireImpl implements SystemInboundWire {
private String serviceName;
private ServiceContract serviceContract;
- private Component<?> component;
+ private Component component;
private SystemOutboundWire wire;
private String containerName;
private Class<?> interfaze;
@@ -50,7 +50,7 @@
* @param interfaze the service interface
* @param target the target context the wire is connected to
*/
- public SystemInboundWireImpl(String serviceName, Class<?> interfaze, Component<?> target) {
+ public SystemInboundWireImpl(String serviceName, Class<?> interfaze, Component target) {
this.serviceName = serviceName;
this.component = target;
serviceContract = new JavaServiceContract(interfaze);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundAutowire.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundAutowire.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundAutowire.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundAutowire.java Sat Sep 9 20:41:09 2006
@@ -42,11 +42,11 @@
public class SystemOutboundAutowire implements OutboundAutowire, SystemOutboundWire {
private String referenceName;
private ServiceContract serviceContract;
- private AutowireComponent<?> component;
+ private AutowireComponent component;
private final boolean required;
private String containerName;
- public SystemOutboundAutowire(String referenceName, Class<?> interfaze, AutowireComponent<?> component,
+ public SystemOutboundAutowire(String referenceName, Class<?> interfaze, AutowireComponent component,
boolean required) {
this.referenceName = referenceName;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/CompositeContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/CompositeContextImpl.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/CompositeContextImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/CompositeContextImpl.java Sat Sep 9 20:41:09 2006
@@ -27,9 +27,9 @@
public class CompositeContextImpl extends SCA implements CompositeContext {
- protected final CompositeComponent<?> composite;
+ protected final CompositeComponent composite;
- public CompositeContextImpl(final CompositeComponent<?> composite) {
+ public CompositeContextImpl(final CompositeComponent composite) {
this.composite = composite;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/LauncherImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/LauncherImpl.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/LauncherImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/LauncherImpl.java Sat Sep 9 20:41:09 2006
@@ -64,7 +64,7 @@
private Deployer deployer;
- private CompositeComponent<?> composite;
+ private CompositeComponent composite;
public void bootRuntime(URL systemScdl, ClassLoader systemClassLoader, MonitorFactory monitor)
throws TuscanyException {
@@ -81,7 +81,7 @@
runtime.start(); // REVIEW: is this redundant w/ the composite.start() call below?
// initialize the runtime info
- SystemCompositeComponent<?> parent = (SystemCompositeComponent) runtime.getSystemComponent();
+ SystemCompositeComponent parent = (SystemCompositeComponent) runtime.getSystemComponent();
RuntimeInfo runtimeInfo = new LauncherRuntimeInfo(getInstallDirectory(), getApplicationRootDirectory());
parent.registerJavaObject("RuntimeInfo", RuntimeInfo.class, runtimeInfo);
@@ -97,7 +97,7 @@
ComponentNames.TUSCANY_SYSTEM, moduleImplementation);
// deploy the component into the runtime under the system parent
- composite = (CompositeComponent<?>) bootDeployer.deploy(parent, definition);
+ composite = (CompositeComponent) bootDeployer.deploy(parent, definition);
// start the system
composite.start();
@@ -152,7 +152,7 @@
* @throws LoaderException
*/
@Deprecated
- public CompositeComponent<?> bootRuntime(URL systemScdl, MonitorFactory monitor) throws TuscanyException {
+ public CompositeComponent bootRuntime(URL systemScdl, MonitorFactory monitor) throws TuscanyException {
ClassLoader systemClassLoader = getClass().getClassLoader();
bootRuntime(systemScdl, systemClassLoader, monitor);
return composite;
@@ -168,7 +168,7 @@
* @see METAINF_APPLICATION_SCDL_PATH
*/
@Deprecated
- public CompositeComponent<?> bootApplication(String name, URL appScdl) throws TuscanyException {
+ public CompositeComponent bootApplication(String name, URL appScdl) throws TuscanyException {
ClassLoader applicationLoader = getApplicationLoader();
if (appScdl == null) {
@@ -190,7 +190,7 @@
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
- return (CompositeComponent<?>) deployer.deploy(parent, moduleDefinition);
+ return (CompositeComponent) deployer.deploy(parent, moduleDefinition);
} finally {
Thread.currentThread().setContextClassLoader(ccl);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/MainLauncherImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/MainLauncherImpl.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/MainLauncherImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/MainLauncherImpl.java Sat Sep 9 20:41:09 2006
@@ -23,13 +23,14 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+import java.net.URL;
import java.util.ResourceBundle;
import java.util.jar.JarFile;
-import java.net.URL;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.core.util.ClassLoaderHelper;
+
import org.apache.tuscany.core.monitor.NullMonitorFactory;
+import org.apache.tuscany.core.util.ClassLoaderHelper;
/**
@@ -42,9 +43,8 @@
private String[] args;
/**
- * Set the application classpath from a string delimited by path separators.
- * If the application classname is not defined, any jars on the path are examined
- * and if the Main-Class manifest entry is set then it will be used.
+ * Set the application classpath from a string delimited by path separators. If the application classname is not
+ * defined, any jars on the path are examined and if the Main-Class manifest entry is set then it will be used.
*
* @param path the path to parse
*/
@@ -82,16 +82,15 @@
}
/**
- * Calls the application's main class as defined by the MainClassName property.
- * The Thread's context ClassLoader is set to the application classloader before
- * the application class is loaded or the main method invoked.
+ * Calls the application's main class as defined by the MainClassName property. The Thread's context ClassLoader is
+ * set to the application classloader before the application class is loaded or the main method invoked.
*
* @throws InvalidMainException
* @throws ClassNotFoundException if the specified class could not be loaded using the application classloader
* @throws InvalidMainException if the main method does not exist or is invalid
* @throws InvocationTargetException if the main method throws an exception
*/
- public void callApplication(CompositeComponent<?> application)
+ public void callApplication(CompositeComponent application)
throws InvalidMainException, ClassNotFoundException, InvocationTargetException {
final ClassLoader cl = Thread.currentThread().getContextClassLoader();
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java Sat Sep 9 20:41:09 2006
@@ -99,7 +99,7 @@
return include;
}
- protected CompositeComponentType loadFromSidefile(CompositeComponent<?> parent,
+ protected CompositeComponentType loadFromSidefile(CompositeComponent parent,
URL url,
DeploymentContext deploymentContext)
throws LoaderException {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java Sat Sep 9 20:41:09 2006
@@ -148,7 +148,7 @@
}
@SuppressWarnings("unchecked")
- public <I extends Implementation<?>> void loadComponentType(CompositeComponent<?> parent, I implementation,
+ public <I extends Implementation<?>> void loadComponentType(CompositeComponent parent, I implementation,
DeploymentContext deploymentContext)
throws LoaderException {
Class<I> key = (Class<I>) implementation.getClass();
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/extension/DirectoryScanExtender.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/extension/DirectoryScanExtender.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/extension/DirectoryScanExtender.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/extension/DirectoryScanExtender.java Sat Sep 9 20:41:09 2006
@@ -121,7 +121,7 @@
new ComponentDefinition<SystemCompositeImplementation>(name, implementation);
try {
- Component<?> component = deployer.deploy(parent, definition);
+ Component component = deployer.deploy(parent, definition);
component.start();
} catch (LoaderException e) {
// FIXME handle the exception
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java Sat Sep 9 20:41:09 2006
@@ -174,7 +174,7 @@
// by CompositeBuilder and thus its children, in particular composite services,
// have been registered
CompositeComponent compositeComponent = (CompositeComponent) component;
- Service<?> serviceChild = (Service) compositeComponent.getChild(service.getName());
+ Service serviceChild = (Service) compositeComponent.getChild(service.getName());
assert serviceChild != null;
if (serviceChild instanceof CompositeService) {
serviceChild.setInboundWire(inboundWire);
@@ -196,7 +196,7 @@
// by CompositeBuilder and thus its children, in particular composite references,
// have been registered
CompositeComponent compositeComponent = (CompositeComponent) component;
- Reference<?> reference = (Reference) compositeComponent.getChild(referenceTarget.getReferenceName());
+ Reference reference = (Reference) compositeComponent.getChild(referenceTarget.getReferenceName());
assert reference != null;
if (reference instanceof CompositeReference) {
reference.setOutboundWire(wire);
@@ -207,7 +207,7 @@
}
}
- public <T> void createWires(Reference<T> reference, ServiceContract<?> contract) {
+ public <T> void createWires(Reference reference, ServiceContract<?> contract) {
InboundWire wire = new InboundWireImpl();
wire.setServiceContract(contract);
wire.setContainerName(reference.getName());
@@ -225,11 +225,11 @@
reference.setInboundWire(wire);
}
- public void createWires(Service<?> service, BoundServiceDefinition<?> def) {
+ public void createWires(Service service, BoundServiceDefinition<?> def) {
createWires(service, def.getTarget().getPath(), def.getServiceContract());
}
- public void createWires(Service<?> service, BindlessServiceDefinition def) {
+ public void createWires(Service service, BindlessServiceDefinition def) {
createWires(service, def.getTarget().getPath(), def.getServiceContract());
}
@@ -283,7 +283,7 @@
return wire;
}
- private <T> void createWires(Service<T> service, String targetName, ServiceContract<?> contract) {
+ private <T> void createWires(Service service, String targetName, ServiceContract<?> contract) {
InboundWire inboundWire = new InboundWireImpl();
OutboundWire outboundWire = new OutboundWireImpl();
inboundWire.setServiceContract(contract);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java Sat Sep 9 20:41:09 2006
@@ -42,8 +42,9 @@
public void testRegistrationWithoutGenerics() {
RawBuilder builder = new RawBuilder();
registry.register(CompositeImplementation.class, builder);
- ComponentDefinition<CompositeImplementation> componentDefinition
- = new ComponentDefinition(new CompositeImplementation());
+ CompositeImplementation implementation = new CompositeImplementation();
+ ComponentDefinition<CompositeImplementation> componentDefinition =
+ new ComponentDefinition<CompositeImplementation>(implementation);
componentDefinition.getImplementation().setComponentType(new CompositeComponentType());
registry.build(null, componentDefinition, deploymentContext);
}
@@ -57,14 +58,13 @@
}
public static class GenerifiedBuilder implements ComponentBuilder<CompositeImplementation> {
- public Component<?> build(CompositeComponent<?> parent,
- ComponentDefinition<CompositeImplementation> componentDefinition,
- DeploymentContext deploymentContext) {
+ public Component build(CompositeComponent parent,
+ ComponentDefinition<CompositeImplementation> componentDefinition,
+ DeploymentContext deploymentContext) {
return null;
}
}
- @SuppressWarnings({"RawUseOfParameterizedType"})
public static class RawBuilder implements ComponentBuilder {
public Component build(CompositeComponent parent,
ComponentDefinition componentDefinition,
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java Sat Sep 9 20:41:09 2006
@@ -106,12 +106,12 @@
public void testBoot1Deployment() throws LoaderException {
URL scdl = BootstrapDeployerTestCase.class.getResource("boot1.scdl");
implementation.setScdlLocation(scdl);
- CompositeComponent<?> parent = createNiceMock(CompositeComponent.class);
+ CompositeComponent parent = createNiceMock(CompositeComponent.class);
parent.register(isA(SCAObject.class));
replay(parent);
// load the boot1 file using the bootstrap deployer
componentDefinition.setName("simple");
- Component<?> component = deployer.deploy(parent, componentDefinition);
+ Component component = deployer.deploy(parent, componentDefinition);
assertNotNull(component);
verify(parent);
}
@@ -119,13 +119,13 @@
public void testBoot2Deployment() throws LoaderException {
URL scdl = BootstrapDeployerTestCase.class.getResource("boot2.scdl");
implementation.setScdlLocation(scdl);
- CompositeComponent<?> parent = createNiceMock(CompositeComponent.class);
+ CompositeComponent parent = createNiceMock(CompositeComponent.class);
parent.register(isA(SCAObject.class));
replay(parent);
// load the boot2 file using the bootstrap deployer
componentDefinition.setName("newDeployer");
- Component<?> component = deployer.deploy(parent, componentDefinition);
+ Component component = deployer.deploy(parent, componentDefinition);
assertNotNull(component);
verify(parent);
component.start();
@@ -137,7 +137,7 @@
parent.reset();
parent.expects(once()).method("register").withAnyArguments();
componentDefinition.setName("newDeployer2");
- component = newDeployer.deploy((CompositeComponent<?>) parent.proxy(), componentDefinition);
+ component = newDeployer.deploy((CompositeComponent) parent.proxy(), componentDefinition);
assertNotNull(component);
parent.verify();
component.start();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTestCase.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTestCase.java Sat Sep 9 20:41:09 2006
@@ -26,7 +26,7 @@
public class CompositeComponentTestCase extends TestCase {
public void testSetUri() throws Exception {
- CompositeComponentImpl<?> component = new CompositeComponentImpl("foo", "foo/bar", null, null, null, null);
+ CompositeComponentImpl component = new CompositeComponentImpl("foo", "foo/bar", null, null, null, null);
assertEquals("foo/bar", component.getURI());
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/AsyncJavaTargetInvokerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/AsyncJavaTargetInvokerTestCase.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/AsyncJavaTargetInvokerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/AsyncJavaTargetInvokerTestCase.java Sat Sep 9 20:41:09 2006
@@ -47,7 +47,7 @@
target.invoke();
expectLastCall().once();
replay(target);
- JavaAtomicComponent<AsyncTarget> component = createJavaComponent(target);
+ JavaAtomicComponent component = createJavaComponent(target);
AsyncMonitor monitor = createMock(AsyncMonitor.class);
replay(monitor);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/GetServiceByNameTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/GetServiceByNameTestCase.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/GetServiceByNameTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/GetServiceByNameTestCase.java Sat Sep 9 20:41:09 2006
@@ -54,7 +54,7 @@
configuration.setInstanceFactory(new PojoObjectFactory<TargetImpl>(TargetImpl.class.getConstructor()));
configuration.addServiceInterface(Target.class);
configuration.setWireService(new JDKWireService());
- final JavaAtomicComponent<?> component = new JavaAtomicComponent("target", configuration, null);
+ final JavaAtomicComponent component = new JavaAtomicComponent("target", configuration, null);
InboundWire wire = createMock(InboundWire.class);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderTestCase.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderTestCase.java Sat Sep 9 20:41:09 2006
@@ -25,18 +25,17 @@
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.model.ComponentDefinition;
-import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.model.ServiceDefinition;
-
-import org.apache.tuscany.core.deployer.RootDeploymentContext;
+import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.implementation.java.ConstructorDefinition;
+import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
import org.apache.tuscany.spi.implementation.java.JavaMappedService;
-import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
+import org.apache.tuscany.spi.model.ComponentDefinition;
+import org.apache.tuscany.spi.model.Scope;
+import org.apache.tuscany.spi.model.ServiceContract;
+import org.apache.tuscany.core.deployer.RootDeploymentContext;
import org.apache.tuscany.core.implementation.composite.CompositeComponentImpl;
import org.apache.tuscany.core.implementation.java.mock.components.Source;
import org.apache.tuscany.core.implementation.java.mock.components.SourceImpl;
@@ -53,19 +52,19 @@
public class JavaComponentBuilderTestCase extends MockObjectTestCase {
private DeploymentContext deploymentContext;
- @SuppressWarnings("unchecked")
public void testBuild() throws Exception {
CompositeComponent parent = new CompositeComponentImpl(null, null, null, null, null);
- PojoComponentType sourceType = new PojoComponentType();
+ PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> sourceType =
+ new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
sourceType.setImplementationScope(Scope.MODULE);
JavaMappedReference reference = new JavaMappedReference();
reference.setName("target");
reference.setMember(SourceImpl.class.getMethod("setTarget", Target.class));
sourceType.add(reference);
- ServiceContract sourceContract = new JavaServiceContract(Source.class);
- ServiceDefinition sourceServiceDefinition = new JavaMappedService();
+ ServiceContract<?> sourceContract = new JavaServiceContract(Source.class);
+ JavaMappedService sourceServiceDefinition = new JavaMappedService();
sourceServiceDefinition.setName("Source");
sourceServiceDefinition.setServiceContract(sourceContract);
@@ -79,11 +78,11 @@
JavaComponentBuilder builder = new JavaComponentBuilder();
builder.setWireService(new JDKWireService());
- JavaAtomicComponent<Source> component =
- (JavaAtomicComponent<Source>) builder.build(parent, sourceComponentDefinition, deploymentContext);
+ JavaAtomicComponent component =
+ (JavaAtomicComponent) builder.build(parent, sourceComponentDefinition, deploymentContext);
deploymentContext.getModuleScope().start();
component.start();
- Source source = component.getServiceInstance();
+ Source source = (Source) component.getServiceInstance();
assertNotNull(source);
component.stop();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/CallbackInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/CallbackInvocationTestCase.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/CallbackInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/CallbackInvocationTestCase.java Sat Sep 9 20:41:09 2006
@@ -75,8 +75,8 @@
*/
public void testComponentToComponentCallback() throws Exception {
ComponentDefinition<JavaImplementation> targetDefinition = createTarget();
- JavaAtomicComponent<?> fooComponent =
- (JavaAtomicComponent<?>) builder.build(null, targetDefinition, context);
+ JavaAtomicComponent fooComponent =
+ (JavaAtomicComponent) builder.build(null, targetDefinition, context);
wireService.createWires(fooComponent, targetDefinition);
container.register(fooComponent);
@@ -86,8 +86,8 @@
replay(parent);
ComponentDefinition<JavaImplementation> sourceDefinition = createSource("fooClient");
- JavaAtomicComponent<?> clientComponent =
- (JavaAtomicComponent<?>) builder.build(parent, sourceDefinition, context);
+ JavaAtomicComponent clientComponent =
+ (JavaAtomicComponent) builder.build(parent, sourceDefinition, context);
wireService.createWires(clientComponent, sourceDefinition);
container.register(clientComponent);
@@ -104,8 +104,8 @@
*/
public void testTwoSourceComponentToComponentCallback() throws Exception {
ComponentDefinition<JavaImplementation> targetDefinition = createTarget();
- JavaAtomicComponent<?> fooComponent =
- (JavaAtomicComponent<?>) builder.build(null, targetDefinition, context);
+ JavaAtomicComponent fooComponent =
+ (JavaAtomicComponent) builder.build(null, targetDefinition, context);
wireService.createWires(fooComponent, targetDefinition);
container.register(fooComponent);
@@ -116,12 +116,12 @@
ComponentDefinition<JavaImplementation> sourceDefinition1 = createSource("fooCleint1");
ComponentDefinition<JavaImplementation> sourceDefinition2 = createSource("fooCleint2");
- JavaAtomicComponent<?> clientComponent1 =
- (JavaAtomicComponent<?>) builder.build(parent, sourceDefinition1, context);
+ JavaAtomicComponent clientComponent1 =
+ (JavaAtomicComponent) builder.build(parent, sourceDefinition1, context);
wireService.createWires(clientComponent1, sourceDefinition1);
container.register(clientComponent1);
- JavaAtomicComponent<?> clientComponent2 =
- (JavaAtomicComponent<?>) builder.build(parent, sourceDefinition2, context);
+ JavaAtomicComponent clientComponent2 =
+ (JavaAtomicComponent) builder.build(parent, sourceDefinition2, context);
wireService.createWires(clientComponent2, sourceDefinition2);
container.register(clientComponent2);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/OutboundWireToJavaTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/OutboundWireToJavaTestCase.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/OutboundWireToJavaTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/OutboundWireToJavaTestCase.java Sat Sep 9 20:41:09 2006
@@ -181,7 +181,7 @@
configuration.setScopeContainer(scope);
configuration.setInstanceFactory(new PojoObjectFactory<TargetImpl>(TargetImpl.class.getConstructor()));
configuration.addServiceInterface(Target.class);
- JavaAtomicComponent<?> atomicComponent = new JavaAtomicComponent("target", configuration, null);
+ JavaAtomicComponent atomicComponent = new JavaAtomicComponent("target", configuration, null);
InboundWire targetWire = MockFactory.createTargetWire("Target", Target.class);
atomicComponent.addInboundWire(targetWire);
connector.connect(atomicComponent, atomicComponent, wire, atomicComponent.getInboundWire("Target"), false);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org