servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r778270 - in /servicemix/smx4/features/trunk/examples: ./ cxf-handler-cfg/ cxf-http-osgi/ cxf-jms-osgi/ cxf-nmr-osgi/ cxf-soap-handler-osgi/ itests/ itests/cxf-handler-cfg/ itests/cxf-http-osgi/ itests/cxf-jms-osgi/ itests/cxf-nmr-osgi/ ite...
Date Mon, 25 May 2009 03:24:51 GMT
Author: ffang
Date: Mon May 25 03:24:50 2009
New Revision: 778270

URL: http://svn.apache.org/viewvc?rev=778270&view=rev
Log:
[SMX4-285]Some of the examples in the examples/ directory in SVN are really tests - move to
itests folder

Added:
    servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/
      - copied from r778264, servicemix/smx4/features/trunk/examples/cxf-handler-cfg/
    servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/
      - copied from r778264, servicemix/smx4/features/trunk/examples/cxf-http-osgi/
    servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/
      - copied from r778264, servicemix/smx4/features/trunk/examples/cxf-jms-osgi/
    servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/
      - copied from r778264, servicemix/smx4/features/trunk/examples/cxf-nmr-osgi/
    servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/
      - copied from r778264, servicemix/smx4/features/trunk/examples/cxf-soap-handler-osgi/
    servicemix/smx4/features/trunk/examples/itests/pom.xml   (with props)
    servicemix/smx4/features/trunk/examples/itests/tests/
    servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
      - copied, changed from r778264, servicemix/smx4/features/trunk/examples/itests/pom.xml
    servicemix/smx4/features/trunk/examples/itests/tests/src/
      - copied from r778264, servicemix/smx4/features/trunk/examples/itests/src/
Removed:
    servicemix/smx4/features/trunk/examples/cxf-handler-cfg/
    servicemix/smx4/features/trunk/examples/cxf-http-osgi/
    servicemix/smx4/features/trunk/examples/cxf-jms-osgi/
    servicemix/smx4/features/trunk/examples/cxf-nmr-osgi/
    servicemix/smx4/features/trunk/examples/cxf-soap-handler-osgi/
    servicemix/smx4/features/trunk/examples/itests/src/
Modified:
    servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/pom.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
    servicemix/smx4/features/trunk/examples/pom.xml

Modified: servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/pom.xml?rev=778270&r1=778264&r2=778270&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/pom.xml Mon May 25 03:24:50
2009
@@ -23,15 +23,15 @@
 
     <parent>
         <groupId>org.apache.servicemix.examples</groupId>
-        <artifactId>examples</artifactId>
+        <artifactId>org.apache.servicemix.examples.itests</artifactId>
         <version>4.1.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.examples</groupId>
-    <artifactId>cxf-handler-cfg</artifactId>
+    <artifactId>org.apache.servicemix.examples.itests.cxf-handler-cfg</artifactId>
     <packaging>bundle</packaging>
     <version>4.1.0-SNAPSHOT</version>
-    <name>Apache ServiceMix Example :: CXF SOAP HANDLER OSGi</name>
+    <name>Apache ServiceMix Example ITESTS BUNDLE:: CXF SOAP HANDLER OSGi</name>
 
     <dependencies>
         <dependency>

Modified: servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml?rev=778270&r1=778264&r2=778270&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml Mon May 25 03:24:50
2009
@@ -23,14 +23,14 @@
 
     <parent>
         <groupId>org.apache.servicemix.examples</groupId>
-        <artifactId>examples</artifactId>
+        <artifactId>org.apache.servicemix.examples.itests</artifactId>
         <version>4.1.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.examples</groupId>
-    <artifactId>cxf-http-osgi</artifactId>
+    <artifactId>org.apache.servicemix.examples.itests.cxf-http-osgi</artifactId>
     <packaging>bundle</packaging>
-    <name>Apache ServiceMix Example :: CXF OSGi</name>
+    <name>Apache ServiceMix Example ITESTS BUNDLE :: CXF OSGi</name>
 
     <dependencies>
         <dependency>

Modified: servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/pom.xml?rev=778270&r1=778264&r2=778270&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/pom.xml Mon May 25 03:24:50
2009
@@ -23,14 +23,14 @@
 
     <parent>
         <groupId>org.apache.servicemix.examples</groupId>
-        <artifactId>examples</artifactId>
+        <artifactId>org.apache.servicemix.examples.itests</artifactId>
         <version>4.1.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.examples</groupId>
-    <artifactId>cxf-jms-osgi</artifactId>
+    <artifactId>org.apache.servicemix.examples.itests.cxf-jms-osgi</artifactId>
     <packaging>bundle</packaging>
