cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amic...@apache.org
Subject svn commit: r1489675 [6/7] - in /cxf/dosgi/trunk: ./ discovery/ discovery/distributed/ discovery/distributed/cxf-discovery/ discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/ discovery/distributed/cxf-discovery/...
Date Wed, 05 Jun 2013 00:40:58 GMT
Modified: cxf/dosgi/trunk/samples/ds/impl/src/main/resources/OSGI-INF/component.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/ds/impl/src/main/resources/OSGI-INF/component.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/ds/impl/src/main/resources/OSGI-INF/component.xml (original)
+++ cxf/dosgi/trunk/samples/ds/impl/src/main/resources/OSGI-INF/component.xml Wed Jun  5 00:40:54 2013
@@ -15,11 +15,11 @@
   -->
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="DS Service Sample">
   <implementation class="org.apache.cxf.dosgi.samples.ds.impl.AdderServiceImpl"/>
-  
+
   <property name="service.exported.interfaces" value="*" />
   <property name="service.exported.configs" value="org.apache.cxf.ws" />
   <property name="org.apache.cxf.ws.address" value="http://localhost:9090/adder" />
-  
+
   <service>
     <provide interface="org.apache.cxf.dosgi.samples.ds.AdderService"/>
   </service>

Modified: cxf/dosgi/trunk/samples/ds/interface/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/ds/interface/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/ds/interface/pom.xml (original)
+++ cxf/dosgi/trunk/samples/ds/interface/pom.xml Wed Jun  5 00:40:54 2013
@@ -43,10 +43,10 @@
             <Bundle-Description>This bundle contains the interfaces of the Distributed OSGi with Declarative Services sample.</Bundle-Description>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Import-Package />
-            <Export-Package>org.apache.cxf.dosgi.samples.ds</Export-Package> 
+            <Export-Package>org.apache.cxf.dosgi.samples.ds</Export-Package>
           </instructions>
         </configuration>
-      </plugin> 
+      </plugin>
     </plugins>
-  </build>    
+  </build>
 </project>

Modified: cxf/dosgi/trunk/samples/ds/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/ds/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/ds/pom.xml (original)
+++ cxf/dosgi/trunk/samples/ds/pom.xml Wed Jun  5 00:40:54 2013
@@ -31,11 +31,11 @@
       <version>1.5-SNAPSHOT</version>
       <relativePath>../../parent/pom.xml</relativePath>
     </parent>
-    
-    <modules>    
+
+    <modules>
       <module>interface</module>
       <module>impl</module>
       <module>client</module>
-    </modules> 
+    </modules>
 
 </project>

Modified: cxf/dosgi/trunk/samples/greeter/client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter/client/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter/client/pom.xml (original)
+++ cxf/dosgi/trunk/samples/greeter/client/pom.xml Wed Jun  5 00:40:54 2013
@@ -34,17 +34,17 @@
     </parent>
 
     <properties>
-        <bundle.import.package>*</bundle.import.package>                
+        <bundle.import.package>*</bundle.import.package>
         <bundle.private.package>org.apache.cxf.dosgi.samples.greeter.client</bundle.private.package>
     </properties>
-    
+
     <dependencies>
-        <dependency> 
+        <dependency>
             <groupId>org.apache.cxf.dosgi.samples</groupId>
             <artifactId>cxf-dosgi-ri-samples-greeter-interface</artifactId>
             <version>${project.version}</version>
-        </dependency> 
-        <dependency> 
+        </dependency>
+        <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
             <version>${felix.version}</version>
@@ -54,8 +54,8 @@
                     <artifactId>org.osgi.foundation</artifactId>
                 </exclusion>
             </exclusions>
-        </dependency> 
-    </dependencies> 
+        </dependency>
+    </dependencies>
 
     <build>
       <plugins>
@@ -69,12 +69,12 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Activator>org.apache.cxf.dosgi.samples.greeter.client.Activator</Bundle-Activator>
                         <Import-Package>${bundle.import.package}</Import-Package>
-                        <Private-Package>${bundle.private.package}</Private-Package> 
+                        <Private-Package>${bundle.private.package}</Private-Package>
                         <DynamicImport-Package>org.apache.cxf.dosgi.dsw.qos,org.apache.cxf</DynamicImport-Package>
                     </instructions>
                 </configuration>
-            </plugin> 
+            </plugin>
          </plugins>
-    </build>    
+    </build>
 
 </project>

Modified: cxf/dosgi/trunk/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/Activator.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/Activator.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/Activator.java (original)
+++ cxf/dosgi/trunk/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/Activator.java Wed Jun  5 00:40:54 2013
@@ -29,7 +29,8 @@ import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.util.tracker.ServiceTracker;
 
-public class Activator implements BundleActivator {    
+public class Activator implements BundleActivator {
+
     private ServiceTracker tracker;
 
     public void start(final BundleContext bc) {
@@ -44,7 +45,6 @@ public class Activator implements Bundle
             }
         };
         tracker.open();
-        
     }
 
     protected void useService(final GreeterService greeter) {
@@ -66,20 +66,20 @@ public class Activator implements Bundle
 
                 System.out.println("greetMe(\"" + gd + "\") returns:");
                 for (Map.Entry<GreetingPhrase, String> greeting : result.entrySet()) {
-                    System.out.println("  " + greeting.getKey().getPhrase() 
+                    System.out.println("  " + greeting.getKey().getPhrase()
                             + " " + greeting.getValue());
                 }
             } else if (gd instanceof GreeterData) {
                 System.out.println("*** Invoking greeter ***");
                 try {
-                    GreetingPhrase [] result = greeter.greetMe((GreeterData) gd);
+                    GreetingPhrase[] result = greeter.greetMe((GreeterData) gd);
                     System.out.println("greetMe(\"" + gd + "\") returns:");
                     for (GreetingPhrase phrase : result) {
                         System.out.println("  " + phrase.getPhrase());
                     }
                 } catch (GreeterException ex) {
                     System.out.println("GreeterException: " + ex.toString());
-                }                
+                }
             }
         }
     }

Modified: cxf/dosgi/trunk/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/GreeterDataImpl.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/GreeterDataImpl.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/GreeterDataImpl.java (original)
+++ cxf/dosgi/trunk/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/GreeterDataImpl.java Wed Jun  5 00:40:54 2013
@@ -21,16 +21,17 @@ package org.apache.cxf.dosgi.samples.gre
 import org.apache.cxf.dosgi.samples.greeter.GreeterData;
 
 public class GreeterDataImpl implements GreeterData {
+
     private final String name;
     private final int age;
     private final boolean exception;
-        
+
     public GreeterDataImpl(String n, int a, boolean b) {
         name = n;
         age = a;
         exception = b;
     }
-    
+
     public String getName() {
         return name;
     }

Modified: cxf/dosgi/trunk/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/GreeterDialog.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/GreeterDialog.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/GreeterDialog.java (original)
+++ cxf/dosgi/trunk/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/GreeterDialog.java Wed Jun  5 00:40:54 2013
@@ -40,8 +40,9 @@ import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
 public class GreeterDialog extends JDialog {
+
     private static final long serialVersionUID = 1L;
-    
+
     JTextField name1field;
     JTextField name2field;
     JTextField ageTextField;
@@ -50,16 +51,16 @@ public class GreeterDialog extends JDial
 
     public GreeterDialog() {
         super((Frame) null, "Invoke Remote Greeter Service", true);
-        
+
         JPanel panel = new JPanel();
-        panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));     
+        panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
         setContentPane(panel);
 
         final JRadioButton rb1 = new JRadioButton("invoke: Map<GreetingPhrase, String> greetMe(String name);");
         rb1.setSelected(true);
-        rb1.setAlignmentX(Component.LEFT_ALIGNMENT);        
+        rb1.setAlignmentX(Component.LEFT_ALIGNMENT);
         panel.add(rb1);
-        
+
         final JPanel simplePanel = createFirstOptionPanel();
         rb1.addChangeListener(new ChangeListener() {
             public void stateChanged(ChangeEvent e) {
@@ -68,60 +69,58 @@ public class GreeterDialog extends JDial
         });
         panel.add(simplePanel);
         panel.add(new JLabel(" ")); // add a spacer
-        
-        final JRadioButton rb2 
-            = new JRadioButton("invoke: GreetingPhrase [] greetMe(GreeterData data) throws GreeterException;");
+
+        final JRadioButton rb2
+            = new JRadioButton("invoke: GreetingPhrase[] greetMe(GreeterData data) throws GreeterException;");
         rb2.setAlignmentX(Component.LEFT_ALIGNMENT);
         panel.add(rb2);
-        
 
         final JPanel complexPanel = createSecondOptionPanel();
 
-        rb2.addChangeListener(new ChangeListener() {            
+        rb2.addChangeListener(new ChangeListener() {
             public void stateChanged(ChangeEvent e) {
                 enablePanel(complexPanel, rb2.isSelected());
             }
-        });            
-        
+        });
+
         panel.add(complexPanel);
         enablePanel(complexPanel, false);
-        
-        JPanel buttons = new JPanel(new FlowLayout(FlowLayout.CENTER));        
+
+        JPanel buttons = new JPanel(new FlowLayout(FlowLayout.CENTER));
         buttons.setAlignmentX(Component.LEFT_ALIGNMENT);
-        
+
         JButton b1 = new JButton("Invoke");
         buttons.add(b1);
-        
-        b1.addActionListener(new ActionListener() {            
+
+        b1.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 if (rb1.isSelected()) {
                     selection = name1field.getText();
                 } else {
                     selection = new GreeterDataImpl(name2field.getText(),
-                                                    new Integer(ageTextField.getText()), 
+                                                    new Integer(ageTextField.getText()),
                                                     throwExCB.isSelected());
-                }                
-                
+                }
+
                 setVisible(false);
             }
         });
