From 62d7edd70ee3d029c10771b2ae05e83e33822ceb Mon Sep 17 00:00:00 2001 From: Cleverson Sacramento Date: Thu, 4 Apr 2013 15:39:32 -0300 Subject: [PATCH] Organização do código --- impl/core/pom.xml | 30 ------------------------------ impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationLoader.java | 42 ++++++++++++++++++++++++------------------ impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/defaultvalue/ConfigurationDefaultValueTest.java | 2 -- parent/bom/pom.xml | 46 +++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 67 insertions(+), 53 deletions(-) diff --git a/impl/core/pom.xml b/impl/core/pom.xml index ad63e8a..d618d17 100755 --- a/impl/core/pom.xml +++ b/impl/core/pom.xml @@ -180,32 +180,9 @@ org.javassist javassist - commons-configuration commons-configuration - - - commons-digester - commons-digester - - - log4j - log4j - - - servlet-api - javax.servlet - - - logkit - logkit - - - avalon-framework - avalon-framework - - @@ -217,19 +194,16 @@ org.jboss.arquillian.junit arquillian-junit-container - ${arquillian.version} test org.jboss.arquillian.container arquillian-weld-se-embedded-1.1 - ${arquillian.weld.se.embedded.version} test org.jboss.weld.se weld-se-core - ${weld.se.version} test @@ -297,10 +271,6 @@ - 1.0.3.Final - 1.0.0.CR6 - 1.1.8.Final - diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationLoader.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationLoader.java index 268475a..b662b64 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationLoader.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationLoader.java @@ -129,36 +129,42 @@ public class ConfigurationLoader implements Serializable { } private void loadConfiguration() { - AbstractConfiguration conf; + org.apache.commons.configuration.Configuration config = createConfiguration(); + + if (config instanceof FileConfiguration) { + ((FileConfiguration) config).setURL(Reflections.getResourceAsURL(this.resource)); + + try { + ((FileConfiguration) config).load(); + + } catch (org.apache.commons.configuration.ConfigurationException cause) { + // TODO Logar como warning. + config = null; + } + } + + this.configuration = config; + } + + private org.apache.commons.configuration.Configuration createConfiguration() { + AbstractConfiguration config; switch (this.type) { case SYSTEM: - conf = new SystemConfiguration(); + config = new SystemConfiguration(); break; case XML: - conf = new XMLConfiguration(); + config = new XMLConfiguration(); break; default: - conf = new PropertiesConfiguration(); + config = new PropertiesConfiguration(); break; } - conf.setDelimiterParsingDisabled(true); - - if (conf instanceof FileConfiguration) { - ((FileConfiguration) conf).setURL(Reflections.getResourceAsURL(this.resource)); - - try { - ((FileConfiguration) conf).load(); - - } catch (org.apache.commons.configuration.ConfigurationException cause) { - conf = null; - } - } - - this.configuration = conf; + config.setDelimiterParsingDisabled(true); + return config; } private void loadPrefix() { diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/defaultvalue/ConfigurationDefaultValueTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/defaultvalue/ConfigurationDefaultValueTest.java index 548c0d6..3d58ab1 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/defaultvalue/ConfigurationDefaultValueTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/defaultvalue/ConfigurationDefaultValueTest.java @@ -46,12 +46,10 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.asset.FileAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import br.gov.frameworkdemoiselle.configuration.AbstractConfigurationTest; -import br.gov.frameworkdemoiselle.configuration.ConfigurationException; @RunWith(Arquillian.class) public class ConfigurationDefaultValueTest extends AbstractConfigurationTest { diff --git a/parent/bom/pom.xml b/parent/bom/pom.xml index 2a0d00f..9f6364a 100755 --- a/parent/bom/pom.xml +++ b/parent/bom/pom.xml @@ -34,7 +34,8 @@ ou escreva para a Fundação do Software Livre (FSF) Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. --> - + 4.0.0 @@ -274,6 +275,28 @@ commons-configuration commons-configuration ${commons.configuration.version} + + + commons-digester + commons-digester + + + log4j + log4j + + + servlet-api + javax.servlet + + + logkit + logkit + + + avalon-framework + avalon-framework + + commons-dbcp @@ -315,6 +338,21 @@ easymock ${easymock.version} + + org.jboss.arquillian.junit + arquillian-junit-container + ${arquillian.version} + + + org.jboss.arquillian.container + arquillian-weld-se-embedded-1.1 + ${arquillian.weld.se.embedded.version} + + + org.jboss.weld.se + weld-se-core + ${weld.version} + @@ -358,8 +396,10 @@ 4.8.1 3.0 - 1.0.0.Alpha4.SP2 - 1.0.0.Alpha2 + + 1.0.3.Final + 1.0.0.CR6 + 1.4.6 3.4 1.6.1 -- libgit2 0.21.2