You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/02/28 07:49:48 UTC
svn commit: r512626 [2/2] - in
/incubator/tuscany/branches/sca-java-integration:
samples/sca/echo.binding/src/main/java/echo/
samples/sca/echo.databinding/src/main/java/echo/
samples/sca/loanappconversation/src/main/java/loanappconversation/
samples/sc...
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorResourceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorResourceTestCase.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorResourceTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorResourceTestCase.java Tue Feb 27 22:49:45 2007
@@ -21,7 +21,7 @@
import java.lang.reflect.Constructor;
import java.util.List;
-import org.osoa.sca.annotations.Resource;
+import org.apache.tuscany.api.annotation.Resource;
import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConversationProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConversationProcessorTestCase.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConversationProcessorTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConversationProcessorTestCase.java Tue Feb 27 22:49:45 2007
@@ -21,16 +21,15 @@
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import org.osoa.sca.annotations.Conversation;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
+import junit.framework.TestCase;
import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
import org.apache.tuscany.spi.implementation.java.JavaMappedService;
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
-
-import junit.framework.TestCase;
+import org.osoa.sca.annotations.ConversationAttributes;
+import org.osoa.sca.annotations.ConversationID;
+import org.osoa.sca.annotations.Scope;
/**
* @version $Rev$ $Date$
@@ -112,30 +111,30 @@
}
@Scope("CONVERSATION")
- @Conversation(maxIdleTime = "10 seconds")
+ @ConversationAttributes(maxIdleTime = "10 seconds")
private class FooMaxIdle {
}
@Scope("CONVERSATION")
- @Conversation(maxAge = "10 seconds")
+ @ConversationAttributes(maxAge = "10 seconds")
private class FooMaxAge {
}
@Scope("CONVERSATION")
- @Conversation(maxAge = "10 seconds", maxIdleTime = "10 seconds")
+ @ConversationAttributes(maxAge = "10 seconds", maxIdleTime = "10 seconds")
private class BadFooBoth {
}
- @Conversation(maxAge = "10 seconds")
+ @ConversationAttributes(maxAge = "10 seconds")
private class ImplicitFooScope {
}
@Scope("STATELESS")
- @Conversation(maxAge = "10 seconds")
+ @ConversationAttributes(maxAge = "10 seconds")
private class BadFooScope {
}
- @Conversation
+ @ConversationAttributes
private class FooJustConversation {
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/EagerInitProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/EagerInitProcessorTestCase.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/EagerInitProcessorTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/EagerInitProcessorTestCase.java Tue Feb 27 22:49:45 2007
@@ -28,7 +28,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
processor.visitClass(null, Level.class, type, null);
- assertEquals(1, type.getInitLevel());
+ assertEquals(50, type.getInitLevel());
}
public void testSubclass() throws ProcessingException {
@@ -36,14 +36,14 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
processor.visitClass(null, SubClass.class, type, null);
- assertEquals(1, type.getInitLevel());
+ assertEquals(50, type.getInitLevel());
}
@EagerInit
private class NoLevel {
}
- @EagerInit(1)
+ @EagerInit
private class Level {
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/PropertyProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/PropertyProcessorTestCase.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/PropertyProcessorTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/PropertyProcessorTestCase.java Tue Feb 27 22:49:45 2007
@@ -112,7 +112,7 @@
@Property
protected String baz;
- @Property(required = "true")
+ @Property(required = true)
protected String bazRequired;
@Property(name = "theBaz")
protected String bazField;
@@ -121,7 +121,7 @@
public void setFoo(String string) {
}
- @Property(required = "true")
+ @Property(required = true)
public void setFooRequired(String string) {
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ResourceProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ResourceProcessorTestCase.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ResourceProcessorTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ResourceProcessorTestCase.java Tue Feb 27 22:49:45 2007
@@ -73,21 +73,21 @@
private class Foo {
- @org.osoa.sca.annotations.Resource
+ @org.apache.tuscany.api.annotation.Resource
protected Bar bar;
- @org.osoa.sca.annotations.Resource(optional = true)
+ @org.apache.tuscany.api.annotation.Resource(optional = true)
protected Bar barNotRequired;
- @org.osoa.sca.annotations.Resource
+ @org.apache.tuscany.api.annotation.Resource
public void setBar(Bar bar) {
}
- @org.osoa.sca.annotations.Resource(name = "someName", mappedName = "mapped")
+ @org.apache.tuscany.api.annotation.Resource(name = "someName", mappedName = "mapped")
public void setBar2(Bar bar) {
}
- @org.osoa.sca.annotations.Resource
+ @org.apache.tuscany.api.annotation.Resource
public void setBad() {
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java Tue Feb 27 22:49:45 2007
@@ -21,21 +21,19 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
-import org.osoa.sca.annotations.EndConversation;
-import org.osoa.sca.annotations.Scope;
-
-import org.apache.tuscany.spi.ObjectCreationException;
-import org.apache.tuscany.spi.QualifiedName;
-import org.apache.tuscany.spi.component.TargetNotFoundException;
-import org.apache.tuscany.spi.wire.InboundWire;
-import org.apache.tuscany.spi.wire.OutboundWire;
-
import org.apache.tuscany.core.implementation.PojoConfiguration;
import org.apache.tuscany.core.implementation.java.JavaAtomicComponent;
import org.apache.tuscany.core.injection.PojoObjectFactory;
import org.apache.tuscany.core.integration.mock.MockFactory;
import org.apache.tuscany.core.wire.jdk.JDKOutboundInvocationHandler;
+import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.spi.QualifiedName;
+import org.apache.tuscany.spi.component.TargetNotFoundException;
+import org.apache.tuscany.spi.wire.InboundWire;
+import org.apache.tuscany.spi.wire.OutboundWire;
import org.easymock.classextension.EasyMock;
+import org.osoa.sca.annotations.EndsConversation;
+import org.osoa.sca.annotations.Scope;
/**
* Verifies conversational resources are cleaned up if the maximum idle time is exceeded
@@ -134,7 +132,7 @@
void operation2();
- @EndConversation
+ @EndsConversation
void end();
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java Tue Feb 27 22:49:45 2007
@@ -21,21 +21,19 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
-import org.osoa.sca.annotations.EndConversation;
-import org.osoa.sca.annotations.Scope;
-
-import org.apache.tuscany.spi.ObjectCreationException;
-import org.apache.tuscany.spi.QualifiedName;
-import org.apache.tuscany.spi.component.TargetNotFoundException;
-import org.apache.tuscany.spi.wire.InboundWire;
-import org.apache.tuscany.spi.wire.OutboundWire;
-
import org.apache.tuscany.core.implementation.PojoConfiguration;
import org.apache.tuscany.core.implementation.java.JavaAtomicComponent;
import org.apache.tuscany.core.injection.PojoObjectFactory;
import org.apache.tuscany.core.integration.mock.MockFactory;
import org.apache.tuscany.core.wire.jdk.JDKOutboundInvocationHandler;
+import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.spi.QualifiedName;
+import org.apache.tuscany.spi.component.TargetNotFoundException;
+import org.apache.tuscany.spi.wire.InboundWire;
+import org.apache.tuscany.spi.wire.OutboundWire;
import org.easymock.classextension.EasyMock;
+import org.osoa.sca.annotations.EndsConversation;
+import org.osoa.sca.annotations.Scope;
/**
* Verifies conversational resources are cleaned up if the maximum age is exceeded
@@ -135,7 +133,7 @@
void operation2();
- @EndConversation
+ @EndsConversation
void end();
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java Tue Feb 27 22:49:45 2007
@@ -18,24 +18,23 @@
*/
package org.apache.tuscany.core.integration.conversation;
+import static org.apache.tuscany.spi.model.Scope.CONVERSATION;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
-import org.osoa.sca.annotations.EndConversation;
-import org.osoa.sca.annotations.Scope;
-
-import org.apache.tuscany.spi.ObjectCreationException;
-import org.apache.tuscany.spi.QualifiedName;
-import static org.apache.tuscany.spi.model.Scope.CONVERSATION;
-import org.apache.tuscany.spi.wire.InboundWire;
-import org.apache.tuscany.spi.wire.OutboundWire;
-
import org.apache.tuscany.core.implementation.PojoConfiguration;
import org.apache.tuscany.core.implementation.java.JavaAtomicComponent;
import org.apache.tuscany.core.injection.PojoObjectFactory;
import org.apache.tuscany.core.integration.mock.MockFactory;
import org.apache.tuscany.core.wire.jdk.JDKOutboundInvocationHandler;
+import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.spi.QualifiedName;
+import org.apache.tuscany.spi.wire.InboundWire;
+import org.apache.tuscany.spi.wire.OutboundWire;
import org.easymock.classextension.EasyMock;
+import org.osoa.sca.annotations.EndsConversation;
+import org.osoa.sca.annotations.Scope;
/**
* Verifies start, continue and end conversation invocations are processed properly. Checks that a target instance is
@@ -134,7 +133,7 @@
void operation2();
- @EndConversation
+ @EndsConversation
void end();
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/IntrospectionRegistryIntegrationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/IntrospectionRegistryIntegrationTestCase.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/IntrospectionRegistryIntegrationTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/IntrospectionRegistryIntegrationTestCase.java Tue Feb 27 22:49:45 2007
@@ -23,7 +23,7 @@
import org.osoa.sca.annotations.Property;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Resource;
+import org.apache.tuscany.api.annotation.Resource;
import org.apache.tuscany.spi.implementation.java.ImplementationProcessorService;
import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java Tue Feb 27 22:49:45 2007
@@ -22,7 +22,7 @@
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+import static org.osoa.sca.Constants.SCA_NS;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
@@ -42,7 +42,7 @@
* @version $Rev$ $Date$
*/
public class ComponentLoaderNoBindingTestCase extends TestCase {
- private static final QName COMPONENT = new QName(XML_NAMESPACE_1_0, "component");
+ private static final QName COMPONENT = new QName(SCA_NS, "component");
private ComponentLoader loader;
private XMLStreamReader reader;
private ServiceDefinition service;
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderReferenceTestCase.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderReferenceTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderReferenceTestCase.java Tue Feb 27 22:49:45 2007
@@ -5,7 +5,7 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+import static org.osoa.sca.Constants.SCA_NS;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
@@ -28,8 +28,8 @@
* @version $Rev$ $Date$
*/
public class ComponentLoaderReferenceTestCase extends TestCase {
- private static final QName COMPONENT = new QName(XML_NAMESPACE_1_0, "component");
- private static final QName REFERENCE = new QName(XML_NAMESPACE_1_0, "reference");
+ private static final QName COMPONENT = new QName(SCA_NS, "component");
+ private static final QName REFERENCE = new QName(SCA_NS, "reference");
private static final String NAME = "testComponent";
private ComponentLoader loader;
private XMLStreamReader reader;
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java Tue Feb 27 22:49:45 2007
@@ -23,7 +23,7 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+import static org.osoa.sca.Constants.SCA_NS;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
@@ -52,7 +52,7 @@
* @version $Rev$ $Date$
*/
public class ComponentLoaderTestCase extends TestCase {
- private static final QName COMPONENT = new QName(XML_NAMESPACE_1_0, "component");
+ private static final QName COMPONENT = new QName(SCA_NS, "component");
private static final String NAME = "testComponent";
private JavaImplementation impl;
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/IncludeLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/IncludeLoaderTestCase.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/IncludeLoaderTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/IncludeLoaderTestCase.java Tue Feb 27 22:49:45 2007
@@ -24,7 +24,7 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.osoa.sca.Version;
+import org.osoa.sca.Constants;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
@@ -48,7 +48,7 @@
* @version $Rev$ $Date$
*/
public class IncludeLoaderTestCase extends TestCase {
- private static final QName INCLUDE = new QName(Version.XML_NAMESPACE_1_0, "include");
+ private static final QName INCLUDE = new QName(Constants.SCA_NS, "include");
private LoaderRegistry registry;
private IncludeLoader loader;
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/PolicySetLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/PolicySetLoaderTestCase.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/PolicySetLoaderTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/PolicySetLoaderTestCase.java Tue Feb 27 22:49:45 2007
@@ -25,7 +25,7 @@
import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
import javax.xml.stream.XMLStreamReader;
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+import static org.osoa.sca.Constants.SCA_NS;
import org.apache.tuscany.spi.model.IntentMap;
import org.apache.tuscany.spi.model.PolicySet;
@@ -34,7 +34,7 @@
import junit.framework.TestCase;
public class PolicySetLoaderTestCase extends TestCase {
- private static final QName POLICYSET = new QName(XML_NAMESPACE_1_0, "policySet");
+ private static final QName POLICYSET = new QName(SCA_NS, "policySet");
public void testLoader() throws Exception {
PolicySetLoader loader = new PolicySetLoader(null);
@@ -49,8 +49,8 @@
PolicySet policySet = loader.load(null, null, reader, null);
assertNotNull(policySet);
assertEquals(2, policySet.getAppliedArtifacts().size());
- assertTrue(policySet.getAppliedArtifacts().contains(new QName(XML_NAMESPACE_1_0, "binding.ws")));
- assertTrue(policySet.getAppliedArtifacts().contains(new QName(XML_NAMESPACE_1_0, "binding.jms")));
+ assertTrue(policySet.getAppliedArtifacts().contains(new QName(SCA_NS, "binding.ws")));
+ assertTrue(policySet.getAppliedArtifacts().contains(new QName(SCA_NS, "binding.jms")));
Collection<IntentMap> intentMaps = policySet.getIntentMaps();
assertEquals(1, intentMaps.size());
IntentMap intentMap = intentMaps.iterator().next();
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ReferenceLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ReferenceLoaderTestCase.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ReferenceLoaderTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ReferenceLoaderTestCase.java Tue Feb 27 22:49:45 2007
@@ -23,7 +23,7 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.osoa.sca.Version;
+import org.osoa.sca.Constants;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -45,7 +45,7 @@
* @version $Rev$ $Date$
*/
public class ReferenceLoaderTestCase extends TestCase {
- private static final QName REFERENCE = new QName(Version.XML_NAMESPACE_1_0, "reference");
+ private static final QName REFERENCE = new QName(Constants.SCA_NS, "reference");
private ReferenceLoader loader;
private DeploymentContext deploymentContext;
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java Tue Feb 27 22:49:45 2007
@@ -24,7 +24,7 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+import static org.osoa.sca.Constants.SCA_NS;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -48,10 +48,10 @@
* @version $Rev$ $Date$
*/
public class ServiceLoaderTestCase extends TestCase {
- private static final QName SERVICE = new QName(XML_NAMESPACE_1_0, "service");
- private static final QName BINDING = new QName(XML_NAMESPACE_1_0, "binding.foo");
- private static final QName REFERENCE = new QName(XML_NAMESPACE_1_0, "reference");
- private static final QName INTERFACE_JAVA = new QName(XML_NAMESPACE_1_0, "interface.java");
+ private static final QName SERVICE = new QName(SCA_NS, "service");
+ private static final QName BINDING = new QName(SCA_NS, "binding.foo");
+ private static final QName REFERENCE = new QName(SCA_NS, "reference");
+ private static final QName INTERFACE_JAVA = new QName(SCA_NS, "interface.java");
private ServiceLoader loader;
private DeploymentContext deploymentContext;
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/WireLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/WireLoaderTestCase.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/WireLoaderTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/WireLoaderTestCase.java Tue Feb 27 22:49:45 2007
@@ -26,7 +26,7 @@
import static org.easymock.EasyMock.verify;
import org.easymock.EasyMock;
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+import static org.osoa.sca.Constants.SCA_NS;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
@@ -46,9 +46,9 @@
* @version $Rev: 471504 $ $Date: 2006-11-06 01:10:40 +0530 (Mon, 06 Nov 2006) $
*/
public class WireLoaderTestCase extends TestCase {
- private static final QName WIRE = new QName(XML_NAMESPACE_1_0, "wire");
- private static final QName SOURCE_URI = new QName(XML_NAMESPACE_1_0, "source.uri");
- private static final QName TARGET_URI = new QName(XML_NAMESPACE_1_0, "target.uri");
+ private static final QName WIRE = new QName(SCA_NS, "wire");
+ private static final QName SOURCE_URI = new QName(SCA_NS, "source.uri");
+ private static final QName TARGET_URI = new QName(SCA_NS, "target.uri");
private LoaderRegistry registry;
private WireLoader loader;
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/policy/IntentRegistryImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/policy/IntentRegistryImplTestCase.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/policy/IntentRegistryImplTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/policy/IntentRegistryImplTestCase.java Tue Feb 27 22:49:45 2007
@@ -23,7 +23,7 @@
import java.util.List;
import javax.xml.namespace.QName;
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+import static org.osoa.sca.Constants.SCA_NS;
import org.apache.tuscany.spi.model.Intent;
import org.apache.tuscany.spi.model.IntentName;
@@ -35,8 +35,8 @@
* @version $Rev$ $Date$
*/
public class IntentRegistryImplTestCase extends TestCase {
- private static final QName WS_BINDING = new QName(XML_NAMESPACE_1_0, "binding.ws");
- private static final QName JMS_BINDING = new QName(XML_NAMESPACE_1_0, "binding.jms");
+ private static final QName WS_BINDING = new QName(SCA_NS, "binding.ws");
+ private static final QName JMS_BINDING = new QName(SCA_NS, "binding.jms");
private IntentRegistry intentReg;
@Override
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/policy/PolicyEngineImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/policy/PolicyEngineImplTestCase.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/policy/PolicyEngineImplTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/policy/PolicyEngineImplTestCase.java Tue Feb 27 22:49:45 2007
@@ -27,7 +27,7 @@
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+import static org.osoa.sca.Constants.SCA_NS;
import org.apache.tuscany.spi.model.Intent;
import org.apache.tuscany.spi.model.IntentName;
@@ -42,8 +42,8 @@
import org.apache.tuscany.core.loader.PolicySetLoader;
public class PolicyEngineImplTestCase extends TestCase {
- private static final QName POLICYSET = new QName(XML_NAMESPACE_1_0, "policySet");
- private static final QName WS_BINDING = new QName(XML_NAMESPACE_1_0, "binding.ws");
+ private static final QName POLICYSET = new QName(SCA_NS, "policySet");
+ private static final QName WS_BINDING = new QName(SCA_NS, "binding.ws");
private IntentRegistry intentReg;
private PolicyEngine policyEngine;
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/util/stax/StaxUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/util/stax/StaxUtil.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/util/stax/StaxUtil.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/util/stax/StaxUtil.java Tue Feb 27 22:49:45 2007
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.spi.util.stax;
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+import static org.osoa.sca.Constants.SCA_NS;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -103,7 +103,7 @@
QName element,
DocumentBuilder builder) throws XMLStreamException {
- final QName PROPERTY = new QName(XML_NAMESPACE_1_0, "property");
+ final QName PROPERTY = new QName(SCA_NS, "property");
List<Document> propertyValues = new ArrayList<Document>();
Document value = null;
do {
Modified: incubator/tuscany/branches/sca-java-integration/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLLoader.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLLoader.java Tue Feb 27 22:49:45 2007
@@ -28,7 +28,7 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+import static org.osoa.sca.Constants.SCA_NS;
import org.osoa.sca.annotations.Constructor;
import org.apache.tuscany.spi.annotation.Autowire;
@@ -49,7 +49,7 @@
* @version $Rev$ $Date$
*/
public class InterfaceWSDLLoader extends LoaderExtension {
- public static final QName INTERFACE_WSDL = new QName(XML_NAMESPACE_1_0, "interface.wsdl");
+ public static final QName INTERFACE_WSDL = new QName(SCA_NS, "interface.wsdl");
private static final String WSDLI = "http://www.w3.org/2006/01/wsdl-instance";
Modified: incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingLoader.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingLoader.java Tue Feb 27 22:49:45 2007
@@ -22,7 +22,7 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.osoa.sca.Version;
+import org.osoa.sca.Constants;
import org.osoa.sca.annotations.Constructor;
import org.apache.tuscany.spi.annotation.Autowire;
@@ -38,7 +38,7 @@
*/
public class TestBindingLoader extends LoaderExtension<TestBindingDefinition> {
- public static final QName BINDING_TEST = new QName(Version.XML_NAMESPACE_1_0, "binding.test");
+ public static final QName BINDING_TEST = new QName(Constants.SCA_NS, "binding.test");
@Constructor
public TestBindingLoader(@Autowire LoaderRegistry registry) {
Modified: incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingServiceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingServiceBinding.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingServiceBinding.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingServiceBinding.java Tue Feb 27 22:49:45 2007
@@ -20,7 +20,7 @@
import javax.xml.namespace.QName;
-import org.osoa.sca.Version;
+import org.osoa.sca.Constants;
import org.apache.tuscany.spi.CoreRuntimeException;
import org.apache.tuscany.spi.component.CompositeComponent;
@@ -30,7 +30,7 @@
* @version $Rev$ $Date$
*/
public class TestBindingServiceBinding extends ServiceBindingExtension {
- private static final QName BINDING_TEST = new QName(Version.XML_NAMESPACE_1_0, "binding.socket");
+ private static final QName BINDING_TEST = new QName(Constants.SCA_NS, "binding.socket");
public TestBindingServiceBinding(String name, CompositeComponent parent) throws CoreRuntimeException {
super(name, parent);
Modified: incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestReferenceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestReferenceBinding.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestReferenceBinding.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestReferenceBinding.java Tue Feb 27 22:49:45 2007
@@ -2,7 +2,7 @@
import javax.xml.namespace.QName;
-import org.osoa.sca.Version;
+import org.osoa.sca.Constants;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.extension.ReferenceBindingExtension;
@@ -14,7 +14,7 @@
* @version $Rev$ $Date$
*/
public class TestReferenceBinding extends ReferenceBindingExtension {
- private static final QName BINDING_TEST = new QName(Version.XML_NAMESPACE_1_0, "binding.socket");
+ private static final QName BINDING_TEST = new QName(Constants.SCA_NS, "binding.socket");
public TestReferenceBinding(String name, CompositeComponent parent) {
super(name, parent);
Modified: incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingLoader.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingLoader.java Tue Feb 27 22:49:45 2007
@@ -4,7 +4,7 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.osoa.sca.Version;
+import org.osoa.sca.Constants;
import org.osoa.sca.annotations.Constructor;
import org.apache.tuscany.spi.annotation.Autowire;
@@ -20,7 +20,7 @@
*/
public class TestSocketBindingLoader extends LoaderExtension<TestSocketBindingDefinition> {
- public static final QName BINDING_TEST = new QName(Version.XML_NAMESPACE_1_0, "binding.socket");
+ public static final QName BINDING_TEST = new QName(Constants.SCA_NS, "binding.socket");
@Constructor
public TestSocketBindingLoader(@Autowire LoaderRegistry registry) {
Modified: incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingServiceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingServiceBinding.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingServiceBinding.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingServiceBinding.java Tue Feb 27 22:49:45 2007
@@ -11,7 +11,7 @@
import javax.xml.namespace.QName;
-import org.osoa.sca.Version;
+import org.osoa.sca.Constants;
import org.apache.tuscany.spi.CoreRuntimeException;
import org.apache.tuscany.spi.component.CompositeComponent;
@@ -28,7 +28,7 @@
* @version $Rev$ $Date$
*/
public class TestSocketBindingServiceBinding extends ServiceBindingExtension {
- private static final QName BINDING_TEST = new QName(Version.XML_NAMESPACE_1_0, "binding.socket");
+ private static final QName BINDING_TEST = new QName(Constants.SCA_NS, "binding.socket");
private int port;
private ServerSocket socket;
private ExecutorService executor;
Modified: incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketReferenceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketReferenceBinding.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketReferenceBinding.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketReferenceBinding.java Tue Feb 27 22:49:45 2007
@@ -2,7 +2,7 @@
import javax.xml.namespace.QName;
-import org.osoa.sca.Version;
+import org.osoa.sca.Constants;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.extension.ReferenceBindingExtension;
@@ -14,7 +14,7 @@
* @version $Rev$ $Date$
*/
public class TestSocketReferenceBinding extends ReferenceBindingExtension {
- private static final QName BINDING_TEST = new QName(Version.XML_NAMESPACE_1_0, "binding.socket");
+ private static final QName BINDING_TEST = new QName(Constants.SCA_NS, "binding.socket");
private String host;
private int port;
Modified: incubator/tuscany/branches/sca-java-integration/spec/sca-api-r0.95/src/main/java/org/osoa/sca/Version.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/spec/sca-api-r0.95/src/main/java/org/osoa/sca/Version.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/spec/sca-api-r0.95/src/main/java/org/osoa/sca/Version.java (original)
+++ incubator/tuscany/branches/sca-java-integration/spec/sca-api-r0.95/src/main/java/org/osoa/sca/Version.java Tue Feb 27 22:49:45 2007
@@ -33,7 +33,7 @@
/**
* Identifier for the XML Namespace for version 1.0
*/
- public static final String XML_NAMESPACE_1_0 = "http://www.osoa.org/xmlns/sca/1.0";
+ public static final String SCA_NS = "http://www.osoa.org/xmlns/sca/1.0";
/**
* The specification version of these API classes.
Modified: incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/CallableReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/CallableReference.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/CallableReference.java (original)
+++ incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/CallableReference.java Tue Feb 27 22:49:45 2007
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.osoa.sca;
/**
Modified: incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/ComponentContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/ComponentContext.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/ComponentContext.java (original)
+++ incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/ComponentContext.java Tue Feb 27 22:49:45 2007
@@ -1,6 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.osoa.sca;
/**
+ * Interface providing programmatic access to a component's SCA context as an alternative to injection.
+ * It provides access to reference and property values for the component and provides a mechanism for
+ * obtaining a reference to a service that can be passed to other components.
+ * <p/>
+ * SCA components obtain an instance of this interface through injection. Non-SCA client code may also
+ * obtain an instance through runtime-specific mechanisms.
+ *
* @version $Rev$ $Date$
*/
public interface ComponentContext {
Modified: incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/Constants.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/Constants.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/Constants.java (original)
+++ incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/Constants.java Tue Feb 27 22:49:45 2007
@@ -1,14 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.osoa.sca;
/**
* @version $Rev$ $Date$
*/
-public final class Constants {
-
- public static final String SCA_NS = "http://www.osoa.org/xmlns/sca/1.0";
-
- public static final String SCA_PREFIX = '{' + SCA_NS + '}';
+public interface Constants {
+ /**
+ * Namespace for intents.
+ */
+ String SCA_NS = "http://www.osoa.org/xmlns/sca/1.0";
- private Constants() {
- }
+ /**
+ * Prefix form of the namespace that can be prepended to intent declarations.
+ */
+ String SCA_PREFIX = '{' + SCA_NS + '}';
}
Modified: incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/Conversation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/Conversation.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/Conversation.java (original)
+++ incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/Conversation.java Tue Feb 27 22:49:45 2007
@@ -1,6 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.osoa.sca;
/**
+ * Interface representing a Conversation providing access to the conversation id and and a mechanism
+ * to terminate the conversation.
+ *
* @version $Rev$ $Date$
*/
public interface Conversation {
@@ -11,7 +32,7 @@
*
* @return the identifier for this conversation
*/
- Object getConversionID();
+ Object getConversationID();
/**
* End this conversation.
Modified: incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Callback.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Callback.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Callback.java (original)
+++ incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Callback.java Tue Feb 27 22:49:45 2007
@@ -31,6 +31,9 @@
* <p/>
* When placed on a method or field, this annotation denotes the injection
* site to be used for a callback reference.
+ * <p/>
+ * There is a error in the 1.00 draft spec in the declaration of this interface.
+ * The form defined here is a proposed correction for that error.
*
* @version $Rev$ $Date$
*/
@@ -38,7 +41,9 @@
@Retention(RUNTIME)
public @interface Callback {
/**
- * The Class of the callback interface.
+ * The Class of the associated callback interface.
+ *
+ * @return the associated callback interface
*/
Class<?> value() default Void.class;
}
Modified: incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Confidentiality.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Confidentiality.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Confidentiality.java (original)
+++ incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Confidentiality.java Tue Feb 27 22:49:45 2007
@@ -1,9 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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 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.ElementType.TYPE;
+import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
@@ -28,17 +47,21 @@
* <p/>
* Applied to an implementation class, it indicates that all invocations of that implementation
* and that all invocations made by that implementation require confidentiality.
- *
+ *
* @version $Rev$ $Date$
*/
+@Inherited
@Target({TYPE, FIELD, METHOD, PARAMETER})
@Retention(RUNTIME)
@Intent(Confidentiality.CONFIDENTIALITY)
public @interface Confidentiality {
String CONFIDENTIALITY = SCA_PREFIX + "confidentiality";
+ String CONFIDENTIALITY_MESSAGE = CONFIDENTIALITY + ".message";
+ String CONFIDENTIALITY_TRANSPORT = CONFIDENTIALITY + ".transport";
/**
* List of confidentiality qualifiers (such as "message" or "transport").
+ *
* @return confidentiality qualifiers
*/
@Qualifier
Modified: incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Context.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Context.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Context.java (original)
+++ incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Context.java Tue Feb 27 22:49:45 2007
@@ -25,7 +25,9 @@
import java.lang.annotation.Target;
/**
- * Annotation used to indicate a field or method that is used to inject the component's CompositeContext.
+ * Annotation used to indicate a field or setter method that is used to inject an SCA context.
+ * The type of context injected is determined by the type of the field or the parameter
+ * to the setter method and is typically a ComponentContext or RequestContext.
*
* @version $Rev$ $Date$
*/
Modified: incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/EagerInit.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/EagerInit.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/EagerInit.java (original)
+++ incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/EagerInit.java Tue Feb 27 22:49:45 2007
@@ -20,7 +20,7 @@
import static java.lang.annotation.ElementType.TYPE;
import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
@@ -29,15 +29,7 @@
* @version $Rev$ $Date$
*/
@Target({TYPE})
-@Retention(RetentionPolicy.RUNTIME)
+@Retention(RUNTIME)
public @interface EagerInit {
-
- /**
- * A Tuscany-specific extension for specifying the component's initialization order, with lesser values given
- * precedence. A value of 0 indicates the component should not be initialized eagerly.
- *
- * @return the component initalization level
- */
- public int value() default 50;
}
Modified: incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Intent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Intent.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Intent.java (original)
+++ incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Intent.java Tue Feb 27 22:49:45 2007
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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 static java.lang.annotation.ElementType.ANNOTATION_TYPE;
Modified: incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Property.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Property.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Property.java (original)
+++ incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Property.java Tue Feb 27 22:49:45 2007
@@ -36,17 +36,21 @@
public @interface Property {
/**
* The name of the property. If not specified then the name will be derived
- * from the annotated field.
+ * from the annotated field or method.
+ *
+ * @return the name of the property
*/
- public String name() default "";
+ String name() default "";
/**
- * Indicates if property requires to be injected
+ * Indicates whether a value for the property must be provided.
+ *
+ * @return true if a value must be provided
*/
- public String required() default "false";
+ boolean required() default false;
/**
* The XML Type in a QName format
*/
- public String xmlType() default "";
+ String xmlType() default "";
}
Modified: incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Qualifier.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Qualifier.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Qualifier.java (original)
+++ incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Qualifier.java Tue Feb 27 22:49:45 2007
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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 static java.lang.annotation.ElementType.METHOD;
Modified: incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Reference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Reference.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Reference.java (original)
+++ incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Reference.java Tue Feb 27 22:49:45 2007
@@ -34,12 +34,16 @@
@Retention(RUNTIME)
public @interface Reference {
/**
- * The name of the reference. If not specified then the name will be derived from the annotated field.
+ * The name of the reference. If not specified then the name will be derived from the annotated field or method.
+ *
+ * @return the name of the reference
*/
public String name() default "";
/**
* Indicates if a reference must be specified.
+ *
+ * @return true if a reference must be specified
*/
public boolean required() default false;
}
Modified: incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Scope.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Scope.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Scope.java (original)
+++ incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Scope.java Tue Feb 27 22:49:45 2007
@@ -25,6 +25,8 @@
/**
* Annotation used to indicate a scoped service.
+ * <p/>
+ * The spec refers to but does not describe an eager() attribute; this is an error in the draft.
*
* @version $Rev$ $Date$
*/
@@ -34,12 +36,13 @@
/**
* The name of the scope. Values currently defined by the specification are:
* <ul>
- * <li>stateless (default)</li>
- * <li>request</li>
- * <li>session</li>
- * <li>module</li>
- * <li>conversation</li>
+ * <li>STATELESS (default)</li>
+ * <li>REQUEST</li>
+ * <li>CONVERSATION</li>
+ * <li>COMPOSITE</li>
* </ul>
+ *
+ * @return the name of the scope
*/
String value() default "STATELESS";
}
Modified: incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Service.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Service.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Service.java (original)
+++ incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Service.java Tue Feb 27 22:49:45 2007
@@ -33,11 +33,15 @@
public @interface Service {
/**
* Array of interfaces that should be exposed as services.
+ *
+ * @return a list of interfaces that should be exposed as services
*/
Class<?>[] interfaces() default {};
/**
* Shortcut allowing a single interface to be exposed.
+ *
+ * @return a single service interfaces to be exposed
*/
Class<?> value() default Void.class;
}
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java Tue Feb 27 22:49:45 2007
@@ -3,27 +3,24 @@
import java.io.File;
import java.text.DateFormat;
-import org.osoa.sca.CurrentCompositeContext;
+import junit.framework.Assert;
+
import org.osoa.sca.CompositeContext;
-import org.osoa.sca.ServiceReference;
import org.osoa.sca.ConversationEndedException;
+import org.osoa.sca.CurrentCompositeContext;
+import org.osoa.sca.ServiceReference;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.ConversationAttributes;
+import org.osoa.sca.annotations.ConversationID;
import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Remotable;
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Conversation;
-
-
-import org.osoa.sca.RequestContext;
-import junit.framework.Assert;
@Service(interfaces={ConversationsClient.class,ConversationsClient2.class})
@Scope("CONVERSATION")
-@Conversation(maxIdleTime="10 minutes",
+@ConversationAttributes(maxIdleTime="10 minutes",
singlePrincipal=false)
@@ -211,14 +208,14 @@
private void test3()
{
- // Note: The @EndSesion and @EndConversation anotations are not implemented.
+ // Note: The @EndSesion and @EndsConversation anotations are not implemented.
// So #1 an #2 cannot be done.
//
// Verify the various methods to end a session.
// Sesssions can be ended:
//
- // 1) Server operation annotated with @EndConversation.
+ // 1) Server operation annotated with @EndsConversation.
// 2) Server operation calls an @EndSession annotated callback method.
// 3) Servers conversation lifetime times out. This is test6() so its not implimented in the test3 method.
// 4) The client calls ServiceReference.endSession();
@@ -247,7 +244,7 @@
//aConversationID = aServRef.getSessionID();
//Assert.assertNotNull("Conversations - Test3-1 ConversationID not found", aConversationID);
- //Call the business method annotated with @EndConversation.
+ //Call the business method annotated with @EndsConversation.
aConversationsLifeCycleService.endThisSession(); // This should also drive @Destroy method.
// Verify session has ended. The ConversationID should be null;
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleServiceImpl.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleServiceImpl.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleServiceImpl.java Tue Feb 27 22:49:45 2007
@@ -5,17 +5,15 @@
import junit.framework.Assert;
import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Service;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Conversation;
-import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.ConversationAttributes;
import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.EndConversation;
-import org.apache.tuscany.sca.test.ConversationsClient;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
@Service(ConversationsLifeCycleService.class)
@Scope("CONVERSATION")
-@Conversation(maxAge="5 seconds")
+@ConversationAttributes(maxAge="5 seconds")
// This is a short-lived conversational service.
@@ -63,7 +61,7 @@
System.out.println("ConversationsLifeCycleServiceImpl.destroy()");
}
-// @EndConversation
+// @EndsConversation
public void endThisSession() {
//This method will end the current session by annotation.
System.out.println("ConversationsLifeCycleServiceImpl.endThisSession()");
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org