-        
+
         panel.add(buttons);
-        
+
         ButtonGroup bg = new ButtonGroup();
         bg.add(rb1);
         bg.add(rb2);
-        
+
         pack();
         setLocationRelativeTo(null); // centers frame on screen
     }
-    
+
     private JPanel createFirstOptionPanel() {
         final JPanel simplePanel = new JPanel(new GridBagLayout());
         simplePanel.setAlignmentX(Component.LEFT_ALIGNMENT);
         GridBagConstraints c1 = new GridBagConstraints();
-        
-        
+
         JLabel lb1 = new JLabel("Name: ");
         c1.weightx = 0.0;
         c1.gridx = 0;
@@ -129,7 +128,7 @@ public class GreeterDialog extends JDial
         c1.insets = new Insets(0, 25, 0, 0);
         c1.anchor = GridBagConstraints.LINE_START;
         simplePanel.add(lb1, c1);
-        
+
         name1field = new JTextField(20);
         c1.weightx = 0.2;
         c1.gridx = 1;
@@ -143,7 +142,7 @@ public class GreeterDialog extends JDial
         final JPanel complexPanel = new JPanel(new GridBagLayout());
         complexPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
         GridBagConstraints c2 = new GridBagConstraints();
-       
+
         JLabel lb2 = new JLabel("Name: ");
         c2.weightx = 0.0;
         c2.gridx = 0;
@@ -151,15 +150,15 @@ public class GreeterDialog extends JDial
         c2.insets = new Insets(0, 25, 0, 0);
         c2.anchor = GridBagConstraints.LINE_START;
         complexPanel.add(lb2, c2);
-        
+
         name2field = new JTextField(20);
         c2.weightx = 0.2;
         c2.gridx = 1;
         c2.gridy = 0;
         c2.insets = new Insets(0, 10, 0, 0);
         c2.anchor = GridBagConstraints.LINE_START;
-        complexPanel.add(name2field, c2);        
-                
+        complexPanel.add(name2field, c2);
+
         JLabel lb3 = new JLabel("Age: ");
         c2.weightx = 0.0;
         c2.gridx = 0;
@@ -167,7 +166,7 @@ public class GreeterDialog extends JDial
         c2.insets = new Insets(0, 25, 0, 0);
         c2.anchor = GridBagConstraints.LINE_START;
         complexPanel.add(lb3, c2);
-        
+
         ageTextField = new JTextField(7);
         c2.weightx = 0.2;
         c2.gridx = 1;
@@ -175,7 +174,7 @@ public class GreeterDialog extends JDial
         c2.insets = new Insets(0, 10, 0, 0);
         c2.anchor = GridBagConstraints.LINE_START;
         complexPanel.add(ageTextField, c2);
-        
+
         throwExCB = new JCheckBox("Throw Exception");
         c2.weightx = 0.0;
         c2.gridx = 0;
@@ -185,12 +184,12 @@ public class GreeterDialog extends JDial
         c2.anchor = GridBagConstraints.LINE_START;
         complexPanel.add(throwExCB, c2);
         return complexPanel;
-    }    
-    
+    }
+
     public Object getSelection() {
         return selection;
     }
