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/12/14 07:18:33 UTC
svn commit: r486986 [2/3] - in /incubator/tuscany/java/sca:
kernel/api/src/main/java/org/apache/tuscany/api/
kernel/api/src/test/java/org/apache/tuscany/api/
kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/
kernel/core/src/main/java/...
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InvalidResourceException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InvalidResourceException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InvalidResourceException.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InvalidResourceException.java Wed Dec 13 22:18:28 2006
@@ -27,18 +27,7 @@
*/
public class InvalidResourceException extends ProcessingException {
- public InvalidResourceException() {
- }
-
- public InvalidResourceException(String message) {
- super(message);
- }
-
- public InvalidResourceException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public InvalidResourceException(Throwable cause) {
- super(cause);
+ public InvalidResourceException(String message, String identifier) {
+ super(message, identifier);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InvalidServiceType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InvalidServiceType.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InvalidServiceType.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InvalidServiceType.java Wed Dec 13 22:18:28 2006
@@ -27,18 +27,8 @@
* @version $Rev$ $Date$
*/
public class InvalidServiceType extends ProcessingException {
- public InvalidServiceType() {
- }
- public InvalidServiceType(String message) {
- super(message);
- }
-
- public InvalidServiceType(String message, Throwable cause) {
- super(message, cause);
- }
-
- public InvalidServiceType(Throwable cause) {
- super(cause);
+ public InvalidServiceType(String message, String identifier) {
+ super(message, identifier);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/NoConstructorException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/NoConstructorException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/NoConstructorException.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/NoConstructorException.java Wed Dec 13 22:18:28 2006
@@ -30,15 +30,7 @@
public NoConstructorException() {
}
- public NoConstructorException(String message) {
- super(message);
- }
-
- public NoConstructorException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public NoConstructorException(Throwable cause) {
- super(cause);
+ public NoConstructorException(String message, String identifier) {
+ super(message, identifier);
}
}
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=486986&r1=486985&r2=486986
==============================================================================
--- 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 Wed Dec 13 22:18:28 2006
@@ -64,9 +64,7 @@
return; //Not a reference or autowire annotation.
}
if (method.getParameterTypes().length != 1) {
- IllegalReferenceException e = new IllegalReferenceException("Setter must have one parameter");
- e.setIdentifier(method.toString());
- throw e;
+ throw new IllegalReferenceException("Setter must have one parameter", method.toString());
}
//process autowire required first let reference override. or if conflicting should this fault?
boolean required = false;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ResourceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ResourceProcessor.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ResourceProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ResourceProcessor.java Wed Dec 13 22:18:28 2006
@@ -54,9 +54,7 @@
return;
}
if (method.getParameterTypes().length != 1) {
- IllegalResourceException e = new IllegalResourceException("Resource setter must have one parameter");
- e.setIdentifier(method.toString());
- throw e;
+ throw new IllegalResourceException("Resource setter must have one parameter", method.toString());
}
String name = annotation.name();
if (name.length() < 1) {
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=486986&r1=486985&r2=486986
==============================================================================
--- 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 Wed Dec 13 22:18:28 2006
@@ -87,9 +87,7 @@
}
for (Class<?> interfaze : interfaces) {
if (!interfaze.isInterface()) {
- InvalidServiceType e = new InvalidServiceType("Service must be an interface");
- e.setIdentifier(interfaze.getName());
- throw e;
+ throw new InvalidServiceType("Service must be an interface", interfaze.getName());
}
JavaMappedService service;
try {
@@ -112,10 +110,7 @@
return;
}
if (method.getParameterTypes().length != 1) {
- IllegalCallbackReferenceException e =
- new IllegalCallbackReferenceException("Setter must have one parameter");
- e.setIdentifier(method.toString());
- throw e;
+ throw new IllegalCallbackReferenceException("Setter must have one parameter", method.toString());
}
String name = toPropertyName(method.getName());
JavaMappedService callbackService = null;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ServiceTypeNotFoundException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ServiceTypeNotFoundException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ServiceTypeNotFoundException.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ServiceTypeNotFoundException.java Wed Dec 13 22:18:28 2006
@@ -26,18 +26,9 @@
* @version $Rev$ $Date$
*/
public class ServiceTypeNotFoundException extends ProcessingException {
- public ServiceTypeNotFoundException() {
- }
public ServiceTypeNotFoundException(String message) {
super(message);
}
- public ServiceTypeNotFoundException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public ServiceTypeNotFoundException(Throwable cause) {
- super(cause);
- }
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/UnknownContextTypeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/UnknownContextTypeException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/UnknownContextTypeException.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/UnknownContextTypeException.java Wed Dec 13 22:18:28 2006
@@ -24,18 +24,9 @@
* @version $Rev$ $Date$
*/
public class UnknownContextTypeException extends IllegalContextException {
- public UnknownContextTypeException() {
- }
public UnknownContextTypeException(String message) {
super(message);
}
- public UnknownContextTypeException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public UnknownContextTypeException(Throwable cause) {
- super(cause);
- }
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemImplementationLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemImplementationLoader.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemImplementationLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemImplementationLoader.java Wed Dec 13 22:18:28 2006
@@ -19,7 +19,6 @@
package org.apache.tuscany.core.implementation.system.loader;
import javax.xml.namespace.QName;
-import javax.xml.stream.Location;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -62,13 +61,7 @@
while (true) {
int code = reader.next();
if (code == XMLStreamConstants.START_ELEMENT) {
- Location location = reader.getLocation();
- int line = location.getLineNumber();
- int col = location.getColumnNumber();
- UnrecognizedElementException e = new UnrecognizedElementException(reader.getName());
- e.setIdentifier(line + "," + col);
- throw e;
-
+ throw new UnrecognizedElementException(reader.getName());
} else if (code == XMLStreamConstants.END_ELEMENT) {
return implementation;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/LaunchException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/LaunchException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/LaunchException.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/LaunchException.java Wed Dec 13 22:18:28 2006
@@ -26,18 +26,24 @@
* @version $Rev$ $Date$
*/
public abstract class LaunchException extends TuscanyException {
- public LaunchException() {
- }
- public LaunchException(String message) {
+ protected LaunchException(String message) {
super(message);
}
- public LaunchException(String message, Throwable cause) {
+ protected LaunchException(String message, String identifier) {
+ super(message, identifier);
+ }
+
+ protected LaunchException(String message, String identifier, Throwable cause) {
+ super(message, identifier, cause);
+ }
+
+ protected LaunchException(String message, Throwable cause) {
super(message, cause);
}
- public LaunchException(Throwable cause) {
+ protected LaunchException(Throwable cause) {
super(cause);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java Wed Dec 13 22:18:28 2006
@@ -112,10 +112,7 @@
try {
componentDefinition.setInitLevel(Integer.valueOf(initLevel));
} catch (NumberFormatException e) {
- InvalidValueException ive = new InvalidValueException(initLevel, e);
- ive.setIdentifier("initValue");
- ive.addContextName(name);
- throw ive;
+ throw new InvalidValueException(initLevel, "initValue", e);
}
}
}
@@ -206,10 +203,10 @@
String target = text != null ? text.trim() : null;
- if (name == null || target == null) {
- InvalidReferenceException le = new InvalidReferenceException();
- le.setIdentifier(target);
- throw le;
+ if (name == null) {
+ throw new InvalidReferenceException("No name specified");
+ } else if (target == null) {
+ throw new InvalidReferenceException("No target specified", name);
}
ReferenceTarget referenceTarget = new ReferenceTarget();
@@ -217,9 +214,7 @@
try {
referenceTarget.addTarget(new URI(target));
} catch (URISyntaxException e) {
- InvalidReferenceException le = new InvalidReferenceException(e);
- le.setIdentifier(target);
- throw le;
+ throw new InvalidReferenceException(e);
}
componentDefinition.add(referenceTarget);
}
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=486986&r1=486985&r2=486986
==============================================================================
--- 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 Wed Dec 13 22:18:28 2006
@@ -75,21 +75,15 @@
try {
url = new URL(deploymentContext.getScdlLocation(), scdlLocation);
} catch (MalformedURLException e) {
- MissingResourceException mre = new MissingResourceException(scdlLocation, e);
- mre.setIdentifier(name);
- throw mre;
+ throw new MissingResourceException(scdlLocation, name, e);
}
} else if (scdlResource != null) {
url = cl.getResource(scdlResource);
if (url == null) {
- MissingResourceException mre = new MissingResourceException(scdlResource);
- mre.setIdentifier(name);
- throw mre;
+ throw new MissingResourceException(scdlResource, name);
}
} else {
- MissingIncludeException mie = new MissingIncludeException("No SCDL location or resource specified");
- mie.setIdentifier(name);
- throw mie;
+ throw new MissingIncludeException("No SCDL location or resource specified", name);
}
DeploymentContext childContext = new ChildDeploymentContext(deploymentContext, cl, url);
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=486986&r1=486985&r2=486986
==============================================================================
--- 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 Wed Dec 13 22:18:28 2006
@@ -27,7 +27,6 @@
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.Location;
import org.osoa.sca.annotations.Init;
@@ -91,12 +90,7 @@
monitor.elementLoad(name);
StAXElementLoader<? extends ModelObject> loader = loaders.get(name);
if (loader == null) {
- Location location = reader.getLocation();
- int line = location.getLineNumber();
- int col = location.getColumnNumber();
- UnrecognizedElementException e = new UnrecognizedElementException(name);
- e.setIdentifier(line + "," + col);
- throw e;
+ throw new UnrecognizedElementException(name);
}
return loader.load(parent, object, reader, deploymentContext);
}
@@ -122,10 +116,6 @@
} else {
UnrecognizedElementException e = new UnrecognizedElementException(name);
e.setResourceURI(url.toString());
- Location location = reader.getLocation();
- int line = location.getLineNumber();
- int col = location.getColumnNumber();
- e.setIdentifier(line + "," + col);
throw e;
}
} finally {
@@ -147,10 +137,7 @@
sfe.setResourceURI(url.toString());
throw sfe;
} catch (XMLStreamException e) {
- InvalidConfigurationException sfe = new InvalidConfigurationException("Invalid or missing resource", e);
- sfe.setIdentifier(url.toString());
- sfe.setResourceURI(url.toString());
- throw sfe;
+ throw new InvalidConfigurationException("Invalid or missing resource", url.toString(), e);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java Wed Dec 13 22:18:28 2006
@@ -96,9 +96,7 @@
try {
targetURI = new URI(target);
} catch (URISyntaxException e) {
- InvalidReferenceException ire = new InvalidReferenceException(target);
- ire.setIdentifier(name);
- throw ire;
+ throw new InvalidReferenceException(target, name);
}
}
@@ -110,9 +108,7 @@
try {
targetURI = new URI(target);
} catch (URISyntaxException e) {
- InvalidReferenceException ire = new InvalidReferenceException(target);
- ire.setIdentifier(name);
- throw ire;
+ throw new InvalidReferenceException(target, name);
}
return new BindlessServiceDefinition(name, serviceContract, false, targetURI);
} else {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java Wed Dec 13 22:18:28 2006
@@ -76,41 +76,21 @@
if (uriString != null && uriString.trim().length() > 0) {
sourceURI = new URI(uriString);
} else {
- int line = reader.getLocation().getLineNumber();
- int col = reader.getLocation().getColumnNumber();
- InvalidWireException e = new InvalidWireException("Wire source not defined");
- e.setIdentifier(line + "," + col);
- e.addContextName(parent.getName());
- throw e;
+ throw new InvalidWireException("Wire source not defined");
}
} else if (reader.getName().equals(TARGET_URI)) {
uriString = reader.getElementText();
if (uriString != null && uriString.trim().length() > 0) {
targetURI = new URI(uriString);
} else {
- int line = reader.getLocation().getLineNumber();
- int col = reader.getLocation().getColumnNumber();
- InvalidWireException e = new InvalidWireException("Wire target not defined");
- e.setIdentifier(line + "," + col);
- e.addContextName(parent.getName());
- throw e;
+ throw new InvalidWireException("Wire target not defined");
}
} else {
- int line = reader.getLocation().getLineNumber();
- int col = reader.getLocation().getColumnNumber();
QName name = reader.getName();
- InvalidWireException e = new InvalidWireException("Unrecognized element in wire '" + name);
- e.setIdentifier(line + "," + col);
- e.addContextName(parent.getName());
- throw e;
+ throw new InvalidWireException("Unrecognized element in wire ", name.toString());
}
} catch (URISyntaxException e) {
- int line = reader.getLocation().getLineNumber();
- int col = reader.getLocation().getColumnNumber();
- InvalidWireException iwe = new InvalidWireException("Invalid wire uri", e);
- iwe.setIdentifier(line + "," + col);
- iwe.addContextName(parent.getName());
- throw iwe;
+ throw new InvalidWireException("Invalid wire uri", e);
}
reader.next();
@@ -122,12 +102,7 @@
wireDefn.setSource(sourceURI);
wireDefn.setTarget(targetURI);
} else {
- int line = reader.getLocation().getLineNumber();
- int col = reader.getLocation().getColumnNumber();
- InvalidWireException e = new InvalidWireException("Incomplete wire definition");
- e.setIdentifier(line + "," + col);
- e.addContextName(parent.getName());
- throw e;
+ throw new InvalidWireException("Incomplete wire definition");
}
return wireDefn;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/host/DelegatingResourceHostRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/host/DelegatingResourceHostRegistry.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/host/DelegatingResourceHostRegistry.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/host/DelegatingResourceHostRegistry.java Wed Dec 13 22:18:28 2006
@@ -94,9 +94,7 @@
String uri = mappedName.substring(0, pos + 3);
ResourceHost host = resourceHosts.get(uri);
if (host == null) {
- ResourceResolutionException e = new ResourceResolutionException("No resource host for URI");
- e.setIdentifier(uri);
- throw e;
+ throw new ResourceResolutionException("No resource host for URI", uri);
}
return host.resolveResource(type, mappedName);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/store/memory/MemoryStore.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/store/memory/MemoryStore.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/store/memory/MemoryStore.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/store/memory/MemoryStore.java Wed Dec 13 22:18:28 2006
@@ -60,6 +60,7 @@
/**
* Returns the maximum default expiration offset for records in the store
+ *
* @return the maximum default expiration offset for records in the store
*/
public long getDefaultExpirationOffset() {
@@ -105,9 +106,7 @@
store.put(owner, map);
}
if (map.containsKey(id)) {
- DuplicateRecordException e = new DuplicateRecordException();
- e.setIdentifier(owner.getCanonicalName());
- throw e;
+ throw new DuplicateRecordException(owner.getCanonicalName(), id);
}
map.put(id, new Record(object, expiration));
}
@@ -115,15 +114,11 @@
public void updateRecord(SCAObject owner, String id, Object object, long expiration) throws StoreWriteException {
Map<String, Record> map = store.get(owner);
if (map == null) {
- StoreWriteException e = new StoreWriteException("Record not found");
- e.setIdentifier(id);
- throw e;
+ throw new StoreWriteException("Record not found", owner.getCanonicalName(), id);
}
Record record = map.get(id);
if (record == null) {
- StoreWriteException e = new StoreWriteException("Record not found");
- e.setIdentifier(id);
- throw e;
+ throw new StoreWriteException("Record not found", owner.getCanonicalName(), id);
}
record.data = object;
}
@@ -147,14 +142,10 @@
public void removeRecord(SCAObject owner, String id) throws StoreWriteException {
Map<String, Record> map = store.get(owner);
if (map == null) {
- StoreWriteException e = new StoreWriteException("Owner not found");
- e.setIdentifier(owner.getCanonicalName());
- throw e;
+ throw new StoreWriteException("Owner not found", owner.getCanonicalName(), id);
}
if (map.remove(id) == null) {
- StoreWriteException e = new StoreWriteException("Record not found for owner " + owner.getCanonicalName());
- e.setIdentifier(id);
- throw e;
+ throw new StoreWriteException("Owner not found", owner.getCanonicalName(), id);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConversationalIntrospectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConversationalIntrospectionTestCase.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConversationalIntrospectionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConversationalIntrospectionTestCase.java Wed Dec 13 22:18:28 2006
@@ -21,7 +21,7 @@
import org.osoa.sca.annotations.EndConversation;
import org.osoa.sca.annotations.Scope;
-import org.apache.tuscany.spi.idl.InvalidConversationalContractException;
+import org.apache.tuscany.spi.idl.InvalidConversationalOperationException;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import static org.apache.tuscany.spi.model.InteractionScope.CONVERSATIONAL;
import static org.apache.tuscany.spi.model.InteractionScope.NONCONVERSATIONAL;
@@ -48,7 +48,7 @@
try {
registry.introspect(BadFoo.class);
fail();
- } catch (InvalidConversationalContractException e) {
+ } catch (InvalidConversationalOperationException e) {
//expected
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLoaderWireResolutionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLoaderWireResolutionTestCase.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLoaderWireResolutionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLoaderWireResolutionTestCase.java Wed Dec 13 22:18:28 2006
@@ -39,6 +39,8 @@
/**
* This class tests the wire resolution function of the composite loader
+ *
+ * @version $Rev$ $Date$
*/
public class CompositeLoaderWireResolutionTestCase extends TestCase {
private CompositeComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> componentType;
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImplTestCase.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImplTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImplTestCase.java Wed Dec 13 22:18:28 2006
@@ -19,7 +19,6 @@
package org.apache.tuscany.core.loader;
import javax.xml.namespace.QName;
-import javax.xml.stream.Location;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -85,7 +84,6 @@
public void testUnsuccessfulDispatch() throws LoaderException, XMLStreamException {
EasyMock.expect(mockReader.getName()).andReturn(name);
- EasyMock.expect(mockReader.getLocation()).andReturn(new MockLocation());
EasyMock.replay(mockReader);
mockMonitor.elementLoad(EasyMock.eq(name));
EasyMock.replay(mockMonitor);
@@ -131,26 +129,4 @@
};
}
- private class MockLocation implements Location {
-
- public int getLineNumber() {
- return 0;
- }
-
- public int getColumnNumber() {
- return 0;
- }
-
- public int getCharacterOffset() {
- return 0;
- }
-
- public String getPublicId() {
- return null;
- }
-
- public String getSystemId() {
- return null;
- }
- }
}
Modified: incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/rmi/RMIHostException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/rmi/RMIHostException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/rmi/RMIHostException.java (original)
+++ incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/rmi/RMIHostException.java Wed Dec 13 22:18:28 2006
@@ -21,13 +21,12 @@
import org.apache.tuscany.api.TuscanyException;
/**
- * This exception will relate to situations where the end applicaition's
- * input is the cause of the exception
+ * This exception will relate to situations where the end applicaition's input is the cause of the exception
*
+ * @version $Rev$ $Date$
*/
public class RMIHostException extends TuscanyException {
-
- private static final long serialVersionUID = -1L;
+ private static final long serialVersionUID = 8031031440259175970L;
public RMIHostException() {
}
@@ -35,7 +34,7 @@
public RMIHostException(String message) {
super(message);
}
-
+
public RMIHostException(Throwable e) {
super(e);
}
Modified: incubator/tuscany/java/sca/kernel/host-api/src/test/java/org/apache/tuscany/host/rmi/RMIHostExceptionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/host-api/src/test/java/org/apache/tuscany/host/rmi/RMIHostExceptionTestCase.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/host-api/src/test/java/org/apache/tuscany/host/rmi/RMIHostExceptionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/host-api/src/test/java/org/apache/tuscany/host/rmi/RMIHostExceptionTestCase.java Wed Dec 13 22:18:28 2006
@@ -35,20 +35,20 @@
public void testMessageConstructor() {
Exception ex = new RMIHostException(MESSAGE);
- assertSame(MESSAGE, ex.getMessage());
+ assertEquals(MESSAGE, ex.getMessage());
assertNull(ex.getCause());
}
public void testThrowableConstructor() {
Exception ex = new RMIHostException(CAUSE);
assertEquals(CAUSE.getClass().getName() + ": " + CAUSE.getMessage(), ex.getMessage());
- assertSame(CAUSE, ex.getCause());
+ assertEquals(CAUSE, ex.getCause());
}
public void testMessageThrowableConstructor() {
Exception ex = new RMIHostException(MESSAGE, CAUSE);
- assertSame(MESSAGE, ex.getMessage());
- assertSame(CAUSE, ex.getCause());
+ assertEquals(MESSAGE, ex.getMessage());
+ assertEquals(CAUSE, ex.getCause());
}
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/host/ResourceResolutionException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/host/ResourceResolutionException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/host/ResourceResolutionException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/host/ResourceResolutionException.java Wed Dec 13 22:18:28 2006
@@ -24,18 +24,9 @@
* @version $Rev$ $Date$
*/
public class ResourceResolutionException extends TuscanyException {
- public ResourceResolutionException() {
- }
-
- public ResourceResolutionException(String message) {
- super(message);
- }
- public ResourceResolutionException(String message, Throwable cause) {
- super(message, cause);
+ public ResourceResolutionException(String message, String identifier) {
+ super(message, identifier);
}
- public ResourceResolutionException(Throwable cause) {
- super(cause);
- }
}
Copied: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/InvalidConversationalOperationException.java (from r486535, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/InvalidConversationalContractException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/InvalidConversationalOperationException.java?view=diff&rev=486986&p1=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/InvalidConversationalContractException.java&r1=486535&p2=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/InvalidConversationalOperationException.java&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/InvalidConversationalContractException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/InvalidConversationalOperationException.java Wed Dec 13 22:18:28 2006
@@ -18,25 +18,23 @@
*/
package org.apache.tuscany.spi.idl;
+import java.lang.reflect.Method;
+
/**
* Denotes an invalid conversational interface definition
*
* @version $Rev$ $Date$
*/
-public class InvalidConversationalContractException extends InvalidServiceContractException {
-
- public InvalidConversationalContractException() {
- }
+public class InvalidConversationalOperationException extends InvalidServiceContractException {
+ private final Method operation;
- public InvalidConversationalContractException(String message) {
- super(message);
+ public InvalidConversationalOperationException(String message, String identifier, Method operation) {
+ super(message, identifier);
+ this.operation = operation;
}
- public InvalidConversationalContractException(String message, Throwable cause) {
- super(message, cause);
+ public Method getOperation() {
+ return operation;
}
- public InvalidConversationalContractException(Throwable cause) {
- super(cause);
- }
}
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/InvalidConversationalOperationException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/InvalidConversationalOperationException.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/InvalidServiceContractException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/InvalidServiceContractException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/InvalidServiceContractException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/InvalidServiceContractException.java Wed Dec 13 22:18:28 2006
@@ -24,6 +24,7 @@
* @version $Rev$ $Date$
*/
public abstract class InvalidServiceContractException extends TuscanyException {
+
public InvalidServiceContractException() {
}
@@ -31,8 +32,16 @@
super(message);
}
+ protected InvalidServiceContractException(String message, String identifier) {
+ super(message, identifier);
+ }
+
public InvalidServiceContractException(String message, Throwable cause) {
super(message, cause);
+ }
+
+ protected InvalidServiceContractException(String message, String identifier, Throwable cause) {
+ super(message, identifier, cause);
}
public InvalidServiceContractException(Throwable cause) {
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/OverloadedOperationException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/OverloadedOperationException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/OverloadedOperationException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/OverloadedOperationException.java Wed Dec 13 22:18:28 2006
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.spi.idl;
+import java.lang.reflect.Method;
+
/**
* Exception thrown to indicate that a service contract specification contains an overloaded method.
*
@@ -25,19 +27,15 @@
*/
public class OverloadedOperationException extends InvalidServiceContractException {
private static final long serialVersionUID = -4658711318608885638L;
+ private final Method operation;
- public OverloadedOperationException() {
- }
-
- public OverloadedOperationException(String message) {
- super(message);
+ public OverloadedOperationException(Method operation) {
+ super(null, operation.getDeclaringClass().getName());
+ this.operation = operation;
}
- public OverloadedOperationException(String message, Throwable cause) {
- super(message, cause);
+ public Method getOperation() {
+ return operation;
}
- public OverloadedOperationException(Throwable cause) {
- super(cause);
- }
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/AbstractPropertyProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/AbstractPropertyProcessor.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/AbstractPropertyProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/AbstractPropertyProcessor.java Wed Dec 13 22:18:28 2006
@@ -52,15 +52,11 @@
}
if (!Void.TYPE.equals(method.getReturnType())) {
- IllegalPropertyException ipe = new IllegalPropertyException("Method does not have void return type");
- ipe.setIdentifier(method.toString());
- throw ipe;
+ throw new IllegalPropertyException("Method does not have void return type", method.toString());
}
Class[] paramTypes = method.getParameterTypes();
if (paramTypes.length != 1) {
- IllegalPropertyException ipe = new IllegalPropertyException("Method must have 1 parameter");
- ipe.setIdentifier(method.toString());
- throw ipe;
+ throw new IllegalPropertyException("Method must have a single parameter", method.toString());
}
Class<?> javaType = paramTypes[0];
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/DuplicatePropertyException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/DuplicatePropertyException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/DuplicatePropertyException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/DuplicatePropertyException.java Wed Dec 13 22:18:28 2006
@@ -24,18 +24,12 @@
* @version $Rev$ $Date$
*/
public class DuplicatePropertyException extends ProcessingException {
- public DuplicatePropertyException() {
- }
public DuplicatePropertyException(String message) {
super(message);
}
- public DuplicatePropertyException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public DuplicatePropertyException(Throwable cause) {
- super(cause);
+ public DuplicatePropertyException(String message, String identifier) {
+ super(message, identifier);
}
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/IllegalPropertyException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/IllegalPropertyException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/IllegalPropertyException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/IllegalPropertyException.java Wed Dec 13 22:18:28 2006
@@ -24,18 +24,13 @@
* @version $Rev$ $Date$
*/
public class IllegalPropertyException extends ProcessingException {
- public IllegalPropertyException() {
- }
public IllegalPropertyException(String message) {
super(message);
}
- public IllegalPropertyException(String message, Throwable cause) {
- super(message, cause);
- }
- public IllegalPropertyException(Throwable cause) {
- super(cause);
+ public IllegalPropertyException(String message, String identifier) {
+ super(message, identifier);
}
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/ProcessingException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/ProcessingException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/ProcessingException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/ProcessingException.java Wed Dec 13 22:18:28 2006
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.spi.implementation.java;
+import java.lang.reflect.Member;
+
import org.apache.tuscany.spi.loader.LoaderException;
/**
@@ -26,6 +28,8 @@
* @version $Rev$ $Date$
*/
public class ProcessingException extends LoaderException {
+ private Member member;
+
public ProcessingException() {
}
@@ -33,6 +37,14 @@
super(message);
}
+ public ProcessingException(String message, String identifier) {
+ super(message, identifier);
+ }
+
+ public ProcessingException(String message, String identifier, Throwable cause) {
+ super(message, identifier, cause);
+ }
+
public ProcessingException(String message, Throwable cause) {
super(message, cause);
}
@@ -40,4 +52,14 @@
public ProcessingException(Throwable cause) {
super(cause);
}
+
+
+ public Member getMemberName() {
+ return member;
+ }
+
+ public void setMember(Member member) {
+ this.member = member;
+ }
+
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/InvalidConfigurationException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/InvalidConfigurationException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/InvalidConfigurationException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/InvalidConfigurationException.java Wed Dec 13 22:18:28 2006
@@ -24,18 +24,13 @@
* @version $Rev$ $Date$
*/
public class InvalidConfigurationException extends LoaderException {
- public InvalidConfigurationException() {
- }
public InvalidConfigurationException(String message) {
super(message);
}
- public InvalidConfigurationException(String message, Throwable cause) {
- super(message, cause);
+ public InvalidConfigurationException(String message, String identifier, Throwable cause) {
+ super(message, identifier, cause);
}
- public InvalidConfigurationException(Throwable cause) {
- super(cause);
- }
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/InvalidReferenceException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/InvalidReferenceException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/InvalidReferenceException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/InvalidReferenceException.java Wed Dec 13 22:18:28 2006
@@ -24,15 +24,12 @@
public class InvalidReferenceException extends LoaderException {
private static final long serialVersionUID = -4346666572527197558L;
- public InvalidReferenceException() {
- }
-
public InvalidReferenceException(String message) {
super(message);
}
- public InvalidReferenceException(String message, Throwable cause) {
- super(message, cause);
+ public InvalidReferenceException(String message, String identifier) {
+ super(message, identifier);
}
public InvalidReferenceException(Throwable cause) {
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/InvalidServiceException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/InvalidServiceException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/InvalidServiceException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/InvalidServiceException.java Wed Dec 13 22:18:28 2006
@@ -22,19 +22,9 @@
* @version $Rev: 430937 $ $Date: 2006-08-12 06:47:56 +0530 (Sat, 12 Aug 2006) $
*/
public class InvalidServiceException extends LoaderException {
-
- public InvalidServiceException() {
- }
-
- public InvalidServiceException(String message) {
- super(message);
- }
- public InvalidServiceException(String message, Throwable cause) {
- super(message, cause);
+ public InvalidServiceException(String message, String identifier) {
+ super(message, identifier);
}
- public InvalidServiceException(Throwable cause) {
- super(cause);
- }
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/InvalidValueException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/InvalidValueException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/InvalidValueException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/InvalidValueException.java Wed Dec 13 22:18:28 2006
@@ -26,9 +26,6 @@
*/
public class InvalidValueException extends LoaderException {
- public InvalidValueException() {
- }
-
public InvalidValueException(String message) {
super(message);
}
@@ -37,7 +34,7 @@
super(message, cause);
}
- public InvalidValueException(Throwable cause) {
- super(cause);
+ public InvalidValueException(String message, String identifier, Throwable cause) {
+ super(message, identifier, cause);
}
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/InvalidWireException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/InvalidWireException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/InvalidWireException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/InvalidWireException.java Wed Dec 13 22:18:28 2006
@@ -30,6 +30,11 @@
super(message);
}
+
+ public InvalidWireException(String message, String identifier) {
+ super(message, identifier);
+ }
+
public InvalidWireException(String message, Throwable cause) {
super(message, cause);
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderException.java Wed Dec 13 22:18:28 2006
@@ -28,7 +28,10 @@
*/
public class LoaderException extends TuscanyException {
private static final long serialVersionUID = -7459051598906813461L;
+ private static final int UNDEFINED = -1;
private String resourceURI;
+ private int line = UNDEFINED;
+ private int col = UNDEFINED;
public LoaderException() {
}
@@ -37,10 +40,18 @@
super(message);
}
+ public LoaderException(String message, String identifier) {
+ super(message, identifier);
+ }
+
public LoaderException(String message, Throwable cause) {
super(message, cause);
}
+ public LoaderException(String message, String identifier, Throwable cause) {
+ super(message, identifier, cause);
+ }
+
public LoaderException(Throwable cause) {
super(cause);
}
@@ -63,4 +74,19 @@
this.resourceURI = resourceURI;
}
+ public int getLine() {
+ return line;
+ }
+
+ public void setLine(int line) {
+ this.line = line;
+ }
+
+ public int getCol() {
+ return col;
+ }
+
+ public void setCol(int col) {
+ this.col = col;
+ }
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/MissingIncludeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/MissingIncludeException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/MissingIncludeException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/MissingIncludeException.java Wed Dec 13 22:18:28 2006
@@ -26,15 +26,7 @@
public class MissingIncludeException extends LoaderException {
private static final long serialVersionUID = -2917278473974880124L;
- /**
- * Default constructor.
- */
- public MissingIncludeException() {
- super();
- }
-
-
- public MissingIncludeException(String message) {
- super(message);
+ public MissingIncludeException(String message, String identifier) {
+ super(message, identifier);
}
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/MissingMustOverridePropertyException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/MissingMustOverridePropertyException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/MissingMustOverridePropertyException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/MissingMustOverridePropertyException.java Wed Dec 13 22:18:28 2006
@@ -22,18 +22,9 @@
* @version $Rev$ $Date$
*/
public class MissingMustOverridePropertyException extends LoaderException {
+
public MissingMustOverridePropertyException(String name) {
super(name);
}
- public MissingMustOverridePropertyException() {
- }
-
- public MissingMustOverridePropertyException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public MissingMustOverridePropertyException(Throwable cause) {
- super(cause);
- }
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/MissingReferenceException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/MissingReferenceException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/MissingReferenceException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/MissingReferenceException.java Wed Dec 13 22:18:28 2006
@@ -24,18 +24,9 @@
* @version $Rev$ $Date$
*/
public class MissingReferenceException extends LoaderException {
- public MissingReferenceException() {
- }
public MissingReferenceException(String message) {
super(message);
}
- public MissingReferenceException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public MissingReferenceException(Throwable cause) {
- super(cause);
- }
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/MissingResourceException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/MissingResourceException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/MissingResourceException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/MissingResourceException.java Wed Dec 13 22:18:28 2006
@@ -37,6 +37,10 @@
super(resource);
}
+ public MissingResourceException(String message, String identifier) {
+ super(message, identifier);
+ }
+
/**
* Constructor that indicates which resource could not be found. The supplied parameter is also returned as the
* message.
@@ -45,5 +49,10 @@
*/
public MissingResourceException(String resource, Throwable cause) {
super(resource, cause);
+ }
+
+
+ public MissingResourceException(String message, String identifier, Throwable cause) {
+ super(message, identifier, cause);
}
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/DuplicateRecordException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/DuplicateRecordException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/DuplicateRecordException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/DuplicateRecordException.java Wed Dec 13 22:18:28 2006
@@ -25,18 +25,7 @@
*/
public class DuplicateRecordException extends StoreWriteException {
- public DuplicateRecordException() {
- }
-
- public DuplicateRecordException(String message) {
- super(message);
- }
-
- public DuplicateRecordException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public DuplicateRecordException(Throwable cause) {
- super(cause);
+ public DuplicateRecordException(String owner, String identifier) {
+ super(null, owner, identifier);
}
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreException.java Wed Dec 13 22:18:28 2006
@@ -26,19 +26,29 @@
* @version $Rev$ $Date$
*/
public class StoreException extends TuscanyException {
+ private final String owner;
- public StoreException() {
+ public StoreException(String message, String owner, String identifier) {
+ super(message, identifier);
+ this.owner = owner;
}
- public StoreException(String message) {
- super(message);
+ public StoreException(String message, String owner, String identifier, Throwable cause) {
+ super(message, identifier, cause);
+ this.owner = owner;
}
- public StoreException(String message, Throwable cause) {
+ public StoreException(String message, String owner, Throwable cause) {
super(message, cause);
+ this.owner = owner;
}
public StoreException(Throwable cause) {
super(cause);
+ owner = null;
+ }
+
+ public String getOwner() {
+ return owner;
}
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreReadException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreReadException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreReadException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreReadException.java Wed Dec 13 22:18:28 2006
@@ -25,18 +25,17 @@
*/
public class StoreReadException extends StoreException {
- public StoreReadException() {
+ public StoreReadException(Throwable cause) {
+ super(cause);
}
- public StoreReadException(String message) {
- super(message);
+ public StoreReadException(String message, String owner, String identifier) {
+ super(message, owner, identifier);
}
- public StoreReadException(String message, Throwable cause) {
- super(message, cause);
+ public StoreReadException(String owner, String identifier, Throwable throwable) {
+ super(owner, identifier, throwable);
}
- public StoreReadException(Throwable cause) {
- super(cause);
- }
+
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreWriteException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreWriteException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreWriteException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreWriteException.java Wed Dec 13 22:18:28 2006
@@ -25,15 +25,16 @@
*/
public class StoreWriteException extends StoreException {
- public StoreWriteException() {
+ public StoreWriteException(String message, String owner, String identifier) {
+ super(message, owner, identifier);
}
- public StoreWriteException(String message) {
- super(message);
+ public StoreWriteException(String message, String owner, String identifier, Throwable cause) {
+ super(message, owner, identifier, cause);
}
- public StoreWriteException(String message, Throwable cause) {
- super(message, cause);
+ public StoreWriteException(String message, String owner, Throwable cause) {
+ super(message, owner, cause);
}
public StoreWriteException(Throwable cause) {
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/IncompatibleServiceContractException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/IncompatibleServiceContractException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/IncompatibleServiceContractException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/IncompatibleServiceContractException.java Wed Dec 13 22:18:28 2006
@@ -19,36 +19,55 @@
package org.apache.tuscany.spi.wire;
+import org.apache.tuscany.spi.model.ServiceContract;
+import org.apache.tuscany.spi.model.Operation;
+
/**
* Denotes imcompatible service contracts for a wire
+ *
+ * @version $Rev$ $Date$
*/
public class IncompatibleServiceContractException extends WireException {
-
private static final long serialVersionUID = 5127478601823295587L;
+ private final ServiceContract<?> source;
+ private final ServiceContract<?> target;
+ private final Operation<?> sourceOperation;
+ private final Operation<?> targetOperation;
+
+ public IncompatibleServiceContractException(String message, ServiceContract<?> source, ServiceContract<?> target) {
+ super(message, null);
+ this.source = source;
+ this.target = target;
+ this.sourceOperation = null;
+ this.targetOperation = null;
+ }
- public IncompatibleServiceContractException() {
+
+ public IncompatibleServiceContractException(String message,
+ ServiceContract<?> source,
+ ServiceContract<?> target,
+ Operation<?> sourceOperation, Operation<?> targetOperation) {
+ super(message, null);
+ this.source = source;
+ this.target = target;
+ this.sourceOperation = sourceOperation;
+ this.targetOperation = targetOperation;
}
- /**
- * @param message
- */
- public IncompatibleServiceContractException(String message) {
- super(message);
+ public ServiceContract<?> getTarget() {
+ return target;
}
- /**
- * @param message
- * @param cause
- */
- public IncompatibleServiceContractException(String message, Throwable cause) {
- super(message, cause);
+ public ServiceContract<?> getSource() {
+ return source;
}
- /**
- * @param cause
- */
- public IncompatibleServiceContractException(Throwable cause) {
- super(cause);
+
+ public Operation<?> getSourceOperation() {
+ return sourceOperation;
}
+ public Operation<?> getTargetOperation() {
+ return targetOperation;
+ }
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireException.java Wed Dec 13 22:18:28 2006
@@ -22,23 +22,13 @@
/**
* Denotes a top-level exception dealing with a wire
+ *
+ * @version $Rev$ $Date$
*/
public abstract class WireException extends TuscanyException {
- public WireException() {
- super();
- }
-
- public WireException(String message) {
- super(message);
- }
-
- public WireException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public WireException(Throwable cause) {
- super(cause);
+ protected WireException(String message, String identifier) {
+ super(message, identifier);
}
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireServiceExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireServiceExtension.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireServiceExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireServiceExtension.java Wed Dec 13 22:18:28 2006
@@ -57,31 +57,19 @@
return;
}
if (source.isRemotable() != target.isRemotable()) {
- IncompatibleServiceContractException ex =
- new IncompatibleServiceContractException("The remotable settings don't match");
- ex.setIdentifier(source.toString() + "," + target.toString());
- throw ex;
+ throw new IncompatibleServiceContractException("Remotable settings do not match", source, target);
}
if (source.getInteractionScope() != target.getInteractionScope()) {
- IncompatibleServiceContractException ex =
- new IncompatibleServiceContractException("The interaction scopes don't match");
- ex.setIdentifier(source.toString() + "," + target.toString());
- throw ex;
+ throw new IncompatibleServiceContractException("Interaction scopes settings do not match", source, target);
}
for (Operation<?> operation : source.getOperations().values()) {
Operation<?> targetOperation = target.getOperations().get(operation.getName());
if (targetOperation == null) {
- IncompatibleServiceContractException ex =
- new IncompatibleServiceContractException("Operation not found on target");
- ex.setIdentifier(operation.getName());
- throw ex;
+ throw new IncompatibleServiceContractException("Operation not found on target", source, target);
}
if (!operation.equals(targetOperation)) {
- IncompatibleServiceContractException ex =
- new IncompatibleServiceContractException("Target operation is not compatible");
- ex.setIdentifier(operation.getServiceContract().toString() + ":" + operation.getName());
- throw ex;
+ throw new IncompatibleServiceContractException("Target operations are not compatible", source, target);
}
}
@@ -92,16 +80,18 @@
for (Operation<?> operation : source.getCallbackOperations().values()) {
Operation<?> targetOperation = target.getCallbackOperations().get(operation.getName());
if (targetOperation == null) {
- IncompatibleServiceContractException ex =
- new IncompatibleServiceContractException("Callback operation not found on target");
- ex.setIdentifier(operation.getName());
- throw ex;
+ throw new IncompatibleServiceContractException("Callback operation not found on target",
+ source,
+ target,
+ null,
+ targetOperation);
}
if (!operation.equals(targetOperation)) {
- IncompatibleServiceContractException ex =
- new IncompatibleServiceContractException("Target callback operation is not compatible");
- ex.setIdentifier(operation.getName());
- throw ex;
+ throw new IncompatibleServiceContractException("Target callback operation is not compatible",
+ source,
+ target,
+ operation,
+ targetOperation);
}
}
}
Modified: incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/OSGILauncherInitException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/OSGILauncherInitException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/OSGILauncherInitException.java (original)
+++ incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/OSGILauncherInitException.java Wed Dec 13 22:18:28 2006
@@ -24,16 +24,6 @@
* @version $Rev$ $Date$
*/
public class OSGILauncherInitException extends TuscanyException {
- public OSGILauncherInitException() {
- }
-
- public OSGILauncherInitException(String string) {
- super(string);
- }
-
- public OSGILauncherInitException(String string, Throwable throwable) {
- super(string, throwable);
- }
public OSGILauncherInitException(Throwable throwable) {
super(throwable);
Modified: incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/ImplementationLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/ImplementationLoader.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/ImplementationLoader.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/ImplementationLoader.java Wed Dec 13 22:18:28 2006
@@ -83,9 +83,7 @@
try {
is = url.openStream();
} catch (IOException e) {
- MissingResourceException mre = new MissingResourceException(resource, e);
- mre.setIdentifier(resource);
- throw mre;
+ throw new MissingResourceException(resource, e);
}
try {
Reader reader = new InputStreamReader(is, "UTF-8");
@@ -97,9 +95,7 @@
}
return source.toString();
} catch (IOException e) {
- LoaderException le = new LoaderException(e);
- le.setIdentifier(resource);
- throw le;
+ throw new LoaderException(resource, e);
} finally {
try {
is.close();
Modified: incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptImplementationLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptImplementationLoader.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptImplementationLoader.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptImplementationLoader.java Wed Dec 13 22:18:28 2006
@@ -87,9 +87,7 @@
try {
is = url.openStream();
} catch (IOException e) {
- MissingResourceException mre = new MissingResourceException(resource, e);
- mre.setIdentifier(resource);
- throw mre;
+ throw new MissingResourceException(resource, resource, e);
}
try {
Reader reader = new InputStreamReader(is, "UTF-8");
@@ -101,9 +99,7 @@
}
return source.toString();
} catch (IOException e) {
- LoaderException le = new LoaderException(e);
- le.setIdentifier(resource);
- throw le;
+ throw new LoaderException(resource, e);
} finally {
try {
is.close();
Modified: incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyImplementationLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyImplementationLoader.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyImplementationLoader.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyImplementationLoader.java Wed Dec 13 22:18:28 2006
@@ -96,9 +96,7 @@
try {
is = url.openStream();
} catch (IOException e) {
- MissingResourceException mre = new MissingResourceException(resource, e);
- mre.setIdentifier(resource);
- throw mre;
+ throw new MissingResourceException(resource, e);
}
try {
Reader reader = new InputStreamReader(is, "UTF-8");
@@ -112,9 +110,7 @@
}
return source.toString();
} catch (IOException e) {
- LoaderException le = new LoaderException(e);
- le.setIdentifier(resource);
- throw le;
+ throw new LoaderException(resource, e);
} finally {
try {
is.close();
Modified: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/MissingSideFileException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/MissingSideFileException.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/MissingSideFileException.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/MissingSideFileException.java Wed Dec 13 22:18:28 2006
@@ -24,18 +24,9 @@
* @version $Rev$ $Date$
*/
public class MissingSideFileException extends LoaderException {
- public MissingSideFileException() {
- }
-
- public MissingSideFileException(String message) {
- super(message);
- }
- public MissingSideFileException(String message, Throwable cause) {
- super(message, cause);
+ public MissingSideFileException(String message, String identifier) {
+ super(message, identifier);
}
- public MissingSideFileException(Throwable cause) {
- super(cause);
- }
}
Modified: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentTypeLoader.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentTypeLoader.java Wed Dec 13 22:18:28 2006
@@ -46,9 +46,7 @@
URL resource = implementation.getClassLoader().getResource(sideFile);
ScriptComponentType componentType;
if (resource == null) {
- MissingSideFileException e = new MissingSideFileException("Component type side file not found");
- e.setIdentifier(sideFile);
- throw e;
+ throw new MissingSideFileException("Component type side file not found", sideFile);
// TODO: or else implement introspection
} else {
componentType = loadFromSidefile(parent, resource, deploymentContext);
Modified: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptImplementationLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptImplementationLoader.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptImplementationLoader.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptImplementationLoader.java Wed Dec 13 22:18:28 2006
@@ -44,6 +44,8 @@
* Loader for handling implementation.script elements.
* <p/>
* <implementation.script script="path/foo.py" class="myclass">
+ *
+ * @version $Rev$ $Date$
*/
public class ScriptImplementationLoader extends LoaderExtension<ScriptImplementation> {
@@ -96,9 +98,7 @@
try {
is = url.openStream();
} catch (IOException e) {
- MissingResourceException mre = new MissingResourceException(resource, e);
- mre.setIdentifier(resource);
- throw mre;
+ throw new MissingResourceException(resource, e);
}
try {
Reader reader = new InputStreamReader(is, "UTF-8");
@@ -110,9 +110,7 @@
}
return source.toString();
} catch (IOException e) {
- LoaderException le = new LoaderException(e);
- le.setIdentifier(resource);
- throw le;
+ throw new LoaderException(resource, e);
} finally {
try {
is.close();
Modified: incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/loader/SpringImplementationLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/loader/SpringImplementationLoader.java?view=diff&rev=486986&r1=486985&r2=486986
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/loader/SpringImplementationLoader.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/loader/SpringImplementationLoader.java Wed Dec 13 22:18:28 2006
@@ -100,9 +100,7 @@
if (!type.isExposeAllBeans()) {
String name = service.getName();
if (!type.getServiceDeclarations().containsKey(name)) {
- LoaderException e = new LoaderException("No service defined in Spring context for ");
- e.setIdentifier(name);
- throw e;
+ throw new LoaderException("No service defined in Spring context for ", name);
}
}
type.getDeclaredServices().put(service.getName(), service);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org