You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2010/10/04 11:37:23 UTC
svn commit: r1004169 - in /tuscany/sca-java-2.x/trunk/samples/learning-more:
distributed-osgi/ distributed-osgi/dosgi-dynamic-calculator-operations/
implementation-osgi/ implementation-osgi/dosgi-calculator-operations/
maven-osgi-junit/ maven-osgi-juni...
Author: slaws
Date: Mon Oct 4 09:37:22 2010
New Revision: 1004169
URL: http://svn.apache.org/viewvc?rev=1004169&view=rev
Log:
Switch over to using the "all" dependency. Whatever is in ejava is not enough.
Modified:
tuscany/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml
tuscany/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/pom.xml
tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml
tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/pom.xml
tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/pom.xml
tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/pom.xml
tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/pom.xml
Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml?rev=1004169&r1=1004168&r2=1004169&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml Mon Oct 4 09:37:22 2010
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-ejava</artifactId>
+ <artifactId>tuscany-feature-all</artifactId>
<version>2.0-SNAPSHOT</version>
<type>pom</type>
</dependency>
Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/pom.xml?rev=1004169&r1=1004168&r2=1004169&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/pom.xml Mon Oct 4 09:37:22 2010
@@ -37,7 +37,7 @@
</activation>
<modules>
<module>dosgi-dynamic-calculator</module>
- <!--module>dosgi-dynamic-calculator-operations</module-->
+ <module>dosgi-dynamic-calculator-operations</module>
</modules>
</profile>
</profiles>
Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml?rev=1004169&r1=1004168&r2=1004169&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml Mon Oct 4 09:37:22 2010
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-ejava</artifactId>
+ <artifactId>tuscany-feature-all</artifactId>
<version>2.0-SNAPSHOT</version>
<type>pom</type>
</dependency>
@@ -113,6 +113,7 @@
</configuration>
</plugin>
+<!-- Don't think we need this as the JUnit test starts equinox
<plugin>
<groupId>org.apache.tuscany.maven.plugins</groupId>
<artifactId>maven-osgi-junit-plugin</artifactId>
@@ -142,6 +143,7 @@
</execution>
</executions>
</plugin>
+-->
</plugins>
</build>
Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/pom.xml?rev=1004169&r1=1004168&r2=1004169&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/pom.xml Mon Oct 4 09:37:22 2010
@@ -37,7 +37,7 @@
</activation>
<modules>
<module>dosgi-calculator</module>
- <!--module>dosgi-calculator-operations</module-->
+ <module>dosgi-calculator-operations</module>
</modules>
</profile>
</profiles>
Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/pom.xml?rev=1004169&r1=1004168&r2=1004169&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/pom.xml Mon Oct 4 09:37:22 2010
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-core</artifactId>
+ <artifactId>tuscany-feature-all</artifactId>
<version>2.0-SNAPSHOT</version>
<type>pom</type>
</dependency>
Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/pom.xml?rev=1004169&r1=1004168&r2=1004169&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/pom.xml Mon Oct 4 09:37:22 2010
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-core</artifactId>
+ <artifactId>tuscany-feature-all</artifactId>
<version>2.0-SNAPSHOT</version>
<type>pom</type>
</dependency>
Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/pom.xml?rev=1004169&r1=1004168&r2=1004169&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/pom.xml Mon Oct 4 09:37:22 2010
@@ -38,8 +38,8 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
- <!--module>calculator-osgi</module-->
- <!--module>calculator-rest-osgi</module-->
+ <module>calculator-osgi</module>
+ <module>calculator-rest-osgi</module>
</modules>
</profile>
</profiles>