You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2006/12/21 17:00:35 UTC
svn commit: r489392 -
/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/
Author: antelder
Date: Thu Dec 21 08:00:34 2006
New Revision: 489392
URL: http://svn.apache.org/viewvc?view=rev&rev=489392
Log:
More tidy up, fix all the eclipse warnings
Added:
incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingException.java
- copied, changed from r489385, incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingRuntimeException.java
Removed:
incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingRuntimeException.java
Modified:
incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/DefaultOperationAndDataBinding.java
incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingBuilder.java
incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader.java
incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSProxy.java
incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSReference.java
incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSService.java
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/DefaultOperationAndDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/DefaultOperationAndDataBinding.java?view=diff&rev=489392&r1=489391&r2=489392
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/DefaultOperationAndDataBinding.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/DefaultOperationAndDataBinding.java Thu Dec 21 08:00:34 2006
@@ -55,7 +55,7 @@
return message.getStringProperty(operationPropertyName);
} catch (JMSException e) {
- throw new JMSBindingRuntimeException("Exception retreiving operation name from message", e);
+ throw new JMSBindingException("Exception retreiving operation name from message", e);
}
}
@@ -71,7 +71,7 @@
message.setStringProperty(operationPropertyName, operationName);
} catch (JMSException e) {
- throw new JMSBindingRuntimeException("Exception setting the operation name on message", e);
+ throw new JMSBindingException("Exception setting the operation name on message", e);
}
}
@@ -114,9 +114,9 @@
return new Object[] {omElement};
} catch (XMLStreamException e) {
- throw new JMSBindingRuntimeException(e);
+ throw new JMSBindingException(e);
} catch (JMSException e) {
- throw new JMSBindingRuntimeException(e);
+ throw new JMSBindingException(e);
}
}
@@ -134,7 +134,7 @@
return message;
} catch (JMSException e) {
- throw new JMSBindingRuntimeException(e);
+ throw new JMSBindingException(e);
}
}
@@ -144,7 +144,7 @@
return ((ObjectMessage)msg).getObject();
} catch (JMSException e) {
- throw new JMSBindingRuntimeException(e);
+ throw new JMSBindingException(e);
}
}
@@ -156,7 +156,7 @@
return message;
} catch (JMSException e) {
- throw new JMSBindingRuntimeException(e);
+ throw new JMSBindingException(e);
}
}
}
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingBuilder.java?view=diff&rev=489392&r1=489391&r2=489392
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingBuilder.java Thu Dec 21 08:00:34 2006
@@ -25,7 +25,6 @@
import org.apache.axiom.om.OMElement;
import org.apache.tuscany.idl.wsdl.WSDLServiceContract;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.Reference;
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.BindingBuilderExtension;
@@ -43,14 +42,13 @@
private static final String DEFAULT_JMS_RESOURCE_FACTORY =
"org.apache.tuscany.binding.jms.SimpleJMSResourceFactory";
- private static final String DEFAULT_OPERATION_SELECTOR = "org.apache.tuscany.binding.jms.DefaultOperationSelector";
+
private static final String OM_DATA_BINDING = OMElement.class.getName();
protected Class<JMSBinding> getBindingType() {
return JMSBinding.class;
}
- @SuppressWarnings( {"unchecked"})
public Service build(CompositeComponent parent,
BoundServiceDefinition<JMSBinding> serviceDefinition,
DeploymentContext deploymentContext) {
@@ -80,8 +78,7 @@
return service;
}
- @SuppressWarnings( {"unchecked"})
- public Reference build(CompositeComponent parent,
+ public JMSReference build(CompositeComponent parent,
BoundReferenceDefinition<JMSBinding> referenceDefinition,
DeploymentContext deploymentContext) {
@@ -91,7 +88,7 @@
try {
serviceContract = (ServiceContract)referenceDefinition.getServiceContract().clone();
} catch (CloneNotSupportedException e) {
- throw new JMSBindingRuntimeException("Couldn't clone the Service Contract", e);
+ throw new JMSBindingException("Couldn't clone the Service Contract", e);
}
serviceContract.setDataBinding(OM_DATA_BINDING);
@@ -106,7 +103,7 @@
replyDest = jmsResourceFactory.lookupDestination(jmsBinding.getResponseDestinationName());
}
} catch (NamingException e) {
- throw new JMSBindingRuntimeException(e);
+ throw new JMSBindingException(e);
}
OperationAndDataBinding requestODB =
@@ -114,7 +111,7 @@
OperationAndDataBinding responseODB =
getRequestOperationAndDatabinding(jmsBinding, deploymentContext.getClassLoader());
- Reference reference =
+ JMSReference reference =
new JMSReference(name, parent, wireService, jmsBinding, jmsResourceFactory, requestODB, responseODB,
interfaze, requestDest, replyDest);
reference.setBindingServiceContract(serviceContract);
@@ -130,19 +127,19 @@
Constructor constructor = factoryClass.getDeclaredConstructor(new Class[] {JMSBinding.class});
return (JMSResourceFactory)constructor.newInstance(jmsBinding);
} catch (ClassNotFoundException e) {
- throw new JMSBindingRuntimeException("Error loading the JMSResourceFactory", e);
+ throw new JMSBindingException("Error loading the JMSResourceFactory", e);
} catch (SecurityException e) {
- throw new JMSBindingRuntimeException("Error loading the JMSResourceFactory", e);
+ throw new JMSBindingException("Error loading the JMSResourceFactory", e);
} catch (NoSuchMethodException e) {
- throw new JMSBindingRuntimeException("Error loading the JMSResourceFactory", e);
+ throw new JMSBindingException("Error loading the JMSResourceFactory", e);
} catch (IllegalArgumentException e) {
- throw new JMSBindingRuntimeException("Error loading the JMSResourceFactory", e);
+ throw new JMSBindingException("Error loading the JMSResourceFactory", e);
} catch (InstantiationException e) {
- throw new JMSBindingRuntimeException("Error loading the JMSResourceFactory", e);
+ throw new JMSBindingException("Error loading the JMSResourceFactory", e);
} catch (IllegalAccessException e) {
- throw new JMSBindingRuntimeException("Error loading the JMSResourceFactory", e);
+ throw new JMSBindingException("Error loading the JMSResourceFactory", e);
} catch (InvocationTargetException e) {
- throw new JMSBindingRuntimeException("Error loading the JMSResourceFactory", e);
+ throw new JMSBindingException("Error loading the JMSResourceFactory", e);
}
} else {
return new SimpleJMSResourceFactory(jmsBinding);
@@ -178,7 +175,7 @@
operationAndDataBinding = (OperationAndDataBinding)constructor.newInstance(jmsBinding);
} catch (Throwable e) {
- throw new JMSBindingRuntimeException("Exception instantiating OperationAndDataBinding class", e);
+ throw new JMSBindingException("Exception instantiating OperationAndDataBinding class", e);
}
return operationAndDataBinding;
}
Copied: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingException.java (from r489385, incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingRuntimeException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingException.java?view=diff&rev=489392&p1=incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingRuntimeException.java&r1=489385&p2=incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingException.java&r2=489392
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingRuntimeException.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingException.java Thu Dec 21 08:00:34 2006
@@ -18,21 +18,22 @@
import org.apache.tuscany.api.TuscanyRuntimeException;
-public class JMSBindingRuntimeException extends TuscanyRuntimeException {
+public class JMSBindingException extends TuscanyRuntimeException {
+ private static final long serialVersionUID = 1L;
- public JMSBindingRuntimeException() {
+ public JMSBindingException() {
super();
}
- public JMSBindingRuntimeException(String arg0, Throwable arg1) {
+ public JMSBindingException(String arg0, Throwable arg1) {
super(arg0, arg1);
}
- public JMSBindingRuntimeException(String arg0) {
+ public JMSBindingException(String arg0) {
super(arg0);
}
- public JMSBindingRuntimeException(Throwable arg0) {
+ public JMSBindingException(Throwable arg0) {
super(arg0);
}
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader.java?view=diff&rev=489392&r1=489391&r2=489392
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader.java Thu Dec 21 08:00:34 2006
@@ -92,7 +92,6 @@
// QName("name"));
// OMElement opSecPropertyOM = opSecOM.getFirstChildWithName(new
// QName("property"));
- String jmsOpSecPropertyName = ""; // = opSecPropertyOM.getText();
JMSBinding binding = new JMSBinding();
binding.setActivationSpecName(activationSpecName);
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSProxy.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSProxy.java?view=diff&rev=489392&r1=489391&r2=489392
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSProxy.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSProxy.java Thu Dec 21 08:00:34 2006
@@ -119,9 +119,9 @@
session.close();
} catch (JMSException e) {
- throw new JMSBindingRuntimeException(e);
+ throw new JMSBindingException(e);
} catch (NamingException e) {
- throw new JMSBindingRuntimeException(e);
+ throw new JMSBindingException(e);
}
}
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSReference.java?view=diff&rev=489392&r1=489391&r2=489392
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSReference.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSReference.java Thu Dec 21 08:00:34 2006
@@ -30,7 +30,7 @@
/**
* @version $Rev: 449970 $ $Date: 2006-09-26 06:05:35 -0400 (Tue, 26 Sep 2006) $
*/
-public class JMSReference<T> extends ReferenceExtension {
+public class JMSReference extends ReferenceExtension {
protected JMSBinding jmsBinding;
protected JMSResourceFactory jmsResourceFactory;
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSService.java?view=diff&rev=489392&r1=489391&r2=489392
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSService.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSService.java Thu Dec 21 08:00:34 2006
@@ -60,7 +60,7 @@
try {
registerListerner();
} catch (Exception e) {
- throw new JMSBindingRuntimeException("Error starting JMSService", e);
+ throw new JMSBindingException("Error starting JMSService", e);
}
}
@@ -70,7 +70,7 @@
consumer.close();
jmsResourceFactory.closeConnection();
} catch (Exception e) {
- throw new JMSBindingRuntimeException("Error stopping JMSService", e);
+ throw new JMSBindingException("Error stopping JMSService", e);
}
super.stop();
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org