diff options
Diffstat (limited to '')
22 files changed, 69 insertions, 70 deletions
diff --git a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java index 3fe1598e0d..20534fdba5 100644 --- a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java +++ b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java @@ -25,5 +25,5 @@ import org.apache.tuscany.sca.assembly.Binding; * A model for the sample Echo binding. */ public interface EchoBinding extends Binding { - + } diff --git a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java index 0f6fee82be..dc445b38b6 100644 --- a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java +++ b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java @@ -23,7 +23,7 @@ package echo; * A factory for the sample Echo binding model. */ public interface EchoBindingFactory { - + /** * Creates a new Echo binding. * diff --git a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java index 19c9271bb8..29e460e83a 100644 --- a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java +++ b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java @@ -33,7 +33,7 @@ import echo.EchoBinding; * Implementation of the Echo binding model. */ public class EchoBindingImpl implements EchoBinding, PolicySetAttachPoint { - + private String name; private String uri; private List<Intent> requiredIntents = new ArrayList<Intent>(); @@ -81,22 +81,22 @@ public class EchoBindingImpl implements EchoBinding, PolicySetAttachPoint { public void setUnresolved(boolean unresolved) { // The sample binding is always resolved } - + public void setPolicySets(List<PolicySet> policySets) { this.policySets = policySets; - + } public void setRequiredIntents(List<Intent> intents) { this.requiredIntents = intents; - + } - + @Override public Object clone() throws CloneNotSupportedException { return super.clone(); - } - + } + public List<PolicySet> getApplicablePolicySets() { return this.applicablePolicySets; } diff --git a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java index 45fdb73f67..1a2b5bfe89 100644 --- a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java +++ b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java @@ -34,10 +34,10 @@ import org.apache.tuscany.sca.contribution.service.ContributionReadException; import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.IntentAttachPointType;
import org.apache.tuscany.sca.policy.PolicyFactory;
import org.apache.tuscany.sca.policy.PolicySet;
import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
import org.apache.tuscany.sca.policy.impl.IntentAttachPointTypeFactoryImpl;
import echo.EchoBinding;
@@ -49,7 +49,7 @@ import echo.EchoBindingFactory; public class EchoBindingProcessor implements StAXArtifactProcessor<EchoBinding> {
private QName BINDING_ECHO = new QName("http://echo", "binding.echo");
-
+
private final EchoBindingFactory factory;
private PolicyAttachPointProcessor policyProcessor;
@@ -68,7 +68,7 @@ public class EchoBindingProcessor implements StAXArtifactProcessor<EchoBinding> public EchoBinding read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
EchoBinding echoBinding = factory.createEchoBinding();
- IntentAttachPointType bindingType = new IntentAttachPointTypeFactoryImpl().createBindingType();
+ IntentAttachPointType bindingType = new IntentAttachPointTypeFactoryImpl().createBindingType();
bindingType.setName(getArtifactType());
bindingType.setUnresolved(true);
((PolicySetAttachPoint)echoBinding).setType(bindingType);
@@ -82,26 +82,27 @@ public class EchoBindingProcessor implements StAXArtifactProcessor<EchoBinding> if (uri != null) {
echoBinding.setURI(uri);
}
-
+
policyProcessor.readPolicies(echoBinding, reader);
return echoBinding;
}
-
- public void write(EchoBinding echoBinding, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
+
+ public void write(EchoBinding echoBinding, XMLStreamWriter writer) throws ContributionWriteException,
+ XMLStreamException {
policyProcessor.writePolicyPrefixes(echoBinding, writer);
writer.writeStartElement(BINDING_ECHO.getNamespaceURI(), BINDING_ECHO.getLocalPart());
policyProcessor.writePolicyAttributes(echoBinding, writer);
-
+
if (echoBinding.getName() != null) {
writer.writeAttribute("name", echoBinding.getName());
}
-
+
if (echoBinding.getURI() != null) {
writer.writeAttribute("uri", echoBinding.getURI());
}
-
+
writer.writeEndElement();
}
@@ -109,16 +110,16 @@ public class EchoBindingProcessor implements StAXArtifactProcessor<EchoBinding> PolicySetAttachPoint policySetAttachPoint = (PolicySetAttachPoint)echoBinding;
List<Intent> requiredIntents = new ArrayList<Intent>();
Intent resolvedIntent = null;
- for ( Intent intent : policySetAttachPoint.getRequiredIntents() ) {
+ for (Intent intent : policySetAttachPoint.getRequiredIntents()) {
resolvedIntent = resolver.resolveModel(Intent.class, intent);
requiredIntents.add(resolvedIntent);
}
policySetAttachPoint.getRequiredIntents().clear();
policySetAttachPoint.getRequiredIntents().addAll(requiredIntents);
-
+
List<PolicySet> resolvedPolicySets = new ArrayList<PolicySet>();
PolicySet resolvedPolicySet = null;
- for ( PolicySet policySet : policySetAttachPoint.getPolicySets() ) {
+ for (PolicySet policySet : policySetAttachPoint.getPolicySets()) {
resolvedPolicySet = resolver.resolveModel(PolicySet.class, policySet);
resolvedPolicySets.add(resolvedPolicySet);
}
diff --git a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java index f9bb195b29..1d9e28a899 100644 --- a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java +++ b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java @@ -28,6 +28,7 @@ import echo.server.EchoServer; */ class EchoBindingInvoker implements Invoker { private String uri; + EchoBindingInvoker(String uri) { this.uri = uri; } diff --git a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java index 4877bade7f..342fd6e0e7 100644 --- a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java +++ b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java @@ -28,8 +28,8 @@ import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message;
import org.apache.tuscany.sca.policy.PolicySet;
-import echo.provider.policy.PolicyHandler;
import echo.provider.policy.EncryptionPolicyHandler;
+import echo.provider.policy.PolicyHandler;
/**
* Invoker that applies policies before invocation for the sample echo binding.
@@ -37,32 +37,31 @@ import echo.provider.policy.EncryptionPolicyHandler; public class EchoBindingPoliciedInvoker implements Invoker {
List<PolicySet> policies = null;
Map<QName, PolicyHandler> policyHandlers = new HashMap<QName, PolicyHandler>();
-
+
public EchoBindingPoliciedInvoker(List<PolicySet> policies) {
this.policies = policies;
- policyHandlers.put(new QName("http://test","EncryptionPolicy"),
- new EncryptionPolicyHandler());
+ policyHandlers.put(new QName("http://test", "EncryptionPolicy"), new EncryptionPolicyHandler());
}
public Message invoke(Message msg) {
try {
Object[] args = msg.getBody();
-
+
applyPolicies(args);
// echo back the first parameter, a real binding would invoke some API for flowing the request
Object result = args[0];
-
+
msg.setBody(result);
-
+
} catch (Exception e) {
msg.setFaultBody(e);
}
return msg;
- }
-
+ }
+
private void applyPolicies(Object[] args) throws Exception {
- for ( PolicySet policySet : policies ) {
+ for (PolicySet policySet : policies) {
PolicyHandler policyHandler = policyHandlers.get(policySet.getName());
policyHandler.applyPolicy(args, policySet);
}
diff --git a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java index ba74d8f99a..adbc436950 100644 --- a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java +++ b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java @@ -31,27 +31,30 @@ import org.apache.tuscany.sca.runtime.RuntimeComponentService; import echo.EchoBinding; - /** * Implementation of the Echo binding model. */ public class EchoBindingProviderFactory implements BindingProviderFactory<EchoBinding> { - + private MessageFactory messageFactory; - + public EchoBindingProviderFactory(ExtensionPointRegistry extensionPoints) { ModelFactoryExtensionPoint factories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class); this.messageFactory = factories.getFactory(MessageFactory.class); } - public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component, RuntimeComponentReference reference, EchoBinding binding) { + public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component, + RuntimeComponentReference reference, + EchoBinding binding) { return new EchoReferenceBindingProvider(component, reference, binding); } - public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component, RuntimeComponentService service, EchoBinding binding) { + public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component, + RuntimeComponentService service, + EchoBinding binding) { return new EchoServiceBindingProvider(component, service, binding, messageFactory); } - + public Class<EchoBinding> getModelType() { return EchoBinding.class; } diff --git a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java index dbd0c535f4..3178c50a2a 100644 --- a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java +++ b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java @@ -37,9 +37,7 @@ class EchoReferenceBindingProvider implements ReferenceBindingProvider { private RuntimeComponentReference reference; private EchoBinding binding; - EchoReferenceBindingProvider(RuntimeComponent component, - RuntimeComponentReference reference, - EchoBinding binding) { + EchoReferenceBindingProvider(RuntimeComponent component, RuntimeComponentReference reference, EchoBinding binding) { this.reference = reference; this.binding = binding; } @@ -47,7 +45,7 @@ class EchoReferenceBindingProvider implements ReferenceBindingProvider { public Invoker createInvoker(Operation operation) { if (binding instanceof PolicySetAttachPoint) { PolicySetAttachPoint policySetAttachPoint = (PolicySetAttachPoint)binding; - if ( !policySetAttachPoint.getPolicySets().isEmpty() ){ + if (!policySetAttachPoint.getPolicySets().isEmpty()) { return new EchoBindingPoliciedInvoker(policySetAttachPoint.getPolicySets()); } } diff --git a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java index 33dc761aa4..c1f1269db6 100644 --- a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java +++ b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java @@ -24,16 +24,19 @@ public class EchoBindingEncryptionPolicy extends EchoBindingPolicy { private String encryptionStrategyClassName;
private Class<? extends EncryptionStrategy> strategyClass;
-
+
public String getEncryptionStrategyClassName() {
return encryptionStrategyClassName;
}
+
public void setEncryptionStrategyClassName(String encryptionStrategyClassName) {
this.encryptionStrategyClassName = encryptionStrategyClassName;
}
+
public Class<? extends EncryptionStrategy> getStrategyClass() {
return strategyClass;
}
+
public void setStrategyClass(Class<? extends EncryptionStrategy> strategy) {
this.strategyClass = strategy;
}
diff --git a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java index c847d088a6..da47bbfac3 100644 --- a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java +++ b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java @@ -21,7 +21,6 @@ package echo.provider.policy; import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
import org.apache.tuscany.sca.monitor.Monitor;
-
/**
*
*/
@@ -29,9 +28,9 @@ public class EchoBindingEncryptionPolicyProcessor extends EchoBindingPolicyProce public EchoBindingEncryptionPolicyProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
}
-
+
public Class<EchoBindingEncryptionPolicy> getModelType() {
return EchoBindingEncryptionPolicy.class;
}
-
+
}
diff --git a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java index 7d38e3b7a8..0dab68075d 100644 --- a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java +++ b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java @@ -27,9 +27,9 @@ import org.apache.tuscany.sca.policy.Policy; */
public class EchoBindingPolicy implements Policy {
private boolean unresolved = true;
-
+
public QName getSchemaName() {
- return new QName("http://sample/policy","echoBindingPolicy");
+ return new QName("http://sample/policy", "echoBindingPolicy");
}
public boolean isUnresolved() {
diff --git a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java index deda8d9744..cf98b3830f 100644 --- a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java +++ b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java @@ -18,7 +18,6 @@ */
package echo.provider.policy;
-import org.apache.tuscany.sca.policy.Policy;
import org.apache.tuscany.sca.policy.PolicySet;
/**
@@ -27,18 +26,18 @@ import org.apache.tuscany.sca.policy.PolicySet; public class EncryptionPolicyHandler implements PolicyHandler {
public void applyPolicy(Object msg, PolicySet policySet) throws Exception {
- for ( Object aPolicy : policySet.getPolicies() ) {
- if ( aPolicy instanceof EchoBindingEncryptionPolicy ) {
- encrypt(msg, (EchoBindingEncryptionPolicy)aPolicy);
+ for (Object aPolicy : policySet.getPolicies()) {
+ if (aPolicy instanceof EchoBindingEncryptionPolicy) {
+ encrypt(msg, (EchoBindingEncryptionPolicy)aPolicy);
}
}
}
-
+
private void encrypt(Object msg, EchoBindingEncryptionPolicy policy) throws Exception {
- if ( !policy.isUnresolved() && msg instanceof Object[] ) {
+ if (!policy.isUnresolved() && msg instanceof Object[]) {
EncryptionStrategy strategy = policy.getStrategyClass().newInstance();
Object[] msgArgs = (Object[])msg;
- for ( int count = 0 ; count < msgArgs.length ; ++count ) {
+ for (int count = 0; count < msgArgs.length; ++count) {
msgArgs[count] = strategy.encryptMessage(msgArgs[count]);
}
}
diff --git a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java index cf55b36fc2..3220102926 100644 --- a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java +++ b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java @@ -23,7 +23,7 @@ package echo.provider.policy; public class ReverseEncryptionStrategy implements EncryptionStrategy {
public Object encryptMessage(Object msg) {
- if ( msg instanceof String ) {
+ if (msg instanceof String) {
StringBuffer sb = new StringBuffer((String)msg);
msg = sb.reverse().toString();
}
diff --git a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java index ac610cfb51..598683c251 100644 --- a/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java +++ b/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.policy.Policy; */
public class WSPolicy implements Policy {
private boolean unresolved = true;
-
+
public QName getSchemaName() {
return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "PolicyAttachment");
}
diff --git a/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/Echo.java b/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/Echo.java index 1d5e973f33..17981083ab 100644 --- a/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/Echo.java +++ b/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/Echo.java @@ -24,6 +24,6 @@ package echo; * @version $Rev$ $Date$ */ public interface Echo { - + String echo(String msg); } diff --git a/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java b/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java index cec1c2bdbc..cdfdfc3e8a 100644 --- a/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java +++ b/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java @@ -22,7 +22,6 @@ import org.osoa.sca.annotations.Constructor; import org.osoa.sca.annotations.Reference; import org.osoa.sca.annotations.Service; - /** * A simple client component that uses a reference with an Echo binding. * @@ -40,7 +39,7 @@ public class EchoComponentImpl implements Echo { public String echo(String msg) { String result = echoReference.echo(msg); - System.out.println("Returned message: "+ result); + System.out.println("Returned message: " + result); return result; } } diff --git a/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java b/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java index 8922c7702a..0775cfb84f 100644 --- a/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java +++ b/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java @@ -46,5 +46,4 @@ public class EchoReferenceTestCase extends TestCase { assertEquals("oof", result); } - } diff --git a/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java b/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java index 8056e43280..3d8fbdc570 100644 --- a/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java +++ b/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java @@ -46,5 +46,4 @@ public class EchoServiceTestCase extends TestCase { assertEquals("oof", result); } - } diff --git a/branches/sca-java-1.x/samples/binding-echo/src/main/java/echo/Echo.java b/branches/sca-java-1.x/samples/binding-echo/src/main/java/echo/Echo.java index 1d5e973f33..17981083ab 100644 --- a/branches/sca-java-1.x/samples/binding-echo/src/main/java/echo/Echo.java +++ b/branches/sca-java-1.x/samples/binding-echo/src/main/java/echo/Echo.java @@ -24,6 +24,6 @@ package echo; * @version $Rev$ $Date$ */ public interface Echo { - + String echo(String msg); } diff --git a/branches/sca-java-1.x/samples/binding-echo/src/main/java/echo/EchoBindingClient.java b/branches/sca-java-1.x/samples/binding-echo/src/main/java/echo/EchoBindingClient.java index 0b9d7acb79..046411a3a1 100644 --- a/branches/sca-java-1.x/samples/binding-echo/src/main/java/echo/EchoBindingClient.java +++ b/branches/sca-java-1.x/samples/binding-echo/src/main/java/echo/EchoBindingClient.java @@ -31,18 +31,18 @@ public class EchoBindingClient { public static void main(String[] args) throws Exception { - SCADomain scaDomain = SCADomain.newInstance("EchoBinding.composite"); + SCADomain scaDomain = SCADomain.newInstance("EchoBinding.composite"); // Call the echo service component which will, in turn, call a reference // with an echo binding. The echo binding will echo the given string. Echo service = scaDomain.getService(Echo.class, "EchoComponent"); String echoString = service.echo("foo"); - System.out.println("Echo reference = " + echoString ); + System.out.println("Echo reference = " + echoString); // Call the echo server. This will dispatch the call to a service with an // echo binding. The echo binding will pass the call to the echo component. - echoString = (String) EchoServer.getServer().call("http://example.com/server", new Object[] {"bar"}); - System.out.println("Echo service = " + echoString ); + echoString = (String)EchoServer.getServer().call("http://example.com/server", new Object[] {"bar"}); + System.out.println("Echo service = " + echoString); scaDomain.close(); diff --git a/branches/sca-java-1.x/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java b/branches/sca-java-1.x/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java index cec1c2bdbc..cdfdfc3e8a 100644 --- a/branches/sca-java-1.x/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java +++ b/branches/sca-java-1.x/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java @@ -22,7 +22,6 @@ import org.osoa.sca.annotations.Constructor; import org.osoa.sca.annotations.Reference; import org.osoa.sca.annotations.Service; - /** * A simple client component that uses a reference with an Echo binding. * @@ -40,7 +39,7 @@ public class EchoComponentImpl implements Echo { public String echo(String msg) { String result = echoReference.echo(msg); - System.out.println("Returned message: "+ result); + System.out.println("Returned message: " + result); return result; } } diff --git a/branches/sca-java-1.x/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java b/branches/sca-java-1.x/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java index 2d29aed238..85c892cd0a 100644 --- a/branches/sca-java-1.x/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java +++ b/branches/sca-java-1.x/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java @@ -31,7 +31,7 @@ public class EchoBindingTestCase extends TestCase { @Override protected void setUp() throws Exception { - scaDomain = SCADomain.newInstance("EchoBinding.composite"); + scaDomain = SCADomain.newInstance("EchoBinding.composite"); } @Override @@ -50,7 +50,7 @@ public class EchoBindingTestCase extends TestCase { public void testService() throws Exception { // Call the echo server. This will dispatch the call to a service with an // echo binding. The echo binding will pass the call to the echo component. - String echoString = (String) EchoServer.getServer().call("http://example.com/server", new Object[] {"bar"}); + String echoString = (String)EchoServer.getServer().call("http://example.com/server", new Object[] {"bar"}); assertEquals(echoString, "bar"); } } |