[seam-commits] Seam SVN: r13883 - in modules/international/trunk: api and 11 other directories.

Author: lincolnthree Date: 2010-10-15 11:24:34 -0400 (Fri, 15 Oct 2010) New Revision: 13883 Removed: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/MockLogger.java Modified: modules/international/trunk/api/pom.xml modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/MessageFactory.java modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessage.java modules/international/trunk/impl/pom.xml modules/international/trunk/impl/src/main/java/org/jboss/seam/international/locale/AvailableLocales.java modules/international/trunk/impl/src/main/java/org/jboss/seam/international/locale/DefaultLocaleProducer.java modules/international/trunk/impl/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessageImpl.java modules/international/trunk/impl/src/main/java/org/jboss/seam/international/timezone/DefaultTimeZoneProducer.java modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/AvailableLocalesTest.java modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideFailTest.java modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangCountryTest.java modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangCountryVariantTest.java modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangTest.java modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleTest.java modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/UserLocaleTest.java modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/MessagesTest.java modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/builder/BundleTemplateMessageImplTest.java modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneOverrideFailTest.java modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneOverrideTest.java modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneTest.java modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/UserTimeZoneTest.java modules/international/trunk/pom.xml Log: Updated to use JBoss Logging Modified: modules/international/trunk/api/pom.xml =================================================================== --- modules/international/trunk/api/pom.xml 2010-10-15 13:02:19 UTC (rev 13882) +++ modules/international/trunk/api/pom.xml 2010-10-15 15:24:34 UTC (rev 13883) @@ -16,6 +16,11 @@ <dependencies> <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> </dependency> Modified: modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/MessageFactory.java =================================================================== --- modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/MessageFactory.java 2010-10-15 13:02:19 UTC (rev 13882) +++ modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/MessageFactory.java 2010-10-15 15:24:34 UTC (rev 13883) @@ -52,42 +52,42 @@ */ public BundleTemplateMessage info(final BundleKey message) { - return getContextualInstance(BundleTemplateMessage.class).text(message).level(Level.INFO); + return getContextualInstance(BundleTemplateMessage.class).key(message).level(Level.INFO); } public BundleTemplateMessage info(final BundleKey message, final Object... params) { - return getContextualInstance(BundleTemplateMessage.class).text(message).level(Level.INFO).textParams(params); + return getContextualInstance(BundleTemplateMessage.class).key(message).level(Level.INFO).params(params); } public BundleTemplateMessage warn(final BundleKey message) { - return getContextualInstance(BundleTemplateMessage.class).text(message).level(Level.WARN); + return getContextualInstance(BundleTemplateMessage.class).key(message).level(Level.WARN); } public BundleTemplateMessage warn(final BundleKey message, final Object... params) { - return getContextualInstance(BundleTemplateMessage.class).text(message).level(Level.WARN).textParams(params); + return getContextualInstance(BundleTemplateMessage.class).key(message).level(Level.WARN).params(params); } public BundleTemplateMessage error(final BundleKey message) { - return getContextualInstance(BundleTemplateMessage.class).text(message).level(Level.ERROR); + return getContextualInstance(BundleTemplateMessage.class).key(message).level(Level.ERROR); } public BundleTemplateMessage error(final BundleKey message, final Object... params) { - return getContextualInstance(BundleTemplateMessage.class).text(message).level(Level.ERROR).textParams(params); + return getContextualInstance(BundleTemplateMessage.class).key(message).level(Level.ERROR).params(params); } public BundleTemplateMessage fatal(final BundleKey message) { - return getContextualInstance(BundleTemplateMessage.class).text(message).level(Level.FATAL); + return getContextualInstance(BundleTemplateMessage.class).key(message).level(Level.FATAL); } public BundleTemplateMessage fatal(final BundleKey message, final Object... params) { - return getContextualInstance(BundleTemplateMessage.class).text(message).level(Level.FATAL).textParams(params); + return getContextualInstance(BundleTemplateMessage.class).key(message).level(Level.FATAL).params(params); } /* Modified: modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessage.java =================================================================== --- modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessage.java 2010-10-15 13:02:19 UTC (rev 13882) +++ modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessage.java 2010-10-15 15:24:34 UTC (rev 13883) @@ -61,14 +61,14 @@ public interface BundleTemplateMessage extends MessageBuilder { /** - * Set the template for this message, using the given {@link BundleKey} to - * perform a resource lookup. + * Use the given {@link BundleKey} to perform a resource lookup, resolving + * the template to render for this message. * <p> * Any expressions of the form "{0}, {1} ... {N}" found in the template will * be interpolated; numbers reference the index of any given parameters, and * can be used more than once per template. */ - public BundleTemplateMessage text(final BundleKey text); + public BundleTemplateMessage key(final BundleKey text); /** * Set the default template text. @@ -81,7 +81,7 @@ * be interpolated; numbers reference the index of any given parameters, and * can be used more than once per template. */ - public BundleTemplateMessage textDefault(final String text); + public BundleTemplateMessage defaults(final String text); /** * Set the parameters for this builder's template. @@ -91,7 +91,7 @@ * {N}". The same parameters will be used when interpolating default text, in * the case when a {@link BundleKey} cannot be resolved. */ - public BundleTemplateMessage textParams(final Object... textParams); + public BundleTemplateMessage params(final Object... textParams); /** * Set the targets for this message. If supported by the consuming Modified: modules/international/trunk/impl/pom.xml =================================================================== --- modules/international/trunk/impl/pom.xml 2010-10-15 13:02:19 UTC (rev 13882) +++ modules/international/trunk/impl/pom.xml 2010-10-15 15:24:34 UTC (rev 13883) @@ -1,110 +1,101 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.jboss.seam.international</groupId> - <artifactId>seam-international-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <parent> + <groupId>org.jboss.seam.international</groupId> + <artifactId>seam-international-parent</artifactId> + <version>3.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> - </parent> + </parent> - <artifactId>seam-international</artifactId> - <version>3.0.0-SNAPSHOT</version> + <artifactId>seam-international</artifactId> + <version>3.0.0-SNAPSHOT</version> - <packaging>jar</packaging> - <name>Seam International Module Core Implementation</name> + <packaging>jar</packaging> + <name>Seam International Module Core Implementation</name> - <properties> - <jboss-logging.version>3.0.0.Beta4</jboss-logging.version> - </properties> + <dependencies> + <dependency> + <artifactId>seam-international-api</artifactId> + <groupId>org.jboss.seam.international</groupId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-extensions</artifactId> + </dependency> - <dependencies> - <dependency> - <artifactId>seam-international-api</artifactId> - <groupId>org.jboss.seam.international</groupId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-extensions</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.ocpsoft</groupId> - <artifactId>ocpsoft-pretty-time</artifactId> - <optional>true</optional> - </dependency> + <dependency> + <groupId>com.ocpsoft</groupId> + <artifactId>ocpsoft-pretty-time</artifactId> + <optional>true</optional> + </dependency> - <!-- Test Dependencies --> - <dependency> - <groupId>org.jboss.seam.xml</groupId> - <artifactId>seam-xml-config</artifactId> - <scope>test</scope> - </dependency> + <!-- Test Dependencies --> + <dependency> + <groupId>org.jboss.seam.xml</groupId> + <artifactId>seam-xml-config</artifactId> + <scope>test</scope> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.arquillian</groupId> - <artifactId>arquillian-junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.arquillian.container</groupId> - <artifactId>arquillian-weld-embedded</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging</artifactId> - <version>${jboss-logging.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>test</scope> - </dependency> - </dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.arquillian</groupId> + <artifactId>arquillian-junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-weld-embedded</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <scope>test</scope> + </dependency> + </dependencies> - <profiles> - <profile> - <id>code-coverage</id> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.sonatype.maven.plugin</groupId> - <artifactId>emma4it-maven-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <profiles> + <profile> + <id>code-coverage</id> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>emma-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.sonatype.maven.plugin</groupId> + <artifactId>emma4it-maven-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Modified: modules/international/trunk/impl/src/main/java/org/jboss/seam/international/locale/AvailableLocales.java =================================================================== --- modules/international/trunk/impl/src/main/java/org/jboss/seam/international/locale/AvailableLocales.java 2010-10-15 13:02:19 UTC (rev 13882) +++ modules/international/trunk/impl/src/main/java/org/jboss/seam/international/locale/AvailableLocales.java 2010-10-15 15:24:34 UTC (rev 13883) @@ -32,7 +32,7 @@ import javax.enterprise.inject.Produces; import javax.inject.Inject; -import org.slf4j.Logger; +import org.jboss.logging.Logger; @ApplicationScoped public class AvailableLocales @@ -40,7 +40,7 @@ private String[] supportedLocaleKeys; @Inject - Logger log; + private Logger log; @Produces private List<Locale> locales = null; Modified: modules/international/trunk/impl/src/main/java/org/jboss/seam/international/locale/DefaultLocaleProducer.java =================================================================== --- modules/international/trunk/impl/src/main/java/org/jboss/seam/international/locale/DefaultLocaleProducer.java 2010-10-15 13:02:19 UTC (rev 13882) +++ modules/international/trunk/impl/src/main/java/org/jboss/seam/international/locale/DefaultLocaleProducer.java 2010-10-15 15:24:34 UTC (rev 13883) @@ -30,7 +30,7 @@ import javax.inject.Inject; import javax.inject.Named; -import org.slf4j.Logger; +import org.jboss.logging.Logger; @ApplicationScoped public class DefaultLocaleProducer implements Serializable @@ -40,7 +40,7 @@ private String defaultLocaleKey; @Inject - Logger log; + private Logger log; @Produces @Named Modified: modules/international/trunk/impl/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessageImpl.java =================================================================== --- modules/international/trunk/impl/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessageImpl.java 2010-10-15 13:02:19 UTC (rev 13882) +++ modules/international/trunk/impl/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessageImpl.java 2010-10-15 15:24:34 UTC (rev 13883) @@ -23,10 +23,10 @@ import javax.inject.Inject; +import org.jboss.logging.Logger; import org.jboss.seam.international.status.Bundles; import org.jboss.seam.international.status.Level; import org.jboss.seam.international.status.Message; -import org.slf4j.Logger; /** * @@ -73,19 +73,19 @@ * Setters */ - public BundleTemplateMessageImpl text(final BundleKey text) + public BundleTemplateMessageImpl key(final BundleKey text) { this.textKey = text; return this; } - public BundleTemplateMessage textDefault(final String text) + public BundleTemplateMessage defaults(final String text) { this.textDefault = text; return this; } - public BundleTemplateMessageImpl textParams(final Object... textParams) + public BundleTemplateMessageImpl params(final Object... textParams) { this.template.textParams(textParams); return this; Modified: modules/international/trunk/impl/src/main/java/org/jboss/seam/international/timezone/DefaultTimeZoneProducer.java =================================================================== --- modules/international/trunk/impl/src/main/java/org/jboss/seam/international/timezone/DefaultTimeZoneProducer.java 2010-10-15 13:02:19 UTC (rev 13882) +++ modules/international/trunk/impl/src/main/java/org/jboss/seam/international/timezone/DefaultTimeZoneProducer.java 2010-10-15 15:24:34 UTC (rev 13883) @@ -29,13 +29,13 @@ import javax.inject.Inject; import javax.inject.Named; +import org.jboss.logging.Logger; import org.joda.time.DateTimeZone; -import org.slf4j.Logger; /** * Default TimeZone of the application. If configuration of the default TimeZone * is found that will be used, otherwise the JVM default TimeZone otherwise. - * + * * @author Ken Finnigan */ Deleted: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/MockLogger.java =================================================================== --- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/MockLogger.java 2010-10-15 13:02:19 UTC (rev 13882) +++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/MockLogger.java 2010-10-15 15:24:34 UTC (rev 13883) @@ -1,292 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc., and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.seam.international.test; - -import org.slf4j.Logger; -import org.slf4j.Marker; - -/** - * Provide a completely empty logger implementation for Unit Tests. This entire - * class is a no-op; it does <i>nothing</i>. - * - * @author <a href="mailto:lincolnbaxter@gmail.com>Lincoln Baxter, III</a> - * - */ -public class MockLogger implements Logger -{ - - public void debug(final String arg0) - { - } - - public void debug(final String arg0, final Object arg1) - { - } - - public void debug(final String arg0, final Object[] arg1) - { - } - - public void debug(final String arg0, final Throwable arg1) - { - } - - public void debug(final Marker arg0, final String arg1) - { - } - - public void debug(final String arg0, final Object arg1, final Object arg2) - { - } - - public void debug(final Marker arg0, final String arg1, final Object arg2) - { - } - - public void debug(final Marker arg0, final String arg1, final Object[] arg2) - { - } - - public void debug(final Marker arg0, final String arg1, final Throwable arg2) - { - } - - public void debug(final Marker arg0, final String arg1, final Object arg2, final Object arg3) - { - } - - public void error(final String arg0) - { - } - - public void error(final String arg0, final Object arg1) - { - } - - public void error(final String arg0, final Object[] arg1) - { - } - - public void error(final String arg0, final Throwable arg1) - { - } - - public void error(final Marker arg0, final String arg1) - { - } - - public void error(final String arg0, final Object arg1, final Object arg2) - { - } - - public void error(final Marker arg0, final String arg1, final Object arg2) - { - } - - public void error(final Marker arg0, final String arg1, final Object[] arg2) - { - } - - public void error(final Marker arg0, final String arg1, final Throwable arg2) - { - } - - public void error(final Marker arg0, final String arg1, final Object arg2, final Object arg3) - { - } - - public String getName() - { - return null; - } - - public void info(final String arg0) - { - } - - public void info(final String arg0, final Object arg1) - { - } - - public void info(final String arg0, final Object[] arg1) - { - } - - public void info(final String arg0, final Throwable arg1) - { - } - - public void info(final Marker arg0, final String arg1) - { - } - - public void info(final String arg0, final Object arg1, final Object arg2) - { - } - - public void info(final Marker arg0, final String arg1, final Object arg2) - { - } - - public void info(final Marker arg0, final String arg1, final Object[] arg2) - { - } - - public void info(final Marker arg0, final String arg1, final Throwable arg2) - { - } - - public void info(final Marker arg0, final String arg1, final Object arg2, final Object arg3) - { - } - - public boolean isDebugEnabled() - { - return false; - } - - public boolean isDebugEnabled(final Marker arg0) - { - return false; - } - - public boolean isErrorEnabled() - { - return false; - } - - public boolean isErrorEnabled(final Marker arg0) - { - return false; - } - - public boolean isInfoEnabled() - { - return false; - } - - public boolean isInfoEnabled(final Marker arg0) - { - return false; - } - - public boolean isTraceEnabled() - { - return false; - } - - public boolean isTraceEnabled(final Marker arg0) - { - return false; - } - - public boolean isWarnEnabled() - { - return false; - } - - public boolean isWarnEnabled(final Marker arg0) - { - return false; - } - - public void trace(final String arg0) - { - } - - public void trace(final String arg0, final Object arg1) - { - } - - public void trace(final String arg0, final Object[] arg1) - { - } - - public void trace(final String arg0, final Throwable arg1) - { - } - - public void trace(final Marker arg0, final String arg1) - { - } - - public void trace(final String arg0, final Object arg1, final Object arg2) - { - } - - public void trace(final Marker arg0, final String arg1, final Object arg2) - { - } - - public void trace(final Marker arg0, final String arg1, final Object[] arg2) - { - } - - public void trace(final Marker arg0, final String arg1, final Throwable arg2) - { - } - - public void trace(final Marker arg0, final String arg1, final Object arg2, final Object arg3) - { - } - - public void warn(final String arg0) - { - } - - public void warn(final String arg0, final Object arg1) - { - } - - public void warn(final String arg0, final Object[] arg1) - { - } - - public void warn(final String arg0, final Throwable arg1) - { - } - - public void warn(final Marker arg0, final String arg1) - { - } - - public void warn(final String arg0, final Object arg1, final Object arg2) - { - } - - public void warn(final Marker arg0, final String arg1, final Object arg2) - { - } - - public void warn(final Marker arg0, final String arg1, final Object[] arg2) - { - } - - public void warn(final Marker arg0, final String arg1, final Throwable arg2) - { - } - - public void warn(final Marker arg0, final String arg1, final Object arg2, final Object arg3) - { - } - -} Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/AvailableLocalesTest.java =================================================================== --- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/AvailableLocalesTest.java 2010-10-15 13:02:19 UTC (rev 13882) +++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/AvailableLocalesTest.java 2010-10-15 15:24:34 UTC (rev 13883) @@ -27,15 +27,12 @@ import javax.inject.Inject; import org.jboss.arquillian.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.international.locale.AvailableLocales; -import org.jboss.seam.international.test.MockLogger; import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.Assert; import org.junit.Test; -import org.junit.runner.RunWith; //(a)RunWith(Arquillian.class) public class AvailableLocalesTest @@ -43,14 +40,14 @@ @Deployment public static JavaArchive createTestArchive() { - return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(AvailableLocales.class, MockLogger.class).addManifestResource("org/jboss/seam/international/test/locale/override-available.xml", ArchivePaths.create("beans.xml")); + return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(AvailableLocales.class).addManifestResource("org/jboss/seam/international/test/locale/override-available.xml", ArchivePaths.create("beans.xml")); } @Inject List<Locale> locales; -//FIXME XML Override not working -// @Test + // FIXME XML Override not working + // @Test public void testAvailableLocalesProducer() { Assert.assertNotNull(locales); Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideFailTest.java =================================================================== --- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideFailTest.java 2010-10-15 13:02:19 UTC (rev 13882) +++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideFailTest.java 2010-10-15 15:24:34 UTC (rev 13883) @@ -28,7 +28,6 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.international.locale.DefaultLocaleProducer; -import org.jboss.seam.international.test.MockLogger; import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; @@ -43,7 +42,7 @@ @Deployment public static JavaArchive createTestArchive() { - return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MockLogger.class, DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")).addManifestResource("org/jboss/seam/international/test/locale/override-fail.xml", ArchivePaths.create("seam-beans.xml")); + return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")).addManifestResource("org/jboss/seam/international/test/locale/override-fail.xml", ArchivePaths.create("seam-beans.xml")); } @Inject Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangCountryTest.java =================================================================== --- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangCountryTest.java 2010-10-15 13:02:19 UTC (rev 13882) +++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangCountryTest.java 2010-10-15 15:24:34 UTC (rev 13883) @@ -26,16 +26,13 @@ import javax.inject.Inject; import org.jboss.arquillian.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.international.locale.DefaultLocaleProducer; -import org.jboss.seam.international.test.MockLogger; import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset; import org.junit.Assert; import org.junit.Test; -import org.junit.runner.RunWith; //(a)RunWith(Arquillian.class) public class DefaultLocaleOverrideLangCountryTest @@ -43,14 +40,14 @@ @Deployment public static JavaArchive createTestArchive() { - return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MockLogger.class, DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")).addManifestResource("org/jboss/seam/international/test/locale/override-lang-country.xml", ArchivePaths.create("seam-beans.xml")); + return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")).addManifestResource("org/jboss/seam/international/test/locale/override-lang-country.xml", ArchivePaths.create("seam-beans.xml")); } @Inject Locale locale; -//FIXME XML Override not working -// @Test + // FIXME XML Override not working + // @Test public void testDefaultLocaleProducerDirect() { Assert.assertNotNull(locale); Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangCountryVariantTest.java =================================================================== --- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangCountryVariantTest.java 2010-10-15 13:02:19 UTC (rev 13882) +++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangCountryVariantTest.java 2010-10-15 15:24:34 UTC (rev 13883) @@ -26,16 +26,13 @@ import javax.inject.Inject; import org.jboss.arquillian.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.international.locale.DefaultLocaleProducer; -import org.jboss.seam.international.test.MockLogger; import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset; import org.junit.Assert; import org.junit.Test; -import org.junit.runner.RunWith; //(a)RunWith(Arquillian.class) public class DefaultLocaleOverrideLangCountryVariantTest @@ -43,14 +40,14 @@ @Deployment public static JavaArchive createTestArchive() { - return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MockLogger.class, DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")).addManifestResource("org/jboss/seam/international/test/locale/override-lang-country-variant.xml", ArchivePaths.create("seam-beans.xml")); + return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")).addManifestResource("org/jboss/seam/international/test/locale/override-lang-country-variant.xml", ArchivePaths.create("seam-beans.xml")); } @Inject Locale locale; -//FIXME XML Override not working -// @Test + // FIXME XML Override not working + // @Test public void testDefaultLocaleProducerDirect() { Assert.assertNotNull(locale); Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangTest.java =================================================================== --- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangTest.java 2010-10-15 13:02:19 UTC (rev 13882) +++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangTest.java 2010-10-15 15:24:34 UTC (rev 13883) @@ -26,16 +26,13 @@ import javax.inject.Inject; import org.jboss.arquillian.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.international.locale.DefaultLocaleProducer; -import org.jboss.seam.international.test.MockLogger; import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset; import org.junit.Assert; import org.junit.Test; -import org.junit.runner.RunWith; //(a)RunWith(Arquillian.class) public class DefaultLocaleOverrideLangTest @@ -43,14 +40,14 @@ @Deployment public static JavaArchive createTestArchive() { - return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MockLogger.class, DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")).addManifestResource("org/jboss/seam/international/test/locale/override-lang.xml", ArchivePaths.create("seam-beans.xml")); + return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")).addManifestResource("org/jboss/seam/international/test/locale/override-lang.xml", ArchivePaths.create("seam-beans.xml")); } @Inject Locale locale; -//FIXME XML Override not working -// @Test + // FIXME XML Override not working + // @Test public void testDefaultLocaleProducerDirect() { Assert.assertNotNull(locale); Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleTest.java =================================================================== --- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleTest.java 2010-10-15 13:02:19 UTC (rev 13882) +++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleTest.java 2010-10-15 15:24:34 UTC (rev 13883) @@ -28,7 +28,6 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.international.locale.DefaultLocaleProducer; -import org.jboss.seam.international.test.MockLogger; import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; @@ -43,7 +42,7 @@ @Deployment public static JavaArchive createTestArchive() { - return ShrinkWrap.create("defaultlocaletest.jar", JavaArchive.class).addClasses(MockLogger.class, DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); + return ShrinkWrap.create("defaultlocaletest.jar", JavaArchive.class).addClasses(DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); } @Inject Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/UserLocaleTest.java =================================================================== --- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/UserLocaleTest.java 2010-10-15 13:02:19 UTC (rev 13882) +++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/UserLocaleTest.java 2010-10-15 15:24:34 UTC (rev 13883) @@ -32,7 +32,6 @@ import org.jboss.seam.international.Changed; import org.jboss.seam.international.locale.DefaultLocaleProducer; import org.jboss.seam.international.locale.UserLocaleProducer; -import org.jboss.seam.international.test.MockLogger; import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; @@ -48,7 +47,7 @@ @Deployment public static JavaArchive createTestArchive() { - return ShrinkWrap.create("userlocaletest.jar", JavaArchive.class).addClasses(MockLogger.class, UserLocaleProducer.class, DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); + return ShrinkWrap.create("userlocaletest.jar", JavaArchive.class).addClasses(UserLocaleProducer.class, DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); } @Inject Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/MessagesTest.java =================================================================== --- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/MessagesTest.java 2010-10-15 13:02:19 UTC (rev 13882) +++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/MessagesTest.java 2010-10-15 15:24:34 UTC (rev 13883) @@ -36,7 +36,6 @@ import org.jboss.seam.international.status.builder.BundleKey; import org.jboss.seam.international.status.builder.BundleTemplateMessageImpl; import org.jboss.seam.international.status.builder.TemplateMessageImpl; -import org.jboss.seam.international.test.MockLogger; import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; @@ -57,7 +56,7 @@ @Deployment public static JavaArchive createTestArchive() { - return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MessagesImpl.class, MessageFactory.class, BundleTemplateMessageImpl.class, TemplateMessageImpl.class, Bundles.class, MockLogger.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); + return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MessagesImpl.class, MessageFactory.class, BundleTemplateMessageImpl.class, TemplateMessageImpl.class, Bundles.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); } @Inject Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/builder/BundleTemplateMessageImplTest.java =================================================================== --- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/builder/BundleTemplateMessageImplTest.java 2010-10-15 13:02:19 UTC (rev 13882) +++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/builder/BundleTemplateMessageImplTest.java 2010-10-15 15:24:34 UTC (rev 13883) @@ -32,7 +32,6 @@ import org.jboss.seam.international.status.builder.BundleTemplateMessageImpl; import org.jboss.seam.international.status.builder.TemplateMessage; import org.jboss.seam.international.status.builder.TemplateMessageImpl; -import org.jboss.seam.international.test.MockLogger; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -51,7 +50,7 @@ @Deployment public static Archive<?> createTestArchive() { - return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MessageFactory.class, BundleTemplateMessageImpl.class, TemplateMessageImpl.class, Bundles.class, MockLogger.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); + return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MessageFactory.class, BundleTemplateMessageImpl.class, TemplateMessageImpl.class, Bundles.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); } @Inject Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneOverrideFailTest.java =================================================================== --- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneOverrideFailTest.java 2010-10-15 13:02:19 UTC (rev 13882) +++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneOverrideFailTest.java 2010-10-15 15:24:34 UTC (rev 13883) @@ -24,17 +24,13 @@ import javax.inject.Inject; import org.jboss.arquillian.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.international.test.MockLogger; import org.jboss.seam.international.timezone.DefaultTimeZoneProducer; import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset; import org.joda.time.DateTimeZone; import org.junit.Assert; import org.junit.Test; -import org.junit.runner.RunWith; //(a)RunWith(Arquillian.class) public class DefaultTimeZoneOverrideFailTest @@ -42,14 +38,14 @@ @Deployment public static JavaArchive createTestArchive() { - return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MockLogger.class, DefaultTimeZoneProducer.class).addManifestResource("org/jboss/seam/international/test/timezone/override-fail.xml", ArchivePaths.create("beans.xml")); + return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(DefaultTimeZoneProducer.class).addManifestResource("org/jboss/seam/international/test/timezone/override-fail.xml", ArchivePaths.create("beans.xml")); } @Inject DateTimeZone timeZone; -//FIXME XML override not working -// @Test + // FIXME XML override not working + // @Test public void testDefaultTimeZoneProducerDirect() { Assert.assertNotNull(timeZone); Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneOverrideTest.java =================================================================== --- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneOverrideTest.java 2010-10-15 13:02:19 UTC (rev 13882) +++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneOverrideTest.java 2010-10-15 15:24:34 UTC (rev 13883) @@ -24,8 +24,6 @@ import javax.inject.Inject; import org.jboss.arquillian.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.international.test.MockLogger; import org.jboss.seam.international.timezone.DefaultTimeZoneProducer; import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -33,7 +31,6 @@ import org.joda.time.DateTimeZone; import org.junit.Assert; import org.junit.Test; -import org.junit.runner.RunWith; //(a)RunWith(Arquillian.class) public class DefaultTimeZoneOverrideTest @@ -41,14 +38,14 @@ @Deployment public static JavaArchive createTestArchive() { - return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MockLogger.class, DefaultTimeZoneProducer.class).addManifestResource("org/jboss/seam/international/test/timezone/override.xml", ArchivePaths.create("beans.xml")); + return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(DefaultTimeZoneProducer.class).addManifestResource("org/jboss/seam/international/test/timezone/override.xml", ArchivePaths.create("beans.xml")); } @Inject DateTimeZone timeZone; -//FIXME XML override not working -// @Test + // FIXME XML override not working + // @Test public void testDefaultTimeZoneProducerDirect() { Assert.assertNotNull(timeZone); Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneTest.java =================================================================== --- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneTest.java 2010-10-15 13:02:19 UTC (rev 13882) +++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneTest.java 2010-10-15 15:24:34 UTC (rev 13883) @@ -25,7 +25,6 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.international.test.MockLogger; import org.jboss.seam.international.timezone.DefaultTimeZoneProducer; import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -42,7 +41,7 @@ @Deployment public static JavaArchive createTestArchive() { - return ShrinkWrap.create("defaulttimezonetest.jar", JavaArchive.class).addClasses(MockLogger.class, DefaultTimeZoneProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); + return ShrinkWrap.create("defaulttimezonetest.jar", JavaArchive.class).addClasses(DefaultTimeZoneProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); } @Inject Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/UserTimeZoneTest.java =================================================================== --- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/UserTimeZoneTest.java 2010-10-15 13:02:19 UTC (rev 13882) +++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/UserTimeZoneTest.java 2010-10-15 15:24:34 UTC (rev 13883) @@ -28,7 +28,6 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.international.Changed; -import org.jboss.seam.international.test.MockLogger; import org.jboss.seam.international.timezone.DefaultTimeZoneProducer; import org.jboss.seam.international.timezone.UserTimeZoneProducer; import org.jboss.shrinkwrap.api.ArchivePaths; @@ -47,7 +46,7 @@ @Deployment public static JavaArchive createTestArchive() { - return ShrinkWrap.create("usertimezonetest.jar", JavaArchive.class).addClasses(MockLogger.class, UserTimeZoneProducer.class, DefaultTimeZoneProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); + return ShrinkWrap.create("usertimezonetest.jar", JavaArchive.class).addClasses(UserTimeZoneProducer.class, DefaultTimeZoneProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); } @Inject Modified: modules/international/trunk/pom.xml =================================================================== --- modules/international/trunk/pom.xml 2010-10-15 13:02:19 UTC (rev 13882) +++ modules/international/trunk/pom.xml 2010-10-15 15:24:34 UTC (rev 13883) @@ -1,4 +1,5 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -30,6 +31,7 @@ <seam.version>3.0.0.b01</seam.version> <!-- Use snapshot WeldX --> <weld.extensions.version>1.0.0.Beta1</weld.extensions.version> + <jboss-logging.version>3.0.0.Beta4</jboss-logging.version> </properties> <dependencyManagement> @@ -61,19 +63,15 @@ <artifactId>weld-extensions</artifactId> <version>${weld.extensions.version}</version> </dependency> + + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + <version>${jboss-logging.version}</version> + </dependency> </dependencies> </dependencyManagement> - <dependencies> - - <!-- Environment Dependencies --> - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - <profiles> <profile> <id>distribution</id> @@ -130,6 +128,13 @@ <developers> <developer> + <name>Ken Finnigan</name> + <timezone>GMT</timezone> + <roles> + <role>Project Lead</role> + </roles> + </developer> + <developer> <name>Lincoln Baxter, III</name> <email&gt;lincolnbaxter(a)gmail.com&lt;/email&gt; <url>http://ocpsoft.com</url> @@ -140,13 +145,6 @@ <role>Project Lead</role> </roles> </developer> - <developer> - <name>Ken Finnigan</name> - <timezone>GMT</timezone> - <roles> - <role>Project Lead</role> - </roles> - </developer> </developers> <scm>