svn commit: r512626 [1/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...

[rf...@apache.org]

Author: rfeng
Date: Tue Feb 27 22:49:45 2007
New Revision: 512626

URL: http://svn.apache.org/viewvc?view=rev&rev=512626
Log:
[sca-integration-branch] Merge the latest SCA 1.0 APIs from trunk to this branch and adjust all the references

Added:
    incubator/tuscany/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/Resource.java
      - copied unchanged from r512619, incubator/tuscany/java/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/Resource.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Authentication.java
      - copied unchanged from r512614, incubator/tuscany/java/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Authentication.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
      - copied unchanged from r512614, incubator/tuscany/java/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Conversational.java
      - copied unchanged from r512614, incubator/tuscany/java/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Conversational.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/EndsConversation.java
      - copied unchanged from r512614, incubator/tuscany/java/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/EndsConversation.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Integrity.java
      - copied unchanged from r512614, incubator/tuscany/java/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Integrity.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/PolicySets.java
      - copied unchanged from r512614, incubator/tuscany/java/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/PolicySets.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Requires.java
      - copied unchanged from r512614, incubator/tuscany/java/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Requires.java
Removed:
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/Version.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/ComponentID.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Conversation.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/EndConversation.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Resource.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/resources/
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/test/
Modified:
    incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/java/echo/EchoBindingLoader.java
    incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/java/echo/EchoReference.java
    incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/java/echo/EchoService.java
    incubator/tuscany/branches/sca-java-integration/samples/sca/echo.databinding/src/main/java/echo/EchoBindingLoader.java
    incubator/tuscany/branches/sca-java-integration/samples/sca/echo.databinding/src/main/java/echo/EchoReference.java
    incubator/tuscany/branches/sca-java-integration/samples/sca/echo.databinding/src/main/java/echo/EchoService.java
    incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversation/src/main/java/loanappconversation/LoanService.java
    incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversation/src/test/java/loanappconversation/LoanAppConversationTestCase.java
    incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversationWS/src/main/java/loanappconversation/LoanService.java
    incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversationWSClient/src/main/java/loanappconversation/LoanService.java
    incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ReferenceBinding.java
    incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java
    incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingDefinition.java
    incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingLoader.java
    incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader.java
    incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/java/org/apache/tuscany/binding/jms/JMSReferenceBinding.java
    incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/java/org/apache/tuscany/binding/jms/JMSServiceBinding.java
    incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/test/java/org/apache/tuscany/binding/jms/JMSBindingLoaderTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/binding/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingLoader.java
    incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/binding/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCServiceBinding.java
    incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptImplementationJavaScriptLoader.java
    incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptImplementationLoader.java
    incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptImplementationPythonLoader.java
    incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptImplementationRubyLoader.java
    incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/test/java/org/apache/tuscany/container/script/ScriptImplementationLoaderTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaLoader.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeLoader.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ImplementationCompositeLoader.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaImplementationLoader.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConversationProcessor.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/EagerInitProcessor.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InvalidResourceException.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ResourceProcessor.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceObjectFactory.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PolicySetLoader.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/MockFactory.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConversationalIntrospectionTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/ImplementationCompositeLoaderTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorPropertyTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorResourceTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConversationProcessorTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/EagerInitProcessorTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/PropertyProcessorTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ResourceProcessorTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/IntrospectionRegistryIntegrationTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderReferenceTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/IncludeLoaderTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/PolicySetLoaderTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ReferenceLoaderTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/WireLoaderTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/policy/IntentRegistryImplTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/policy/PolicyEngineImplTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/util/stax/StaxUtil.java
    incubator/tuscany/branches/sca-java-integration/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLLoader.java
    incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingLoader.java
    incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingServiceBinding.java
    incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestReferenceBinding.java
    incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingLoader.java
    incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingServiceBinding.java
    incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketReferenceBinding.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r0.95/src/main/java/org/osoa/sca/Version.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/CallableReference.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/ComponentContext.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/Constants.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/Conversation.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Callback.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Confidentiality.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Context.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/EagerInit.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Intent.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Property.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Qualifier.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Reference.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Scope.java
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Service.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleServiceImpl.java

Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/java/echo/EchoBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/java/echo/EchoBindingLoader.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/java/echo/EchoBindingLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/java/echo/EchoBindingLoader.java Tue Feb 27 22:49:45 2007
@@ -22,7 +22,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;
@@ -38,7 +38,7 @@
  */
 public class EchoBindingLoader extends LoaderExtension<EchoBinding> {
 
-    public static final QName BINDING_ECHO = new QName(XML_NAMESPACE_1_0, "binding.echo");
+    public static final QName BINDING_ECHO = new QName(SCA_NS, "binding.echo");
 
     @Constructor
     public EchoBindingLoader(@Autowire LoaderRegistry registry) {

Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/java/echo/EchoReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/java/echo/EchoReference.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/java/echo/EchoReference.java (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/java/echo/EchoReference.java Tue Feb 27 22:49:45 2007
@@ -20,7 +20,7 @@
 
 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.component.CompositeComponent;
 import org.apache.tuscany.spi.extension.ReferenceBindingExtension;
@@ -32,7 +32,7 @@
  * @version $Rev$ $Date$
  */
 public class EchoReference extends ReferenceBindingExtension {
-    private static final QName BINDING_ECHO = new QName(XML_NAMESPACE_1_0, "binding.echo");
+    private static final QName BINDING_ECHO = new QName(SCA_NS, "binding.echo");
 
     public EchoReference(String name, CompositeComponent parent) {
         super(name, parent);

Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/java/echo/EchoService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/java/echo/EchoService.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/java/echo/EchoService.java (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/echo.binding/src/main/java/echo/EchoService.java Tue Feb 27 22:49:45 2007
@@ -20,7 +20,7 @@
 
 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.CoreRuntimeException;
 import org.apache.tuscany.spi.component.CompositeComponent;
@@ -30,7 +30,7 @@
  * @version $Rev$ $Date$
  */
 public class EchoService extends ServiceBindingExtension {
-    private static final QName BINDING_ECHO = new QName(XML_NAMESPACE_1_0, "binding.echo");
+    private static final QName BINDING_ECHO = new QName(SCA_NS, "binding.echo");
 
     public EchoService(String name, CompositeComponent parent) throws CoreRuntimeException {
         super(name, parent);

Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/echo.databinding/src/main/java/echo/EchoBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/echo.databinding/src/main/java/echo/EchoBindingLoader.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/echo.databinding/src/main/java/echo/EchoBindingLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/echo.databinding/src/main/java/echo/EchoBindingLoader.java Tue Feb 27 22:49:45 2007
@@ -22,7 +22,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;
@@ -38,7 +38,7 @@
  */
 public class EchoBindingLoader extends LoaderExtension<EchoBinding> {
 
-    public static final QName BINDING_ECHO = new QName(XML_NAMESPACE_1_0, "binding.echo");
+    public static final QName BINDING_ECHO = new QName(SCA_NS, "binding.echo");
 
     @Constructor
     public EchoBindingLoader(@Autowire LoaderRegistry registry) {

Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/echo.databinding/src/main/java/echo/EchoReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/echo.databinding/src/main/java/echo/EchoReference.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/echo.databinding/src/main/java/echo/EchoReference.java (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/echo.databinding/src/main/java/echo/EchoReference.java Tue Feb 27 22:49:45 2007
@@ -18,7 +18,7 @@
  */
 package echo;
 
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+import static org.osoa.sca.Constants.SCA_NS;
 
 import javax.xml.namespace.QName;
 
@@ -36,7 +36,7 @@
 
     private static final String OM_DATA_BINDING = OMElement.class.getName();
 
-    private static final QName BINDING_ECHO = new QName(XML_NAMESPACE_1_0, "binding.echo");
+    private static final QName BINDING_ECHO = new QName(SCA_NS, "binding.echo");
 
     public EchoReference(String name, CompositeComponent parent) {
         super(name, parent);

Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/echo.databinding/src/main/java/echo/EchoService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/echo.databinding/src/main/java/echo/EchoService.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/echo.databinding/src/main/java/echo/EchoService.java (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/echo.databinding/src/main/java/echo/EchoService.java Tue Feb 27 22:49:45 2007
@@ -18,7 +18,7 @@
  */
 package echo;
 
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+import static org.osoa.sca.Constants.SCA_NS;
 
 import javax.xml.namespace.QName;
 
@@ -30,7 +30,7 @@
  * @version $Rev$ $Date$
  */
 public class EchoService extends ServiceBindingExtension {
-    private static final QName BINDING_ECHO = new QName(XML_NAMESPACE_1_0, "binding.echo");
+    private static final QName BINDING_ECHO = new QName(SCA_NS, "binding.echo");
 
     public EchoService(String name, CompositeComponent parent) throws CoreRuntimeException {
         super(name, parent);

Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversation/src/main/java/loanappconversation/LoanService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversation/src/main/java/loanappconversation/LoanService.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversation/src/main/java/loanappconversation/LoanService.java (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversation/src/main/java/loanappconversation/LoanService.java Tue Feb 27 22:49:45 2007
@@ -18,7 +18,7 @@
  */
 package loanappconversation;
 
-import org.osoa.sca.annotations.EndConversation;
+import org.osoa.sca.annotations.EndsConversation;
 import org.osoa.sca.annotations.OneWay;
 import org.osoa.sca.annotations.Remotable;
 import org.osoa.sca.annotations.Scope;
@@ -32,6 +32,6 @@
     void cancelApplication();
     String getLoanStatus();
     String display();
-    @EndConversation
+    @EndsConversation
     void close();
 }

Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversation/src/test/java/loanappconversation/LoanAppConversationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversation/src/test/java/loanappconversation/LoanAppConversationTestCase.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversation/src/test/java/loanappconversation/LoanAppConversationTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversation/src/test/java/loanappconversation/LoanAppConversationTestCase.java Tue Feb 27 22:49:45 2007
@@ -52,7 +52,7 @@
             System.out.println("Cancelled: " + loanClient.displayLoan());
             loanClient.closeLoan();
             
-            /* This is a mistake, after @EndConversation, a new conversation is
+            /* This is a mistake, after @EndsConversation, a new conversation is
              * started automatically, so we should not get TargetNotFoundException.
              * Keep this for the timeout case, where we should get the exception
             try {

Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversationWS/src/main/java/loanappconversation/LoanService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversationWS/src/main/java/loanappconversation/LoanService.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversationWS/src/main/java/loanappconversation/LoanService.java (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversationWS/src/main/java/loanappconversation/LoanService.java Tue Feb 27 22:49:45 2007
@@ -35,6 +35,6 @@
     void cancelApplication();
     String getLoanStatus();
     String display();
-    @EndConversation
+    @EndsConversation
     void close();
 }

Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversationWSClient/src/main/java/loanappconversation/LoanService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversationWSClient/src/main/java/loanappconversation/LoanService.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversationWSClient/src/main/java/loanappconversation/LoanService.java (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversationWSClient/src/main/java/loanappconversation/LoanService.java Tue Feb 27 22:49:45 2007
@@ -19,7 +19,7 @@
 package loanappconversation;
 
 import org.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.EndConversation;
+import org.osoa.sca.annotations.EndsConversation;
 import org.osoa.sca.annotations.OneWay;
 import org.osoa.sca.annotations.Remotable;
 import org.osoa.sca.annotations.Scope;
@@ -35,6 +35,6 @@
     void cancelApplication();
     String getLoanStatus();
     String display();
-    @EndConversation
+    @EndsConversation
     void close();
 }

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ReferenceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ReferenceBinding.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ReferenceBinding.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ReferenceBinding.java Tue Feb 27 22:49:45 2007
@@ -22,7 +22,7 @@
 import javax.wsdl.Definition;
 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.component.CompositeComponent;
 import org.apache.tuscany.spi.component.WorkContext;
@@ -48,7 +48,7 @@
  * Axis2Reference uses Axis2 to invoke a remote web service
  */
 public class Axis2ReferenceBinding<T> extends ReferenceBindingExtension {
-    private static final QName BINDING_WS = new QName(XML_NAMESPACE_1_0, "binding.ws");
+    private static final QName BINDING_WS = new QName(SCA_NS, "binding.ws");
 
     private WebServicePortMetaData wsPortMetaData;
     private ServiceClient serviceClient;

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java Tue Feb 27 22:49:45 2007
@@ -32,7 +32,7 @@
 import javax.wsdl.PortType;
 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.osoa.sca.annotations.Destroy;
 
 import org.apache.tuscany.spi.builder.BuilderConfigException;
@@ -72,7 +72,7 @@
  * @version $Rev$ $Date$
  */
 public class Axis2ServiceBinding extends ServiceBindingExtension {
-    private static final QName BINDING_WS = new QName(XML_NAMESPACE_1_0, "binding.ws");
+    private static final QName BINDING_WS = new QName(SCA_NS, "binding.ws");
 
     private ServiceContract<?> serviceContract;
 

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingDefinition.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingDefinition.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingDefinition.java Tue Feb 27 22:49:45 2007
@@ -25,7 +25,7 @@
 import javax.xml.namespace.QName;
 
 import org.apache.tuscany.spi.model.BindingDefinition;
-import org.osoa.sca.Version;
+import org.osoa.sca.Constants;
 
 /**
  * Represents a Celtix binding configuration in an assembly
@@ -33,7 +33,7 @@
  * @version $Rev$ $Date$
  */
 public class WebServiceBindingDefinition extends BindingDefinition {
-    public static final QName CONVERSATION_ID_REFPARM_QN = new QName(Version.XML_NAMESPACE_1_0,"conversationID");
+    public static final QName CONVERSATION_ID_REFPARM_QN = new QName(Constants.SCA_NS,"conversationID");
     private Definition definition;
     private Port port;
     private Service service;

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingLoader.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingLoader.java Tue Feb 27 22:49:45 2007
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.binding.axis2;
 
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+import static org.osoa.sca.Constants.SCA_NS;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -52,7 +52,7 @@
 @Scope("COMPOSITE")
 @SuppressWarnings("deprecation")
 public class WebServiceBindingLoader extends LoaderExtension<WebServiceBindingDefinition> {
-    public static final QName BINDING_WS = new QName(XML_NAMESPACE_1_0, "binding.ws");
+    public static final QName BINDING_WS = new QName(SCA_NS, "binding.ws");
 
     private WSDLDefinitionRegistry wsdlDefinitionRegistry;
 

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader.java Tue Feb 27 22:49:45 2007
@@ -18,7 +18,7 @@
 
 import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
 import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+import static org.osoa.sca.Constants.SCA_NS;
 
 import java.util.Arrays;
 import java.util.List;
@@ -43,7 +43,7 @@
 public class JMSBindingLoader extends LoaderExtension<JMSBindingDefinition> {
 
     public static final QName BINDING_JMS =
-        new QName(XML_NAMESPACE_1_0, "binding.jms");
+        new QName(SCA_NS, "binding.jms");
 
     public static final List<String> VALID_CORRELATION_SCHEMES =
         Arrays.asList(new String[] {"requestmsgidtocorrelid", "requestcorrelidtocorrelid", "none"});

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/java/org/apache/tuscany/binding/jms/JMSReferenceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/java/org/apache/tuscany/binding/jms/JMSReferenceBinding.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/java/org/apache/tuscany/binding/jms/JMSReferenceBinding.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/java/org/apache/tuscany/binding/jms/JMSReferenceBinding.java Tue Feb 27 22:49:45 2007
@@ -21,7 +21,7 @@
 import javax.jms.Destination;
 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.component.CompositeComponent;
 import org.apache.tuscany.spi.extension.ReferenceBindingExtension;
@@ -33,7 +33,7 @@
  * @version $Rev: 449970 $ $Date: 2006-09-26 06:05:35 -0400 (Tue, 26 Sep 2006) $
  */
 public class JMSReferenceBinding extends ReferenceBindingExtension {
-    private static final QName BINDING_JMS = new QName(XML_NAMESPACE_1_0, "binding.jms");
+    private static final QName BINDING_JMS = new QName(SCA_NS, "binding.jms");
 
     protected JMSBindingDefinition jmsBinding;
     protected JMSResourceFactory jmsResourceFactory;

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/java/org/apache/tuscany/binding/jms/JMSServiceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/java/org/apache/tuscany/binding/jms/JMSServiceBinding.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/java/org/apache/tuscany/binding/jms/JMSServiceBinding.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/java/org/apache/tuscany/binding/jms/JMSServiceBinding.java Tue Feb 27 22:49:45 2007
@@ -25,7 +25,7 @@
 import javax.naming.NamingException;
 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.component.CompositeComponent;
 import org.apache.tuscany.spi.extension.ServiceBindingExtension;
@@ -35,7 +35,7 @@
  * @version $Rev: 449970 $ $Date: 2006-09-26 06:05:35 -0400 (Tue, 26 Sep 2006) $
  */
 public class JMSServiceBinding extends ServiceBindingExtension {
-    private static final QName BINDING_JMS = new QName(XML_NAMESPACE_1_0, "binding.jms");
+    private static final QName BINDING_JMS = new QName(SCA_NS, "binding.jms");
 
     private JMSBindingDefinition jmsBinding;
     private JMSResourceFactory jmsResourceFactory;

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/test/java/org/apache/tuscany/binding/jms/JMSBindingLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/test/java/org/apache/tuscany/binding/jms/JMSBindingLoaderTestCase.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/test/java/org/apache/tuscany/binding/jms/JMSBindingLoaderTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/test/java/org/apache/tuscany/binding/jms/JMSBindingLoaderTestCase.java Tue Feb 27 22:49:45 2007
@@ -9,7 +9,7 @@
 import junit.framework.TestCase;
 
 import org.apache.tuscany.spi.loader.LoaderException;
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+import static org.osoa.sca.Constants.SCA_NS;
 
 public class JMSBindingLoaderTestCase extends TestCase {
 
@@ -78,7 +78,7 @@
     private XMLStreamReader createReader(String xml) throws XMLStreamException {
         XMLInputFactory factory = XMLInputFactory.newInstance();
 
-        String xxx = "<xxx xmlns=\"" + XML_NAMESPACE_1_0 + "\">" + xml + "</xxx>";
+        String xxx = "<xxx xmlns=\"" + SCA_NS + "\">" + xml + "</xxx>";
         XMLStreamReader reader = factory.createXMLStreamReader(new StringReader(xxx));
         reader.nextTag();
         reader.nextTag();

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/binding/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/binding/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingLoader.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/binding/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/binding/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingLoader.java Tue Feb 27 22:49:45 2007
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.binding.jsonrpc;
 
-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;
 import javax.xml.stream.XMLStreamReader;
@@ -39,7 +39,7 @@
  */
 @Scope("COMPOSITE")
 public class JSONRPCBindingLoader extends LoaderExtension<JSONRPCBindingDefinition> {
-    public static final QName BINDING_JSON = new QName(XML_NAMESPACE_1_0, "binding.jsonrpc");
+    public static final QName BINDING_JSON = new QName(SCA_NS, "binding.jsonrpc");
 
     public JSONRPCBindingLoader(@Autowire LoaderRegistry registry) {
         super(registry);

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/binding/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCServiceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/binding/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCServiceBinding.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/binding/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCServiceBinding.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/binding/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCServiceBinding.java Tue Feb 27 22:49:45 2007
@@ -20,7 +20,7 @@
 
 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.osoa.sca.annotations.Destroy;
 
 import org.apache.tuscany.spi.component.CompositeComponent;
@@ -32,7 +32,7 @@
  * @version $Rev$ $Date$
  */
 public class JSONRPCServiceBinding extends ServiceBindingExtension {
-    public static final QName BINDING_JSON = new QName(XML_NAMESPACE_1_0, "binding.jsonrpc");
+    public static final QName BINDING_JSON = new QName(SCA_NS, "binding.jsonrpc");
 
     private static int servletRegistrationCount = 0;
 

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptImplementationJavaScriptLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptImplementationJavaScriptLoader.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptImplementationJavaScriptLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptImplementationJavaScriptLoader.java Tue Feb 27 22:49:45 2007
@@ -19,7 +19,7 @@
 
 package org.apache.tuscany.container.script;
 
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+import static org.osoa.sca.Constants.SCA_NS;
 
 import javax.xml.namespace.QName;
 
@@ -29,7 +29,7 @@
 
 public class ScriptImplementationJavaScriptLoader extends ScriptImplementationLoader {
 
-    private static final QName IMPLEMENTATION_JS = new QName(XML_NAMESPACE_1_0, "implementation.js");
+    private static final QName IMPLEMENTATION_JS = new QName(SCA_NS, "implementation.js");
 
     @Constructor({"registry"})
     public ScriptImplementationJavaScriptLoader(@Autowire LoaderRegistry registry) {

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptImplementationLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptImplementationLoader.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptImplementationLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptImplementationLoader.java Tue Feb 27 22:49:45 2007
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.container.script;
 
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+import static org.osoa.sca.Constants.SCA_NS;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -50,7 +50,7 @@
  */
 public class ScriptImplementationLoader extends LoaderExtension<ScriptImplementation> {
 
-    private static final QName IMPLEMENTATION_SCRIPT = new QName(XML_NAMESPACE_1_0, "implementation.script");
+    private static final QName IMPLEMENTATION_SCRIPT = new QName(SCA_NS, "implementation.script");
 
     @Constructor({"registry"})
     public ScriptImplementationLoader(@Autowire LoaderRegistry registry) {

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptImplementationPythonLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptImplementationPythonLoader.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptImplementationPythonLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptImplementationPythonLoader.java Tue Feb 27 22:49:45 2007
@@ -19,7 +19,7 @@
 
 package org.apache.tuscany.container.script;
 
-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;
@@ -37,7 +37,7 @@
 
 public class ScriptImplementationPythonLoader extends ScriptImplementationLoader {
 
-    private static final QName IMPLEMENTATION_PYTHON = new QName(XML_NAMESPACE_1_0, "implementation.python");
+    private static final QName IMPLEMENTATION_PYTHON = new QName(SCA_NS, "implementation.python");
 
     @Constructor({"registry"})
     public ScriptImplementationPythonLoader(@Autowire LoaderRegistry registry) {

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptImplementationRubyLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptImplementationRubyLoader.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptImplementationRubyLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptImplementationRubyLoader.java Tue Feb 27 22:49:45 2007
@@ -19,7 +19,7 @@
 
 package org.apache.tuscany.container.script;
 
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+import static org.osoa.sca.Constants.SCA_NS;
 
 import javax.xml.namespace.QName;
 
@@ -29,7 +29,7 @@
 
 public class ScriptImplementationRubyLoader extends ScriptImplementationLoader {
 
-    private static final QName IMPLEMENTATION_RUBY = new QName(XML_NAMESPACE_1_0, "implementation.ruby");
+    private static final QName IMPLEMENTATION_RUBY = new QName(SCA_NS, "implementation.ruby");
 
     @Constructor({"registry"})
     public ScriptImplementationRubyLoader(@Autowire LoaderRegistry registry) {

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/test/java/org/apache/tuscany/container/script/ScriptImplementationLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/test/java/org/apache/tuscany/container/script/ScriptImplementationLoaderTestCase.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/test/java/org/apache/tuscany/container/script/ScriptImplementationLoaderTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/test/java/org/apache/tuscany/container/script/ScriptImplementationLoaderTestCase.java Tue Feb 27 22:49:45 2007
@@ -22,7 +22,7 @@
 import static org.easymock.classextension.EasyMock.createMock;
 import static org.easymock.classextension.EasyMock.replay;
 import static org.easymock.classextension.EasyMock.verify;
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+import static org.osoa.sca.Constants.SCA_NS;
 
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
@@ -116,7 +116,7 @@
     }
 
     public void testGetXMLType() throws LoaderException {
-        assertEquals(XML_NAMESPACE_1_0, loader.getXMLType().getNamespaceURI());
+        assertEquals(SCA_NS, loader.getXMLType().getNamespaceURI());
         assertEquals("implementation.script", loader.getXMLType().getLocalPart());
     }
 

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaLoader.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaLoader.java Tue Feb 27 22:49:45 2007
@@ -25,7 +25,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;
@@ -50,7 +50,7 @@
  * @version $Rev$ $Date$
  */
 public class InterfaceJavaLoader extends LoaderExtension<JavaServiceContract> {
-    public static final QName INTERFACE_JAVA = new QName(XML_NAMESPACE_1_0, "interface.java");
+    public static final QName INTERFACE_JAVA = new QName(SCA_NS, "interface.java");
 
     private final JavaInterfaceProcessorRegistry interfaceRegsitry;
 

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java Tue Feb 27 22:49:45 2007
@@ -26,7 +26,7 @@
 import java.util.Map;
 
 import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.EndConversation;
+import org.osoa.sca.annotations.EndsConversation;
 import org.osoa.sca.annotations.OneWay;
 import org.osoa.sca.annotations.Remotable;
 import org.osoa.sca.annotations.Scope;
@@ -122,7 +122,7 @@
             Type[] faultTypes = method.getGenericExceptionTypes();
             boolean nonBlocking = method.isAnnotationPresent(OneWay.class);
             int conversationSequence = NO_CONVERSATION;
-            if (method.isAnnotationPresent(EndConversation.class)) {
+            if (method.isAnnotationPresent(EndsConversation.class)) {
                 if (!conversational) {
                     throw new InvalidConversationalOperationException(
                         "Method is marked as end conversation but contract is not conversational",

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeLoader.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeLoader.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.apache.tuscany.spi.QualifiedName;
 import org.apache.tuscany.spi.annotation.Autowire;
@@ -62,7 +62,7 @@
  * @version $Rev$ $Date$
  */
 public class CompositeLoader extends LoaderExtension<CompositeComponentType> {
-    public static final QName COMPOSITE = new QName(XML_NAMESPACE_1_0, "composite");
+    public static final QName COMPOSITE = new QName(SCA_NS, "composite");
     public static final String URI_DELIMITER = "/";
 
     private final ArtifactRepository artifactRepository;

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ImplementationCompositeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ImplementationCompositeLoader.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ImplementationCompositeLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ImplementationCompositeLoader.java Tue Feb 27 22:49:45 2007
@@ -25,7 +25,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.annotation.Autowire;
 import org.apache.tuscany.spi.component.CompositeComponent;
@@ -49,7 +49,7 @@
  */
 public class ImplementationCompositeLoader extends LoaderExtension<CompositeImplementation> {
     private static final QName IMPLEMENTATION_COMPOSITE =
-        new QName(Version.XML_NAMESPACE_1_0, "implementation.composite");
+        new QName(Constants.SCA_NS, "implementation.composite");
 
     private final ArtifactRepository artifactRepository;
 

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaImplementationLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaImplementationLoader.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaImplementationLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaImplementationLoader.java Tue Feb 27 22:49:45 2007
@@ -22,7 +22,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.component.CompositeComponent;
@@ -35,7 +35,7 @@
 import org.apache.tuscany.spi.annotation.Autowire;
 
 public class JavaImplementationLoader extends LoaderExtension {
-    public static final QName IMPLEMENTATION_JAVA = new QName(XML_NAMESPACE_1_0, "implementation.java");
+    public static final QName IMPLEMENTATION_JAVA = new QName(SCA_NS, "implementation.java");
 
     @Constructor({"registry"})
     public JavaImplementationLoader(@Autowire LoaderRegistry registry) {

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConversationProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConversationProcessor.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConversationProcessor.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConversationProcessor.java Tue Feb 27 22:49:45 2007
@@ -21,10 +21,6 @@
 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 org.apache.tuscany.spi.component.CompositeComponent;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
 import org.apache.tuscany.spi.implementation.java.ImplementationProcessorExtension;
@@ -33,6 +29,9 @@
 import org.apache.tuscany.spi.implementation.java.JavaMappedService;
 import org.apache.tuscany.spi.implementation.java.PojoComponentType;
 import org.apache.tuscany.spi.implementation.java.ProcessingException;
+import org.osoa.sca.annotations.ConversationAttributes;
+import org.osoa.sca.annotations.ConversationID;
+import org.osoa.sca.annotations.Scope;
 
 /**
  * @version $Rev$ $Date$
@@ -49,7 +48,7 @@
                                PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
                                DeploymentContext context) throws ProcessingException {
 
-        Conversation conversation = clazz.getAnnotation(Conversation.class);
+        ConversationAttributes conversation = clazz.getAnnotation(ConversationAttributes.class);
         if (conversation == null) {
             return;
         }
@@ -59,7 +58,7 @@
             type.setImplementationScope(org.apache.tuscany.spi.model.Scope.CONVERSATION);
         } else if (scope != null && !"CONVERSATION".equals(scope.value().toUpperCase())) {
             throw new InvalidConversationalImplementation(
-                "Service is marked with @Conversation but the scope is not @Scope(\"CONVERSATION\")", clazz.getName());
+                "Service is marked with @ConversationAttributes but the scope is not @Scope(\"CONVERSATION\")", clazz.getName());
         } else if (conversation != null) {
             long maxAge;
             long maxIdleTime;

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/EagerInitProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/EagerInitProcessor.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/EagerInitProcessor.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/EagerInitProcessor.java Tue Feb 27 22:49:45 2007
@@ -54,6 +54,6 @@
                 return;
             }
         }
-        type.setInitLevel(annotation.value());
+        type.setInitLevel(50);
     }
 }

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java Tue Feb 27 22:49:45 2007
@@ -48,7 +48,7 @@
 import org.osoa.sca.annotations.Property;
 import org.osoa.sca.annotations.Reference;
 import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Resource;
+import org.apache.tuscany.api.annotation.Resource;
 
 /**
  * The default implementation of an <code>ImplementationProcessorService</code>
@@ -311,7 +311,7 @@
             throw new DuplicatePropertyException(name);
         }
         property.setName(name);
-        property.setMustSupply(Boolean.parseBoolean(propAnnot.required()));
+        property.setMustSupply(propAnnot.required());
 
         String xmlType = propAnnot.xmlType();
         if (xmlType != null && xmlType.length() != 0) {

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InvalidResourceException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InvalidResourceException.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InvalidResourceException.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InvalidResourceException.java Tue Feb 27 22:49:45 2007
@@ -21,7 +21,7 @@
 import org.apache.tuscany.spi.implementation.java.ProcessingException;
 
 /**
- * Denotes an invalid usage of {@link @org.osoa.sca.annotations.Resource}
+ * Denotes an invalid usage of {@link @org.apache.tuscany.api.annotation.Resource}
  *
  * @version $Rev$ $Date$
  */

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ResourceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ResourceProcessor.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ResourceProcessor.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ResourceProcessor.java Tue Feb 27 22:49:45 2007
@@ -49,7 +49,7 @@
                             PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
                             DeploymentContext context)
         throws ProcessingException {
-        org.osoa.sca.annotations.Resource annotation = method.getAnnotation(org.osoa.sca.annotations.Resource.class);
+        org.apache.tuscany.api.annotation.Resource annotation = method.getAnnotation(org.apache.tuscany.api.annotation.Resource.class);
         if (annotation == null) {
             return;
         }
@@ -80,7 +80,7 @@
                            PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
                            DeploymentContext context) throws ProcessingException {
 
-        org.osoa.sca.annotations.Resource annotation = field.getAnnotation(org.osoa.sca.annotations.Resource.class);
+        org.apache.tuscany.api.annotation.Resource annotation = field.getAnnotation(org.apache.tuscany.api.annotation.Resource.class);
         if (annotation == null) {
             return;
         }

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceObjectFactory.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceObjectFactory.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceObjectFactory.java Tue Feb 27 22:49:45 2007
@@ -30,7 +30,7 @@
 
 /**
  * Resolves a runtime resource to be injected on a field or method of a Java component type marked with {@link
- * org.osoa.sca.annotations.Resource}. If the mapped name of the resource is an absolute URI such as
+ * org.apache.tuscany.api.annotation.Resource}. If the mapped name of the resource is an absolute URI such as
  * <code>sca://localhost</code> or <code>jndi://localhost</code> the host container namespace is searched; otherwise the
  * URI is assumed to be relative and the parent composite is searched. If a mapped name is not provided, i.e. resolution
  * is by type, the parent composite is first searched followed by the host namespace.

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java Tue Feb 27 22:49:45 2007
@@ -20,7 +20,7 @@
 
 import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
 import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+import static org.osoa.sca.Constants.SCA_NS;
 
 import java.lang.reflect.Type;
 import java.net.URI;
@@ -77,9 +77,9 @@
  * @version $Rev$ $Date$
  */
 public class ComponentLoader extends LoaderExtension<ComponentDefinition<?>> {
-    private static final QName COMPONENT = new QName(XML_NAMESPACE_1_0, "component");
-    private static final QName PROPERTY = new QName(XML_NAMESPACE_1_0, "property");
-    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 PROPERTY = new QName(SCA_NS, "property");
+    private static final QName REFERENCE = new QName(SCA_NS, "reference");
 
     private static final String PROPERTY_FILE_ATTR = "file";
     private static final String PROPERTY_SOURCE_ATTR = "source";

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.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.osoa.sca.annotations.Constructor;
 
 import org.apache.tuscany.spi.annotation.Autowire;
@@ -43,7 +43,7 @@
  * @version $Rev$ $Date$
  */
 public class ComponentTypeElementLoader extends LoaderExtension<ComponentType> {
-    public static final QName COMPONENT_TYPE = new QName(XML_NAMESPACE_1_0, "componentType");
+    public static final QName COMPONENT_TYPE = new QName(SCA_NS, "componentType");
 
     @Constructor
     public ComponentTypeElementLoader(@Autowire LoaderRegistry registry) {

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.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.osoa.sca.annotations.Constructor;
 
 import org.apache.tuscany.spi.annotation.Autowire;
@@ -48,7 +48,7 @@
  * @version $Rev$ $Date$
  */
 public class IncludeLoader extends LoaderExtension<Include> {
-    private static final QName INCLUDE = new QName(XML_NAMESPACE_1_0, "include");
+    private static final QName INCLUDE = new QName(SCA_NS, "include");
 
     @Constructor({"registry"})
     public IncludeLoader(@Autowire LoaderRegistry registry) {

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PolicySetLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PolicySetLoader.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PolicySetLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PolicySetLoader.java Tue Feb 27 22:49:45 2007
@@ -26,7 +26,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;
@@ -52,13 +52,13 @@
 
     private static final String WSPOLICY_NAMESPACE = "http://schemas.xmlsoap.org/ws/2004/09/policy";
 
-    private static final QName POLICYSET = new QName(XML_NAMESPACE_1_0, "policySet");
+    private static final QName POLICYSET = new QName(SCA_NS, "policySet");
 
-    private static final QName INTENTMAP = new QName(XML_NAMESPACE_1_0, "intentMap");
+    private static final QName INTENTMAP = new QName(SCA_NS, "intentMap");
 
-    private static final QName QUALIFIER = new QName(XML_NAMESPACE_1_0, "qualifier");
+    private static final QName QUALIFIER = new QName(SCA_NS, "qualifier");
 
-    private static final QName POLICYSETREFERENCE = new QName(XML_NAMESPACE_1_0, "policySetReference");
+    private static final QName POLICYSETREFERENCE = new QName(SCA_NS, "policySetReference");
 
     private static final QName WSPOLICYATTACHMENT = new QName(WSPOLICY_NAMESPACE, "PolicyAttachment");
 
@@ -80,10 +80,10 @@
         String name = reader.getAttributeValue(null, "name");
         String provides = reader.getAttributeValue(null, "provides");
         String appliesTo = reader.getAttributeValue(null, "appliesTo");
-        PolicySet policySet = new PolicySet(new QName(XML_NAMESPACE_1_0, name), parseIntentName(provides));
+        PolicySet policySet = new PolicySet(new QName(SCA_NS, name), parseIntentName(provides));
         String[] appliesToArtifact = split(appliesTo);
         for (String artifact : appliesToArtifact) {
-            policySet.addAppliedArtifacts(new QName(XML_NAMESPACE_1_0, artifact));
+            policySet.addAppliedArtifacts(new QName(SCA_NS, artifact));
         }
         while (true) {
             switch (reader.next()) {
@@ -114,7 +114,7 @@
         assert POLICYSETREFERENCE.equals(reader.getName());
         String name = reader.getAttributeValue(null, "name");
         LoaderUtil.skipToEndElement(reader);
-        return new PolicySetReference(new QName(XML_NAMESPACE_1_0, name));
+        return new PolicySetReference(new QName(SCA_NS, name));
     }
 
     private IntentMap loadIntentMap(XMLStreamReader reader, DeploymentContext deploymentContext)

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java Tue Feb 27 22:49:45 2007
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.core.loader;
 
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+import static org.osoa.sca.Constants.SCA_NS;
 
 import java.util.List;
 
@@ -56,7 +56,7 @@
     public static final String DEFAULT_SCHEMA_NS = "http://www.w3.org/2001/XMLSchema";
     public static final char COLON = ':';
 
-    public static final QName PROPERTY = new QName(XML_NAMESPACE_1_0, "property");
+    public static final QName PROPERTY = new QName(SCA_NS, "property");
     private final DocumentBuilder documentBuilder;
 
     @Constructor( {"registry"})

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.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.osoa.sca.annotations.Constructor;
 
 import org.apache.tuscany.spi.annotation.Autowire;
@@ -47,7 +47,7 @@
  * @version $Rev$ $Date$
  */
 public class ReferenceLoader extends LoaderExtension<ReferenceDefinition> {
-    public static final QName REFERENCE = new QName(XML_NAMESPACE_1_0, "reference");
+    public static final QName REFERENCE = new QName(SCA_NS, "reference");
 
     @Constructor
     public ReferenceLoader(@Autowire LoaderRegistry registry) {

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java Tue Feb 27 22:49:45 2007
@@ -26,7 +26,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;
@@ -48,8 +48,8 @@
  * @version $Rev$ $Date$
  */
 public class ServiceLoader extends LoaderExtension<ServiceDefinition> {
-    private static final QName SERVICE = new QName(XML_NAMESPACE_1_0, "service");
-    private static final QName REFERENCE = new QName(XML_NAMESPACE_1_0, "reference");
+    private static final QName SERVICE = new QName(SCA_NS, "service");
+    private static final QName REFERENCE = new QName(SCA_NS, "reference");
 
     @Constructor
     public ServiceLoader(@Autowire LoaderRegistry registry) {

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java?view=diff&rev=512626&r1=512625&r2=512626
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java Tue Feb 27 22:49:45 2007
@@ -26,7 +26,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;
@@ -45,9 +45,9 @@
  * @version $Rev: 465084 $ $Date: 2006-10-18 04:00:49 +0530 (Wed, 18 Oct 2006) $
  */
 public class WireLoader extends LoaderExtension<WireDefinition> {
-    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");
 
     @Constructor({"registry"})
     public WireLoader(@Autowire LoaderRegistry registry) {

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/MockFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/MockFactory.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/component/scope/MockFactory.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/MockFactory.java Tue Feb 27 22:49:45 2007
@@ -67,7 +67,7 @@
         Class[] interfaces = targetClass.getInterfaces();
         EagerInit eager = targetClass.getAnnotation(EagerInit.class);
         if (eager != null) {
-            sourceConfig.setInitLevel(eager.value());
+            sourceConfig.setInitLevel(50);
         }
 
         Method setter = null;
@@ -118,7 +118,7 @@
         configuration.setInstanceFactory(new PojoObjectFactory(clazz.getConstructor()));
         EagerInit eager = clazz.getAnnotation(EagerInit.class);
         if (eager != null) {
-            configuration.setInitLevel(eager.value());
+            configuration.setInitLevel(50);
         }
         Method[] methods = clazz.getMethods();
         for (Method method : methods) {

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConversationalIntrospectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConversationalIntrospectionTestCase.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/idl/java/ConversationalIntrospectionTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConversationalIntrospectionTestCase.java Tue Feb 27 22:49:45 2007
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.core.idl.java;
 
-import org.osoa.sca.annotations.EndConversation;
+import org.osoa.sca.annotations.EndsConversation;
 import org.osoa.sca.annotations.Scope;
 
 import org.apache.tuscany.spi.idl.InvalidConversationalOperationException;
@@ -64,14 +64,14 @@
     private interface Foo {
         void operation();
 
-        @EndConversation
+        @EndsConversation
         void endOperation();
     }
 
     private interface BadFoo {
         void operation();
 
-        @EndConversation
+        @EndsConversation
         void endOperation();
     }
 

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/ImplementationCompositeLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/ImplementationCompositeLoaderTestCase.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/composite/ImplementationCompositeLoaderTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/ImplementationCompositeLoaderTestCase.java Tue Feb 27 22:49:45 2007
@@ -25,7 +25,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.CompositeClassLoader;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
@@ -46,7 +46,7 @@
  * @version $Rev$ $Date$
  */
 public class ImplementationCompositeLoaderTestCase extends TestCase {
-    private static final QName IMPLEMENTATION_COMPOSITE = new QName(XML_NAMESPACE_1_0, "implementation.composite");
+    private static final QName IMPLEMENTATION_COMPOSITE = new QName(SCA_NS, "implementation.composite");
 
     private ClassLoader cl;
     private ImplementationCompositeLoader loader;

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorPropertyTestCase.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/ConstructorPropertyTestCase.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/ConstructorPropertyTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorPropertyTestCase.java Tue Feb 27 22:49:45 2007
@@ -121,7 +121,7 @@
     private static class Foo {
 
         @org.osoa.sca.annotations.Constructor()
-        public Foo(@Property(name = "myProp", required = "true") String prop) {
+        public Foo(@Property(name = "myProp", required = true) String prop) {
 
         }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org