Author: fmoga
Date: Mon Jul 18 15:13:44 2011
New Revision: 1147924
URL: http://svn.apache.org/viewvc?rev=1147924&view=rev
Log:
Merge comet binding dependency changes into beta3
Modified:
tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/all/src/main/release/bin/
(props changed)
tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/all/src/main/release/bin/LICENSE
tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-comet-runtime/
(props changed)
tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-comet-runtime/pom.xml
Propchange:
tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/all/src/main/release/bin/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Jul 18 15:13:44 2011
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/distribution/all/src/main/release/bin:671193
+/tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin:1147891
Modified:
tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/all/src/main/release/bin/LICENSE
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/all/src/main/release/bin/LICENSE?rev=1147924&r1=1147923&r2=1147924&view=diff
==============================================================================
---
tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/all/src/main/release/bin/LICENSE
(original)
+++
tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/all/src/main/release/bin/LICENSE
Mon Jul 18 15:13:44 2011
@@ -688,13 +688,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
================================================================================
The jars;
-atmosphere-annotations-0.8-SNAPSHOT.jar,
-atmosphere-compat-jbossweb-0.8-SNAPSHOT.jar,
-atmosphere-compat-tomcat-0.8-SNAPSHOT.jar,
-atmosphere-compat-weblogic-0.8-SNAPSHOT.jar,
-atmosphere-jersey-0.8-SNAPSHOT.jar,
-atmosphere-runtime-0.8-SNAPSHOT.jar,
-atmosphere-ping-0.8-SNAPSHOT.jar,
+atmosphere-annotations-0.7.2.jar,
+atmosphere-compat-jbossweb-0.7.2.jar,
+atmosphere-compat-tomcat-0.7.2.jar,
+atmosphere-compat-weblogic-0.7.2.jar,
+atmosphere-jersey-0.7.2.jar,
+atmosphere-runtime-0.7.2.jar,
+atmosphere-ping-0.7.2.jar,
jersey-core-1.6.jar,
jersey-server-1.6.jar,
jstl-1.1.2.jar,
Propchange:
tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-comet-runtime/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Jul 18 15:13:44 2011
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/binding-comet-runtime:671193
+/tuscany/sca-java-2.x/trunk/modules/binding-comet-runtime:1147891
Modified:
tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-comet-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-comet-runtime/pom.xml?rev=1147924&r1=1147923&r2=1147924&view=diff
==============================================================================
---
tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-comet-runtime/pom.xml
(original)
+++
tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-comet-runtime/pom.xml
Mon Jul 18 15:13:44 2011
@@ -1,90 +1,90 @@
-<?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>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-modules</artifactId>
- <version>2.0-Beta3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-comet-runtime</artifactId>
- <name>Apache Tuscany SCA Comet Binding Runtime</name>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-base-runtime-pom</artifactId>
- <type>pom</type>
- <version>2.0-Beta3-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.26</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.atmosphere</groupId>
- <artifactId>atmosphere-jersey</artifactId>
- <version>0.8-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-
- <repositories>
- <repository>
- <id>gson-googlecode-repository</id>
-
<url>http://google-gson.googlecode.com/svn/mavenrepo</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>sonatype-releases</id>
-
<url>https://oss.sonatype.org/content/repositories/releases/</url>
- </repository>
- <repository>
- <id>sonatype-snapshots</id>
-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
- </repository>
-</repositories>
-
-</project>
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-modules</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-comet-runtime</artifactId>
+ <name>Apache Tuscany SCA Comet Binding Runtime</name>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime-pom</artifactId>
+ <type>pom</type>
+ <version>2.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.26</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.atmosphere</groupId>
+ <artifactId>atmosphere-jersey</artifactId>
+ <version>0.7.2</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>gson-googlecode-repository</id>
+
<url>http://google-gson.googlecode.com/svn/mavenrepo</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>sonatype-releases</id>
+
<url>https://oss.sonatype.org/content/repositories/releases/</url>
+ </repository>
+ <repository>
+ <id>sonatype-snapshots</id>
+
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+ </repository>
+</repositories>
+
+</project>
