cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1293551 - in /cxf/branches/2.5.x-fixes: ./ distribution/src/main/release/samples/jax_rs/minimal_osgi/README distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
Date Sat, 25 Feb 2012 09:08:59 GMT
Author: ningjiang
Date: Sat Feb 25 09:08:58 2012
New Revision: 1293551

URL: http://svn.apache.org/viewvc?rev=1293551&view=rev
Log:
Merged revisions 1293546 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1293546 | ningjiang | 2012-02-25 16:42:03 +0800 (Sat, 25 Feb 2012) | 1 line
  
  CXF-4138 Fixed the build hung of samples/jax_rs/minimal_osgi
........

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/README
    cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 09:08:58 2012
@@ -1 +1 @@
-/cxf/trunk:1291943,1292763,1292792,1292839,1293064,1293255,1293326,1293413
+/cxf/trunk:1291943,1292763,1292792,1292839,1293064,1293255,1293326,1293413,1293546

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/README
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/README?rev=1293551&r1=1293550&r2=1293551&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/README
(original)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/README
Sat Feb 25 09:08:58 2012
@@ -68,7 +68,7 @@ Running the sample
 
 You can run it directly from maven using the following command
 	
-	mvn integration-test
+	mvn exec:exec
 
 Note that when you run the sample this way, your input to the OSGI console will not echo.
No worries, it'll still be processed!
 

Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml?rev=1293551&r1=1293550&r2=1293551&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
(original)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
Sat Feb 25 09:08:58 2012
@@ -118,10 +118,11 @@
           <artifactId>exec-maven-plugin</artifactId>
           <executions>
               <execution>
-                  <phase>integration-test</phase>
                   <goals>
                       <goal>exec</goal>
                   </goals>
+              </execution>
+          </executions>
                   <configuration>
                       <executable>java</executable>
                       <arguments>
@@ -135,8 +136,6 @@
                       </arguments>
                       <workingDirectory>${project.build.directory}/delivery/${project.artifactId}-${project.version}-equinox/${project.artifactId}-${project.version}/</workingDirectory>
                   </configuration>
-              </execution>
-          </executions>
       </plugin>
 		</plugins>
 	</build>



Mime
View raw message