diff options
| author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-04 09:37:22 +0000 |
|---|---|---|
| committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-04 09:37:22 +0000 |
| commit | a7906657edb91117078050c613fd67383c80d601 (patch) | |
| tree | fe35d30fcd38577eefac2faaf1888e0595618aff /sca-java-2.x/trunk/samples/learning-more | |
| parent | fb7c54995c6852c4925f5333831f8369039fab84 (diff) | |
Switch over to using the "all" dependency. Whatever is in ejava is not enough.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1004169 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
7 files changed, 10 insertions, 8 deletions
diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml index 926208b388..b06c285ef5 100644 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml @@ -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> diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/pom.xml index adaf73cdb2..fefbffb638 100644 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/pom.xml @@ -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> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml index cf7faab1e8..8e95e7c215 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml @@ -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> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/pom.xml index 56a5f0bd58..56d975dea8 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/pom.xml @@ -37,7 +37,7 @@ </activation> <modules> <module>dosgi-calculator</module> - <!--module>dosgi-calculator-operations</module--> + <module>dosgi-calculator-operations</module> </modules> </profile> </profiles> diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/pom.xml b/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/pom.xml index 6580790162..34f37873f1 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/pom.xml @@ -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> diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/pom.xml b/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/pom.xml index 5412ab75f7..9cedf7ec07 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/pom.xml @@ -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> diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/pom.xml b/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/pom.xml index 4256af8438..b2e096c145 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/pom.xml @@ -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> |