-    <name>Apache ServiceMix Example :: CXF JMS transport OSGi</name>
+    <name>Apache ServiceMix Example ITESTS BUNDLE:: CXF JMS transport OSGi</name>
 
     <dependencies>
         <dependency>

Modified: servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/pom.xml?rev=778270&r1=778264&r2=778270&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/pom.xml Mon May 25 03:24:50
2009
@@ -23,14 +23,14 @@
 
     <parent>
         <groupId>org.apache.servicemix.examples</groupId>
-        <artifactId>examples</artifactId>
+        <artifactId>org.apache.servicemix.examples.itests</artifactId>
         <version>4.1.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.examples</groupId>
-    <artifactId>cxf-nmr-osgi</artifactId>
+    <artifactId>org.apache.servicemix.examples.itests.cxf-nmr-osgi</artifactId>
     <packaging>bundle</packaging>
-    <name>Apache ServiceMix Example :: CXF NMR transport OSGi</name>
+    <name>Apache ServiceMix Example ITESTS BUNDLE:: CXF NMR transport OSGi</name>
 
     <dependencies>
         <dependency>

Modified: servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml?rev=778270&r1=778264&r2=778270&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml Mon May 25
03:24:50 2009
@@ -23,15 +23,15 @@
 
     <parent>
         <groupId>org.apache.servicemix.examples</groupId>
-        <artifactId>examples</artifactId>
+        <artifactId>org.apache.servicemix.examples.itests</artifactId>
         <version>4.1.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.examples</groupId>
-    <artifactId>cxf-soap-handler-osgi</artifactId>
+    <artifactId>org.apache.servicemix.examples.itests.cxf-soap-handler-osgi</artifactId>
     <packaging>bundle</packaging>
     <version>4.1.0-SNAPSHOT</version>
-    <name>Apache ServiceMix Example :: CXF SOAP HANDLER OSGi</name>
+    <name>Apache ServiceMix Example ITESTS BUNDLE:: CXF SOAP HANDLER OSGi</name>
 
     <dependencies>
         <dependency>

Added: servicemix/smx4/features/trunk/examples/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/pom.xml?rev=778270&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/pom.xml (added)
+++ servicemix/smx4/features/trunk/examples/itests/pom.xml Mon May 25 03:24:50 2009
@@ -0,0 +1,43 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <!--
+
+        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.
+    -->
+
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.servicemix.examples</groupId>
+        <artifactId>examples</artifactId>
+        <version>4.1.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.servicemix.examples</groupId>
+    <artifactId>org.apache.servicemix.examples.itests</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache ServiceMix Examples Integration Tests</name>
+    
+ 
+    <modules>
+        <module>cxf-http-osgi</module>
+        <module>cxf-jms-osgi</module>
+        <module>cxf-nmr-osgi</module>
+        <module>cxf-soap-handler-osgi</module>
+        <module>cxf-handler-cfg</module>
+        <module>tests</module>
+    </modules>
+
+</project>

