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 [4/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/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java Sat Sep 9 20:41:09 2006
@@ -53,7 +53,7 @@
}
public void testInvalidType() {
- Composite<?> composite = new Composite();
+ Composite composite = new Composite();
try {
composite.register(getAtomic("foo"));
fail();
@@ -63,10 +63,10 @@
}
public void testDuplicateName() {
- Composite<?> composite = new Composite();
- composite.register(new ServiceExtension<Object>("foo", null, null, null));
+ Composite composite = new Composite();
+ composite.register(new ServiceExtension("foo", null, null, null));
try {
- composite.register(new ServiceExtension<Object>("foo", null, null, null));
+ composite.register(new ServiceExtension("foo", null, null, null));
fail();
} catch (DuplicateNameException e) {
// expected
@@ -74,28 +74,28 @@
}
public void testGetChildren() {
- Composite<?> composite = new Composite();
- composite.register(new ServiceExtension<Object>("foo", null, null, null));
+ Composite composite = new Composite();
+ composite.register(new ServiceExtension("foo", null, null, null));
assertEquals(1, composite.getChildren().size());
}
public void testGetServices() {
- Composite<?> composite = new Composite();
- composite.register(new ServiceExtension<Object>("foo", null, null, null));
+ Composite composite = new Composite();
+ composite.register(new ServiceExtension("foo", null, null, null));
composite.register(getReference("bar"));
assertEquals(1, composite.getServices().size());
}
public void testGetService() {
- Composite<?> composite = new Composite();
- composite.register(new ServiceExtension<Object>("foo", null, null, null));
+ Composite composite = new Composite();
+ composite.register(new ServiceExtension("foo", null, null, null));
composite.start();
assertNotNull(composite.getService("foo"));
}
public void testServiceNotFound() {
- Composite<?> composite = new Composite();
- composite.register(new ServiceExtension<Object>("foo", null, null, null));
+ Composite composite = new Composite();
+ composite.register(new ServiceExtension("foo", null, null, null));
composite.start();
try {
composite.getService("bar");
@@ -106,7 +106,7 @@
}
public void testNotService() {
- Composite<?> composite = new Composite();
+ Composite composite = new Composite();
composite.register(getReference("foo"));
composite.start();
try {
@@ -118,14 +118,14 @@
}
public void testReferencesServices() {
- Composite<?> composite = new Composite();
- composite.register(new ServiceExtension<Object>("foo", null, null, null));
+ Composite composite = new Composite();
+ composite.register(new ServiceExtension("foo", null, null, null));
composite.register(getReference("bar"));
assertEquals(1, composite.getReferences().size());
}
public void testServiceInterfaces() {
- Composite<?> composite = new Composite();
+ Composite composite = new Composite();
Service service1 = getService("foo", Foo.class);
composite.register(service1);
Service service2 = getService("bar", Bar.class);
@@ -141,7 +141,7 @@
}
public void testGetServiceInstanceByName() {
- Composite<?> composite = new Composite();
+ Composite composite = new Composite();
Service service = createMock(Service.class);
service.getName();
expectLastCall().andReturn("foo").anyTimes();
@@ -156,7 +156,7 @@
}
public void testGetServiceInstanceNotFound() {
- Composite<?> composite = new Composite();
+ Composite composite = new Composite();
Service service = getService("foo", Foo.class);
composite.register(service);
try {
@@ -168,7 +168,7 @@
}
public void testGetServiceInstanceNotService() {
- Composite<?> composite = new Composite();
+ Composite composite = new Composite();
Reference reference = getReference("foo");
composite.register(reference);
try {
@@ -180,7 +180,7 @@
}
public void testOnEvent() {
- Composite<?> composite = new Composite();
+ Composite composite = new Composite();
Event event = new Event() {
public Object getSource() {
return null;
@@ -195,13 +195,13 @@
}
public void testPrepare() {
- Composite<?> composite = new Composite();
+ Composite composite = new Composite();
composite.prepare();
}
// TODO method not implemented
// public void testSingleGetServiceInstance(){
-// Composite<?> composite = new Composite();
+// Composite composite = new Composite();
// Mock mock = mock(Service.class);
// mock.stubs().method("getName").will(returnValue("foo"));
// mock.stubs().method("getInterface").will(returnValue(Foo.class));
@@ -211,7 +211,7 @@
// assertNotNull(composite.getServiceInstance());
// }
- private class Composite<T> extends CompositeComponentExtension<T> {
+ private class Composite extends CompositeComponentExtension {
public Composite() {
super(null, null, createNiceMock(Connector.class), null);
}
@@ -225,8 +225,8 @@
}
}
- private AtomicComponent<?> getAtomic(String name) {
- AtomicComponent<?> component = createMock(AtomicComponent.class);
+ private AtomicComponent getAtomic(String name) {
+ AtomicComponent component = createMock(AtomicComponent.class);
component.getName();
expectLastCall().andReturn(name).anyTimes();
replay(component);
@@ -234,7 +234,7 @@
}
private Reference getReference(String name) {
- Reference<?> reference = createMock(Reference.class);
+ Reference reference = createMock(Reference.class);
reference.getName();
expectLastCall().andReturn(name).anyTimes();
replay(reference);
@@ -242,7 +242,7 @@
}
private Service getService(String name, Class<?> interfaze) {
- Service<?> service = createMock(Service.class);
+ Service service = createMock(Service.class);
service.getName();
expectLastCall().andReturn(name).anyTimes();
service.getInterface();
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/ReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/ReferenceTestCase.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/ReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/ReferenceTestCase.java Sat Sep 9 20:41:09 2006
@@ -80,7 +80,7 @@
ref.prepare();
}
- private class TestReference<T> extends ReferenceExtension<T> {
+ private class TestReference<T> extends ReferenceExtension {
public TestReference(Class<T> clazz) {
super(null, clazz, null, null);
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/ServiceExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/ServiceExtensionTestCase.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/ServiceExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/ServiceExtensionTestCase.java Sat Sep 9 20:41:09 2006
@@ -33,7 +33,7 @@
public class ServiceExtensionTestCase extends TestCase {
public void testScope() throws Exception {
- ServiceExtension<Object> service = new ServiceExtension<Object>(null, null, null, null);
+ ServiceExtension service = new ServiceExtension(null, null, null, null);
assertEquals(Scope.COMPOSITE, service.getScope());
}
@@ -43,14 +43,14 @@
JavaServiceContract contract = new JavaServiceContract(getClass());
expect(wire.getServiceContract()).andReturn(contract);
replay(wire);
- ServiceExtension<Object> service = new ServiceExtension<Object>(null, null, null, null);
+ ServiceExtension service = new ServiceExtension(null, null, null, null);
service.setInboundWire(wire);
service.getInterface();
}
public void testPrepare() throws Exception {
- ServiceExtension<Object> service = new ServiceExtension<Object>(null, null, null, null);
+ ServiceExtension service = new ServiceExtension(null, null, null, null);
service.prepare();
}
Modified: incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/LauncherActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/LauncherActivator.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/LauncherActivator.java (original)
+++ incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/LauncherActivator.java Sat Sep 9 20:41:09 2006
@@ -59,7 +59,7 @@
try {
System.out.println(":::" + new File(".").toURL().toString());
// URL systemScdl = getSystemSCDL(systemScdlPath);
- CompositeComponent<?> rt =
+ CompositeComponent rt =
launcher.bootRuntime(new File("./sca/system.scdl").toURI().toURL(), new NullMonitorFactory());
} catch (Exception e) {
throw new OSGILauncherInitException(e);
@@ -67,12 +67,12 @@
}
private void bootApplication(String name, URL scdl) throws TuscanyException {
- CompositeComponent<?> root = launcher.bootApplication(name, scdl);
+ CompositeComponent root = launcher.bootApplication(name, scdl);
root.start();
}
private void loadExtension(String name, URL scdl) throws TuscanyException {
- CompositeComponent<?> root = launcher.bootApplication(name, scdl);
+ CompositeComponent root = launcher.bootApplication(name, scdl);
root.start();
}
Modified: incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingBuilder.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingBuilder.java Sat Sep 9 20:41:09 2006
@@ -21,7 +21,6 @@
import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.BindingBuilderExtension;
@@ -49,7 +48,7 @@
}
@SuppressWarnings("unchecked")
- public Service<?> build(CompositeComponent parent,
+ public Service build(CompositeComponent parent,
BoundServiceDefinition<OSGiBinding> boundServiceDefinition,
DeploymentContext deploymentContext) {
String name = boundServiceDefinition.getName();
Modified: incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiReference.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiReference.java (original)
+++ incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiReference.java Sat Sep 9 20:41:09 2006
@@ -30,7 +30,7 @@
/**
* @version $Rev$ $Date$
*/
-public class OSGiReference<T> extends ReferenceExtension<T> {
+public class OSGiReference<T> extends ReferenceExtension {
//private final String uri;
public OSGiReference(String name, Class<T> interfaze, CompositeComponent parent, WireService service, String uri) {
Modified: incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiService.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiService.java (original)
+++ incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiService.java Sat Sep 9 20:41:09 2006
@@ -31,7 +31,7 @@
/**
* @version $Rev$ $Date$
*/
-public class OSGiService<T> extends ServiceExtension<T> {
+public class OSGiService extends ServiceExtension {
private final String osgiServiceName;
//private final Class<? extends Object> service;
private OSGiHost host;
@@ -50,7 +50,7 @@
CompositeComponent parent,
WireService wireService,
String osgiServiceName,
- Class<T> service,
+ Class<?> service,
OSGiHost host) {
super(name, service, parent, wireService);
this.osgiServiceName = osgiServiceName;
Modified: incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletLauncherListener.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletLauncherListener.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletLauncherListener.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletLauncherListener.java Sat Sep 9 20:41:09 2006
@@ -77,7 +77,7 @@
public class ServletLauncherListener implements TuscanyWebappRuntime {
private URL testSystemScdl;
- private CompositeComponent<?> component;
+ private CompositeComponent component;
private ServletLauncherMonitor monitor;
private LauncherImpl launcher;
private CompositeContextImpl context;
@@ -109,7 +109,7 @@
try {
URL systemScdl = getSystemSCDL(systemScdlPath);
- CompositeComponent<?> rt = launcher.bootRuntime(systemScdl, mf);
+ CompositeComponent rt = launcher.bootRuntime(systemScdl, mf);
// Read optional path to extension SCDLs from context-param
String extensionScdlPath = servletContext.getInitParameter(EXTENSION_SCDL_PATH_PARAM);
@@ -143,7 +143,7 @@
name = "application";
}
- CompositeComponent<?> root = launcher.bootApplication(name, appScdl);
+ CompositeComponent root = launcher.bootApplication(name, appScdl);
String compositePath = servletContext.getInitParameter(CURRENT_COMPOSITE_PATH_PARAM);
root.start();
// set the current composite
@@ -203,7 +203,7 @@
* @param scdlURL the location of the system SCDL
* @throws LoaderException
*/
- private void deployExtension(CompositeComponent<?> composite, String extensionName, URL scdlURL)
+ private void deployExtension(CompositeComponent composite, String extensionName, URL scdlURL)
throws LoaderException {
SystemCompositeImplementation implementation = new SystemCompositeImplementation();
implementation.setScdlLocation(scdlURL);
@@ -215,7 +215,7 @@
implementation);
Deployer deployer = (Deployer) composite.getChild("deployer").getServiceInstance();
- Component<?> component = deployer.deploy(composite, definition);
+ Component component = deployer.deploy(composite, definition);
component.start();
}
@@ -249,13 +249,13 @@
*
* @throws InvalidCompositePath
*/
- private void setCurrentComposite(String compositePath, CompositeComponent<?> root) throws InvalidCompositePath {
+ private void setCurrentComposite(String compositePath, CompositeComponent root) throws InvalidCompositePath {
if (compositePath != null) {
StringTokenizer tokens = new StringTokenizer(compositePath, "/");
- CompositeComponent<?> current = root;
+ CompositeComponent current = root;
while (tokens.hasMoreTokens()) {
String token = tokens.nextToken();
- SCAObject<?> child = current.getChild(token);
+ SCAObject child = current.getChild(token);
if (child == null) {
InvalidCompositePath e = new InvalidCompositePath("Composite not found");
e.setIdentifier(token);
@@ -265,7 +265,7 @@
e.setIdentifier(child.getName());
throw e;
}
- current = (CompositeComponent<?>) child;
+ current = (CompositeComponent) child;
}
component = current;
} else {
Modified: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/Bootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/Bootstrapper.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/Bootstrapper.java (original)
+++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/Bootstrapper.java Sat Sep 9 20:41:09 2006
@@ -21,7 +21,7 @@
* @version $Rev$ $Date$
*/
public class Bootstrapper extends TestCase {
- protected CompositeComponent<?> component;
+ protected CompositeComponent component;
private CompositeContextImpl context;
private Map<String, URL> extensions = new HashMap<String, URL>();
private String applicationSCDL = LauncherImpl.METAINF_APPLICATION_SCDL_PATH;
@@ -31,7 +31,7 @@
ClassLoader cl = getClass().getClassLoader();
TestLauncher launcher = new TestLauncher();
launcher.setApplicationLoader(cl);
- CompositeComponent<?> composite = launcher.bootRuntime(cl.getResource(LauncherImpl.METAINF_SYSTEM_SCDL_PATH),
+ CompositeComponent composite = launcher.bootRuntime(cl.getResource(LauncherImpl.METAINF_SYSTEM_SCDL_PATH),
new NullMonitorFactory());
for (String extensionName : extensions.keySet()) {
@@ -62,7 +62,7 @@
extensions.put(extensionName, extentionSCDL);
}
- protected void deployExtension(CompositeComponent<?> composite, String extensionName, URL scdlURL)
+ protected void deployExtension(CompositeComponent composite, String extensionName, URL scdlURL)
throws LoaderException {
SystemCompositeImplementation implementation = new SystemCompositeImplementation();
implementation.setScdlLocation(scdlURL);
@@ -74,7 +74,7 @@
implementation);
Deployer deployer = (Deployer) composite.getChild("deployer").getServiceInstance();
- Component<?> component = deployer.deploy(composite, definition);
+ Component component = deployer.deploy(composite, definition);
component.start();
}
Modified: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/SCATestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/SCATestCase.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/SCATestCase.java (original)
+++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/SCATestCase.java Sat Sep 9 20:41:09 2006
@@ -41,7 +41,7 @@
* @version $Rev$ $Date$
*/
public class SCATestCase extends TestCase {
- protected CompositeComponent<?> component;
+ protected CompositeComponent component;
private CompositeContextImpl context;
private Map<String, URL> extensions = new HashMap<String, URL>();
private String applicationSCDL = LauncherImpl.METAINF_APPLICATION_SCDL_PATH;
@@ -51,7 +51,7 @@
ClassLoader cl = getClass().getClassLoader();
LauncherImpl launcher = new LauncherImpl();
launcher.setApplicationLoader(cl);
- CompositeComponent<?> composite = launcher.bootRuntime(cl.getResource(LauncherImpl.METAINF_SYSTEM_SCDL_PATH),
+ CompositeComponent composite = launcher.bootRuntime(cl.getResource(LauncherImpl.METAINF_SYSTEM_SCDL_PATH),
new NullMonitorFactory());
for (String extensionName : extensions.keySet()) {
@@ -82,7 +82,7 @@
extensions.put(extensionName, extentionSCDL);
}
- protected void deployExtension(CompositeComponent<?> composite, String extensionName, URL scdlURL)
+ protected void deployExtension(CompositeComponent composite, String extensionName, URL scdlURL)
throws LoaderException {
SystemCompositeImplementation implementation = new SystemCompositeImplementation();
implementation.setScdlLocation(scdlURL);
@@ -93,7 +93,7 @@
implementation);
Deployer deployer = (Deployer) composite.getChild("deployer").getServiceInstance();
- Component<?> component = deployer.deploy(composite, definition);
+ Component component = deployer.deploy(composite, definition);
component.start();
}
Modified: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingBuilder.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingBuilder.java Sat Sep 9 20:41:09 2006
@@ -18,8 +18,6 @@
*/
package org.apache.tuscany.test.binding;
-import java.lang.reflect.Type;
-
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Reference;
import org.apache.tuscany.spi.component.Service;
@@ -34,14 +32,14 @@
public class TestBindingBuilder extends BindingBuilderExtension<TestBinding> {
@SuppressWarnings("unchecked")
- public Service<?> build(CompositeComponent parent,
+ public Service build(CompositeComponent parent,
BoundServiceDefinition<TestBinding> definition,
DeploymentContext context) {
Class<?> interfaze = definition.getServiceContract().getInterfaceClass();
return new TestBindingService(definition.getName(), interfaze, parent, wireService);
}
- public Reference<?> build(CompositeComponent parent,
+ public Reference build(CompositeComponent parent,
BoundReferenceDefinition<TestBinding> definition,
DeploymentContext context) {
Class<?> interfaze = definition.getServiceContract().getInterfaceClass();
Modified: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingReference.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingReference.java (original)
+++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingReference.java Sat Sep 9 20:41:09 2006
@@ -10,7 +10,7 @@
/**
* @version $Rev$ $Date$
*/
-public class TestBindingReference<T> extends ReferenceExtension<T> {
+public class TestBindingReference<T> extends ReferenceExtension {
public TestBindingReference(String name, Class<T> interfaze, CompositeComponent parent, WireService wireService) {
super(name, interfaze, parent, wireService);
Modified: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingService.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingService.java (original)
+++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingService.java Sat Sep 9 20:41:09 2006
@@ -27,9 +27,9 @@
*
* @version $Rev$ $Date$
*/
-public class TestBindingService<T> extends ServiceExtension<T> {
+public class TestBindingService extends ServiceExtension {
public TestBindingService(String name,
- Class<T> interfaze,
+ Class<?> interfaze,
CompositeComponent parent,
WireService wireService) throws CoreRuntimeException {
super(name, interfaze, parent, wireService);
Modified: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingBuilder.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingBuilder.java Sat Sep 9 20:41:09 2006
@@ -14,7 +14,7 @@
public class TestSocketBindingBuilder extends BindingBuilderExtension<TestSocketBinding> {
@SuppressWarnings("unchecked")
- public Service<?> build(CompositeComponent parent,
+ public Service build(CompositeComponent parent,
BoundServiceDefinition<TestSocketBinding> definition,
DeploymentContext context) {
Class<?> interfaze = definition.getServiceContract().getInterfaceClass();
@@ -23,7 +23,7 @@
}
@SuppressWarnings("unchecked")
- public Reference<?> build(CompositeComponent parent,
+ public Reference build(CompositeComponent parent,
BoundReferenceDefinition<TestSocketBinding> definition,
DeploymentContext context) {
Class<?> interfaze = definition.getServiceContract().getInterfaceClass();
Modified: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingReference.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingReference.java (original)
+++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingReference.java Sat Sep 9 20:41:09 2006
@@ -10,7 +10,7 @@
/**
* @version $Rev$ $Date$
*/
-public class TestSocketBindingReference<T> extends ReferenceExtension<T> {
+public class TestSocketBindingReference<T> extends ReferenceExtension {
private String host;
private int port;
Modified: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingService.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingService.java (original)
+++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingService.java Sat Sep 9 20:41:09 2006
@@ -24,15 +24,15 @@
*
* @version $Rev$ $Date$
*/
-public class TestSocketBindingService<T> extends ServiceExtension<T> {
+public class TestSocketBindingService extends ServiceExtension {
private int port;
private ServerSocket socket;
private ExecutorService executor;
- private TestSocketBindingService<T>.ServerRunnable runnable;
+ private TestSocketBindingService.ServerRunnable runnable;
public TestSocketBindingService(String name,
int port,
- Class<T> interfaze,
+ Class<?> interfaze,
CompositeComponent parent,
WireService wireService) throws CoreRuntimeException {
super(name, interfaze, parent, wireService);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org