Author: antelder
Date: Fri May 8 11:48:59 2009
New Revision: 772947
URL: http://svn.apache.org/viewvc?rev=772947&view=rev
Log:
Remove commentted out or unused code and fix IDE warnings
Modified:
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
Modified:
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java?rev=772947&r1=772946&r2=772947&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
(original)
+++
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
Fri May 8 11:48:59 2009
@@ -31,7 +31,7 @@
public File deployDir;
/** If non-null the type of exception we expect to get when we deploy. */
- public Class expectedException = null;
+ public Class<?> expectedException = null;
public ODEDeployment(File deployDir) {
this.deployDir = deployDir;
Modified:
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java?rev=772947&r1=772946&r2=772947&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java
(original)
+++
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java
Fri May 8 11:48:59 2009
@@ -34,14 +34,9 @@
* @version $Rev$ $Date$
*/
public class TuscanyEPR implements EndpointReference {
- private final QName prcessName;
- private final Endpoint endpoint;
private final Document doc = DOMUtils.newDocument();
public TuscanyEPR(QName processName, Endpoint endpoint) {
- this.prcessName = processName;
- this.endpoint = endpoint;
-
Element serviceref =
doc.createElementNS(EndpointReference.SERVICE_REF_QNAME.getNamespaceURI(),
EndpointReference.SERVICE_REF_QNAME.getLocalPart());
serviceref.setNodeValue(endpoint.serviceName + ":" +
endpoint.portName);
Modified:
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java?rev=772947&r1=772946&r2=772947&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java
(original)
+++
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java
Fri May 8 11:48:59 2009
@@ -36,15 +36,9 @@
*/
public class TuscanyPRC implements PartnerRoleChannel {
private final QName processName;
- private final QName pid;
- private final PortType portType;
- private final Endpoint endpoint;
public TuscanyPRC(QName processName, QName pid, PortType portType,
Endpoint endpoint){
this.processName = processName;
- this.pid = pid;
- this.portType = portType;
- this.endpoint = endpoint;
}
public QName getProcessName() {
Modified:
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java?rev=772947&r1=772946&r2=772947&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
(original)
+++
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
Fri May 8 11:48:59 2009
@@ -60,7 +60,6 @@
private EmbeddedODEServer odeServer;
private TransactionManager txMgr;
- private RuntimeComponent component;
private RuntimeComponentService service;
private Operation operation;
private QName bpelServiceName;
@@ -69,7 +68,6 @@
private Part bpelOperationOutputPart;
public BPELInvoker(RuntimeComponent component, RuntimeComponentService
service, Operation operation, EmbeddedODEServer odeServer, TransactionManager
txMgr) {
- this.component = component;
this.service = service;
this.operation = operation;
this.bpelOperationName = operation.getName();
@@ -120,7 +118,7 @@
}
org.apache.ode.bpel.iapi.MyRoleMessageExchange mex = null;
- Future onhold = null;
+ Future<?> onhold = null;
//Process the BPEL process invocation
try {
@@ -239,7 +237,6 @@
* @return
*/
private Element processResponse(Element response) {
- // return (Element) DOMUtils.findChildByName(response, new
QName("",bpelOperationOutputPart.getName())).getFirstChild();
return (Element) DOMUtils.findChildByName(response, new
QName("",bpelOperationOutputPart.getName()));
}
}