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/22 13:35:30 UTC
svn commit: r1026302 - in /tuscany/sca-java-2.x/trunk/samples:
learning-more/ learning-more/maven-junit/ learning-more/maven-osgi-junit/
running-tuscany/ running-tuscany/maven-junit/
running-tuscany/maven-osgi-junit/ running-tuscany/maven-osgi-junit/ca...
Author: slaws
Date: Fri Oct 22 11:35:30 2010
New Revision: 1026302
URL: http://svn.apache.org/viewvc?rev=1026302&view=rev
Log:
Move the maven junit samples to running-tuscany.
Added:
tuscany/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/
- copied from r1026289, tuscany/sca-java-2.x/trunk/samples/learning-more/maven-junit/
tuscany/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/pom.xml
tuscany/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/
- copied from r1025864, tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/
tuscany/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/pom.xml
- copied unchanged from r1026113, tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/pom.xml
tuscany/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml
- copied unchanged from r1026113, tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/pom.xml
Removed:
tuscany/sca-java-2.x/trunk/samples/learning-more/maven-junit/
tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/
Modified:
tuscany/sca-java-2.x/trunk/samples/learning-more/pom.xml
tuscany/sca-java-2.x/trunk/samples/running-tuscany/pom.xml
Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/pom.xml?rev=1026302&r1=1026301&r2=1026302&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/pom.xml Fri Oct 22 11:35:30 2010
@@ -54,8 +54,6 @@
<module>distributed-osgi</module>
<module>sca-client</module>
<module>async</module>
- <module>maven-osgi-junit</module>
- <module>maven-junit</module>
</modules>
</profile>
</profiles>
Added: tuscany/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/pom.xml?rev=1026302&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/pom.xml (added)
+++ tuscany/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/pom.xml Fri Oct 22 11:35:30 2010
@@ -0,0 +1,43 @@
+<?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-sample-maven-junit</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Tuscany SCA Sample Maven Junit</name>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>calculator-contribution</module>
+ </modules>
+ </profile>
+ </profiles>
+</project>
Modified: tuscany/sca-java-2.x/trunk/samples/running-tuscany/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/pom.xml?rev=1026302&r1=1026301&r2=1026302&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/running-tuscany/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/running-tuscany/pom.xml Fri Oct 22 11:35:30 2010
@@ -47,9 +47,10 @@
-->
<module>embedded-jse</module>
<module>embedded-osgi</module>
- <!-- module>embedded-osgi-base</module -->
+ <!-- module>embedded-osgi-base</module -->
+ <module>maven-osgi-junit</module>
+ <module>maven-junit</module>
<module>shell</module>
-
</modules>
</profile>
</profiles>