svn commit: r1294830 - in /cxf/branches/2.5.x-fixes: ./ distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/Activator.java

[dkulp]

Author: dkulp
Date: Tue Feb 28 21:08:01 2012
New Revision: 1294830

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

........
  r1293552 | ningjiang | 2012-02-25 04:13:26 -0500 (Sat, 25 Feb 2012) | 1 line
  
  CXF-4138 clean up the code
........

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/Activator.java

Propchange: cxf/branches/2.5.x-fixes/
            ('svn:mergeinfo' removed)

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/src/main/java/minimalosgi/Activator.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/Activator.java?rev=1294830&r1=1294829&r2=1294830&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/Activator.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/Activator.java
 Tue Feb 28 21:08:01 2012
@@ -18,7 +18,7 @@
  */
 
 package minimalosgi;
-
+import java.util.Dictionary;
 import java.util.Dictionary;
 import java.util.Hashtable;