Author: jsdelfino
Date: Wed Aug 6 16:59:24 2008
New Revision: 683451
URL: http://svn.apache.org/viewvc?rev=683451&view=rev
Log:
Fixed the start method of the Web 2.0 binding providers where we were
overwriting the model binding URI with the URI calculated at runtime, and
removed the FIXME and TODO comments that were used to flag that issue.
Modified:
tuscany/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
tuscany/java/sca/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java
tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
tuscany/java/sca/modules/binding-gdata-gsoc/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java
tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingImpl.java
tuscany/java/sca/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
Modified:
tuscany/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java?rev=683451&r1=683450&r2=683451&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
(original)
+++
tuscany/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
Wed Aug 6 16:59:24 2008
@@ -79,9 +79,6 @@
servletMapping += "*";
}
servletHost.addServletMapping(servletMapping, servlet);
-
- // Save the actual binding URI in the binding
- binding.setURI(servletHost.getURLMapping(binding.getURI()).toString());
}
public void stop() {
Modified:
tuscany/java/sca/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java?rev=683451&r1=683450&r2=683451&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
(original)
+++
tuscany/java/sca/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
Wed Aug 6 16:59:24 2008
@@ -37,7 +37,7 @@
*
* @version $Rev$ $Date$
*/
-class AtomBindingImpl implements AtomBinding, OptimizableBinding,
PolicySetAttachPoint {
+class AtomBindingImpl implements AtomBinding, PolicySetAttachPoint {
private String name;
private String uri;
@@ -107,40 +107,9 @@
public void setRequiredIntents(List<Intent> intents) {
this.requiredIntents = intents;
}
-
- //FIXME Temporary to get access to the target binding information
- // To be removed when the distributed domain supports wiring of other
- // bindings than the SCA binding
- private Binding targetBinding;
- private Component targetComponent;
- private ComponentService targetComponentService;
-
+
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
-
- public Binding getTargetBinding() {
- return targetBinding;
- }
-
- public void setTargetBinding(Binding binding) {
- this.targetBinding = binding;
- }
-
- public Component getTargetComponent() {
- return targetComponent;
- }
-
- public void setTargetComponent(Component component) {
- this.targetComponent = component;
- }
-
- public ComponentService getTargetComponentService() {
- return targetComponentService;
- }
-
- public void setTargetComponentService(ComponentService service) {
- this.targetComponentService = service;
- }
-
}
Modified:
tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java?rev=683451&r1=683450&r2=683451&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java
(original)
+++
tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java
Wed Aug 6 16:59:24 2008
@@ -22,10 +22,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.binding.feed.AtomBinding;
import org.apache.tuscany.sca.policy.Intent;
import org.apache.tuscany.sca.policy.IntentAttachPointType;
@@ -37,7 +33,7 @@
*
* @version $Rev$ $Date$
*/
-class AtomBindingImpl implements AtomBinding, OptimizableBinding,
PolicySetAttachPoint {
+class AtomBindingImpl implements AtomBinding, PolicySetAttachPoint {
private String name;
private String uri;
@@ -91,47 +87,10 @@
public void setType(IntentAttachPointType intentAttachPointType) {
this.intentAttachPointType = intentAttachPointType;
}
-
- //FIXME Temporary to get access to the target binding information
- // To be removed when the distributed domain supports wiring of other
- // bindings than the SCA binding
- private Binding targetBinding;
- private Component targetComponent;
- private ComponentService targetComponentService;
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
-
- public Binding getTargetBinding() {
- return targetBinding;
- }
-
- public void setTargetBinding(Binding binding) {
- this.targetBinding = binding;
- }
-
- public Component getTargetComponent() {
- return targetComponent;
- }
-
- public void setTargetComponent(Component component) {
- this.targetComponent = component;
- }
-
- public ComponentService getTargetComponentService() {
- return targetComponentService;
- }
-
- public void setTargetComponentService(ComponentService service) {
- this.targetComponentService = service;
- }
-
- public void setPolicySets(List<PolicySet> policySets) {
- this.policySets = policySets;
- }
- public void setRequiredIntents(List<Intent> intents) {
- this.requiredIntents = intents;
- }
}
Modified:
tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java?rev=683451&r1=683450&r2=683451&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
(original)
+++
tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
Wed Aug 6 16:59:24 2008
@@ -79,9 +79,6 @@
servletMapping += "*";
}
servletHost.addServletMapping(servletMapping, servlet);
-
- // Save the actual binding URI in the binding
- binding.setURI(servletHost.getURLMapping(binding.getURI()).toString());
}
public void stop() {
Modified:
tuscany/java/sca/modules/binding-gdata-gsoc/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-gdata-gsoc/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java?rev=683451&r1=683450&r2=683451&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-gdata-gsoc/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java
(original)
+++
tuscany/java/sca/modules/binding-gdata-gsoc/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java
Wed Aug 6 16:59:24 2008
@@ -36,7 +36,7 @@
* Implementation of the GData binding model.
*
*/
-class GdataBindingImpl implements GdataBinding, OptimizableBinding,
PolicySetAttachPoint {
+class GdataBindingImpl implements GdataBinding, PolicySetAttachPoint {
private String name;
private String uri;
@@ -127,41 +127,6 @@
this.intentAttachPointType = intentAttachPointType;
}
- //FIXME Temporary to get access to the target binding information
- // To be removed when the distributed domain supports wiring of other
- // bindings than the SCA binding
- private Binding targetBinding;
- private Component targetComponent;
- private ComponentService targetComponentService;
-
- public Object clone() throws CloneNotSupportedException {
- return super.clone();
- }
-
- public Binding getTargetBinding() {
- return targetBinding;
- }
-
- public void setTargetBinding(Binding binding) {
- this.targetBinding = binding;
- }
-
- public Component getTargetComponent() {
- return targetComponent;
- }
-
- public void setTargetComponent(Component component) {
- this.targetComponent = component;
- }
-
- public ComponentService getTargetComponentService() {
- return targetComponentService;
- }
-
- public void setTargetComponentService(ComponentService service) {
- this.targetComponentService = service;
- }
-
public void setPolicySets(List<PolicySet> policySets) {
this.policySets = policySets;
}
@@ -169,4 +134,9 @@
public void setRequiredIntents(List<Intent> intents) {
this.requiredIntents = intents;
}
+
+ @Override
+ public Object clone() throws CloneNotSupportedException {
+ return super.clone();
+ }
}
Modified:
tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingImpl.java?rev=683451&r1=683450&r2=683451&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingImpl.java
(original)
+++
tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingImpl.java
Wed Aug 6 16:59:24 2008
@@ -21,10 +21,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.binding.gdata.GDataBinding;
import org.apache.tuscany.sca.policy.Intent;
import org.apache.tuscany.sca.policy.IntentAttachPointType;
@@ -36,7 +32,7 @@
*
* @version $Rev$ $Date$
*/
-class GDataBindingImpl implements GDataBinding, OptimizableBinding,
PolicySetAttachPoint {
+class GDataBindingImpl implements GDataBinding, PolicySetAttachPoint {
private String password;
private String username;
@@ -100,41 +96,12 @@
public void setType(IntentAttachPointType intentAttachPointType) {
this.intentAttachPointType = intentAttachPointType;
- } //FIXME Temporary to get access to the target binding information
- // To be removed when the distributed domain supports wiring of other
- // bindings than the SCA binding
- private Binding targetBinding;
- private Component targetComponent;
- private ComponentService targetComponentService;
-
+ }
+
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
- public Binding getTargetBinding() {
- return targetBinding;
- }
-
- public void setTargetBinding(Binding binding) {
- this.targetBinding = binding;
- }
-
- public Component getTargetComponent() {
- return targetComponent;
- }
-
- public void setTargetComponent(Component component) {
- this.targetComponent = component;
- }
-
- public ComponentService getTargetComponentService() {
- return targetComponentService;
- }
-
- public void setTargetComponentService(ComponentService service) {
- this.targetComponentService = service;
- }
-
public void setPolicySets(List<PolicySet> policySets) {
this.policySets = policySets;
}
Modified:
tuscany/java/sca/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java?rev=683451&r1=683450&r2=683451&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
(original)
+++
tuscany/java/sca/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
Wed Aug 6 16:59:24 2008
@@ -90,9 +90,6 @@
servletMapping += "*";
}
servletHost.addServletMapping(servletMapping, servlet);
-
- // Save the actual binding URI in the binding
- binding.setURI(servletHost.getURLMapping(binding.getURI()).toString());
}
public void stop() {
Modified:
tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java?rev=683451&r1=683450&r2=683451&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
(original)
+++
tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
Wed Aug 6 16:59:24 2008
@@ -31,7 +31,7 @@
*
* @version $Rev$ $Date$
*/
-class HTTPBindingImpl implements HTTPBinding, OptimizableBinding {
+class HTTPBindingImpl implements HTTPBinding {
private String name;
private String uri;
@@ -65,35 +65,4 @@
return super.clone();
}
- //FIXME Temporary to get access to the target binding information
- // To be removed when the distributed domain supports wiring of other
- // bindings than the SCA binding
- private Binding targetBinding;
- private Component targetComponent;
- private ComponentService targetComponentService;
-
- public Binding getTargetBinding() {
- return targetBinding;
- }
-
- public void setTargetBinding(Binding binding) {
- this.targetBinding = binding;
- }
-
- public Component getTargetComponent() {
- return targetComponent;
- }
-
- public void setTargetComponent(Component component) {
- this.targetComponent = component;
- }
-
- public ComponentService getTargetComponentService() {
- return targetComponentService;
- }
-
- public void setTargetComponentService(ComponentService service) {
- this.targetComponentService = service;
- }
-
}
Modified:
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java?rev=683451&r1=683450&r2=683451&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
(original)
+++
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
Wed Aug 6 16:59:24 2008
@@ -109,12 +109,9 @@
servletHost.addServletMapping(binding.getURI(), serviceServlet);
servletMappings.add(binding.getURI());
- // Save the actual binding URI
- binding.setURI(servletHost.getURLMapping(binding.getURI()).toString());
-
// Register service to scaDomain.js
int port;
- URI uri = URI.create(binding.getURI());
+ URI uri =
URI.create(servletHost.getURLMapping(binding.getURI()).toString());
port = uri.getPort();
if (port == -1) {
port = servletHost.getDefaultPort();
Modified:
tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java?rev=683451&r1=683450&r2=683451&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
(original)
+++
tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
Wed Aug 6 16:59:24 2008
@@ -20,16 +20,13 @@
package org.apache.tuscany.sca.binding.jsonrpc;
import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.OptimizableBinding;
/**
* A model for the JSONRPC binding.
*
* @version $Rev$ $Date$
*/
-public class JSONRPCBinding implements OptimizableBinding {
+public class JSONRPCBinding implements Binding {
private String name;
private String uri;
@@ -58,39 +55,9 @@
// The binding is always resolved
}
- //FIXME Temporary to get access to the target binding information
- // To be removed when the distributed domain supports wiring of other
- // bindings than the SCA binding
- private Binding targetBinding;
- private Component targetComponent;
- private ComponentService targetComponentService;
-
+ @Override
public Object clone() throws CloneNotSupportedException {
+ // TODO Auto-generated method stub
return super.clone();
}
-
- public Binding getTargetBinding() {
- return targetBinding;
- }
-
- public void setTargetBinding(Binding binding) {
- this.targetBinding = binding;
- }
-
- public Component getTargetComponent() {
- return targetComponent;
- }
-
- public void setTargetComponent(Component component) {
- this.targetComponent = component;
- }
-
- public ComponentService getTargetComponentService() {
- return targetComponentService;
- }
-
- public void setTargetComponentService(ComponentService service) {
- this.targetComponentService = service;
- }
-
}
