You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2007/01/20 00:37:41 UTC
svn commit: r498006 - in /incubator/tuscany/sandbox/jboynes/sca-client/src:
main/java/org/osoa/sca/ main/java/org/osoa/sca/annotations/
test/java/org/osoa/sca/
Author: jboynes
Date: Fri Jan 19 15:37:39 2007
New Revision: 498006
URL: http://svn.apache.org/viewvc?view=rev&rev=498006
Log:
support connecting to an existing domain
Modified:
incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/CompositeContext.java
incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/ConversationEndedException.java
incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/DomainFactory.java
incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/SCADomain.java
incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/ServiceRuntimeException.java
incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/ServiceUnavailableException.java
incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/annotations/EndConversation.java
incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/annotations/OneWay.java
incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/annotations/Property.java
incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/annotations/Resource.java
incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/annotations/Service.java
incubator/tuscany/sandbox/jboynes/sca-client/src/test/java/org/osoa/sca/DelegatingDomainFactory.java
Modified: incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/CompositeContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/CompositeContext.java?view=diff&rev=498006&r1=498005&r2=498006
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/CompositeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/CompositeContext.java Fri Jan 19 15:37:39 2007
@@ -27,10 +27,10 @@
public interface CompositeContext extends ComponentContext {
/**
* Returns a reference to a service within this composite. The service may be provided by a component
- * or a reference that is defined in this composite.
+ * or a reference that is defined in this composite.
*
* @param businessInterface the interface that will be used to invoke the service
- * @param serviceName the name of another service in thus composite
+ * @param serviceName the name of another service in thus composite
* @return an object that implements the service's interface
*/
<T> T locateService(Class<T> businessInterface, String serviceName);
Modified: incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/ConversationEndedException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/ConversationEndedException.java?view=diff&rev=498006&r1=498005&r2=498006
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/ConversationEndedException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/ConversationEndedException.java Fri Jan 19 15:37:39 2007
@@ -20,7 +20,7 @@
/**
* Exception thrown to indicate the conversation being used for a stateful interaction has been ended.
- *
+ *
* @version $Rev$ $Date$
*/
public class ConversationEndedException extends ServiceRuntimeException {
Modified: incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/DomainFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/DomainFactory.java?view=diff&rev=498006&r1=498005&r2=498006
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/DomainFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/DomainFactory.java Fri Jan 19 15:37:39 2007
@@ -72,15 +72,29 @@
if (is == null) {
return null;
}
+ BufferedReader reader = null;
try {
- BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+ reader = new BufferedReader(new InputStreamReader(is));
return reader.readLine();
} finally {
- is.close();
+ if (reader != null) {
+ reader.close();
+ }
}
}
+ /**
+ * Create an SCA domain that remains isolated and does not attempt to participate in a federation.
+ *
+ * @return a new, isolated SCA domain
+ */
public abstract SCADomain createLocalDomain();
- public abstract SCADomain joinDomain(URI domainId);
+ /**
+ * Connect to the designated SCA domain.
+ *
+ * @param domainId a URI that identifies the domain
+ * @return the SCADomain service for the specified domain
+ */
+ public abstract SCADomain connect(URI domainId);
}
Modified: incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java?view=diff&rev=498006&r1=498005&r2=498006
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java Fri Jan 19 15:37:39 2007
@@ -49,7 +49,7 @@
* Override constructor from ServiceRuntimeException.
*
* @param message passed to ServiceRuntimeException
- * @param cause passed to ServiceRuntimeException
+ * @param cause passed to ServiceRuntimeException
* @see ServiceRuntimeException
*/
public NoRegisteredCallbackException(String message, Throwable cause) {
Modified: incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/SCADomain.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/SCADomain.java?view=diff&rev=498006&r1=498005&r2=498006
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/SCADomain.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/SCADomain.java Fri Jan 19 15:37:39 2007
@@ -23,4 +23,10 @@
* @return the context for that component
*/
CompositeContext getContext(URI componentURI);
+
+ /**
+ * Disconnect from this domain, shutting down any components running in the local environment
+ * and releasing any resources associated with the connection.
+ */
+ void disconnect();
}
Modified: incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/ServiceRuntimeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/ServiceRuntimeException.java?view=diff&rev=498006&r1=498005&r2=498006
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/ServiceRuntimeException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/ServiceRuntimeException.java Fri Jan 19 15:37:39 2007
@@ -22,7 +22,7 @@
/**
* Base for Exceptions that may be raised by an SCA runtime and which typical
* application code is not expected to be able to handle.
- *
+ *
* @version $Rev$ $Date$
*/
public class ServiceRuntimeException extends RuntimeException {
Modified: incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/ServiceUnavailableException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/ServiceUnavailableException.java?view=diff&rev=498006&r1=498005&r2=498006
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/ServiceUnavailableException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/ServiceUnavailableException.java Fri Jan 19 15:37:39 2007
@@ -54,13 +54,12 @@
/**
* Constructs a new ServiceUnavailableException with the specified detail message and cause.
- * @param message
- * The message (which is saved to later retrieval by the getMessage() method).
- * @param cause
- * The cause (which is saved to later retrieval by the getCause() method).
+ *
+ * @param message The message (which is saved to later retrieval by the getMessage() method).
+ * @param cause The cause (which is saved to later retrieval by the getCause() method).
*/
public ServiceUnavailableException(String message, Throwable cause) {
super(message, cause);
- }
+ }
}
Modified: incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/annotations/EndConversation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/annotations/EndConversation.java?view=diff&rev=498006&r1=498005&r2=498006
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/annotations/EndConversation.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/annotations/EndConversation.java Fri Jan 19 15:37:39 2007
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.osoa.sca.annotations;
import java.lang.annotation.ElementType;
Modified: incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/annotations/OneWay.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/annotations/OneWay.java?view=diff&rev=498006&r1=498005&r2=498006
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/annotations/OneWay.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/annotations/OneWay.java Fri Jan 19 15:37:39 2007
@@ -19,9 +19,8 @@
package org.osoa.sca.annotations;
import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/annotations/Property.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/annotations/Property.java?view=diff&rev=498006&r1=498005&r2=498006
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/annotations/Property.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/annotations/Property.java Fri Jan 19 15:37:39 2007
@@ -21,18 +21,17 @@
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
* Annotation used to indicate a constructor parameter, field or method that is
* used to inject a configuration property value.
- *
+ *
* @version $Rev$ $Date$
*/
-@Target( {METHOD, FIELD, PARAMETER})
+@Target({METHOD, FIELD, PARAMETER})
@Retention(RUNTIME)
public @interface Property {
/**
Modified: incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/annotations/Resource.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/annotations/Resource.java?view=diff&rev=498006&r1=498005&r2=498006
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/annotations/Resource.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/annotations/Resource.java Fri Jan 19 15:37:39 2007
@@ -18,10 +18,10 @@
*/
package org.osoa.sca.annotations;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* Annotation used to indicate a resource should be provided to an implementation by the runtime.
Modified: incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/annotations/Service.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/annotations/Service.java?view=diff&rev=498006&r1=498005&r2=498006
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/annotations/Service.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca-client/src/main/java/org/osoa/sca/annotations/Service.java Fri Jan 19 15:37:39 2007
@@ -32,7 +32,7 @@
@Retention(RUNTIME)
public @interface Service {
/**
- * Array of interfaces that should be exposed as services.
+ * Array of interfaces that should be exposed as services.
*/
Class<?>[] interfaces() default {};
Modified: incubator/tuscany/sandbox/jboynes/sca-client/src/test/java/org/osoa/sca/DelegatingDomainFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca-client/src/test/java/org/osoa/sca/DelegatingDomainFactory.java?view=diff&rev=498006&r1=498005&r2=498006
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca-client/src/test/java/org/osoa/sca/DelegatingDomainFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca-client/src/test/java/org/osoa/sca/DelegatingDomainFactory.java Fri Jan 19 15:37:39 2007
@@ -12,7 +12,7 @@
return delegate.createLocalDomain();
}
- public SCADomain joinDomain(URI domainId) {
- return delegate.joinDomain(domainId);
+ public SCADomain connect(URI domainId) {
+ return delegate.connect(domainId);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org