Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ABE9F101C7 for ; Wed, 27 Nov 2013 11:46:52 +0000 (UTC) Received: (qmail 36051 invoked by uid 500); 27 Nov 2013 11:46:48 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 35958 invoked by uid 500); 27 Nov 2013 11:46:41 -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 35903 invoked by uid 99); 27 Nov 2013 11:46:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Nov 2013 11:46:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Wed, 27 Nov 2013 11:46:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EA4E7238890B; Wed, 27 Nov 2013 11:46:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1546000 - in /cxf/fediz/trunk: plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationTest.java plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationWriterTest.java pom.xml Date: Wed, 27 Nov 2013 11:46:05 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131127114605.EA4E7238890B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Wed Nov 27 11:46:05 2013 New Revision: 1546000 URL: http://svn.apache.org/r1546000 Log: Upgrading some dependencies Modified: cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationTest.java cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationWriterTest.java cxf/fediz/trunk/pom.xml Modified: cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationTest.java URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationTest.java?rev=1546000&r1=1545999&r2=1546000&view=diff ============================================================================== --- cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationTest.java (original) +++ cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationTest.java Wed Nov 27 11:46:05 2013 @@ -223,7 +223,7 @@ public class FedizConfigurationTest { } @org.junit.Test - public void testSaveConfig() throws JAXBException, IOException { + public void testSaveAndLoadConfig() throws JAXBException, IOException { final JAXBContext jaxbContext = JAXBContext .newInstance(FedizConfig.class); @@ -239,12 +239,9 @@ public class FedizConfigurationTest { f.createNewFile(); configurator.saveConfiguration(f); - } - - @org.junit.Test - public void testLoadConfig() throws JAXBException { - FederationConfigurator configurator = new FederationConfigurator(); - File f = new File(CONFIG_FILE); + + configurator = new FederationConfigurator(); + f = new File(CONFIG_FILE); configurator.loadConfig(f); } Modified: cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationWriterTest.java URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationWriterTest.java?rev=1546000&r1=1545999&r2=1546000&view=diff ============================================================================== --- cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationWriterTest.java (original) +++ cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationWriterTest.java Wed Nov 27 11:46:05 2013 @@ -203,7 +203,7 @@ public class FedizConfigurationWriterTes } @org.junit.Test - public void testSaveConfig() throws JAXBException, IOException { + public void testSaveAndLoadConfig() throws JAXBException, IOException { final JAXBContext jaxbContext = JAXBContext .newInstance(FedizConfig.class); @@ -218,12 +218,9 @@ public class FedizConfigurationWriterTes f.createNewFile(); configurator.saveConfiguration(f); - } - - @org.junit.Test - public void testLoadConfig() throws JAXBException { - FederationConfigurator configurator = new FederationConfigurator(); - File f = new File(CONFIG_FILE); + + configurator = new FederationConfigurator(); + f = new File(CONFIG_FILE); configurator.loadConfig(f); } Modified: cxf/fediz/trunk/pom.xml URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/pom.xml?rev=1546000&r1=1545999&r2=1546000&view=diff ============================================================================== --- cxf/fediz/trunk/pom.xml (original) +++ cxf/fediz/trunk/pom.xml Wed Nov 27 11:46:05 2013 @@ -41,14 +41,14 @@ 3.2 8.1.12.v20130726 - 4.8.2 - 1.2.15 + 4.11 + 1.2.17 2.5 1.7.5 3.1.4.RELEASE 3.1.4.RELEASE 7.0.42 - 1.6.12 + 1.6.13 http://localhost:8080/manager/text UTF-8 @@ -476,7 +476,7 @@ org.apache.maven.plugins maven-pmd-plugin - 2.7.1 + 3.0.1 org.apache.cxf.build-utils