cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1235268 - in /cxf/trunk: api/src/main/java/org/apache/cxf/workqueue/ rt/core/src/main/java/org/apache/cxf/bus/managers/ rt/core/src/main/java/org/apache/cxf/workqueue/ rt/core/src/main/resources/META-INF/cxf/ rt/core/src/test/java/org/apac...
Date Tue, 24 Jan 2012 14:37:09 GMT
Author: dkulp
Date: Tue Jan 24 14:37:08 2012
New Revision: 1235268

URL: http://svn.apache.org/viewvc?rev=1235268&view=rev
Log:
resolve workqueue split package issue

Added:
    cxf/trunk/api/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java   (contents,
props changed)
      - copied, changed from r1235092, cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
    cxf/trunk/api/src/main/java/org/apache/cxf/workqueue/Messages.properties   (contents,
props changed)
      - copied, changed from r1235092, cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/Messages.properties
    cxf/trunk/api/src/main/java/org/apache/cxf/workqueue/OneShotAsyncExecutor.java   (contents,
props changed)
      - copied, changed from r1235092, cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/OneShotAsyncExecutor.java
    cxf/trunk/api/src/main/java/org/apache/cxf/workqueue/SynchronousExecutor.java   (contents,
props changed)
      - copied, changed from r1235092, cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/SynchronousExecutor.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueImplMBeanWrapper.java
  (contents, props changed)
      - copied, changed from r1235092, cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueImplMBeanWrapper.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java
  (contents, props changed)
      - copied, changed from r1235092, cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManagerImpl.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImplMBeanWrapper.java
  (contents, props changed)
      - copied, changed from r1235092, cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManagerImplMBeanWrapper.java
Removed:
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/Messages.properties
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/OneShotAsyncExecutor.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/SynchronousExecutor.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueImplMBeanWrapper.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManagerImpl.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManagerImplMBeanWrapper.java
Modified:
    cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/osgi/WorkQueueSingleConfigTest.java
    cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java

Copied: cxf/trunk/api/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java (from
r1235092, cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java&r1=1235092&r2=1235268&rev=1235268&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java Tue Jan
24 14:37:08 2012
@@ -485,7 +485,7 @@ public class AutomaticWorkQueueImpl impl
         return executor == null ? true : executor.getQueue().size() == 0;
     }
 
