summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sca-java-2.x/trunk/samples/learning-more/pom.xml2
-rw-r--r--sca-java-2.x/trunk/samples/pom.xml3
-rw-r--r--sca-java-2.x/trunk/samples/tuscany-features/pom.xml44
3 files changed, 3 insertions, 46 deletions
diff --git a/sca-java-2.x/trunk/samples/learning-more/pom.xml b/sca-java-2.x/trunk/samples/learning-more/pom.xml
index b2175bbbda..9e4cd9cb45 100644
--- a/sca-java-2.x/trunk/samples/learning-more/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/pom.xml
@@ -49,6 +49,8 @@
<module>distributed-osgi</module>
<module>sca-client</module>
<module>async</module>
+ <module>maven-osgi-junit</module>
+ <module>logging-scribe</module>
</modules>
</profile>
</profiles>
diff --git a/sca-java-2.x/trunk/samples/pom.xml b/sca-java-2.x/trunk/samples/pom.xml
index f48525cae0..2d45da3b07 100644
--- a/sca-java-2.x/trunk/samples/pom.xml
+++ b/sca-java-2.x/trunk/samples/pom.xml
@@ -33,9 +33,8 @@
<modules>
<module>getting-started</module>
- <module>sca-features</module>
- <module>tuscany-features</module>
<module>running-tuscany</module>
+ <module>learning-more</module>
<module>applications</module>
<!-- *********
diff --git a/sca-java-2.x/trunk/samples/tuscany-features/pom.xml b/sca-java-2.x/trunk/samples/tuscany-features/pom.xml
deleted file mode 100644
index 1cbe7d100e..0000000000
--- a/sca-java-2.x/trunk/samples/tuscany-features/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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-samples</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>tuscany-samples-tuscany-features</artifactId>
- <packaging>pom</packaging>
- <name>Apache Tuscany SCA Tuscany Feature Samples</name>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <!-- <module>logging-scribe</module> -->
- <module>maven-osgi-junit</module>
- </modules>
- </profile>
- </profiles>
-</project>