You are viewing a plain text version of this content. The canonical link for it is here.
Posted to nuvem-commits@incubator.apache.org by lr...@apache.org on 2010/09/13 16:32:59 UTC
svn commit: r996594 - in /incubator/nuvem/trunk: nuvem-google/pom.xml
store-catalog-appengine-webapp/pom.xml store-merger-appengine-webapp/pom.xml
Author: lresende
Date: Mon Sep 13 16:32:58 2010
New Revision: 996594
URL: http://svn.apache.org/viewvc?rev=996594&view=rev
Log:
Tweaking pom to have proper GAE dependencies to avoid runtime issues
Modified:
incubator/nuvem/trunk/nuvem-google/pom.xml
incubator/nuvem/trunk/store-catalog-appengine-webapp/pom.xml
incubator/nuvem/trunk/store-merger-appengine-webapp/pom.xml
Modified: incubator/nuvem/trunk/nuvem-google/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/pom.xml?rev=996594&r1=996593&r2=996594&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/pom.xml (original)
+++ incubator/nuvem/trunk/nuvem-google/pom.xml Mon Sep 13 16:32:58 2010
@@ -7,17 +7,17 @@
* 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.
+ * under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<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>
@@ -44,21 +44,21 @@
<version>${pom.version}</version>
<type>pom</type>
</dependency>
-
+
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api</artifactId>
- <version>1.3.1</version>
+ <version>1.3.7</version>
<scope>provided</scope>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-impl</artifactId>
<version>${tuscany.version}</version>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -66,7 +66,7 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
@@ -83,9 +83,9 @@
<classpathContainer>com.google.appengine.eclipse.core.GAE_CONTAINER</classpathContainer>
</classpathContainers>
</configuration>
- </plugin>
- </plugins>
- </build>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: incubator/nuvem/trunk/store-catalog-appengine-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/store-catalog-appengine-webapp/pom.xml?rev=996594&r1=996593&r2=996594&view=diff
==============================================================================
--- incubator/nuvem/trunk/store-catalog-appengine-webapp/pom.xml (original)
+++ incubator/nuvem/trunk/store-catalog-appengine-webapp/pom.xml Mon Sep 13 16:32:58 2010
@@ -7,15 +7,15 @@
* 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.
+ * under the License.
-->
<project>
<modelVersion>4.0.0</modelVersion>
@@ -36,7 +36,7 @@
<artifactId>store-assets</artifactId>
<version>${pom.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
@@ -49,7 +49,7 @@
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
@@ -65,15 +65,29 @@
<exclusions>
<exclusion>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-databinding-jaxb</artifactId>
+ <artifactId>tuscany-databinding-jaxb</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-interface-java-jaxws</artifactId>
+ <artifactId>tuscany-interface-java-jaxws</artifactId>
</exclusion>
</exclusions>
- </dependency>
-
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.appengine</groupId>
+ <artifactId>appengine-api</artifactId>
+ <version>1.3.7</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!--dependency>
+ <groupId>com.google.appengine</groupId>
+ <artifactId>appengine-sdk</artifactId>
+ <version>1.3.7</version>
+ <type>zip</type>
+ </dependency-->
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -81,12 +95,12 @@
<scope>provided</scope>
</dependency>
</dependencies>
-
+
<build>
<finalName>${artifactId}</finalName>
<sourceDirectory>src</sourceDirectory>
<outputDirectory>war/WEB-INF/classes</outputDirectory>
-
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -95,7 +109,7 @@
<sourceIncludes>
<sourceInclude>**/*</sourceInclude>
</sourceIncludes>
-
+
<projectnatures>
<projectnature>org.eclipse.jdt.core.javanature</projectnature>
<projectnature>com.google.appengine.eclipse.core.gaeNature</projectnature>
@@ -141,7 +155,7 @@
<warSourceDirectory>war</warSourceDirectory>
</configuration>
</plugin>
- </plugins>
+ </plugins>
</build>
</project>
Modified: incubator/nuvem/trunk/store-merger-appengine-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/store-merger-appengine-webapp/pom.xml?rev=996594&r1=996593&r2=996594&view=diff
==============================================================================
--- incubator/nuvem/trunk/store-merger-appengine-webapp/pom.xml (original)
+++ incubator/nuvem/trunk/store-merger-appengine-webapp/pom.xml Mon Sep 13 16:32:58 2010
@@ -7,15 +7,15 @@
* 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.
+ * under the License.
-->
<project>
<modelVersion>4.0.0</modelVersion>
@@ -87,6 +87,20 @@
</dependency>
<dependency>
+ <groupId>com.google.appengine</groupId>
+ <artifactId>appengine-api</artifactId>
+ <version>1.3.7</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!--dependency>
+ <groupId>com.google.appengine</groupId>
+ <artifactId>appengine-sdk</artifactId>
+ <version>1.3.7</version>
+ <type>zip</type>
+ </dependency-->
+
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>