cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject svn commit: r735998 - in /cxf/sandbox/dosgi: discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/ dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/ dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/ dsw/cxf-dsw/src/test/java/org/apach...
Date Tue, 20 Jan 2009 12:13:41 GMT
Author: davidb
Date: Tue Jan 20 04:13:41 2009
New Revision: 735998

URL: http://svn.apache.org/viewvc?rev=735998&view=rev
Log:
Fix for bug CXF-1874

Added:
    cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/OSGI-INF/remote-service/   (props changed)
      - copied from r735726, cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/OSGI-INF/remote-services/
    cxf/sandbox/dosgi/samples/greeter/client/src/main/resources/OSGI-INF/remote-service/ 
 (props changed)
      - copied from r735726, cxf/sandbox/dosgi/samples/greeter/client/src/main/resources/OSGI-INF/remote-services/
    cxf/sandbox/dosgi/samples/spring_dm/client/src/main/resources/OSGI-INF/remote-service/
  (props changed)
      - copied from r735726, cxf/sandbox/dosgi/samples/spring_dm/client/src/main/resources/OSGI-INF/remote-services/
    cxf/sandbox/dosgi/systests/basic/src/test/resources/OSGI-INF/remote-service/   (props
changed)
      - copied from r735726, cxf/sandbox/dosgi/systests/basic/src/test/resources/OSGI-INF/remote-services/
Removed:
    cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/OSGI-INF/remote-services/
    cxf/sandbox/dosgi/samples/greeter/client/src/main/resources/OSGI-INF/remote-services/
    cxf/sandbox/dosgi/samples/spring_dm/client/src/main/resources/OSGI-INF/remote-services/
    cxf/sandbox/dosgi/systests/basic/src/test/resources/OSGI-INF/remote-services/
Modified:
    cxf/sandbox/dosgi/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/LocalDiscoveryService.java
    cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/OsgiUtils.java
    cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/OsgiUtilsTest.java
    cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/hooks/CxfListenerHookTest.java
    cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/hooks/CxfPublishHookTest.java

Modified: cxf/sandbox/dosgi/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/LocalDiscoveryService.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/LocalDiscoveryService.java?rev=735998&r1=735997&r2=735998&view=diff
==============================================================================
--- cxf/sandbox/dosgi/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/LocalDiscoveryService.java
(original)
+++ cxf/sandbox/dosgi/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/LocalDiscoveryService.java
Tue Jan 20 04:13:41 2009
@@ -59,7 +59,7 @@
     private static final String DEFAULT_SERVICES_LOCATION = 
         "/discovery/conf/remote-services.xml";
     private static final String REMOTE_SERVICES_ENTRY = 
-        "/META-INF/osgi/remote-services.xml";
+        "/META-INF/remote-service/remote-services.xml";
     private static final String REMOTE_SERVICES_NS =
         "http://www.osgi.org/xmlns/sd/v1.0.0";    
     

Modified: cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/OsgiUtils.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/OsgiUtils.java?rev=735998&r1=735997&r2=735998&view=diff
==============================================================================
--- cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/OsgiUtils.java (original)
+++ cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/OsgiUtils.java Tue
Jan 20 04:13:41 2009
@@ -55,7 +55,7 @@
     
     private static final String REMOTE_SERVICES_HEADER_NAME = "Remote-Service";
     private static final String REMOTE_SERVICES_DIRECTORY =
-        "OSGI-INF/remote-services";
+        "OSGI-INF/remote-service";
     private static final String REMOTE_SERVICES_NS =
         "http://www.osgi.org/xmlns/sd/v1.0.0";
     

Modified: cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/OsgiUtilsTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/OsgiUtilsTest.java?rev=735998&r1=735997&r2=735998&view=diff
==============================================================================
--- cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/OsgiUtilsTest.java
(original)
+++ cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/OsgiUtilsTest.java
Tue Jan 20 04:13:41 2009
@@ -137,7 +137,7 @@
         
         Bundle b = EasyMock.createNiceMock(Bundle.class);
         EasyMock.expect(b.findEntries(
-            EasyMock.eq("OSGI-INF/remote-services"), 
+            EasyMock.eq("OSGI-INF/remote-service"), 
             EasyMock.eq("*.xml"), EasyMock.anyBoolean())).andReturn(
                 Collections.enumeration(Arrays.asList(rs1URL))).anyTimes();
         EasyMock.replay(b);
@@ -155,7 +155,7 @@
         
         Bundle b = EasyMock.createNiceMock(Bundle.class);
         EasyMock.expect(b.findEntries(
-            EasyMock.eq("OSGI-INF/remote-services"), 
+            EasyMock.eq("OSGI-INF/remote-service"), 
             EasyMock.eq("*.xml"), EasyMock.anyBoolean())).andReturn(
                 Collections.enumeration(Arrays.asList(rs1URL, rs2URL))).anyTimes();
         EasyMock.replay(b);

