svn commit: r1764849 - in /qpid/java/trunk: bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/ broker-core/src/main/java/org/apache/qpid/server/model/ broker-core/src/main/java/org/apache/qpid/server/virtualhost/ broker-core/src/main...

[rgodfrey]

Author: rgodfrey
Date: Fri Oct 14 09:54:12 2016
New Revision: 1764849

URL: http://svn.apache.org/viewvc?rev=1764849&view=rev
Log:
QPID-7379 : Revert renaming of extractConfig

Modified:
    
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java

Modified: 
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java?rev=1764849&r1=1764848&r2=1764849&view=diff
==============================================================================
--- 
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java
 (original)
+++ 
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java
 Fri Oct 14 09:54:12 2016
@@ -456,7 +456,7 @@ public class BDBHAReplicaVirtualHostImpl
     }
 
     @Override
-    public Map<String, Object> exportConfig(boolean includeSecureAttributes)
+    public Map<String, Object> extractConfig(boolean includeSecureAttributes)
     {
         return Collections.emptyMap();
     }

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java?rev=1764849&r1=1764848&r2=1764849&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
 Fri Oct 14 09:54:12 2016
@@ -221,7 +221,7 @@ public interface VirtualHost<X extends V
             description = "Extract configuration",
             paramRequiringSecure = "includeSecureAttributes",
             changesConfiguredObjectState = false)
-    Map<String,Object> exportConfig(@Param(name="includeSecureAttributes",
+    Map<String,Object> extractConfig(@Param(name="includeSecureAttributes",
                                             description = "include attributes 
that may contain passwords or other "
                                                           + "confidential 
information",
                                             defaultValue = "false") boolean 
includeSecureAttributes);

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1764849&r1=1764848&r2=1764849&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
 Fri Oct 14 09:54:12 2016
@@ -808,7 +808,7 @@ public abstract class AbstractVirtualHos
     }
 
     @Override
-    public Map<String, Object> exportConfig(final boolean 
includeSecureAttributes)
+    public Map<String, Object> extractConfig(final boolean 
includeSecureAttributes)
     {
         return doSync(doOnConfigThread(new 
Task<ListenableFuture<Map<String,Object>>, RuntimeException>()
         {
@@ -830,7 +830,7 @@ public abstract class AbstractVirtualHos
             @Override
             public String getAction()
             {
-                return "exportConfig";
+                return "extractConfig";
             }
 
             @Override

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java?rev=1764849&r1=1764848&r2=1764849&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java
 Fri Oct 14 09:54:12 2016
@@ -315,7 +315,7 @@ class RedirectingVirtualHostImpl
     }
 
     @Override
-    public Map<String, Object> exportConfig(boolean includeSecureAttributes)
+    public Map<String, Object> extractConfig(boolean includeSecureAttributes)
     {
         return Collections.emptyMap();
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org