Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 89535 invoked from network); 5 Aug 2008 21:45:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Aug 2008 21:45:30 -0000 Received: (qmail 38450 invoked by uid 500); 5 Aug 2008 21:45:29 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 38319 invoked by uid 500); 5 Aug 2008 21:45:29 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 38309 invoked by uid 99); 5 Aug 2008 21:45:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Aug 2008 14:45:29 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Aug 2008 21:44:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2AC76238889E; Tue, 5 Aug 2008 14:45:09 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r682972 - in /cxf/branches/2.0.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/bus/spring/ rt/core/src/main/java/org/apache/cxf/workqueue/ rt/management/src/test/java/org/apache/cxf/management/ systests/src/test/java/org/apache/cxf/systest... Date: Tue, 05 Aug 2008 21:45:08 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080805214509.2AC76238889E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Tue Aug 5 14:45:08 2008 New Revision: 682972 URL: http://svn.apache.org/viewvc?rev=682972&view=rev Log: Merged revisions 682951 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r682951 | dkulp | 2008-08-05 17:21:12 -0400 (Tue, 05 Aug 2008) | 2 lines [CXF-1734] Fix mbean names and stuff ........ Modified: cxf/branches/2.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueImplMBeanWrapper.java cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManagerImplMBeanWrapper.java cxf/branches/2.0.x-fixes/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 5 14:45:08 2008 @@ -1 +1 @@ -/cxf/trunk:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902 +/cxf/trunk:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951 Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java?rev=682972&r1=682971&r2=682972&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java (original) +++ cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java Tue Aug 5 14:45:08 2008 @@ -43,6 +43,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; import org.springframework.core.io.UrlResource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; @@ -137,36 +138,10 @@ usingDefault = true; } for (String cfgFile : cfgFiles) { - boolean found = false; - Resource cpr = new ClassPathResource(cfgFile); - if (!cpr.exists()) { - try { - //see if it's a URL - URL url = new URL(cfgFile); - cpr = new UrlResource(url); - if (cpr.exists()) { - resources.add(cpr); - found = true; - } - } catch (MalformedURLException e) { - //ignore - } - if (!found) { - //try loading it our way - URL url = ClassLoaderUtils.getResource(cfgFile, this.getClass()); - if (url != null) { - cpr = new UrlResource(url); - if (cpr.exists()) { - resources.add(cpr); - found = true; - } - } - } - } else { + Resource cpr = findResource(cfgFile); + if (cpr != null && cpr.exists()) { resources.add(cpr); - found = true; - } - if (!found) { + } else { if (!usingDefault) { LogUtils.log(LOG, Level.WARNING, "USER_CFG_FILE_NOT_FOUND_MSG", cfgFile); } else { @@ -212,6 +187,36 @@ return res; } + protected Resource findResource(String cfgFile) { + Resource cpr = new ClassPathResource(cfgFile); + if (cpr.exists()) { + return cpr; + } + try { + //see if it's a URL + URL url = new URL(cfgFile); + cpr = new UrlResource(url); + if (cpr.exists()) { + return cpr; + } + } catch (MalformedURLException e) { + //ignore + } + //try loading it our way + URL url = ClassLoaderUtils.getResource(cfgFile, this.getClass()); + if (url != null) { + cpr = new UrlResource(url); + if (cpr.exists()) { + return cpr; + } + } + cpr = new FileSystemResource(cfgFile); + if (cpr.exists()) { + return cpr; + } + return null; + } + @Override protected void initBeanDefinitionReader(XmlBeanDefinitionReader reader) { // Spring always creates a new one of these, which takes a fair amount Modified: cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueImplMBeanWrapper.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueImplMBeanWrapper.java?rev=682972&r1=682971&r2=682972&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueImplMBeanWrapper.java (original) +++ cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueImplMBeanWrapper.java Tue Aug 5 14:45:08 2008 @@ -27,12 +27,12 @@ import org.apache.cxf.management.annotation.ManagedAttribute; import org.apache.cxf.management.annotation.ManagedResource; -@ManagedResource(componentName = "WorkQueueManager", - description = "The CXF manangement of work queues", +@ManagedResource(componentName = "WorkQueue", + description = "The CXF work queue", currencyTimeLimit = 15, persistPolicy = "OnUpdate", persistPeriod = 200) public class WorkQueueImplMBeanWrapper implements ManagedComponent { - private static final String TYPE_VALUE = "WorkQueueMBean"; + private static final String TYPE_VALUE = "WorkQueues"; private AutomaticWorkQueueImpl aWorkQueue; Modified: cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManagerImplMBeanWrapper.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManagerImplMBeanWrapper.java?rev=682972&r1=682971&r2=682972&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManagerImplMBeanWrapper.java (original) +++ cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManagerImplMBeanWrapper.java Tue Aug 5 14:45:08 2008 @@ -34,7 +34,7 @@ public class WorkQueueManagerImplMBeanWrapper implements ManagedComponent { static final String NAME_VALUE = "Bus.WorkQueueManager"; - static final String TYPE_VALUE = "WorkQueueManagerMBean"; + static final String TYPE_VALUE = "WorkQueueManager"; private WorkQueueManagerImpl wqManager; private Bus bus; @@ -55,10 +55,9 @@ StringBuffer buffer = new StringBuffer(); buffer.append(ManagementConstants.DEFAULT_DOMAIN_NAME + ":"); buffer.append(ManagementConstants.BUS_ID_PROP + "=" + busId + ","); - buffer.append(ManagementConstants.TYPE_PROP + "=" + TYPE_VALUE + ","); - buffer.append(ManagementConstants.NAME_PROP + "=" + NAME_VALUE); + buffer.append("WorkQueueManager=" + NAME_VALUE); + buffer.append("," + ManagementConstants.TYPE_PROP + "=" + TYPE_VALUE); - //Use default domain name of server return new ObjectName(buffer.toString()); } Modified: cxf/branches/2.0.x-fixes/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java?rev=682972&r1=682971&r2=682972&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java (original) +++ cxf/branches/2.0.x-fixes/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java Tue Aug 5 14:45:08 2008 @@ -71,7 +71,7 @@ MBeanServer mbs = im.getMBeanServer(); assertNotNull("MBeanServer should be available.", mbs); ObjectName name = new ObjectName(ManagementConstants.DEFAULT_DOMAIN_NAME - + ":type=WorkQueueMBean,*"); + + ":type=WorkQueues,*"); Set s = mbs.queryNames(name, null); assertTrue(s.size() == 1); Iterator it = s.iterator(); Modified: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java?rev=682972&r1=682971&r2=682972&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java (original) +++ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java Tue Aug 5 14:45:08 2008 @@ -70,7 +70,7 @@ MBeanServer mbs = im.getMBeanServer(); ObjectName name = new ObjectName(ManagementConstants.DEFAULT_DOMAIN_NAME - + ":type=WorkQueueManagerMBean,*"); + + ":type=WorkQueueManager,*"); Set s = mbs.queryNames(name, null); StringBuilder b = new StringBuilder(); for (ObjectName o : CastUtils.cast(s, ObjectName.class)) { @@ -83,7 +83,7 @@ manager.getAutomaticWorkQueue(); name = new ObjectName(ManagementConstants.DEFAULT_DOMAIN_NAME - + ":type=WorkQueueMBean,*"); + + ":type=WorkQueues,*"); s = mbs.queryNames(name, null); b = new StringBuilder(); for (ObjectName o : CastUtils.cast(s, ObjectName.class)) {