Propchange: servicemix/smx4/features/trunk/examples/itests/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/features/trunk/examples/itests/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: servicemix/smx4/features/trunk/examples/itests/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: servicemix/smx4/features/trunk/examples/itests/tests/pom.xml (from r778264, servicemix/smx4/features/trunk/examples/itests/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/pom.xml?p2=servicemix/smx4/features/trunk/examples/itests/tests/pom.xml&p1=servicemix/smx4/features/trunk/examples/itests/pom.xml&r1=778264&r2=778270&rev=778270&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/pom.xml Mon May 25 03:24:50 2009
@@ -22,12 +22,12 @@
 
     <parent>
         <groupId>org.apache.servicemix.examples</groupId>
-        <artifactId>examples</artifactId>
+        <artifactId>org.apache.servicemix.examples.itests</artifactId>
         <version>4.1.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.examples</groupId>
-    <artifactId>org.apache.servicemix.examples.itests</artifactId>
+    <artifactId>org.apache.servicemix.examples.itests.tests</artifactId>
     <packaging>jar</packaging>
     <name>Apache ServiceMix Examples Integration Tests</name>
 
@@ -202,28 +202,28 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-		    <groupId>org.apache.servicemix.examples</groupId>
-		    <artifactId>cxf-http-osgi</artifactId>
+            <groupId>org.apache.servicemix.examples</groupId>
+	    <artifactId>org.apache.servicemix.examples.itests.cxf-http-osgi</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.examples</groupId>
-            <artifactId>cxf-jms-osgi</artifactId>
+            <artifactId>org.apache.servicemix.examples.itests.cxf-jms-osgi</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.examples</groupId>
-            <artifactId>cxf-nmr-osgi</artifactId>
+            <artifactId>org.apache.servicemix.examples.itests.cxf-nmr-osgi</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
 		    <groupId>org.apache.servicemix.examples</groupId>
-		    <artifactId>cxf-soap-handler-osgi</artifactId>
+		    <artifactId>org.apache.servicemix.examples.itests.cxf-soap-handler-osgi</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
 		    <groupId>org.apache.servicemix.examples</groupId>
-		    <artifactId>cxf-handler-cfg</artifactId>
+		    <artifactId>org.apache.servicemix.examples.itests.cxf-handler-cfg</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=778270&r1=778264&r2=778270&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
(original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
Mon May 25 03:24:50 2009
@@ -129,13 +129,13 @@
             getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.spring"),
             getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.osgi"),
             getBundle("org.apache.servicemix.document", "org.apache.servicemix.document"),
-            getBundle("org.apache.servicemix.examples", "cxf-http-osgi"),
-            getBundle("org.apache.servicemix.examples", "cxf-jms-osgi"),
-            getBundle("org.apache.servicemix.examples", "cxf-soap-handler-osgi"),
-            getBundle("org.apache.servicemix.examples", "cxf-handler-cfg"),
+            getBundle("org.apache.servicemix.examples", "org.apache.servicemix.examples.itests.cxf-http-osgi"),
+            getBundle("org.apache.servicemix.examples", "org.apache.servicemix.examples.itests.cxf-jms-osgi"),
+            getBundle("org.apache.servicemix.examples", "org.apache.servicemix.examples.itests.cxf-soap-handler-osgi"),
+            getBundle("org.apache.servicemix.examples", "org.apache.servicemix.examples.itests.cxf-handler-cfg"),
             getBundle("org.apache.servicemix.examples", "cxf-ws-addressing"),
             getBundle("org.apache.servicemix.examples", "cxf-jaxrs"),
-            getBundle("org.apache.servicemix.examples", "cxf-nmr-osgi"),
+            getBundle("org.apache.servicemix.examples", "org.apache.servicemix.examples.itests.cxf-nmr-osgi"),
         };
 	}
 
@@ -147,7 +147,7 @@
 
     public void testHttpOsgi() throws Exception {
         Thread.sleep(5000);
-        waitOnContextCreation("cxf-http-osgi");
+        waitOnContextCreation("org.apache.servicemix.examples.itests.cxf-http-osgi");
         Thread.sleep(5000);
 
         ServiceReference ref = bundleContext.getServiceReference(HelloWorld.class.getName());
@@ -163,7 +163,7 @@
     
     public void testJmsOsgi() throws Exception {
         Thread.sleep(5000);
-        waitOnContextCreation("cxf-jms-osgi");
+        waitOnContextCreation("org.apache.servicemix.examples.itests.cxf-jms-osgi");
         Thread.sleep(5000);
 
         ServiceReference ref = bundleContext.getServiceReference(HelloWorld.class.getName());
@@ -179,7 +179,7 @@
     
     public void testNMROsgi() throws Exception {
         Thread.sleep(5000);
-        waitOnContextCreation("cxf-nmr-osgi");
+        waitOnContextCreation("org.apache.servicemix.examples.itests.cxf-nmr-osgi");
         Thread.sleep(5000);
         NMR nmr = getOsgiService(NMR.class);
         assertNotNull(nmr);
@@ -218,7 +218,7 @@
 
     public void testSoapHandlerOsgi() throws Exception {
         Thread.sleep(5000);
-        waitOnContextCreation("cxf-soap-handler-osgi");
+        waitOnContextCreation("org.apache.servicemix.examples.itests.cxf-soap-handler-osgi");
         Thread.sleep(5000);
 
         ServiceReference ref = bundleContext.getServiceReference(org.apache.handlers.AddNumbers.class.getName());
@@ -235,7 +235,7 @@
 
      public void testSpringConfigHandlerOsgi() throws Exception {
          Thread.sleep(5000);
-         waitOnContextCreation("cxf-handler-cfg");
+         waitOnContextCreation("org.apache.servicemix.examples.itests.cxf-handler-cfg");
          Thread.sleep(5000);
 
          ServiceReference ref = bundleContext.getServiceReference(org.apache.springcfg.handlers.AddNumbers.class.getName());

Modified: servicemix/smx4/features/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/pom.xml?rev=778270&r1=778269&r2=778270&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/pom.xml Mon May 25 03:24:50 2009
@@ -45,11 +45,6 @@
         <module>cxf-nmr</module>
         <module>cxf-osgi</module>
         <module>cxf-jaxrs</module>
-        <module>cxf-http-osgi</module>
-        <module>cxf-jms-osgi</module>
-        <module>cxf-nmr-osgi</module>
-        <module>cxf-soap-handler-osgi</module>
-        <module>cxf-handler-cfg</module>
         <module>cxf-ws-addressing</module>
         <module>itests</module>
     </modules>



Mime
View raw message