Author: jmarino
Date: Tue Dec 5 23:16:06 2006
New Revision: 482937
URL: http://svn.apache.org/viewvc?view=rev&rev=482937
Log:
simplify exception hierarchy
Removed:
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ComponentNotFoundException.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java?view=diff&rev=482937&r1=482936&r2=482937
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
Tue Dec 5 23:16:06 2006
@@ -29,7 +29,6 @@
import org.apache.tuscany.spi.builder.Connector;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.Component;
-import org.apache.tuscany.spi.component.ComponentRuntimeException;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Reference;
import org.apache.tuscany.spi.component.SCAObject;
@@ -234,7 +233,7 @@
boolean isOneWayOperation = operation.isNonBlocking();
boolean operationHasCallback = contract.getCallbackName() != null;
if (isOneWayOperation && operationHasCallback) {
- throw new ComponentRuntimeException("Operation cannot be
marked one-way and have a callback");
+ throw new BuilderConfigException("Operation cannot be marked
one-way and have a callback");
}
TargetInvoker invoker = null;
if (target instanceof Component) {
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java?view=diff&rev=482937&r1=482936&r2=482937
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java
Tue Dec 5 23:16:06 2006
@@ -20,7 +20,6 @@
import java.util.List;
-import org.apache.tuscany.spi.component.ComponentNotFoundException;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.IllegalTargetException;
import org.apache.tuscany.spi.component.Reference;
@@ -78,7 +77,7 @@
try {
composite.getService("bar");
fail();
- } catch (ComponentNotFoundException e) {
+ } catch (TargetNotFoundException e) {
// expected
}
}
@@ -90,7 +89,7 @@
try {
composite.getService("foo");
fail();
- } catch (ComponentNotFoundException e) {
+ } catch (TargetNotFoundException e) {
// expected
}
}
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java?view=diff&rev=482937&r1=482936&r2=482937
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java
Tue Dec 5 23:16:06 2006
@@ -22,10 +22,10 @@
import java.util.List;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.ComponentNotFoundException;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.component.SystemAtomicComponent;
+import org.apache.tuscany.spi.component.TargetNotFoundException;
import junit.framework.TestCase;
import org.apache.tuscany.core.mock.component.Source;
@@ -130,7 +130,7 @@
try {
parent.getSystemService("source");
fail();
- } catch (ComponentNotFoundException e) {
+ } catch (TargetNotFoundException e) {
// expected
}
EasyMock.verify(service);
@@ -150,7 +150,7 @@
try {
parent.getService("source");
fail();
- } catch (ComponentNotFoundException e) {
+ } catch (TargetNotFoundException e) {
// expected
}
EasyMock.verify(service);
Modified:
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java?view=diff&rev=482937&r1=482936&r2=482937
==============================================================================
---
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java
(original)
+++
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java
Tue Dec 5 23:16:06 2006
@@ -86,16 +86,16 @@
/**
* Returns the service associated with the given name
*
- * @throws ComponentNotFoundException
+ * @throws TargetNotFoundException
*/
- Service getService(String name) throws ComponentNotFoundException;
+ Service getService(String name) throws TargetNotFoundException;
/**
* Returns the system service associated with the given name
*
- * @throws ComponentNotFoundException
+ * @throws TargetNotFoundException
*/
- Service getSystemService(String name) throws ComponentNotFoundException;
+ Service getSystemService(String name) throws TargetNotFoundException;
/**
* Returns a system service associated with the given name
Modified:
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java?view=diff&rev=482937&r1=482936&r2=482937
==============================================================================
---
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
(original)
+++
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
Tue Dec 5 23:16:06 2006
@@ -33,7 +33,6 @@
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.AutowireResolutionException;
import org.apache.tuscany.spi.component.Component;
-import org.apache.tuscany.spi.component.ComponentNotFoundException;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.DuplicateNameException;
import org.apache.tuscany.spi.component.IllegalTargetException;
@@ -204,7 +203,7 @@
public InboundWire getInboundWire(String serviceName) {
SCAObject object = children.get(serviceName);
if (!(object instanceof Service)) {
- throw new ComponentNotFoundException(serviceName);
+ throw new TargetNotFoundException(serviceName);
}
return ((Service) object).getInboundWire();
}
@@ -222,12 +221,12 @@
public Service getService(String name) {
SCAObject ctx = children.get(name);
if (ctx == null) {
- ComponentNotFoundException e = new
ComponentNotFoundException("Service not found");
+ TargetNotFoundException e = new TargetNotFoundException("Service
not found");
e.setIdentifier(name);
e.addContextName(getName());
throw e;
} else if (!(ctx instanceof Service)) {
- ComponentNotFoundException e = new
ComponentNotFoundException("SCAObject not a service");
+ TargetNotFoundException e = new TargetNotFoundException("SCAObject
not a service");
e.setIdentifier(name);
e.addContextName(getName());
throw e;
@@ -246,12 +245,12 @@
public Service getSystemService(String name) {
SCAObject ctx = systemChildren.get(name);
if (ctx == null) {
- ComponentNotFoundException e = new
ComponentNotFoundException("Service not found");
+ TargetNotFoundException e = new TargetNotFoundException("Service
not found");
e.setIdentifier(name);
e.addContextName(getName());
throw e;
} else if (!(ctx instanceof Service)) {
- ComponentNotFoundException e = new
ComponentNotFoundException("SCAObject not a service");
+ TargetNotFoundException e = new TargetNotFoundException("SCAObject
not a service");
e.setIdentifier(name);
e.addContextName(getName());
throw e;
Modified:
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java?view=diff&rev=482937&r1=482936&r2=482937
==============================================================================
---
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java
(original)
+++
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java
Tue Dec 5 23:16:06 2006
@@ -91,7 +91,6 @@
/**
* Get all components including the ones are from included composites
- * @return
*/
@SuppressWarnings("unchecked")
public Map<String, ComponentDefinition<? extends Implementation<?>>>
getComponents() {
@@ -106,7 +105,6 @@
/**
* Get all wires including the ones are from included composites
- * @return
*/
@SuppressWarnings("unchecked")
public List<WireDefinition> getWires() {
@@ -120,7 +118,6 @@
/**
* Get declared properties in this composite type, included doesn't count
- * @return
*/
public Map<String, P> getDeclaredProperties() {
return super.getProperties();
@@ -128,7 +125,6 @@
/**
* Get declared references in this composite type, included doesn't count
- * @return
*/
public Map<String, R> getDeclaredReferences() {
return super.getReferences();
@@ -136,7 +132,6 @@
/**
* Get declared services in this composite type, included doesn't count
- * @return
*/
public Map<String, S> getDeclaredServices() {
return super.getServices();
@@ -144,7 +139,6 @@
/**
* Get declared components in this composite type, included doesn't count
- * @return
*/
public Map<String, ComponentDefinition<? extends Implementation<?>>>
getDeclaredComponents() {
return components;
@@ -152,7 +146,6 @@
/**
* Get declared wires in this composite type, included doesn't count
- * @return
*/
public List<WireDefinition> getDeclaredWires() {
return wires;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
