You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/01/13 23:04:46 UTC
svn commit: r495979 - in /incubator/tuscany/java:
sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/
sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/
spec/sca/src/main/java/org/osoa/sca/
Author: jsdelfino
Date: Sat Jan 13 14:04:45 2007
New Revision: 495979
URL: http://svn.apache.org/viewvc?view=rev&rev=495979
Log:
Fix for TUSCANY-909. Renamed CompositeContext.getCompositeName to getName and getCompositeURI to getURI to bring CompositeContext in compliance with the SCA Java C&I 0.95 spec. Changed the CompositeContext interface and its implementation in the kernel module.
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeContext.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ManagedCompositeContext.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeContextTestCase.java
incubator/tuscany/java/spec/sca/src/main/java/org/osoa/sca/CompositeContext.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeContext.java?view=diff&rev=495979&r1=495978&r2=495979
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeContext.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeContext.java Sat Jan 13 14:04:45 2007
@@ -49,11 +49,11 @@
this.wireService = wireService;
}
- public String getCompositeName() {
+ public String getName() {
return composite.getName();
}
- public String getCompositeURI() {
+ public String getURI() {
throw new UnsupportedOperationException();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ManagedCompositeContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ManagedCompositeContext.java?view=diff&rev=495979&r1=495978&r2=495979
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ManagedCompositeContext.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ManagedCompositeContext.java Sat Jan 13 14:04:45 2007
@@ -42,11 +42,11 @@
super(composite, wireService);
}
- public String getCompositeName() {
+ public String getName() {
return composite.getName();
}
- public String getCompositeURI() {
+ public String getURI() {
throw new UnsupportedOperationException();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeContextTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeContextTestCase.java?view=diff&rev=495979&r1=495978&r2=495979
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeContextTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeContextTestCase.java Sat Jan 13 14:04:45 2007
@@ -32,7 +32,7 @@
EasyMock.replay(composite);
WireService wireService = EasyMock.createNiceMock(WireService.class);
CompositeContext context = new TestCompositeContext(composite, wireService);
- assertEquals("foo", context.getCompositeName());
+ assertEquals("foo", context.getName());
}
public void testAtomicLocate() throws Exception {
Modified: incubator/tuscany/java/spec/sca/src/main/java/org/osoa/sca/CompositeContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sca/src/main/java/org/osoa/sca/CompositeContext.java?view=diff&rev=495979&r1=495978&r2=495979
==============================================================================
--- incubator/tuscany/java/spec/sca/src/main/java/org/osoa/sca/CompositeContext.java (original)
+++ incubator/tuscany/java/spec/sca/src/main/java/org/osoa/sca/CompositeContext.java Sat Jan 13 14:04:45 2007
@@ -31,14 +31,14 @@
*
* @return the name of the module
*/
- String getCompositeName();
+ String getName();
/**
* Returns the absolute URI of the composite component.
*
* @return the absolute URI of the module component
*/
- String getCompositeURI();
+ String getURI();
/**
* Returns the request context that corresponds to the last remotable service invocation. If this is
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org