-    boolean isFull() {
+    public boolean isFull() {
         return executor == null ? false : executor.getQueue().remainingCapacity() == 0;
     }
 

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/api/src/main/java/org/apache/cxf/workqueue/Messages.properties (from r1235092,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/Messages.properties)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/workqueue/Messages.properties?p2=cxf/trunk/api/src/main/java/org/apache/cxf/workqueue/Messages.properties&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/Messages.properties&r1=1235092&r2=1235268&rev=1235268&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/workqueue/Messages.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/workqueue/Messages.properties
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/workqueue/Messages.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: cxf/trunk/api/src/main/java/org/apache/cxf/workqueue/OneShotAsyncExecutor.java (from
r1235092, cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/OneShotAsyncExecutor.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/workqueue/OneShotAsyncExecutor.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/workqueue/OneShotAsyncExecutor.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/OneShotAsyncExecutor.java&r1=1235092&r2=1235268&rev=1235268&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/workqueue/OneShotAsyncExecutor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/workqueue/OneShotAsyncExecutor.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/api/src/main/java/org/apache/cxf/workqueue/SynchronousExecutor.java (from
r1235092, cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/SynchronousExecutor.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/workqueue/SynchronousExecutor.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/workqueue/SynchronousExecutor.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/SynchronousExecutor.java&r1=1235092&r2=1235268&rev=1235268&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/workqueue/SynchronousExecutor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/workqueue/SynchronousExecutor.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueImplMBeanWrapper.java
(from r1235092, cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueImplMBeanWrapper.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueImplMBeanWrapper.java?p2=cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueImplMBeanWrapper.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueImplMBeanWrapper.java&r1=1235092&r2=1235268&rev=1235268&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueImplMBeanWrapper.java
(original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueImplMBeanWrapper.java
Tue Jan 24 14:37:08 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.workqueue;
+package org.apache.cxf.bus.managers;
 
 import javax.management.JMException;
 import javax.management.ObjectName;
@@ -27,6 +27,8 @@ import org.apache.cxf.management.Managed
 import org.apache.cxf.management.ManagementConstants;
 import org.apache.cxf.management.annotation.ManagedAttribute;
 import org.apache.cxf.management.annotation.ManagedResource;
+import org.apache.cxf.workqueue.AutomaticWorkQueueImpl;
+import org.apache.cxf.workqueue.WorkQueueManager;
 
 @ManagedResource(componentName = "WorkQueue", 
                  description = "The CXF work queue", 

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueImplMBeanWrapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueImplMBeanWrapper.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueImplMBeanWrapper.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java
(from r1235092, cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManagerImpl.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java?p2=cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManagerImpl.java&r1=1235092&r2=1235268&rev=1235268&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManagerImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java
Tue Jan 24 14:37:08 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.workqueue;
+package org.apache.cxf.bus.managers;
 
 import java.util.Collection;
 import java.util.Map;
@@ -35,6 +35,9 @@ import org.apache.cxf.common.injection.N
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.configuration.ConfiguredBeanLocator;
 import org.apache.cxf.management.InstrumentationManager;
+import org.apache.cxf.workqueue.AutomaticWorkQueue;
+import org.apache.cxf.workqueue.AutomaticWorkQueueImpl;
+import org.apache.cxf.workqueue.WorkQueueManager;
 
 @NoJSR250Annotations(unlessNull = "bus")
 public class WorkQueueManagerImpl implements WorkQueueManager {

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImplMBeanWrapper.java
(from r1235092, cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManagerImplMBeanWrapper.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImplMBeanWrapper.java?p2=cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImplMBeanWrapper.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManagerImplMBeanWrapper.java&r1=1235092&r2=1235268&rev=1235268&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManagerImplMBeanWrapper.java
(original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImplMBeanWrapper.java
Tue Jan 24 14:37:08 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.workqueue;
+package org.apache.cxf.bus.managers;
 
 import javax.management.JMException;
 import javax.management.ObjectName;

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImplMBeanWrapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImplMBeanWrapper.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1235268&r1=1235267&r2=1235268&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt (original)
+++ cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt Tue Jan 24 14:37:08
2012
@@ -1,6 +1,6 @@
 org.apache.cxf.wsdl11.WSDLManagerImpl:org.apache.cxf.wsdl.WSDLManager:true
 org.apache.cxf.bus.managers.PhaseManagerImpl:org.apache.cxf.phase.PhaseManager:true
-org.apache.cxf.workqueue.WorkQueueManagerImpl:org.apache.cxf.workqueue.WorkQueueManager:true
+org.apache.cxf.bus.managers.WorkQueueManagerImpl:org.apache.cxf.workqueue.WorkQueueManager:true
 org.apache.cxf.bus.managers.CXFBusLifeCycleManager:org.apache.cxf.buslifecycle.BusLifeCycleManager:true
  	   
 org.apache.cxf.endpoint.ServerRegistryImpl:org.apache.cxf.endpoint.ServerRegistry:true
 org.apache.cxf.transports.http.internal.QueryHandlerRegistryImpl:org.apache.cxf.transports.http.QueryHandlerRegistry:true


Modified: cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/osgi/WorkQueueSingleConfigTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/osgi/WorkQueueSingleConfigTest.java?rev=1235268&r1=1235267&r2=1235268&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/osgi/WorkQueueSingleConfigTest.java
(original)
+++ cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/osgi/WorkQueueSingleConfigTest.java
Tue Jan 24 14:37:08 2012
@@ -24,9 +24,9 @@ import java.util.Properties;
 
 import junit.framework.Assert;
 
+import org.apache.cxf.bus.managers.WorkQueueManagerImpl;
 import org.apache.cxf.workqueue.AutomaticWorkQueueImpl;
 import org.apache.cxf.workqueue.WorkQueueManager;
-import org.apache.cxf.workqueue.WorkQueueManagerImpl;
 import org.junit.Test;
 import org.osgi.service.cm.ConfigurationException;
 

Modified: cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java?rev=1235268&r1=1235267&r2=1235268&view=diff
==============================================================================
--- cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
(original)
+++ cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
Tue Jan 24 14:37:08 2012
@@ -25,10 +25,10 @@ import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.bus.managers.WorkQueueManagerImpl;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.management.counters.CounterRepository;
 import org.apache.cxf.management.jmx.InstrumentationManagerImpl;
-import org.apache.cxf.workqueue.WorkQueueManagerImpl;
 
 import org.junit.After;
 import org.junit.Assert;



Mime
View raw message