cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1293546 - in /cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi: README pom.xml src/main/java/minimalosgi/Activator.java
Date Sat, 25 Feb 2012 08:42:04 GMT
Author: ningjiang
Date: Sat Feb 25 08:42:03 2012
New Revision: 1293546

URL: http://svn.apache.org/viewvc?rev=1293546&view=rev
Log:
CXF-4138 Fixed the build hung of samples/jax_rs/minimal_osgi

Modified:
    cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/README
    cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
    cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/Activator.java

Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/README
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/README?rev=1293546&r1=1293545&r2=1293546&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/README (original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/README Sat Feb 25
08:42:03 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/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml?rev=1293546&r1=1293545&r2=1293546&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml Sat Feb 25
08:42:03 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>

Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/Activator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/Activator.java?rev=1293546&r1=1293545&r2=1293546&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/Activator.java
(original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/Activator.java
Sat Feb 25 08:42:03 2012
@@ -51,7 +51,7 @@ public class Activator implements Bundle
                 public Object addingService(ServiceReference serviceReference) {
                     try {
                         HttpService service = (HttpService)_context.getService(serviceReference);
-                        Map<String, String> initParams = new Hashtable<String, String>();
+                        Hashtable<String, String> initParams = new Hashtable<String,
String>();
                         initParams.put("javax.ws.rs.Application", SampleApplication.class.getName());
                         service.registerServlet(_path, new SampleServlet(), initParams, null);
                         return service;



Mime
View raw message