Modified: cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/hooks/CxfListenerHookTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/hooks/CxfListenerHookTest.java?rev=735998&r1=735997&r2=735998&view=diff
==============================================================================
--- cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/hooks/CxfListenerHookTest.java
(original)
+++ cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/hooks/CxfListenerHookTest.java
Tue Jan 20 04:13:41 2009
@@ -50,10 +50,10 @@
     public void testSyncListenerHook() throws Exception {
         
         Bundle bundle = control.createMock(Bundle.class);
-        bundle.findEntries(EasyMock.eq("OSGI-INF/remote-services"), 
+        bundle.findEntries(EasyMock.eq("OSGI-INF/remote-service"), 
             EasyMock.eq("*.xml"), EasyMock.anyBoolean());
         EasyMock.expectLastCall().andReturn(Collections.enumeration(
-            Arrays.asList(getClass().getResource("/OSGI-INF/remote-services/remote-services.xml"))));
+            Arrays.asList(getClass().getResource("/OSGI-INF/remote-service/remote-services.xml"))));
         Dictionary<String, String> bundleHeaders = new Hashtable<String, String>();
         bundleHeaders.put(org.osgi.framework.Constants.BUNDLE_NAME, 
                           "Test Bundle");
@@ -89,10 +89,10 @@
     public void testListenerHook() throws Exception {
         
         Bundle bundle = control.createMock(Bundle.class);
-        bundle.findEntries(EasyMock.eq("OSGI-INF/remote-services"), 
+        bundle.findEntries(EasyMock.eq("OSGI-INF/remote-service"), 
             EasyMock.eq("*.xml"), EasyMock.anyBoolean());
         EasyMock.expectLastCall().andReturn(Collections.enumeration(
-            Arrays.asList(getClass().getResource("/OSGI-INF/remote-services/remote-services.xml"))));
+            Arrays.asList(getClass().getResource("/OSGI-INF/remote-service/remote-services.xml"))));
         Dictionary<String, String> bundleHeaders = new Hashtable<String, String>();
         bundleHeaders.put(org.osgi.framework.Constants.BUNDLE_NAME, 
                           "Test Bundle");

Modified: cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/hooks/CxfPublishHookTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/hooks/CxfPublishHookTest.java?rev=735998&r1=735997&r2=735998&view=diff
==============================================================================
--- cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/hooks/CxfPublishHookTest.java
(original)
+++ cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/hooks/CxfPublishHookTest.java
Tue Jan 20 04:13:41 2009
@@ -74,10 +74,10 @@
                                    String[] addresses) throws Exception {
         
         Bundle bundle = control.createMock(Bundle.class);
-        bundle.findEntries(EasyMock.eq("OSGI-INF/remote-services"), 
+        bundle.findEntries(EasyMock.eq("OSGI-INF/remote-service"), 
             EasyMock.eq("*.xml"), EasyMock.anyBoolean());
         EasyMock.expectLastCall().andReturn(Collections.enumeration(
-            Arrays.asList(getClass().getResource("/OSGI-INF/remote-services/" + remoteServices))));
+            Arrays.asList(getClass().getResource("/OSGI-INF/remote-service/" + remoteServices))));
         Dictionary<String, String> bundleHeaders = new Hashtable<String, String>();
         bundleHeaders.put(org.osgi.framework.Constants.BUNDLE_NAME, 
                           "Test Bundle");
@@ -139,12 +139,12 @@
     @Test
     public void testPublishMultipleTimes() {
         Bundle bundle = control.createMock(Bundle.class);
-        bundle.findEntries(EasyMock.eq("OSGI-INF/remote-services"), 
+        bundle.findEntries(EasyMock.eq("OSGI-INF/remote-service"), 
                 EasyMock.eq("*.xml"), EasyMock.anyBoolean());
         EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() {
             public Object answer() throws Throwable {
                 return Collections.enumeration(Arrays.asList(
-                    getClass().getResource("/OSGI-INF/remote-services/remote-services.xml")));
+                    getClass().getResource("/OSGI-INF/remote-service/remote-services.xml")));
             }            
         }).anyTimes();
         Dictionary<String, String> bundleHeaders = new Hashtable<String, String>();

Propchange: cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/OSGI-INF/remote-service/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: cxf/sandbox/dosgi/samples/greeter/client/src/main/resources/OSGI-INF/remote-service/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: cxf/sandbox/dosgi/samples/spring_dm/client/src/main/resources/OSGI-INF/remote-service/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: cxf/sandbox/dosgi/systests/basic/src/test/resources/OSGI-INF/remote-service/
------------------------------------------------------------------------------
    svn:mergeinfo = 



Mime
View raw message