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 2011/07/21 10:21:17 UTC
svn commit: r1149065 - in
/tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started: ./
helloworld-ant/ helloworld-jaxrs/ helloworld-jsonrpc/ helloworld-scaclient/
helloworld-spring/ helloworld-webapp/ helloworld-webservice/ helloworld/
Author: antelder
Date: Thu Jul 21 08:21:14 2011
New Revision: 1149065
URL: http://svn.apache.org/viewvc?rev=1149065&view=rev
Log:
Merge trunk change r1148679 to add snapshot repos to the sample pom.xml's to beta3
Modified:
tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-ant/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-ant/pom.xml
tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-jaxrs/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-jaxrs/pom.xml
tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-jsonrpc/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-jsonrpc/pom.xml
tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-scaclient/pom.xml
tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-spring/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-spring/pom.xml
tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/pom.xml
tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webservice/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webservice/pom.xml
tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld/pom.xml
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jul 21 08:21:14 2011
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/samples/getting-started:671193
+/tuscany/sca-java-2.x/trunk/samples/getting-started:1148679
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 08:21:14 2011
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/samples/getting-started/helloworld-contribution:671193
+/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld:1148679
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-ant/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 08:21:14 2011
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/samples/getting-started/helloworld-contribution:671193
+/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-ant:1148679
Modified: tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-ant/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-ant/pom.xml?rev=1149065&r1=1149064&r2=1149065&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-ant/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-ant/pom.xml Thu Jul 21 08:21:14 2011
@@ -37,6 +37,20 @@
<tuscany.version>${project.version}</tuscany.version>
</properties>
+ <!-- ASF repositories so sample can be built from SVN without building trunk-->
+ <repositories><repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases><enabled>false</enabled></releases>
+ </repository></repositories>
+ <pluginRepositories><pluginRepository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases><enabled>false</enabled></releases>
+ </pluginRepository></pluginRepositories>
+
<dependencies>
<dependency>
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-jaxrs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 08:21:14 2011
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/samples/getting-started/helloworld-contribution:671193
+/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-jaxrs:1148679
Modified: tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-jaxrs/pom.xml?rev=1149065&r1=1149064&r2=1149065&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-jaxrs/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-jaxrs/pom.xml Thu Jul 21 08:21:14 2011
@@ -36,6 +36,20 @@
<tuscany.version>${project.version}</tuscany.version>
</properties>
+ <!-- ASF repositories so sample can be built from SVN without building trunk-->
+ <repositories><repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases><enabled>false</enabled></releases>
+ </repository></repositories>
+ <pluginRepositories><pluginRepository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases><enabled>false</enabled></releases>
+ </pluginRepository></pluginRepositories>
+
<dependencies>
<dependency>
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-jsonrpc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 08:21:14 2011
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/samples/getting-started/helloworld-contribution:671193
+/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-jsonrpc:1148679
Modified: tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-jsonrpc/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-jsonrpc/pom.xml?rev=1149065&r1=1149064&r2=1149065&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-jsonrpc/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-jsonrpc/pom.xml Thu Jul 21 08:21:14 2011
@@ -37,6 +37,20 @@
<tuscany.version>${project.version}</tuscany.version>
</properties>
+ <!-- ASF repositories so sample can be built from SVN without building trunk-->
+ <repositories><repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases><enabled>false</enabled></releases>
+ </repository></repositories>
+ <pluginRepositories><pluginRepository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases><enabled>false</enabled></releases>
+ </pluginRepository></pluginRepositories>
+
<dependencies>
<dependency>
Modified: tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-scaclient/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-scaclient/pom.xml?rev=1149065&r1=1149064&r2=1149065&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-scaclient/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-scaclient/pom.xml Thu Jul 21 08:21:14 2011
@@ -37,6 +37,20 @@
<tuscany.version>${project.version}</tuscany.version>
</properties>
+ <!-- ASF repositories so sample can be built from SVN without building trunk-->
+ <repositories><repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases><enabled>false</enabled></releases>
+ </repository></repositories>
+ <pluginRepositories><pluginRepository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases><enabled>false</enabled></releases>
+ </pluginRepository></pluginRepositories>
+
<dependencies>
<dependency>
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-spring/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 08:21:14 2011
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/samples/getting-started/helloworld-contribution:671193
+/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-spring:1148679
Modified: tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-spring/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-spring/pom.xml?rev=1149065&r1=1149064&r2=1149065&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-spring/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-spring/pom.xml Thu Jul 21 08:21:14 2011
@@ -36,6 +36,20 @@
<tuscany.version>${project.version}</tuscany.version>
</properties>
+ <!-- ASF repositories so sample can be built from SVN without building trunk-->
+ <repositories><repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases><enabled>false</enabled></releases>
+ </repository></repositories>
+ <pluginRepositories><pluginRepository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases><enabled>false</enabled></releases>
+ </pluginRepository></pluginRepositories>
+
<dependencies>
<dependency>
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 08:21:14 2011
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/unreleased/samples/helloworld-webapp:671193
+/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp:1148679
Modified: tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/pom.xml?rev=1149065&r1=1149064&r2=1149065&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/pom.xml Thu Jul 21 08:21:14 2011
@@ -38,6 +38,20 @@
<tuscany.version>${project.version}</tuscany.version>
</properties>
+ <!-- ASF repositories so sample can be built from SVN without building trunk-->
+ <repositories><repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases><enabled>false</enabled></releases>
+ </repository></repositories>
+ <pluginRepositories><pluginRepository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases><enabled>false</enabled></releases>
+ </pluginRepository></pluginRepositories>
+
<dependencies>
<dependency>
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webservice/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 08:21:14 2011
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/samples/getting-started/helloworld-contribution:671193
+/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webservice:1148679
Modified: tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webservice/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webservice/pom.xml?rev=1149065&r1=1149064&r2=1149065&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webservice/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webservice/pom.xml Thu Jul 21 08:21:14 2011
@@ -37,6 +37,20 @@
<tuscany.version>${project.version}</tuscany.version>
</properties>
+ <!-- ASF repositories so sample can be built from SVN without building trunk-->
+ <repositories><repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases><enabled>false</enabled></releases>
+ </repository></repositories>
+ <pluginRepositories><pluginRepository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases><enabled>false</enabled></releases>
+ </pluginRepository></pluginRepositories>
+
<dependencies>
<dependency>
Modified: tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld/pom.xml?rev=1149065&r1=1149064&r2=1149065&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld/pom.xml Thu Jul 21 08:21:14 2011
@@ -36,6 +36,20 @@
<tuscany.version>${project.version}</tuscany.version>
</properties>
+ <!-- ASF repositories so sample can be built from SVN without building trunk-->
+ <repositories><repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases><enabled>false</enabled></releases>
+ </repository></repositories>
+ <pluginRepositories><pluginRepository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases><enabled>false</enabled></releases>
+ </pluginRepository></pluginRepositories>
+
<dependencies>
<dependency>