NUVEM-13 - Introduced a new module named nuvem-sca-config to isolate all Tuscany dependencies. Some one can use tuscany to configure Nuvem components by making this module as a dependency.
git-svn-id: https://svn.apache.org/repos/asf/incubator/nuvem/trunk@1296945 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/nuvem-amazon/pom.xml b/nuvem-amazon/pom.xml
index ad3da3c..4506148 100644
--- a/nuvem-amazon/pom.xml
+++ b/nuvem-amazon/pom.xml
@@ -31,13 +31,13 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId>
- <version>1.1.5</version>
+ <version>${aws.java-sdk.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.1</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
diff --git a/nuvem-google/pom.xml b/nuvem-google/pom.xml
index 575727f..7b608c3 100644
--- a/nuvem-google/pom.xml
+++ b/nuvem-google/pom.xml
@@ -76,40 +76,33 @@
<dependency>
<groupId>net.sf.jsr107cache</groupId>
<artifactId>jsr107cache</artifactId>
- <version>1.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>${tuscany.version}</version>
- <scope>test</scope>
+ <version>${jsr107cache.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.1</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>3.0</version>
+ <version>${easymock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
+ <version>${commons.collections.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <version>${servlet.api.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/nuvem-samples/pom.xml b/nuvem-samples/pom.xml
index ded8443..e043b5b 100644
--- a/nuvem-samples/pom.xml
+++ b/nuvem-samples/pom.xml
@@ -39,5 +39,12 @@
<module>store-merger-appengine-webapp</module>
<module>store-standalone</module>
</modules>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.nuvem</groupId>
+ <artifactId>nuvem-sca-config</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
diff --git a/nuvem-samples/store-appengine-webapp/war/WEB-INF/web.xml b/nuvem-samples/store-appengine-webapp/war/WEB-INF/web.xml
index 85f6e13..169fcc8 100644
--- a/nuvem-samples/store-appengine-webapp/war/WEB-INF/web.xml
+++ b/nuvem-samples/store-appengine-webapp/war/WEB-INF/web.xml
@@ -25,7 +25,7 @@
<!-- Tuscany Filter -->
<filter>
<filter-name>tuscany</filter-name>
- <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
+ <filter-class>org.apache.nuvem.cloud.config.sca.NuvemSCAConfigServletFilter</filter-class>
</filter>
<filter-mapping>
diff --git a/nuvem-sca-config/pom.xml b/nuvem-sca-config/pom.xml
new file mode 100644
index 0000000..b0ecba0
--- /dev/null
+++ b/nuvem-sca-config/pom.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.nuvem</groupId>
+ <artifactId>nuvem</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>nuvem-sca-config</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <name>Apache Nuvem Cloud API</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-assembly</artifactId>
+ <version>${tuscany.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>${tuscany.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>${tuscany.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-domain-node</artifactId>
+ <version>${tuscany.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-webapp</artifactId>
+ <version>${tuscany.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${servlet.api.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
+
diff --git a/nuvem-sca-config/src/main/java/org/apache/nuvem/cloud/config/sca/NuvemSCAConfigServletFilter.java b/nuvem-sca-config/src/main/java/org/apache/nuvem/cloud/config/sca/NuvemSCAConfigServletFilter.java
new file mode 100644
index 0000000..01185dd
--- /dev/null
+++ b/nuvem-sca-config/src/main/java/org/apache/nuvem/cloud/config/sca/NuvemSCAConfigServletFilter.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.nuvem.cloud.config.sca;
+
+import org.apache.tuscany.sca.host.webapp.TuscanyServletFilter;
+
+public class NuvemSCAConfigServletFilter extends TuscanyServletFilter {
+
+}
diff --git a/nuvem-standalone/pom.xml b/nuvem-standalone/pom.xml
index f47b3c2..f815c5c 100644
--- a/nuvem-standalone/pom.xml
+++ b/nuvem-standalone/pom.xml
@@ -31,41 +31,16 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-assembly</artifactId>
- <version>${tuscany.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>${tuscany.version}</version>
+ <groupId>org.apache.nuvem</groupId>
+ <artifactId>nuvem-sca-config</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>${tuscany.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>${tuscany.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-domain-node</artifactId>
- <version>${tuscany.version}</version>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.1</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
@@ -73,61 +48,61 @@
<groupId>org.apache.vysper</groupId>
<artifactId>vysper-server</artifactId>
<type>pom</type>
- <version>1.0.0-SNAPSHOT</version>
+ <version>${vysper.version}</version>
</dependency>
<dependency>
<groupId>org.apache.vysper</groupId>
<artifactId>vysper-core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>${vysper.version}</version>
</dependency>
<dependency>
<groupId>org.apache.vysper</groupId>
<artifactId>vysper-extensions</artifactId>
<type>pom</type>
- <version>1.0.0-SNAPSHOT</version>
+ <version>${vysper.version}</version>
</dependency>
<dependency>
<groupId>me.prettyprint</groupId>
<artifactId>hector-core</artifactId>
- <version>0.8.0-2</version>
+ <version>${hector.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
+ <version>${slf4j.api.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.5.3</version>
+ <version>${slf4j.impl.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.5.3</version>
+ <version>${slf4j.impl.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.1</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jivesoftware</groupId>
<artifactId>smackx</artifactId>
- <version>3.1.0</version>
+ <version>${smackx.version}</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>3.0</version>
+ <version>${easymock.version}</version>
<scope>test</scope>
</dependency>
diff --git a/pom.xml b/pom.xml
index 3d385eb..7a0eda0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,6 +93,18 @@
<maven.gae.plugin.version>0.8.2</maven.gae.plugin.version>
<gae.version>1.5.0.1</gae.version>
<datanucleus.version>1.1.5</datanucleus.version>
+ <junit.version>4.8.1</junit.version>
+ <commons.lang.version>2.2</commons.lang.version>
+ <aws.java-sdk.version>1.1.5</aws.java-sdk.version>
+ <jsr107cache.version>1.1</jsr107cache.version>
+ <easymock.version>3.0</easymock.version>
+ <commons.collections.version>3.2.1</commons.collections.version>
+ <servlet.api.version>2.5</servlet.api.version>
+ <vysper.version>1.0.0-SNAPSHOT</vysper.version>
+ <hector.version>0.8.0-2</hector.version>
+ <slf4j.api.version>1.6.1</slf4j.api.version>
+ <slf4j.impl.version>1.5.3</slf4j.impl.version>
+ <smackx.version>3.1.0</smackx.version>
</properties>
@@ -198,6 +210,7 @@
<module>nuvem-ibm</module>
<module>nuvem-azure</module>
<module>nuvem-amazon</module>
+ <module>nuvem-sca-config</module>
<module>nuvem-samples</module>
</modules>
</profile>
