Author: zoe
Date: Tue Jun 29 15:39:42 2010
New Revision: 959011
URL: http://svn.apache.org/viewvc?rev=959011&view=rev
Log:
ARIES-345 Fixing tutorial build
Modified:
incubator/aries/trunk/tutorials/blueprint/pom.xml
incubator/aries/trunk/tutorials/blueprint/tutorial-assembly/src/main/docs/instructions.html
incubator/aries/trunk/tutorials/blueprint/tutorial-modules/greeter-api/pom.xml
incubator/aries/trunk/tutorials/blueprint/tutorial-modules/greeter-client-blueprint/pom.xml
incubator/aries/trunk/tutorials/blueprint/tutorial-modules/greeter-client-osgi/pom.xml
incubator/aries/trunk/tutorials/blueprint/tutorial-modules/greeter-server-blueprint/pom.xml
incubator/aries/trunk/tutorials/blueprint/tutorial-modules/greeter-server-osgi/pom.xml
incubator/aries/trunk/tutorials/blueprint/tutorial-modules/pom.xml
Modified: incubator/aries/trunk/tutorials/blueprint/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/tutorials/blueprint/pom.xml?rev=959011&r1=959010&r2=959011&view=diff
==============================================================================
--- incubator/aries/trunk/tutorials/blueprint/pom.xml (original)
+++ incubator/aries/trunk/tutorials/blueprint/pom.xml Tue Jun 29 15:39:42 2010
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries.tutorials</groupId>
<artifactId>tutorials</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified:
incubator/aries/trunk/tutorials/blueprint/tutorial-assembly/src/main/docs/instructions.html
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/tutorials/blueprint/tutorial-assembly/src/main/docs/instructions.html?rev=959011&r1=959010&r2=959011&view=diff
==============================================================================
---
incubator/aries/trunk/tutorials/blueprint/tutorial-assembly/src/main/docs/instructions.html
(original)
+++
incubator/aries/trunk/tutorials/blueprint/tutorial-assembly/src/main/docs/instructions.html
Tue Jun 29 15:39:42 2010
@@ -221,8 +221,8 @@ your blueprint xml file:</p>
changed.</p>
<p>To build the code, run the script build.sh (or build.bat) in the
-[toplevel]/scripts directory. If you are using your own Maven repository
-the commands are:</p>
+[toplevel]/scripts directory.
+The commands are:</p>
<div class=code>./build.sh org.apache.aries.tutorials.blueprint.greeter.api<br>
./build.sh org.apache.aries.tutorials.blueprint.greeter.client.osgi<br>
./build.sh org.apache.aries.tutorials.blueprint.greeter.server.osgi<br>
@@ -335,7 +335,7 @@ from the class constructor. Like this:
<p>The last step is to modify the blueprint xml to reflect these
changes. Edit the blueprint xml you created earlier:</p>
<div class=code>
-[toplevel]/source/org.apache.aries.tutorials.blueprint.greeter.client.osgi/src/main/resources/OSGI_INF/blueprint/blueprint.xml
+[toplevel]/source/org.apache.aries.tutorials.blueprint.greeter.client.osgi/src/main/resources/OSGI-INF/blueprint/blueprint.xml
</div>
<p>Remove the following line from the blueprint xml</p>
<div class=code><argument ref="blueprintBundleContext"/></div>
Modified:
incubator/aries/trunk/tutorials/blueprint/tutorial-modules/greeter-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/tutorials/blueprint/tutorial-modules/greeter-api/pom.xml?rev=959011&r1=959010&r2=959011&view=diff
==============================================================================
---
incubator/aries/trunk/tutorials/blueprint/tutorial-modules/greeter-api/pom.xml
(original)
+++
incubator/aries/trunk/tutorials/blueprint/tutorial-modules/greeter-api/pom.xml
Tue Jun 29 15:39:42 2010
@@ -24,7 +24,7 @@
<artifactId>org.apache.aries.tutorials.blueprint.greeter.api</artifactId>
<packaging>bundle</packaging>
<name>Greeter API</name>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<description>
This is the API for the greeter service. It has no parent because it
Modified:
incubator/aries/trunk/tutorials/blueprint/tutorial-modules/greeter-client-blueprint/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/tutorials/blueprint/tutorial-modules/greeter-client-blueprint/pom.xml?rev=959011&r1=959010&r2=959011&view=diff
==============================================================================
---
incubator/aries/trunk/tutorials/blueprint/tutorial-modules/greeter-client-blueprint/pom.xml
(original)
+++
incubator/aries/trunk/tutorials/blueprint/tutorial-modules/greeter-client-blueprint/pom.xml
Tue Jun 29 15:39:42 2010
@@ -24,7 +24,7 @@
<artifactId>org.apache.aries.tutorials.blueprint.greeter.client.blueprint</artifactId>
<packaging>bundle</packaging>
<name>Greeter Blueprint Client</name>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<description>
This is the final client for the greeter service. Students working
through the tutorial
@@ -62,7 +62,7 @@
<dependency>
<groupId>org.apache.aries.tutorials.blueprint</groupId>
<artifactId>org.apache.aries.tutorials.blueprint.greeter.api</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
Modified:
incubator/aries/trunk/tutorials/blueprint/tutorial-modules/greeter-client-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/tutorials/blueprint/tutorial-modules/greeter-client-osgi/pom.xml?rev=959011&r1=959010&r2=959011&view=diff
==============================================================================
---
incubator/aries/trunk/tutorials/blueprint/tutorial-modules/greeter-client-osgi/pom.xml
(original)
+++
incubator/aries/trunk/tutorials/blueprint/tutorial-modules/greeter-client-osgi/pom.xml
Tue Jun 29 15:39:42 2010
@@ -24,7 +24,7 @@
<artifactId>org.apache.aries.tutorials.blueprint.greeter.client.osgi</artifactId>
<packaging>bundle</packaging>
<name>Greeter OSGi Client</name>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<description>
This is the initial client for the greeter service. Students working
through the tutorial
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.aries.tutorials.blueprint</groupId>
<artifactId>org.apache.aries.tutorials.blueprint.greeter.api</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified:
incubator/aries/trunk/tutorials/blueprint/tutorial-modules/greeter-server-blueprint/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/tutorials/blueprint/tutorial-modules/greeter-server-blueprint/pom.xml?rev=959011&r1=959010&r2=959011&view=diff
==============================================================================
---
incubator/aries/trunk/tutorials/blueprint/tutorial-modules/greeter-server-blueprint/pom.xml
(original)
+++
incubator/aries/trunk/tutorials/blueprint/tutorial-modules/greeter-server-blueprint/pom.xml
Tue Jun 29 15:39:42 2010
@@ -24,7 +24,7 @@
<artifactId>org.apache.aries.tutorials.blueprint.greeter.server.blueprint</artifactId>
<packaging>bundle</packaging>
<name>Greeter Blueprint Server</name>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<description>
This is the final greeter service. Students working through the
tutorial
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.aries.tutorials.blueprint</groupId>
<artifactId>org.apache.aries.tutorials.blueprint.greeter.api</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified:
incubator/aries/trunk/tutorials/blueprint/tutorial-modules/greeter-server-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/tutorials/blueprint/tutorial-modules/greeter-server-osgi/pom.xml?rev=959011&r1=959010&r2=959011&view=diff
==============================================================================
---
incubator/aries/trunk/tutorials/blueprint/tutorial-modules/greeter-server-osgi/pom.xml
(original)
+++
incubator/aries/trunk/tutorials/blueprint/tutorial-modules/greeter-server-osgi/pom.xml
Tue Jun 29 15:39:42 2010
@@ -23,7 +23,7 @@
<artifactId>org.apache.aries.tutorials.blueprint.greeter.server.osgi</artifactId>
<packaging>bundle</packaging>
<name>Greeter OSGi Server</name>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<description>
This is the initial greeter service project. Students working through
the tutorial
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.aries.tutorials.blueprint</groupId>
<artifactId>org.apache.aries.tutorials.blueprint.greeter.api</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified: incubator/aries/trunk/tutorials/blueprint/tutorial-modules/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/tutorials/blueprint/tutorial-modules/pom.xml?rev=959011&r1=959010&r2=959011&view=diff
==============================================================================
--- incubator/aries/trunk/tutorials/blueprint/tutorial-modules/pom.xml
(original)
+++ incubator/aries/trunk/tutorials/blueprint/tutorial-modules/pom.xml Tue Jun
29 15:39:42 2010
@@ -21,14 +21,14 @@
<parent>
<groupId>org.apache.aries.tutorials.blueprint</groupId>
<artifactId>blueprint</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.tutorials.blueprint</groupId>
<artifactId>tutorial-modules</artifactId>
<name>Greeter Modules</name>
<packaging>pom</packaging>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<modules>
<module>greeter-api</module>
