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/10/25 10:46:51 UTC
svn commit: r1026973 - in
/tuscany/sca-java-2.x/trunk/modules/domain-hazelcast: ./ META-INF/
src/main/java/org/apache/tuscany/sca/binding/
src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/
src/main/resources/META-INF/services/ src/test/ja...
Author: antelder
Date: Mon Oct 25 08:46:51 2010
New Revision: 1026973
URL: http://svn.apache.org/viewvc?rev=1026973&view=rev
Log:
Merge the hazelcast modules into a single module
Added:
tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/
- copied from r1026613, tuscany/sca-java-2.x/trunk/modules/endpoint-hazelcast/
tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/
- copied from r1026613, tuscany/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/
tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/
- copied from r1026613, tuscany/sca-java-2.x/trunk/modules/endpoint-hazelcast-client/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/
tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
- copied unchanged from r1026613, tuscany/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
- copied unchanged from r1026613, tuscany/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/binding/
- copied from r1026613, tuscany/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/
tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/test/resources/client.composite
- copied unchanged from r1026613, tuscany/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/resources/client.composite
tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/test/resources/client2.composite
- copied unchanged from r1026613, tuscany/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/resources/client2.composite
tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/test/resources/service.composite
- copied unchanged from r1026613, tuscany/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/resources/service.composite
Modified:
tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/META-INF/MANIFEST.MF
tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/pom.xml
tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory
Modified: tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/META-INF/MANIFEST.MF?rev=1026973&r1=1026613&r2=1026973&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/META-INF/MANIFEST.MF (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/META-INF/MANIFEST.MF Mon Oct 25 08:46:51 2010
@@ -1,19 +1,36 @@
Manifest-Version: 1.0
SCA-Version: 1.1
-Bundle-Name: Apache Tuscany SCA Hazelcast Based EndPoint Registry
+Bundle-Name: Apache Tuscany SCA Hazelcast Based Domain
Bundle-Vendor: The Apache Software Foundation
Bundle-Version: 2.0.0
Bundle-ManifestVersion: 2
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-Description: Apache Tuscany Hazelcast Endpoint Regsitry
-Bundle-SymbolicName: org.apache.tuscany.sca.endpoint.hazelcast
+Bundle-Description: Apache Tuscany Domain Hazelcast
+Bundle-SymbolicName: org.apache.tuscany.sca.domain.hazelcast
Bundle-DocURL: http://www.apache.org/
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: com.hazelcast.config,
+ com.hazelcast.client,
com.hazelcast.core,
com.hazelcast.nio,
org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.impl;version="2.0.0",
+ org.apache.tuscany.sca.assembly.xml;version="2.0.0",
+ org.apache.tuscany.sca.binding.ws;version="2.0.0",
+ org.apache.tuscany.sca.binding.ws.wsdlgen;version="2.0.0",
+ org.apache.tuscany.sca.common.xml;version="2.0.0",
+ org.apache.tuscany.sca.context;version="2.0.0",
org.apache.tuscany.sca.core;version="2.0.0",
- org.apache.tuscany.sca.runtime;version="2.0.0"
+ org.apache.tuscany.sca.databinding.xml;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
+ org.oasisopen.sca,
+ org.oasisopen.sca.annotation,
+ org.w3c.dom,
+ org.xml.sax
Export-Package: org.apache.tuscany.sca.endpoint.hazelcast;version="2.0.0";
uses:="org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.core"
+
Modified: tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/pom.xml?rev=1026973&r1=1026613&r2=1026973&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/pom.xml Mon Oct 25 08:46:51 2010
@@ -25,7 +25,7 @@
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>tuscany-endpoint-hazelcast</artifactId>
+ <artifactId>tuscany-domain-hazelcast</artifactId>
<name>Apache Tuscany SCA EndPoint Registry using Hazelcast</name>
<dependencies>
@@ -35,28 +35,35 @@
<version>1.8.3</version>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-core-spi</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-core</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-deployment</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>test</scope>
+ <groupId>com.hazelcast</groupId>
+ <artifactId>hazelcast-client</artifactId>
+ <version>1.8.3</version>
</dependency>
+ <!-- dependency>
+ <groupId>com.hazelcast</groupId>
+ <artifactId>hazelcast-all</artifactId>
+ <version>1.9</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.hazelcast</groupId>
+ <artifactId>hazelcast</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.hazelcast</groupId>
+ <artifactId>hazelcast-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.hazelcast</groupId>
+ <artifactId>hazelcast-hibernate</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <artifactId>tuscany-base-runtime-pom</artifactId>
+ <type>pom</type>
<version>2.0-SNAPSHOT</version>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory?rev=1026973&r1=1026613&r2=1026973&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory Mon Oct 25 08:46:51 2010
@@ -15,3 +15,4 @@
# specific language governing permissions and limitations
# under the License.
org.apache.tuscany.sca.endpoint.hazelcast.HazelcastDomainRegistryFactory;ranking=100
+org.apache.tuscany.sca.endpoint.hazelcast.client.HazelcastClientDomainRegistryFactory;ranking=100