-    
+
     private static void enablePanel(JPanel panel, boolean b) {
         for (Component c : panel.getComponents()) {
             c.setEnabled(b);

Modified: cxf/dosgi/trunk/samples/greeter/impl/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter/impl/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter/impl/pom.xml (original)
+++ cxf/dosgi/trunk/samples/greeter/impl/pom.xml Wed Jun  5 00:40:54 2013
@@ -33,12 +33,12 @@
     </parent>
 
     <properties>
-        <bundle.import.package>*</bundle.import.package>                               
+        <bundle.import.package>*</bundle.import.package>
         <bundle.private.package>org.apache.cxf.dosgi.samples.greeter.impl</bundle.private.package>
     </properties>
-    
+
     <dependencies>
-        <dependency> 
+        <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
             <version>${felix.version}</version>
@@ -48,13 +48,13 @@
                     <artifactId>org.osgi.foundation</artifactId>
                 </exclusion>
             </exclusions>
-        </dependency> 
-        <dependency> 
+        </dependency>
+        <dependency>
             <groupId>org.apache.cxf.dosgi.samples</groupId>
             <artifactId>cxf-dosgi-ri-samples-greeter-interface</artifactId>
             <version>${project.version}</version>
-        </dependency> 
-    </dependencies> 
+        </dependency>
+    </dependencies>
 
     <build>
       <plugins>
@@ -68,12 +68,12 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Activator>org.apache.cxf.dosgi.samples.greeter.impl.Activator</Bundle-Activator>
                         <Import-Package>${bundle.import.package}</Import-Package>
-                        <Private-Package>${bundle.private.package}</Private-Package> 
+                        <Private-Package>${bundle.private.package}</Private-Package>
                         <DynamicImport-Package>org.apache.cxf.dosgi.dsw.qos,org.apache.cxf</DynamicImport-Package>
                     </instructions>
                 </configuration>
-            </plugin> 
+            </plugin>
          </plugins>
-    </build>    
+    </build>
 
 </project>

Modified: cxf/dosgi/trunk/samples/greeter/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/Activator.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/Activator.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/Activator.java (original)
+++ cxf/dosgi/trunk/samples/greeter/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/Activator.java Wed Jun  5 00:40:54 2013
@@ -18,17 +18,16 @@
  */
 package org.apache.cxf.dosgi.samples.greeter.impl;
 
-
 import java.util.Dictionary;
 import java.util.Hashtable;
 
-
 import org.apache.cxf.dosgi.samples.greeter.GreeterService;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 
 public class Activator implements BundleActivator {
+
     private ServiceRegistration registration;
 
     public void start(BundleContext bc) throws Exception {
@@ -37,8 +36,8 @@ public class Activator implements Bundle
         props.put("service.exported.interfaces", "*");
         props.put("service.exported.configs", "org.apache.cxf.ws");
         props.put("org.apache.cxf.ws.address", "http://localhost:9090/greeter");
-        
-        registration = bc.registerService(GreeterService.class.getName(), 
+
+        registration = bc.registerService(GreeterService.class.getName(),
                                           new GreeterServiceImpl(), props);
     }
 

Modified: cxf/dosgi/trunk/samples/greeter/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/GreeterServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/GreeterServiceImpl.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/GreeterServiceImpl.java (original)
+++ cxf/dosgi/trunk/samples/greeter/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/GreeterServiceImpl.java Wed Jun  5 00:40:54 2013
@@ -27,36 +27,35 @@ import org.apache.cxf.dosgi.samples.gree
 import org.apache.cxf.dosgi.samples.greeter.GreetingPhrase;
 
 public class GreeterServiceImpl implements GreeterService {
+
     public Map<GreetingPhrase, String> greetMe(String name) {
         System.out.println("Invoking: greetMe(" + name + ")");
-        
-        Map<GreetingPhrase, String> greetings = 
-            new HashMap<GreetingPhrase, String>();
-        
+
+        Map<GreetingPhrase, String> greetings = new HashMap<GreetingPhrase, String>();
+
         greetings.put(new GreetingPhrase("Hello"), name);
         greetings.put(new GreetingPhrase("Hoi"), name);
         greetings.put(new GreetingPhrase("Hola"), name);
         greetings.put(new GreetingPhrase("Bonjour"), name);
-        
-        
+
         return greetings;
     }
 
-    public GreetingPhrase [] greetMe(GreeterData gd) throws GreeterException {
+    public GreetingPhrase[] greetMe(GreeterData gd) throws GreeterException {
         if (gd.isException()) {
             System.out.println("Throwing custom exception from: greetMe(" + gd.getName() + ")");
             throw new GreeterException(gd.getName());
         }
-        
+
         String details = gd.getName() + "(" + gd.getAge() + ")";
         System.out.println("Invoking: greetMe(" + details + ")");
-        
-        GreetingPhrase [] greetings = new GreetingPhrase [] {
+
+        GreetingPhrase[] greetings = new GreetingPhrase[] {
             new GreetingPhrase("Howdy " + details),
             new GreetingPhrase("Hallo " + details),
             new GreetingPhrase("Ni hao " + details)
         };
-        
+
         return greetings;
     }
 }

Modified: cxf/dosgi/trunk/samples/greeter/interface/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter/interface/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter/interface/pom.xml (original)
+++ cxf/dosgi/trunk/samples/greeter/interface/pom.xml Wed Jun  5 00:40:54 2013
@@ -37,19 +37,19 @@
         <bundle.import.package>*</bundle.import.package>
         <bundle.export.package>org.apache.cxf.dosgi.samples.greeter</bundle.export.package>
     </properties>
-    
+
     <dependencies>
         <dependency>
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
            <scope>test</scope>
-        </dependency>  
+        </dependency>
         <dependency>
            <groupId>org.easymock</groupId>
            <artifactId>easymockclassextension</artifactId>
            <scope>test</scope>
          </dependency>
-    </dependencies> 
+    </dependencies>
 
     <build>
       <plugins>
@@ -62,11 +62,11 @@
                         <Bundle-Description>This bundle contains the implementation of the CXF Distributed OSGi Greeter Demo Interfaces</Bundle-Description>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Import-Package>${bundle.import.package}</Import-Package>
-                        <Export-Package>${bundle.export.package}</Export-Package> 
+                        <Export-Package>${bundle.export.package}</Export-Package>
                     </instructions>
                 </configuration>
-            </plugin> 
+            </plugin>
          </plugins>
-    </build>    
+    </build>
 
 </project>

Modified: cxf/dosgi/trunk/samples/greeter/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/GreeterException.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/GreeterException.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/GreeterException.java (original)
+++ cxf/dosgi/trunk/samples/greeter/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/GreeterException.java Wed Jun  5 00:40:54 2013
@@ -19,24 +19,25 @@
 package org.apache.cxf.dosgi.samples.greeter;
 
 public class GreeterException extends Exception {
+
     private static final long serialVersionUID = 1L;
     private String name;
-    
+
     public GreeterException() {
     }
-    
+
     public GreeterException(String name) {
         this.name = name;
     }
-    
+
     public String getName() {
         return name;
     }
-    
+
     public void setName(String theName) {
         name = theName;
     }
-    
+
     @Override
     public String toString() {
         return "GreeterService can not greet " + name;

Modified: cxf/dosgi/trunk/samples/greeter/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/GreeterService.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/GreeterService.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/GreeterService.java (original)
+++ cxf/dosgi/trunk/samples/greeter/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/GreeterService.java Wed Jun  5 00:40:54 2013
@@ -20,8 +20,8 @@ package org.apache.cxf.dosgi.samples.gre
 
 import java.util.Map;
 
-
 public interface GreeterService {
+
     Map<GreetingPhrase, String> greetMe(String name);
-    GreetingPhrase [] greetMe(GreeterData name) throws GreeterException;
+    GreetingPhrase[] greetMe(GreeterData name) throws GreeterException;
 }

Modified: cxf/dosgi/trunk/samples/greeter/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/GreetingPhrase.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/GreetingPhrase.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/GreetingPhrase.java (original)
+++ cxf/dosgi/trunk/samples/greeter/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/GreetingPhrase.java Wed Jun  5 00:40:54 2013
@@ -19,11 +19,12 @@
 package org.apache.cxf.dosgi.samples.greeter;
 
 public class GreetingPhrase {
+
     private String phrase;
-    
+
     public GreetingPhrase() {
     }
-    
+
     public GreetingPhrase(String phrase) {
         this.phrase = phrase;
     }
@@ -31,20 +32,19 @@ public class GreetingPhrase {
     public void setPhrase(String thePhrase) {
         this.phrase = thePhrase;
     }
-    
+
     public String getPhrase() {
         return phrase;
     }
-    
+
     @Override
     public int hashCode() {
         return phrase.hashCode();
     }
-    
+
     @Override
     public boolean equals(Object other) {
         return GreetingPhrase.class.isAssignableFrom(other.getClass())
                 && phrase.equals(((GreetingPhrase) other).phrase);
-
     }
 }

Modified: cxf/dosgi/trunk/samples/greeter/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter/pom.xml (original)
+++ cxf/dosgi/trunk/samples/greeter/pom.xml Wed Jun  5 00:40:54 2013
@@ -30,13 +30,13 @@
       <groupId>org.apache.cxf.dosgi</groupId>
       <artifactId>cxf-dosgi-ri-parent</artifactId>
       <version>1.5-SNAPSHOT</version>
-      <relativePath>../../parent/pom.xml</relativePath> 
+      <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
-    <modules>    
+    <modules>
       <module>interface</module>
       <module>impl</module>
       <module>client</module>
-    </modules> 
+    </modules>
 
 </project>

Modified: cxf/dosgi/trunk/samples/greeter_rest/client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter_rest/client/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter_rest/client/pom.xml (original)
+++ cxf/dosgi/trunk/samples/greeter_rest/client/pom.xml Wed Jun  5 00:40:54 2013
@@ -33,17 +33,17 @@
     </parent>
 
     <properties>
-        <bundle.import.package>javax.ws.rs.*,*</bundle.import.package>                
+        <bundle.import.package>javax.ws.rs.*,*</bundle.import.package>
         <bundle.private.package>org.apache.cxf.dosgi.samples.greeter.client.rest</bundle.private.package>
     </properties>
-    
+
     <dependencies>
-        <dependency> 
+        <dependency>
             <groupId>org.apache.cxf.dosgi.samples</groupId>
             <artifactId>cxf-dosgi-ri-samples-greeter-rest-interface</artifactId>
             <version>${project.version}</version>
-        </dependency> 
-        <dependency> 
+        </dependency>
+        <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
             <version>${felix.version}</version>
@@ -53,8 +53,8 @@
                     <artifactId>org.osgi.foundation</artifactId>
                 </exclusion>
             </exclusions>
-        </dependency> 
-    </dependencies> 
+        </dependency>
+    </dependencies>
 
     <build>
       <plugins>
@@ -68,12 +68,12 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Activator>org.apache.cxf.dosgi.samples.greeter.client.rest.Activator</Bundle-Activator>
                         <Import-Package>${bundle.import.package}</Import-Package>
-                        <Private-Package>${bundle.private.package}</Private-Package> 
+                        <Private-Package>${bundle.private.package}</Private-Package>
                         <DynamicImport-Package>org.apache.cxf.dosgi.dsw.qos,org.apache.cxf</DynamicImport-Package>
                     </instructions>
                 </configuration>
-            </plugin> 
+            </plugin>
          </plugins>
-    </build>    
+    </build>
 
 </project>

Modified: cxf/dosgi/trunk/samples/greeter_rest/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/rest/Activator.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter_rest/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/rest/Activator.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter_rest/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/rest/Activator.java (original)
+++ cxf/dosgi/trunk/samples/greeter_rest/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/rest/Activator.java Wed Jun  5 00:40:54 2013
@@ -30,7 +30,8 @@ import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.util.tracker.ServiceTracker;
 
-public class Activator implements BundleActivator {    
+public class Activator implements BundleActivator {
+
     private ServiceTracker tracker;
     private ServiceTracker tracker2;
 
@@ -46,7 +47,7 @@ public class Activator implements Bundle
             }
         };
         tracker.open();
-        
+
         tracker2 = new ServiceTracker(bc, GreeterService2.class.getName(), null) {
             @Override
             public Object addingService(ServiceReference reference) {
@@ -68,7 +69,7 @@ public class Activator implements Bundle
         });
         t.start();
     }
-    
+
     protected void useGreeterService2(final GreeterService2 greeter) {
         Thread t = new Thread(new Runnable() {
             public void run() {
@@ -88,10 +89,10 @@ public class Activator implements Bundle
                 System.out.println("*** Invoking greeter ***");
                 try {
                     GreeterInfo info = greeter.greetMe(name);
-    
+
                     System.out.println("greetMe(\"" + name + "\") returns:");
                     for (GreetingPhrase greeting: info.getGreetings()) {
-                        System.out.println("  " + greeting.getPhrase() 
+                        System.out.println("  " + greeting.getPhrase()
                                 + " " + greeting.getName());
                     }
                 } catch (GreeterException ex) {
@@ -100,7 +101,7 @@ public class Activator implements Bundle
             }
         }
     }
-    
+
     private void greeter2UI(final GreeterService2 greeter) {
         while (true) {
             System.out.println("*** Opening greeter2 client dialog ***");
@@ -111,10 +112,10 @@ public class Activator implements Bundle
                 System.out.println("*** Invoking greeter2 ***");
                 try {
                     GreeterInfo info = greeter.greetMe(name);
-    
+
                     System.out.println("greetMe(\"" + name + "\") returns:");
                     for (GreetingPhrase greeting: info.getGreetings()) {
-                        System.out.println("  " + greeting.getPhrase() 
+                        System.out.println("  " + greeting.getPhrase()
                                 + " " + greeting.getName());
                     }
                 } catch (GreeterException ex) {

Modified: cxf/dosgi/trunk/samples/greeter_rest/impl/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter_rest/impl/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter_rest/impl/pom.xml (original)
+++ cxf/dosgi/trunk/samples/greeter_rest/impl/pom.xml Wed Jun  5 00:40:54 2013
@@ -34,12 +34,12 @@
     </parent>
 
     <properties>
-        <bundle.import.package>javax.ws.rs.*,*</bundle.import.package>                               
+        <bundle.import.package>javax.ws.rs.*,*</bundle.import.package>
         <bundle.private.package>org.apache.cxf.dosgi.samples.greeter.impl.rest</bundle.private.package>
     </properties>
-    
+
     <dependencies>
-        <dependency> 
+        <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
             <version>${felix.version}</version>
@@ -49,13 +49,13 @@
                     <artifactId>org.osgi.foundation</artifactId>
                 </exclusion>
             </exclusions>
-        </dependency> 
-        <dependency> 
+        </dependency>
+        <dependency>
             <groupId>org.apache.cxf.dosgi.samples</groupId>
             <artifactId>cxf-dosgi-ri-samples-greeter-rest-interface</artifactId>
             <version>${project.version}</version>
-        </dependency> 
-    </dependencies> 
+        </dependency>
+    </dependencies>
 
     <build>
       <plugins>
@@ -69,12 +69,12 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Activator>org.apache.cxf.dosgi.samples.greeter.impl.rest.Activator</Bundle-Activator>
                         <Import-Package>${bundle.import.package}</Import-Package>
-                        <Private-Package>${bundle.private.package}</Private-Package> 
+                        <Private-Package>${bundle.private.package}</Private-Package>
                         <DynamicImport-Package>org.apache.cxf.dosgi.dsw.qos,org.apache.cxf</DynamicImport-Package>
                     </instructions>
                 </configuration>
-            </plugin> 
+            </plugin>
          </plugins>
-    </build>    
+    </build>
 
 </project>

Modified: cxf/dosgi/trunk/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/Activator.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/Activator.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/Activator.java (original)
+++ cxf/dosgi/trunk/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/Activator.java Wed Jun  5 00:40:54 2013
@@ -18,7 +18,6 @@
  */
 package org.apache.cxf.dosgi.samples.greeter.impl.rest;
 
-
 import java.util.Dictionary;
 import java.util.Hashtable;
 
@@ -29,21 +28,21 @@ import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 
 public class Activator implements BundleActivator {
+
     private ServiceRegistration registration;
     private ServiceRegistration registration2;
 
     public void start(BundleContext bc) throws Exception {
         Dictionary<String, Object> props = getProperties("/greeter");
-        registration = bc.registerService(GreeterService.class.getName(), 
+        registration = bc.registerService(GreeterService.class.getName(),
                                           new GreeterServiceImpl(), props);
-        
+
         props = getProperties("/greeter2");
-        registration2 = bc.registerService(GreeterService2.class.getName(), 
+        registration2 = bc.registerService(GreeterService2.class.getName(),
                                           new GreeterServiceImpl2(), props);
-        
     }
 
-    private Dictionary<String, Object> getProperties(String address) { 
+    private Dictionary<String, Object> getProperties(String address) {
         Dictionary<String, Object> props = new Hashtable<String, Object>();
 
         props.put("service.exported.interfaces", "*");
@@ -52,7 +51,7 @@ public class Activator implements Bundle
         props.put("org.apache.cxf.rs.httpservice.context", address);
         return props;
     }
-    
+
     public void stop(BundleContext bc) throws Exception {
         registration.unregister();
         registration2.unregister();

Modified: cxf/dosgi/trunk/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/GreeterServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/GreeterServiceImpl.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/GreeterServiceImpl.java (original)
+++ cxf/dosgi/trunk/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/GreeterServiceImpl.java Wed Jun  5 00:40:54 2013
@@ -32,7 +32,7 @@ public class GreeterServiceImpl implemen
 
     public GreeterInfo greetMe(String name) throws GreeterException {
         System.out.println("Invoking: greetMe(" + name + ")");
-        
+
         if (name.equals(STRANGER_NAME)) {
             throw new GreeterException(name);
         }
@@ -46,5 +46,4 @@ public class GreeterServiceImpl implemen
         info.setGreetings(list);
         return info;
     }
-
 }

Modified: cxf/dosgi/trunk/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/GreeterServiceImpl2.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/GreeterServiceImpl2.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/GreeterServiceImpl2.java (original)
+++ cxf/dosgi/trunk/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/GreeterServiceImpl2.java Wed Jun  5 00:40:54 2013
@@ -30,5 +30,4 @@ public class GreeterServiceImpl2 impleme
         System.out.println("Delegating from GreeterServiceImpl2 to GreeterServiceImpl");
         return greeter.greetMe(name);
     }
-
 }

Modified: cxf/dosgi/trunk/samples/greeter_rest/impl2/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter_rest/impl2/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter_rest/impl2/pom.xml (original)
+++ cxf/dosgi/trunk/samples/greeter_rest/impl2/pom.xml Wed Jun  5 00:40:54 2013
@@ -34,12 +34,12 @@
     </parent>
 
     <properties>
-        <bundle.import.package>javax.ws.rs.*,*</bundle.import.package>                               
+        <bundle.import.package>javax.ws.rs.*,*</bundle.import.package>
         <bundle.private.package>org.apache.cxf.dosgi.samples.greeter.impl2.rest</bundle.private.package>
     </properties>
-    
+
     <dependencies>
-        <dependency> 
+        <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
             <version>${felix.version}</version>
@@ -49,13 +49,13 @@
                     <artifactId>org.osgi.foundation</artifactId>
                 </exclusion>
             </exclusions>
-        </dependency> 
-        <dependency> 
+        </dependency>
+        <dependency>
             <groupId>org.apache.cxf.dosgi.samples</groupId>
             <artifactId>cxf-dosgi-ri-samples-greeter-rest-interface</artifactId>
             <version>${project.version}</version>
-        </dependency> 
-    </dependencies> 
+        </dependency>
+    </dependencies>
 
     <build>
       <plugins>
@@ -69,12 +69,12 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Activator>org.apache.cxf.dosgi.samples.greeter.impl2.rest.Activator</Bundle-Activator>
                         <Import-Package>${bundle.import.package}</Import-Package>
-                        <Private-Package>${bundle.private.package}</Private-Package> 
+                        <Private-Package>${bundle.private.package}</Private-Package>
                         <DynamicImport-Package>org.apache.cxf.dosgi.dsw.qos,org.apache.cxf</DynamicImport-Package>
                     </instructions>
                 </configuration>
-            </plugin> 
+            </plugin>
          </plugins>
-    </build>    
+    </build>
 
 </project>

Modified: cxf/dosgi/trunk/samples/greeter_rest/impl2/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl2/rest/Activator.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter_rest/impl2/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl2/rest/Activator.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter_rest/impl2/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl2/rest/Activator.java (original)
+++ cxf/dosgi/trunk/samples/greeter_rest/impl2/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl2/rest/Activator.java Wed Jun  5 00:40:54 2013
@@ -18,7 +18,6 @@
  */
 package org.apache.cxf.dosgi.samples.greeter.impl2.rest;
 
-
 import java.util.Dictionary;
 import java.util.Hashtable;
 
@@ -28,14 +27,16 @@ import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 
 public class Activator implements BundleActivator {
+
     private ServiceRegistration registration;
+
     public void start(BundleContext bc) throws Exception {
         Dictionary<String, Object> props = getProperties("/rest");
-        registration = bc.registerService(GreeterService.class.getName(), 
+        registration = bc.registerService(GreeterService.class.getName(),
                                           new GreeterServiceImpl2(), props);
     }
 
-    private Dictionary<String, Object> getProperties(String address) { 
+    private Dictionary<String, Object> getProperties(String address) {
         Dictionary<String, Object> props = new Hashtable<String, Object>();
 
         props.put("service.exported.interfaces", "*");
@@ -45,7 +46,7 @@ public class Activator implements Bundle
         props.put("org.apache.cxf.rs.address", "/service");
         return props;
     }
-    
+
     public void stop(BundleContext bc) throws Exception {
         registration.unregister();
     }

Modified: cxf/dosgi/trunk/samples/greeter_rest/impl2/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl2/rest/GreeterServiceImpl2.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter_rest/impl2/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl2/rest/GreeterServiceImpl2.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter_rest/impl2/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl2/rest/GreeterServiceImpl2.java (original)
+++ cxf/dosgi/trunk/samples/greeter_rest/impl2/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl2/rest/GreeterServiceImpl2.java Wed Jun  5 00:40:54 2013
@@ -32,7 +32,7 @@ public class GreeterServiceImpl2 impleme
 
     public GreeterInfo greetMe(String name) throws GreeterException {
         System.out.println("Invoking from GreeterServiceImpl2: greetMe(" + name + ")");
-        
+
         if (name.equals(STRANGER_NAME)) {
             throw new GreeterException(name);
         }
@@ -46,5 +46,4 @@ public class GreeterServiceImpl2 impleme
         info.setGreetings(list);
         return info;
     }
-
 }

Modified: cxf/dosgi/trunk/samples/greeter_rest/interface/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter_rest/interface/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter_rest/interface/pom.xml (original)
+++ cxf/dosgi/trunk/samples/greeter_rest/interface/pom.xml Wed Jun  5 00:40:54 2013
@@ -36,13 +36,13 @@
         <bundle.import.package>javax.ws.rs,javax.xml.bind.annotation,*</bundle.import.package>
         <bundle.export.package>org.apache.cxf.dosgi.samples.greeter.rest</bundle.export.package>
     </properties>
-    
+
     <dependencies>
         <dependency>
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
            <scope>test</scope>
-        </dependency>  
+        </dependency>
         <dependency>
            <groupId>org.easymock</groupId>
            <artifactId>easymockclassextension</artifactId>
@@ -58,7 +58,7 @@
           <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
           <version>${servicemix.specs.version}</version>
         </dependency>
-    </dependencies> 
+    </dependencies>
 
     <build>
       <plugins>
@@ -71,11 +71,11 @@
                         <Bundle-Description>This bundle contains the implementation of the CXF Distributed OSGi Greeter Rest Demo Interfaces</Bundle-Description>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Import-Package>${bundle.import.package}</Import-Package>
-                        <Export-Package>${bundle.export.package}</Export-Package> 
+                        <Export-Package>${bundle.export.package}</Export-Package>
                     </instructions>
                 </configuration>
-            </plugin> 
+            </plugin>
          </plugins>
-    </build>    
+    </build>
 
 </project>

Modified: cxf/dosgi/trunk/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterException.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterException.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterException.java (original)
+++ cxf/dosgi/trunk/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterException.java Wed Jun  5 00:40:54 2013
@@ -19,25 +19,25 @@
 package org.apache.cxf.dosgi.samples.greeter.rest;
 
 public class GreeterException extends Exception {
-    
+
     private static final long serialVersionUID = 1L;
     private String name;
-    
+
     public GreeterException() {
     }
-    
+
     public GreeterException(String name) {
         this.name = name;
     }
-    
+
     public String getName() {
         return name;
     }
-    
+
     public void setName(String theName) {
         name = theName;
     }
-    
+
     @Override
     public String toString() {
         return "GreeterService can not greet " + name;

Modified: cxf/dosgi/trunk/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterInfo.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterInfo.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterInfo.java (original)
+++ cxf/dosgi/trunk/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterInfo.java Wed Jun  5 00:40:54 2013
@@ -24,15 +24,14 @@ import java.util.List;
 import javax.xml.bind.annotation.XmlRootElement;
 @XmlRootElement
 public class GreeterInfo {
+
     private List<GreetingPhrase> greetings = new ArrayList<GreetingPhrase>();
-    
+
     public void setGreetings(List<GreetingPhrase> list) {
         greetings = list;
     }
-    
+
     public List<GreetingPhrase> getGreetings() {
         return greetings;
     }
-    
-    
 }

Modified: cxf/dosgi/trunk/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterService.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterService.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterService.java (original)
+++ cxf/dosgi/trunk/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterService.java Wed Jun  5 00:40:54 2013
@@ -28,5 +28,4 @@ public interface GreeterService {
     @GET
     @Path("greeting/{name}")
     GreeterInfo greetMe(@PathParam("name") String name) throws GreeterException;
-
 }

Modified: cxf/dosgi/trunk/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterService2.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterService2.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterService2.java (original)
+++ cxf/dosgi/trunk/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterService2.java Wed Jun  5 00:40:54 2013
@@ -21,5 +21,4 @@ package org.apache.cxf.dosgi.samples.gre
 public interface GreeterService2 {
 
     GreeterInfo greetMe(String name) throws GreeterException;
-
 }

Modified: cxf/dosgi/trunk/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreetingPhrase.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreetingPhrase.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreetingPhrase.java (original)
+++ cxf/dosgi/trunk/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreetingPhrase.java Wed Jun  5 00:40:54 2013
@@ -22,12 +22,13 @@ import javax.xml.bind.annotation.XmlRoot
 
 @XmlRootElement
 public class GreetingPhrase {
+
     private String phrase;
     private String name;
-    
+
     public GreetingPhrase() {
     }
-    
+
     public GreetingPhrase(String phrase, String name) {
         this.phrase = phrase;
         this.name = name;
@@ -36,29 +37,28 @@ public class GreetingPhrase {
     public void setPhrase(String thePhrase) {
         this.phrase = thePhrase;
     }
-    
+
     public String getPhrase() {
         return phrase;
     }
-    
+
     public void setName(String theName) {
         this.name = theName;
     }
-    
+
     public String getName() {
         return name;
     }
-    
+
     @Override
     public int hashCode() {
         return phrase.hashCode() + 37 * name.hashCode();
     }
-    
+
     @Override
     public boolean equals(Object other) {
         return GreetingPhrase.class.isAssignableFrom(other.getClass())
                 && phrase.equals(((GreetingPhrase) other).phrase)
                 && name.equals(((GreetingPhrase) other).name);
-
     }
 }

Modified: cxf/dosgi/trunk/samples/greeter_rest/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter_rest/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter_rest/pom.xml (original)
+++ cxf/dosgi/trunk/samples/greeter_rest/pom.xml Wed Jun  5 00:40:54 2013
@@ -30,14 +30,14 @@
       <groupId>org.apache.cxf.dosgi</groupId>
       <artifactId>cxf-dosgi-ri-parent</artifactId>
       <version>1.5-SNAPSHOT</version>
-      <relativePath>../../parent/pom.xml</relativePath> 
+      <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
-    <modules>    
+    <modules>
       <module>interface</module>
       <module>impl</module>
       <module>impl2</module>
       <module>client</module>
-    </modules> 
+    </modules>
 
 </project>

Modified: cxf/dosgi/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/pom.xml (original)
+++ cxf/dosgi/trunk/samples/pom.xml Wed Jun  5 00:40:54 2013
@@ -31,7 +31,7 @@
       <groupId>org.apache.cxf.dosgi</groupId>
       <artifactId>cxf-dosgi-ri-parent</artifactId>
       <version>1.5-SNAPSHOT</version>
-      <relativePath>../parent/pom.xml</relativePath>  
+      <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <modules>
@@ -41,5 +41,5 @@
       <module>ds</module>
       <module>discovery</module>
       <module>security_filter</module>
-    </modules> 
+    </modules>
 </project>

Modified: cxf/dosgi/trunk/samples/security_filter/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/security_filter/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/security_filter/pom.xml (original)
+++ cxf/dosgi/trunk/samples/security_filter/pom.xml Wed Jun  5 00:40:54 2013
@@ -30,11 +30,11 @@
     <groupId>org.apache.cxf.dosgi</groupId>
     <artifactId>cxf-dosgi-ri-parent</artifactId>
     <version>1.5-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath> 
+    <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
   <dependencies>
-      <dependency> 
+      <dependency>
           <groupId>org.apache.felix</groupId>
           <artifactId>org.apache.felix.framework</artifactId>
           <version>${felix.version}</version>
@@ -44,7 +44,7 @@
                   <artifactId>org.osgi.foundation</artifactId>
               </exclusion>
           </exclusions>
-      </dependency> 
+      </dependency>
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-servlet_${servlet.version}_spec</artifactId>
@@ -59,7 +59,7 @@
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
       </dependency>
-  </dependencies> 
+  </dependencies>
 
   <build>
     <plugins>
@@ -75,8 +75,8 @@
             <Bundle-Activator>org.apache.cxf.dosgi.samples.security.Activator</Bundle-Activator>
           </instructions>
         </configuration>
-      </plugin> 
+      </plugin>
     </plugins>
-  </build>    
+  </build>
 
 </project>

Modified: cxf/dosgi/trunk/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/Activator.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/Activator.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/Activator.java (original)
+++ cxf/dosgi/trunk/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/Activator.java Wed Jun  5 00:40:54 2013
@@ -32,6 +32,7 @@ import org.osgi.framework.ServiceRegistr
  * endpoint.
  */
 public class Activator implements BundleActivator {
+
     private ServiceRegistration restRegistration;
     private ServiceRegistration filterRegistration;
 

Modified: cxf/dosgi/trunk/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/SampleSecurityFilter.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/SampleSecurityFilter.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/SampleSecurityFilter.java (original)
+++ cxf/dosgi/trunk/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/SampleSecurityFilter.java Wed Jun  5 00:40:54 2013
@@ -37,6 +37,7 @@ import org.slf4j.LoggerFactory;
  * resource.
  */
 public class SampleSecurityFilter implements Filter {
+
     private static final Logger LOG = LoggerFactory.getLogger(SampleSecurityFilter.class);
 
     public void destroy() {

Modified: cxf/dosgi/trunk/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/SecureRestEndpoint.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/SecureRestEndpoint.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/SecureRestEndpoint.java (original)
+++ cxf/dosgi/trunk/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/SecureRestEndpoint.java Wed Jun  5 00:40:54 2013
@@ -25,7 +25,7 @@ import javax.ws.rs.core.MediaType;
 
 @Path("/")
 public class SecureRestEndpoint {
-  
+
     @GET
     @Path("hello")
     @Produces(MediaType.TEXT_PLAIN)

Modified: cxf/dosgi/trunk/samples/spring_dm/client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/spring_dm/client/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/spring_dm/client/pom.xml (original)
+++ cxf/dosgi/trunk/samples/spring_dm/client/pom.xml Wed Jun  5 00:40:54 2013
@@ -38,7 +38,7 @@
       <artifactId>cxf-dosgi-ri-samples-spring-dm-interface</artifactId>
       <version>${project.version}</version>
     </dependency>
-  </dependencies> 
+  </dependencies>
 
   <build>
     <plugins>
@@ -50,11 +50,11 @@
             <Bundle-Name>CXF Distributed OSGi Spring-DM Sample Client Bundle</Bundle-Name>
             <Bundle-Description>This bundle contains the client-side implementation of the Distributed OSGi with Spring-DM sample.</Bundle-Description>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Import-Package>org.apache.cxf.dosgi.samples.springdm</Import-Package> 
-            <Private-Package>org.apache.cxf.dosgi.samples.springdm.client</Private-Package> 
+            <Import-Package>org.apache.cxf.dosgi.samples.springdm</Import-Package>
+            <Private-Package>org.apache.cxf.dosgi.samples.springdm.client</Private-Package>
           </instructions>
         </configuration>
-      </plugin> 
+      </plugin>
     </plugins>
-  </build>    
+  </build>
 </project>

Modified: cxf/dosgi/trunk/samples/spring_dm/client/src/main/java/org/apache/cxf/dosgi/samples/springdm/client/DinnerServiceConsumer.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/spring_dm/client/src/main/java/org/apache/cxf/dosgi/samples/springdm/client/DinnerServiceConsumer.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/spring_dm/client/src/main/java/org/apache/cxf/dosgi/samples/springdm/client/DinnerServiceConsumer.java (original)
+++ cxf/dosgi/trunk/samples/spring_dm/client/src/main/java/org/apache/cxf/dosgi/samples/springdm/client/DinnerServiceConsumer.java Wed Jun  5 00:40:54 2013
@@ -22,12 +22,13 @@ import org.apache.cxf.dosgi.samples.spri
 import org.apache.cxf.dosgi.samples.springdm.Restaurant;
 
 public class DinnerServiceConsumer {
+
     DinnerService dinnerService;
-    
+
     public void setDinnerService(DinnerService ds) {
         dinnerService = ds;
     }
-    
+
     public void start() {
         System.out.println("Found the following restaurants:");
         for (Restaurant r : dinnerService.findRestaurants("nice and not too expensive!")) {

Modified: cxf/dosgi/trunk/samples/spring_dm/client/src/main/resources/META-INF/spring/client-spring.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/spring_dm/client/src/main/resources/META-INF/spring/client-spring.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/spring_dm/client/src/main/resources/META-INF/spring/client-spring.xml (original)
+++ cxf/dosgi/trunk/samples/spring_dm/client/src/main/resources/META-INF/spring/client-spring.xml Wed Jun  5 00:40:54 2013
@@ -23,7 +23,7 @@
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                       http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
   <osgi:reference id="dinnerServiceRef" interface="org.apache.cxf.dosgi.samples.springdm.DinnerService"/>
-  
+
   <bean class="org.apache.cxf.dosgi.samples.springdm.client.DinnerServiceConsumer"
         init-method="start">
     <property name="dinnerService" ref="dinnerServiceRef"/>

Modified: cxf/dosgi/trunk/samples/spring_dm/impl/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/spring_dm/impl/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/spring_dm/impl/pom.xml (original)
+++ cxf/dosgi/trunk/samples/spring_dm/impl/pom.xml Wed Jun  5 00:40:54 2013
@@ -38,7 +38,7 @@
       <artifactId>cxf-dosgi-ri-samples-spring-dm-interface</artifactId>
       <version>${project.version}</version>
     </dependency>
-  </dependencies> 
+  </dependencies>
 
   <build>
     <plugins>
@@ -50,11 +50,11 @@
             <Bundle-Name>CXF Distributed OSGi Spring-DM Sample Implementation Bundle</Bundle-Name>
             <Bundle-Description>This bundle contains the server-side implementation of the Distributed OSGi with Spring-DM sample.</Bundle-Description>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Import-Package>org.apache.cxf.dosgi.samples.springdm</Import-Package> 
-            <Private-Package>org.apache.cxf.dosgi.samples.springdm.impl</Private-Package> 
+            <Import-Package>org.apache.cxf.dosgi.samples.springdm</Import-Package>
+            <Private-Package>org.apache.cxf.dosgi.samples.springdm.impl</Private-Package>
           </instructions>
         </configuration>
-      </plugin> 
+      </plugin>
     </plugins>
-  </build>    
+  </build>
 </project>

Modified: cxf/dosgi/trunk/samples/spring_dm/impl/src/main/java/org/apache/cxf/dosgi/samples/springdm/impl/DinnerServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/spring_dm/impl/src/main/java/org/apache/cxf/dosgi/samples/springdm/impl/DinnerServiceImpl.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/spring_dm/impl/src/main/java/org/apache/cxf/dosgi/samples/springdm/impl/DinnerServiceImpl.java (original)
+++ cxf/dosgi/trunk/samples/spring_dm/impl/src/main/java/org/apache/cxf/dosgi/samples/springdm/impl/DinnerServiceImpl.java Wed Jun  5 00:40:54 2013
@@ -25,12 +25,13 @@ import org.apache.cxf.dosgi.samples.spri
 import org.apache.cxf.dosgi.samples.springdm.Restaurant;
 
 public class DinnerServiceImpl implements DinnerService {
+
     List<Restaurant> restaurants = Arrays.asList(
         new Restaurant("Jojo's", "1 food way", 3),
         new Restaurant("Boohaa's", "95 forage ave", 1),
         new Restaurant("MicMac", "Plastic Plaza", 1)
     );
-    
+
     public List<Restaurant> findRestaurants(String query) {
         System.out.println("Hey! Someone's using the Dinner Service! Query: " + query);
         return restaurants;

Modified: cxf/dosgi/trunk/samples/spring_dm/impl/src/main/resources/META-INF/spring/spring.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/spring_dm/impl/src/main/resources/META-INF/spring/spring.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/spring_dm/impl/src/main/resources/META-INF/spring/spring.xml (original)
+++ cxf/dosgi/trunk/samples/spring_dm/impl/src/main/resources/META-INF/spring/spring.xml Wed Jun  5 00:40:54 2013
@@ -26,7 +26,7 @@
     <osgi:service-properties>
       <entry key="service.exported.interfaces" value="*" />
     </osgi:service-properties>
-    
+
     <bean class="org.apache.cxf.dosgi.samples.springdm.impl.DinnerServiceImpl" />
-  </osgi:service>                      
+  </osgi:service>
 </beans>

Modified: cxf/dosgi/trunk/samples/spring_dm/interface/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/spring_dm/interface/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/spring_dm/interface/pom.xml (original)
+++ cxf/dosgi/trunk/samples/spring_dm/interface/pom.xml Wed Jun  5 00:40:54 2013
@@ -43,10 +43,10 @@
             <Bundle-Description>This bundle contains the interfaces of the Distributed OSGi with Spring-DM sample.</Bundle-Description>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Import-Package />
-            <Export-Package>org.apache.cxf.dosgi.samples.springdm</Export-Package> 
+            <Export-Package>org.apache.cxf.dosgi.samples.springdm</Export-Package>
           </instructions>
         </configuration>
-      </plugin> 
+      </plugin>
     </plugins>
-  </build>    
-</project>
\ No newline at end of file
+  </build>
+</project>

Modified: cxf/dosgi/trunk/samples/spring_dm/interface/src/main/java/org/apache/cxf/dosgi/samples/springdm/DinnerService.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/spring_dm/interface/src/main/java/org/apache/cxf/dosgi/samples/springdm/DinnerService.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/spring_dm/interface/src/main/java/org/apache/cxf/dosgi/samples/springdm/DinnerService.java (original)
+++ cxf/dosgi/trunk/samples/spring_dm/interface/src/main/java/org/apache/cxf/dosgi/samples/springdm/DinnerService.java Wed Jun  5 00:40:54 2013
@@ -22,4 +22,4 @@ import java.util.List;
 
 public interface DinnerService {
     List<Restaurant> findRestaurants(String searchQuery);
-}
\ No newline at end of file
+}

Modified: cxf/dosgi/trunk/samples/spring_dm/interface/src/main/java/org/apache/cxf/dosgi/samples/springdm/Restaurant.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/spring_dm/interface/src/main/java/org/apache/cxf/dosgi/samples/springdm/Restaurant.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/spring_dm/interface/src/main/java/org/apache/cxf/dosgi/samples/springdm/Restaurant.java (original)
+++ cxf/dosgi/trunk/samples/spring_dm/interface/src/main/java/org/apache/cxf/dosgi/samples/springdm/Restaurant.java Wed Jun  5 00:40:54 2013
@@ -18,20 +18,21 @@
  */
 package org.apache.cxf.dosgi.samples.springdm;
 
-public class Restaurant {    
+public class Restaurant {
+
     private String name;
     private String address;
     private int rating;
 
     public Restaurant() {
     }
-    
+
     public Restaurant(String name, String address, int rating) {
         this.name = name;
         this.address = address;
         this.rating = rating;
     }
-    
+
     public String getAddress() {
         return address;
     }
@@ -56,4 +57,3 @@ public class Restaurant {    
         this.rating = rating;
     }
 }
-

Modified: cxf/dosgi/trunk/samples/spring_dm/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/spring_dm/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/spring_dm/pom.xml (original)
+++ cxf/dosgi/trunk/samples/spring_dm/pom.xml Wed Jun  5 00:40:54 2013
@@ -32,11 +32,10 @@
       <version>1.5-SNAPSHOT</version>
       <relativePath>../../parent/pom.xml</relativePath>
     </parent>
-    
-    <modules>    
+
+    <modules>
       <module>interface</module>
       <module>impl</module>
       <module>client</module>
-    </modules> 
-
+    </modules>
 </project>

Modified: cxf/dosgi/trunk/systests2/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/common/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/common/pom.xml (original)
+++ cxf/dosgi/trunk/systests2/common/pom.xml Wed Jun  5 00:40:54 2013
@@ -74,7 +74,7 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>provided</scope>
-        </dependency> 
+        </dependency>
     </dependencies>
 
     <build>
@@ -99,8 +99,7 @@
                         <Export-Package>*</Export-Package>
                     </instructions>
                 </configuration>
-            </plugin> 
+            </plugin>
         </plugins>
     </build>
 </project>
-

Modified: cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/GreeterDataImpl.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/GreeterDataImpl.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/GreeterDataImpl.java (original)
+++ cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/GreeterDataImpl.java Wed Jun  5 00:40:54 2013
@@ -36,5 +36,4 @@ public class GreeterDataImpl implements 
         // TODO Auto-generated method stub
         return false;
     }
-
 }

Modified: cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/MyActivator.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/MyActivator.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/MyActivator.java (original)
+++ cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/MyActivator.java Wed Jun  5 00:40:54 2013
@@ -23,20 +23,21 @@ import org.osgi.framework.BundleContext;
 import org.osgi.framework.Filter;
 import org.osgi.util.tracker.ServiceTracker;
 
-public class MyActivator implements BundleActivator {    
+public class MyActivator implements BundleActivator {
+
     private ServiceTracker startTracker;
     private ServiceTracker tracker;
 
     public void start(final BundleContext bc) throws Exception {
         Filter filter = bc.createFilter("(&(objectClass=java.lang.Object)(testName=test1))");
         tracker = new MyServiceTracker(bc);
-        
-        // The start tracker waits until a service from the test class is set before the 
+
+        // The start tracker waits until a service from the test class is set before the
         // 'MyServiceTracker' is activated.
         startTracker = new StartServiceTracker(bc, filter, tracker);
         startTracker.open();
     }
-    
+
     public void stop(BundleContext bc) throws Exception {
         startTracker.close();
         tracker.close();

Modified: cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/MyServiceTracker.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/MyServiceTracker.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/MyServiceTracker.java (original)
+++ cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/MyServiceTracker.java Wed Jun  5 00:40:54 2013
@@ -30,6 +30,7 @@ import org.osgi.framework.ServiceReferen
 import org.osgi.util.tracker.ServiceTracker;
 
 public class MyServiceTracker extends ServiceTracker {
+
     private static StringBuffer invocationResult = new StringBuffer();
 
     public MyServiceTracker(BundleContext context) {
@@ -44,7 +45,7 @@ public class MyServiceTracker extends Se
         }
         return svc;
     }
-    
+
     public static String getResult() {
         return invocationResult.toString();
     }
@@ -61,7 +62,7 @@ public class MyServiceTracker extends Se
                 svc.greetMe(new GreeterDataImpl());
             } catch (GreeterException ex) {
                 invocationResult.append(";exception");
-            } 
+            }
             Dictionary<String, Object> props = new Hashtable<String, Object>();
             props.put("result", invocationResult.toString());
             props.put("testResult", "test1");

Modified: cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/StartServiceTracker.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/StartServiceTracker.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/StartServiceTracker.java (original)
+++ cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/StartServiceTracker.java Wed Jun  5 00:40:54 2013
@@ -24,6 +24,7 @@ import org.osgi.framework.ServiceReferen
 import org.osgi.util.tracker.ServiceTracker;
 
 public class StartServiceTracker extends ServiceTracker {
+
     private ServiceTracker tracker;
 
     public StartServiceTracker(BundleContext context, Filter filter, ServiceTracker tracker) {

Modified: cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/Test2Service.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/Test2Service.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/Test2Service.java (original)
+++ cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/Test2Service.java Wed Jun  5 00:40:54 2013
@@ -19,5 +19,5 @@
 package org.apache.cxf.dosgi.systests2.common.test2;
 
 public interface Test2Service {
-    String getRemoteStackTrace();    
+    String getRemoteStackTrace();
 }

Modified: cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/client/ClientActivator.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/client/ClientActivator.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/client/ClientActivator.java (original)
+++ cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/client/ClientActivator.java Wed Jun  5 00:40:54 2013
@@ -23,6 +23,7 @@ import org.osgi.framework.BundleContext;
 import org.osgi.util.tracker.ServiceTracker;
 
 public class ClientActivator implements BundleActivator {
+
     private ServiceTracker tracker;
 
     public void start(final BundleContext bc) throws Exception {

Modified: cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/client/Test2ServiceTracker.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/client/Test2ServiceTracker.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/client/Test2ServiceTracker.java (original)
+++ cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/client/Test2ServiceTracker.java Wed Jun  5 00:40:54 2013
@@ -29,6 +29,7 @@ import org.osgi.framework.ServiceReferen
 import org.osgi.util.tracker.ServiceTracker;
 
 public class Test2ServiceTracker extends ServiceTracker {
+
     public Test2ServiceTracker(BundleContext context) {
         super(context, getFilter(context), null);
     }
@@ -48,13 +49,13 @@ public class Test2ServiceTracker extends
 
     @Override
     public Object addingService(ServiceReference reference) {
-        Object svc = super.addingService(reference);        
+        Object svc = super.addingService(reference);
         if (svc instanceof Test2Service) {
             System.out.println("*** Ref: " + reference);
             for (String key : reference.getPropertyKeys()) {
                 System.out.println("  " + key + "-" + reference.getProperty(key));
             }
-            
+
             invokeRemoteTestService(context, (Test2Service) svc);
         }
         return svc;
@@ -62,7 +63,7 @@ public class Test2ServiceTracker extends
 
     private void invokeRemoteTestService(BundleContext bc, Test2Service svc) {
         String res = svc.getRemoteStackTrace();
-        
+
         Dictionary<String, Object> props = new Hashtable<String, Object>();
         props.put("result", res);
         props.put("testResult", "test2");

Modified: cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/server/ServerActivator.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/server/ServerActivator.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/server/ServerActivator.java (original)
+++ cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/server/ServerActivator.java Wed Jun  5 00:40:54 2013
@@ -27,22 +27,23 @@ import org.osgi.framework.BundleActivato
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 
-public class ServerActivator implements BundleActivator {    
+public class ServerActivator implements BundleActivator {
+
     private ServiceRegistration reg;
 
     public void start(BundleContext bc) throws Exception {
         Test2Service svc = new Test2ServiceImpl();
-                
+
         // Dynamically assign a free port
         int freePort = new ServerSocket(0).getLocalPort();
         String url = "http://localhost:" + freePort + "/test2";
         System.out.println("*** Server using URL: " + url);
-        
+
         Dictionary<String, Object> props = new Hashtable<String, Object>();
         props.put("service.exported.interfaces", "*");
         props.put("service.exported.configs", "org.apache.cxf.ws");
         props.put("endpoint.id", url);
-        
+
         reg = bc.registerService(Test2Service.class.getName(), svc, props);
     }
 

Modified: cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/server/Test2ServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/server/Test2ServiceImpl.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/server/Test2ServiceImpl.java (original)
+++ cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/server/Test2ServiceImpl.java Wed Jun  5 00:40:54 2013
@@ -24,12 +24,13 @@ import java.io.StringWriter;
 import org.apache.cxf.dosgi.systests2.common.test2.Test2Service;
 
 public class Test2ServiceImpl implements Test2Service {
+
     public String getRemoteStackTrace() {
         Throwable th = new Throwable("Throwable created on the server");
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
         th.printStackTrace(pw);
-        
+
         return sw.toString();
     }
 }

Modified: cxf/dosgi/trunk/systests2/multi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/pom.xml Wed Jun  5 00:40:54 2013
@@ -62,14 +62,14 @@
             <version>${exam.version}</version>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.ops4j.pax.url</groupId>
             <artifactId>pax-url-aether</artifactId>
             <version>1.5.0</version>
             <scope>test</scope>
         </dependency>
- 
+
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
@@ -180,9 +180,9 @@
         <plugins>
             <!-- use pax exam maven plugin -->
 
-            <!-- Note: settings and dependencies for the final osgi runtime 
-                (TESTS) are just used in TestCases that annotated with this: @RunWith( MavenConfiguredJUnit4TestRunner.class 
-                ) All other testcases will use their own settings/provisioning inside @Configure 
+            <!-- Note: settings and dependencies for the final osgi runtime
+                (TESTS) are just used in TestCases that annotated with this: @RunWith( MavenConfiguredJUnit4TestRunner.class
+                ) All other testcases will use their own settings/provisioning inside @Configure
                 Methods. -->
             <plugin>
                 <groupId>org.ops4j.pax.exam</groupId>
@@ -208,7 +208,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <systemPropertyVariables>
-                        <!-- <org.apache.cxf.dosgi.test.debug.port>5005</org.apache.cxf.dosgi.test.debug.port> 
+                        <!-- <org.apache.cxf.dosgi.test.debug.port>5005</org.apache.cxf.dosgi.test.debug.port>
                             <org.apache.cxf.dosgi.test.serviceWaitTimeout>180</org.apache.cxf.dosgi.test.serviceWaitTimeout> -->
                         <java.util.logging.config.file>${project.build.directory}/test-classes/logging.properties</java.util.logging.config.file>
                     </systemPropertyVariables>
@@ -217,4 +217,3 @@
         </plugins>
     </build>
 </project>
-

Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/AbstractDosgiTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/AbstractDosgiTest.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/AbstractDosgiTest.java (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/AbstractDosgiTest.java Wed Jun  5 00:40:54 2013
@@ -101,5 +101,4 @@ public class AbstractDosgiTest {
             socket.close();
         }
     }
-
 }



Mime
View raw message