You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2010/07/23 14:07:56 UTC
svn commit: r967060 - in /tuscany/sca-java-2.x/branches/2.0-Beta1: ./
distribution/ distribution/all/src/main/components/
distribution/all/src/main/release/bin/ features/ features/api/
features/webapp/ itest/ itest/bpel/ itest/contribution-import-expor...
Author: antelder
Date: Fri Jul 23 12:07:51 2010
New Revision: 967060
URL: http://svn.apache.org/viewvc?rev=967060&view=rev
Log:
Remove mergeinfo properties. Not totaly sure how this actually works so try it out here on the beta1 branch first
Modified:
tuscany/sca-java-2.x/branches/2.0-Beta1/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/BUILDING (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/CHANGES (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/LICENSE (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/NOTICE (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/README (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/RELEASE_NOTES (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/distribution/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/distribution/all/src/main/components/bin-common.xml (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/distribution/all/src/main/components/bin-modules.xml (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/distribution/all/src/main/components/bin-samples.xml (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/distribution/all/src/main/release/bin/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/distribution/all/src/main/release/bin/INSTALL (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/distribution/all/src/main/release/bin/LICENSE (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/distribution/all/src/main/release/bin/NOTICE (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/features/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/features/api/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/features/webapp/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/itest/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/itest/bpel/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/itest/contribution-import-export/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/itest/corba/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/itest/distribution/bin-distro-unzip/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/itest/jms/args/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/itest/jms/callbacks/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/itest/jms/definitions/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/itest/jms/exceptions/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/itest/jms/noreplyto/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/itest/jms/nulls/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/itest/jms/oneway-nocf/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/itest/jms/responsecf/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/itest/jms/selectors/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/itest/jms/topics/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/itest/jms/ttl/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/itest/nodes/one-jvm-hazelcast-client/pom.xml (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/maven/maven-tuscany-plugin/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jms.xsd (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsBuilderImpl.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-atom/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-atom-js-dojo/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-atom-runtime/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-corba/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-corba-runtime/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-http/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-http-runtime/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms-runtime/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderPolicyProviderFactory.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderReferencePolicyInterceptor.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderReferencePolicyProvider.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms-runtime/src/main/resources/org/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms-runtime/src/test/resources/org/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms/src/main/resources/binding-jms-policy-validation-messages.properties (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonrpc/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonrpc-js-dojo/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonrpc-runtime/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-rmi-runtime/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-rmi-runtime/src/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingImpl.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-rss/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-rss-runtime/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RemoteBindingHelper.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws-runtime-jaxws/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/common-xml/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentImpl.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/InstanceWrapper.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImpl.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageFactoryImpl.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/NoMethodForOperationException.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorter.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainer.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainerFactory.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ScopeRegistryImpl.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainer.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainerFactory.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManagerTestCase.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorterTestCase.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/data-api/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/databinding-json/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/deployment/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultExtensionPointRegistryTestCase.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/host-corba/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/host-corba-jee/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/host-corba-jse/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/host-corba-jse-tns/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/host-webapp/LICENSE (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/host-webapp/NOTICE (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-bpel/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-bpel-runtime/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-bpel-runtime/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentModelResolver.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementationException.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceTypeException.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/TestAbstractPropertyProcessorTestCase.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-osgi-runtime/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-script/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-script-runtime/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/SCANamespaceHandlerResolver.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaNamespaceHandler.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaPropertyBeanDefinitionParser.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaReferenceBeanDefinitionParser.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaServiceBeanDefinitionParser.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-spring-sca/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-web/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-web-runtime/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-web-runtime/LICENSE (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-web-runtime/NOTICE (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-widget/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-widget-runtime/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-widget-runtime-dojo/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/BPELPartnerLinkTypeExt.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/node-api/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/node-impl-osgi/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/node-impl-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/main/resources/org/apache/tuscany/sca/node/impl/node-impl-validation-messages.properties (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/node-launcher/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/policy-logging/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/ComponentContext.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/RequestContext.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceReference.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceRuntimeException.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceUnavailableException.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AllowsPassByReference.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authentication.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Callback.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ComponentName.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Confidentiality.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Constructor.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Context.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Destroy.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EagerInit.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Init.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Integrity.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Intent.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/OneWay.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/PolicySets.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Property.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Qualifier.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Reference.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Remotable.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Scope.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Service.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/web-javascript/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/web-javascript-dojo/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/src/main/java/calculator/AddService.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/src/main/java/calculator/DivideService.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/src/main/java/calculator/SubtractService.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/src/main/resources/Calculator.composite (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-bpel/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/samples/store/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/samples/store-webapp/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jms/ (props changed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/BUILDING
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/CHANGES
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/LICENSE
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/NOTICE
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/README
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/RELEASE_NOTES
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/distribution/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/distribution/all/src/main/components/bin-common.xml
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/distribution/all/src/main/components/bin-modules.xml
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/distribution/all/src/main/components/bin-samples.xml
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/distribution/all/src/main/release/bin/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/distribution/all/src/main/release/bin/INSTALL
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/distribution/all/src/main/release/bin/LICENSE
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/distribution/all/src/main/release/bin/NOTICE
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/features/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/features/api/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/features/webapp/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/itest/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/itest/bpel/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/itest/contribution-import-export/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/itest/corba/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/itest/distribution/bin-distro-unzip/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/itest/jms/args/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/itest/jms/callbacks/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/itest/jms/definitions/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/itest/jms/exceptions/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/itest/jms/noreplyto/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/itest/jms/nulls/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/itest/jms/oneway-nocf/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/itest/jms/responsecf/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/itest/jms/selectors/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/itest/jms/topics/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/itest/jms/ttl/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/itest/nodes/one-jvm-hazelcast-client/pom.xml
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/maven/maven-tuscany-plugin/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jms.xsd
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsBuilderImpl.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-atom/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-atom-js-dojo/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-atom-runtime/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-corba/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-corba-runtime/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-http/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-http-runtime/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms-runtime/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderPolicyProviderFactory.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderReferencePolicyInterceptor.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderReferencePolicyProvider.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms-runtime/src/main/resources/org/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms-runtime/src/test/resources/org/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms/src/main/resources/binding-jms-policy-validation-messages.properties
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonrpc/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonrpc-js-dojo/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonrpc-runtime/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-rmi-runtime/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-rmi-runtime/src/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingImpl.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-rss/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-rss-runtime/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RemoteBindingHelper.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws-runtime-jaxws/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/common-xml/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentImpl.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/InstanceWrapper.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImpl.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageFactoryImpl.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/NoMethodForOperationException.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorter.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainer.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainerFactory.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ScopeRegistryImpl.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainer.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainerFactory.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManagerTestCase.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorterTestCase.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/data-api/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/databinding-json/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/deployment/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultExtensionPointRegistryTestCase.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/host-corba/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/host-corba-jee/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/host-corba-jse/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/host-corba-jse-tns/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/host-webapp/LICENSE
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/host-webapp/NOTICE
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-bpel/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-bpel-runtime/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-bpel-runtime/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentModelResolver.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementationException.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceTypeException.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/TestAbstractPropertyProcessorTestCase.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-osgi-runtime/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-script/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-script-runtime/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/SCANamespaceHandlerResolver.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaNamespaceHandler.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaPropertyBeanDefinitionParser.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaReferenceBeanDefinitionParser.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaServiceBeanDefinitionParser.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-spring-sca/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-web/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-web-runtime/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-web-runtime/LICENSE
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-web-runtime/NOTICE
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-widget/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-widget-runtime/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/implementation-widget-runtime-dojo/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/BPELPartnerLinkTypeExt.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/node-api/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/node-impl-osgi/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/node-impl-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/main/resources/org/apache/tuscany/sca/node/impl/node-impl-validation-messages.properties
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/node-launcher/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/policy-logging/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/ComponentContext.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/RequestContext.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceReference.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceRuntimeException.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceUnavailableException.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AllowsPassByReference.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authentication.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Callback.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ComponentName.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Confidentiality.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Constructor.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Context.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Destroy.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EagerInit.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Init.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Integrity.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Intent.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/OneWay.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/PolicySets.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Property.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Qualifier.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Reference.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Remotable.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Scope.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Service.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/web-javascript/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/web-javascript-dojo/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/src/main/java/calculator/AddService.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/src/main/java/calculator/DivideService.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/src/main/resources/Calculator.composite
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-bpel/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/store/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/store-webapp/
('svn:mergeinfo' removed)
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jms/
('svn:mergeinfo' removed)