[dna-commits] DNA SVN: r99 - in trunk: dna-common/src/main/java/org/jboss/dna/common/component and 12 other directories.
dna-commits at lists.jboss.org
dna-commits at lists.jboss.org
Tue Apr 22 11:16:43 EDT 2008
Author: rhauch
Date: 2008-04-22 11:16:43 -0400 (Tue, 22 Apr 2008)
New Revision: 99
Added:
trunk/dna-common/src/main/java/org/jboss/dna/common/CommonI18n.java
trunk/dna-common/src/main/resources/org/jboss/dna/common/CommonI18n.properties
Removed:
trunk/dna-common/src/main/java/org/jboss/dna/common/CoreI18n.java
trunk/dna-common/src/main/resources/org/jboss/dna/common/CoreI18n.properties
Modified:
trunk/dna-common/src/main/java/org/jboss/dna/common/component/ComponentConfig.java
trunk/dna-common/src/main/java/org/jboss/dna/common/component/ComponentLibrary.java
trunk/dna-common/src/main/java/org/jboss/dna/common/i18n/I18n.java
trunk/dna-common/src/main/java/org/jboss/dna/common/jcr/Path.java
trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/LoggingProgressMonitor.java
trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/SimpleProgressMonitor.java
trunk/dna-common/src/main/java/org/jboss/dna/common/util/ArgCheck.java
trunk/dna-common/src/main/java/org/jboss/dna/common/util/ClassUtil.java
trunk/dna-common/src/main/java/org/jboss/dna/common/util/DateUtil.java
trunk/dna-common/src/test/java/org/jboss/dna/common/component/MockComponentA.java
trunk/dna-common/src/test/java/org/jboss/dna/common/component/MockComponentB.java
trunk/dna-common/src/test/java/org/jboss/dna/common/i18n/I18nTest.java
trunk/dna-common/src/test/java/org/jboss/dna/common/monitor/SimpleProgressMonitorTest.java
trunk/dna-common/src/test/java/org/jboss/dna/common/stats/HistogramTest.java
trunk/dna-common/src/test/java/org/jboss/dna/common/util/LogContextTest.java
trunk/dna-integration-tests/src/test/java/org/jboss/dna/tests/integration/jackrabbit/JackrabbitBasicFunctionTest.java
trunk/dna-integration-tests/src/test/java/org/jboss/dna/tests/integration/jackrabbit/JackrabbitDerbyStressTest.java
trunk/dna-integration-tests/src/test/java/org/jboss/dna/tests/integration/jackrabbit/JackrabbitInMemoryTest.java
trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencers/MockSequencerA.java
trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencers/MockSequencerB.java
Log:
DNA-56: Rename CoreI18n to CommonI18n
http://jira.jboss.org/jira/browse/DNA-56
Renamed class and properties file.
Copied: trunk/dna-common/src/main/java/org/jboss/dna/common/CommonI18n.java (from rev 98, trunk/dna-common/src/main/java/org/jboss/dna/common/CoreI18n.java)
===================================================================
--- trunk/dna-common/src/main/java/org/jboss/dna/common/CommonI18n.java (rev 0)
+++ trunk/dna-common/src/main/java/org/jboss/dna/common/CommonI18n.java 2008-04-22 15:16:43 UTC (rev 99)
@@ -0,0 +1,95 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.dna.common;
+
+import org.jboss.dna.common.i18n.I18n;
+
+/**
+ * @author John Verhaeg
+ * @author Randall Hauch
+ */
+public final class CommonI18n {
+
+ static {
+ try {
+ I18n.initialize(CommonI18n.class);
+ } catch (final Exception err) {
+ System.err.println(err);
+ }
+ }
+
+ // Make sure the following I18n.java-related fields are defined before all other fields to ensure a valid error message is
+ // produced in the event of a missing/duplicate/unused property
+
+ public static I18n i18nArgumentsMismatchedParameter;
+ public static I18n i18nArgumentMismatchedParameters;
+ public static I18n i18nArgumentsMismatchedParameters;
+ public static I18n i18nReplaceArgumentsMismatchedParameter;
+ public static I18n i18nReplaceArgumentMismatchedParameters;
+ public static I18n i18nReplaceArgumentsMismatchedParameters;
+ public static I18n i18nClassInterface;
+ public static I18n i18nClassNotPublic;
+ public static I18n i18nFieldFinal;
+ public static I18n i18nFieldInvalidType;
+ public static I18n i18nFieldNotPublic;
+ public static I18n i18nFieldNotStatic;
+ public static I18n i18nPropertiesFileNotFound;
+ public static I18n i18nPropertyDuplicate;
+ public static I18n i18nPropertyMissing;
+ public static I18n i18nPropertyUnused;
+
+ // Core-related fields
+ public static I18n componentClassnameNotValid;
+ public static I18n componentNotConfigured;
+ public static I18n progressMonitorBeginTask;
+ public static I18n progressMonitorStatus;
+
+ public static I18n argumentMayNotBeNegative;
+ public static I18n argumentMayNotBePositive;
+ public static I18n argumentMustBeNegative;
+ public static I18n argumentMustBePositive;
+ public static I18n argumentMustBeNumber;
+ public static I18n argumentMayNotBeNullOrZeroLength;
+ public static I18n argumentMayNotBeNullOrZeroLengthOrEmpty;
+ public static I18n argumentMayNotBeNull;
+ public static I18n argumentMustBeNull;
+ public static I18n argumentMustBeInstanceOf;
+ public static I18n argumentMustBeSameAs;
+ public static I18n argumentMustNotBeSameAs;
+ public static I18n argumentMustBeEquals;
+ public static I18n argumentMustNotBeEquals;
+ public static I18n argumentMayNotBeEmpty;
+ public static I18n argumentDidNotContainObject;
+ public static I18n argumentDidNotContainKey;
+ public static I18n argumentMayNotContainNullValue;
+
+ public static I18n dateParsingFailure;
+
+ public static I18n pathAncestorDegreeIsInvalid;
+ public static I18n pathIsAlreadyAbsolute;
+ public static I18n pathIsNotAbsolute;
+ public static I18n pathIsNotRelative;
+ public static I18n pathCannotBeNormalized;
+
+ public static I18n passthrough;
+ public static I18n empty;
+}
Deleted: trunk/dna-common/src/main/java/org/jboss/dna/common/CoreI18n.java
===================================================================
--- trunk/dna-common/src/main/java/org/jboss/dna/common/CoreI18n.java 2008-04-22 14:59:02 UTC (rev 98)
+++ trunk/dna-common/src/main/java/org/jboss/dna/common/CoreI18n.java 2008-04-22 15:16:43 UTC (rev 99)
@@ -1,95 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.dna.common;
-
-import org.jboss.dna.common.i18n.I18n;
-
-/**
- * @author John Verhaeg
- * @author Randall Hauch
- */
-public final class CoreI18n {
-
- static {
- try {
- I18n.initialize(CoreI18n.class);
- } catch (final Exception err) {
- System.err.println(err);
- }
- }
-
- // Make sure the following I18n.java-related fields are defined before all other fields to ensure a valid error message is
- // produced in the event of a missing/duplicate/unused property
-
- public static I18n i18nArgumentsMismatchedParameter;
- public static I18n i18nArgumentMismatchedParameters;
- public static I18n i18nArgumentsMismatchedParameters;
- public static I18n i18nReplaceArgumentsMismatchedParameter;
- public static I18n i18nReplaceArgumentMismatchedParameters;
- public static I18n i18nReplaceArgumentsMismatchedParameters;
- public static I18n i18nClassInterface;
- public static I18n i18nClassNotPublic;
- public static I18n i18nFieldFinal;
- public static I18n i18nFieldInvalidType;
- public static I18n i18nFieldNotPublic;
- public static I18n i18nFieldNotStatic;
- public static I18n i18nPropertiesFileNotFound;
- public static I18n i18nPropertyDuplicate;
- public static I18n i18nPropertyMissing;
- public static I18n i18nPropertyUnused;
-
- // Core-related fields
- public static I18n componentClassnameNotValid;
- public static I18n componentNotConfigured;
- public static I18n progressMonitorBeginTask;
- public static I18n progressMonitorStatus;
-
- public static I18n argumentMayNotBeNegative;
- public static I18n argumentMayNotBePositive;
- public static I18n argumentMustBeNegative;
- public static I18n argumentMustBePositive;
- public static I18n argumentMustBeNumber;
- public static I18n argumentMayNotBeNullOrZeroLength;
- public static I18n argumentMayNotBeNullOrZeroLengthOrEmpty;
- public static I18n argumentMayNotBeNull;
- public static I18n argumentMustBeNull;
- public static I18n argumentMustBeInstanceOf;
- public static I18n argumentMustBeSameAs;
- public static I18n argumentMustNotBeSameAs;
- public static I18n argumentMustBeEquals;
- public static I18n argumentMustNotBeEquals;
- public static I18n argumentMayNotBeEmpty;
- public static I18n argumentDidNotContainObject;
- public static I18n argumentDidNotContainKey;
- public static I18n argumentMayNotContainNullValue;
-
- public static I18n dateParsingFailure;
-
- public static I18n pathAncestorDegreeIsInvalid;
- public static I18n pathIsAlreadyAbsolute;
- public static I18n pathIsNotAbsolute;
- public static I18n pathIsNotRelative;
- public static I18n pathCannotBeNormalized;
-
- public static I18n passthrough;
- public static I18n empty;
-}
Modified: trunk/dna-common/src/main/java/org/jboss/dna/common/component/ComponentConfig.java
===================================================================
--- trunk/dna-common/src/main/java/org/jboss/dna/common/component/ComponentConfig.java 2008-04-22 14:59:02 UTC (rev 98)
+++ trunk/dna-common/src/main/java/org/jboss/dna/common/component/ComponentConfig.java 2008-04-22 15:16:43 UTC (rev 99)
@@ -25,7 +25,7 @@
import java.util.Collections;
import java.util.List;
import net.jcip.annotations.Immutable;
-import org.jboss.dna.common.CoreI18n;
+import org.jboss.dna.common.CommonI18n;
import org.jboss.dna.common.util.ArgCheck;
import org.jboss.dna.common.util.ClassUtil;
@@ -73,7 +73,7 @@
this.timestamp = timestamp;
// Check the classname is a valid classname ...
if (!ClassUtil.isFullyQualifiedClassname(classname)) {
- throw new IllegalArgumentException(CoreI18n.componentClassnameNotValid.text(classname, name));
+ throw new IllegalArgumentException(CommonI18n.componentClassnameNotValid.text(classname, name));
}
}
Modified: trunk/dna-common/src/main/java/org/jboss/dna/common/component/ComponentLibrary.java
===================================================================
--- trunk/dna-common/src/main/java/org/jboss/dna/common/component/ComponentLibrary.java 2008-04-22 14:59:02 UTC (rev 98)
+++ trunk/dna-common/src/main/java/org/jboss/dna/common/component/ComponentLibrary.java 2008-04-22 15:16:43 UTC (rev 99)
@@ -30,7 +30,7 @@
import java.util.concurrent.locks.ReentrantLock;
import net.jcip.annotations.GuardedBy;
import net.jcip.annotations.ThreadSafe;
-import org.jboss.dna.common.CoreI18n;
+import org.jboss.dna.common.CommonI18n;
import org.jboss.dna.common.SystemFailureException;
import org.jboss.dna.common.util.ArgCheck;
@@ -210,7 +210,7 @@
throw new SystemFailureException(e);
}
if (newInstance instanceof Component && ((Component<ConfigType>)newInstance).getConfiguration() == null) {
- throw new SystemFailureException(CoreI18n.componentNotConfigured.text(config.getName()));
+ throw new SystemFailureException(CommonI18n.componentNotConfigured.text(config.getName()));
}
return newInstance;
}
Modified: trunk/dna-common/src/main/java/org/jboss/dna/common/i18n/I18n.java
===================================================================
--- trunk/dna-common/src/main/java/org/jboss/dna/common/i18n/I18n.java 2008-04-22 14:59:02 UTC (rev 98)
+++ trunk/dna-common/src/main/java/org/jboss/dna/common/i18n/I18n.java 2008-04-22 15:16:43 UTC (rev 99)
@@ -37,7 +37,7 @@
import java.util.regex.Pattern;
import net.jcip.annotations.Immutable;
import net.jcip.annotations.ThreadSafe;
-import org.jboss.dna.common.CoreI18n;
+import org.jboss.dna.common.CommonI18n;
import org.jboss.dna.common.SystemFailureException;
import org.jboss.dna.common.util.ArgCheck;
import org.jboss.dna.common.util.ClassUtil;
@@ -119,7 +119,7 @@
public static void initialize( Class i18nClass ) {
ArgCheck.isNotNull(i18nClass, "i18nClass");
if (i18nClass.isInterface()) {
- throw new IllegalArgumentException(CoreI18n.i18nClassInterface.text(i18nClass.getName()));
+ throw new IllegalArgumentException(CommonI18n.i18nClassInterface.text(i18nClass.getName()));
}
// Find all public static non-final String fields in the specified class and instantiate an I18n object for each.
@@ -131,17 +131,17 @@
// Ensure field is not final
if ((fld.getModifiers() & Modifier.FINAL) == Modifier.FINAL) {
- throw new SystemFailureException(CoreI18n.i18nFieldFinal.text(fld.getName(), i18nClass));
+ throw new SystemFailureException(CommonI18n.i18nFieldFinal.text(fld.getName(), i18nClass));
}
// Ensure field is public
if ((fld.getModifiers() & Modifier.PUBLIC) != Modifier.PUBLIC) {
- throw new SystemFailureException(CoreI18n.i18nFieldNotPublic.text(fld.getName(), i18nClass));
+ throw new SystemFailureException(CommonI18n.i18nFieldNotPublic.text(fld.getName(), i18nClass));
}
// Ensure field is static
if ((fld.getModifiers() & Modifier.STATIC) != Modifier.STATIC) {
- throw new SystemFailureException(CoreI18n.i18nFieldNotStatic.text(fld.getName(), i18nClass));
+ throw new SystemFailureException(CommonI18n.i18nFieldNotStatic.text(fld.getName(), i18nClass));
}
// Ensure we can access field even if it's in a private class
@@ -152,7 +152,7 @@
}
}
} catch (IllegalAccessException err) {
- throw new IllegalArgumentException(CoreI18n.i18nClassNotPublic.text(i18nClass.getName()));
+ throw new IllegalArgumentException(CommonI18n.i18nClassNotPublic.text(i18nClass.getName()));
}
}
@@ -193,7 +193,7 @@
String bundleMsg = null;
if (url == null) {
// Record no variant of the i18n properties file for the specified class found
- bundleMsg = CoreI18n.i18nPropertiesFileNotFound.text(bundleName);
+ bundleMsg = CommonI18n.i18nPropertiesFileNotFound.text(bundleName);
} else {
// Initialize i18n map
final Map<String, String> finalMap = id2TextMap;
@@ -210,18 +210,18 @@
Field fld = localization.i18nClass.getDeclaredField(id);
if (fld.getType() != I18n.class) {
// Invalid field type
- mapErrorMessage(localization, id, CoreI18n.i18nFieldInvalidType.text(id,
+ mapErrorMessage(localization, id, CommonI18n.i18nFieldInvalidType.text(id,
finalUrl,
getClass().getName()));
}
} catch (NoSuchFieldException err) {
// No corresponding field exists
- mapErrorMessage(localization, id, CoreI18n.i18nPropertyUnused.text(id, finalUrl));
+ mapErrorMessage(localization, id, CommonI18n.i18nPropertyUnused.text(id, finalUrl));
}
if (finalMap.put(id, text) != null) {
// Duplicate id encountered
- mapErrorMessage(localization, id, CoreI18n.i18nPropertyDuplicate.text(id, finalUrl));
+ mapErrorMessage(localization, id, CommonI18n.i18nPropertyDuplicate.text(id, finalUrl));
}
return null;
@@ -245,7 +245,7 @@
if (fld.getType() == I18n.class && id2TextMap.get(fld.getName()) == null) {
mapErrorMessage(localization,
fld.getName(),
- bundleMsg == null ? CoreI18n.i18nPropertyMissing.text(fld.getName(), url) : bundleMsg);
+ bundleMsg == null ? CommonI18n.i18nPropertyMissing.text(fld.getName(), url) : bundleMsg);
}
}
@@ -302,20 +302,20 @@
I18n msg = null;
if (id != null) {
if (arguments.length == 1) {
- msg = CoreI18n.i18nArgumentMismatchedParameters;
+ msg = CommonI18n.i18nArgumentMismatchedParameters;
} else if (argCount == 1) {
- msg = CoreI18n.i18nArgumentsMismatchedParameter;
+ msg = CommonI18n.i18nArgumentsMismatchedParameter;
} else {
- msg = CoreI18n.i18nArgumentsMismatchedParameters;
+ msg = CommonI18n.i18nArgumentsMismatchedParameters;
}
throw new IllegalArgumentException(msg.text(arguments.length, id, argCount, text, newText.toString()));
}
if (arguments.length == 1) {
- msg = CoreI18n.i18nReplaceArgumentMismatchedParameters;
+ msg = CommonI18n.i18nReplaceArgumentMismatchedParameters;
} else if (argCount == 1) {
- msg = CoreI18n.i18nReplaceArgumentsMismatchedParameter;
+ msg = CommonI18n.i18nReplaceArgumentsMismatchedParameter;
} else {
- msg = CoreI18n.i18nReplaceArgumentsMismatchedParameters;
+ msg = CommonI18n.i18nReplaceArgumentsMismatchedParameters;
}
throw new IllegalArgumentException(msg.text(arguments.length, argCount, text, newText.toString()));
}
Modified: trunk/dna-common/src/main/java/org/jboss/dna/common/jcr/Path.java
===================================================================
--- trunk/dna-common/src/main/java/org/jboss/dna/common/jcr/Path.java 2008-04-22 14:59:02 UTC (rev 98)
+++ trunk/dna-common/src/main/java/org/jboss/dna/common/jcr/Path.java 2008-04-22 15:16:43 UTC (rev 99)
@@ -30,7 +30,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import net.jcip.annotations.Immutable;
-import org.jboss.dna.common.CoreI18n;
+import org.jboss.dna.common.CommonI18n;
import org.jboss.dna.common.text.Inflector;
import org.jboss.dna.common.text.Jsr283Encoder;
import org.jboss.dna.common.text.NoOpEncoder;
@@ -449,7 +449,7 @@
if (segment.equals(PARENT_SEGMENT)) {
if (newSegments.size() <= 0) {
if (this.isAbsolute()) {
- throw new InvalidPathException(CoreI18n.pathCannotBeNormalized.text(this));
+ throw new InvalidPathException(CommonI18n.pathCannotBeNormalized.text(this));
}
}
if (newSegments.size() > 0 && !newSegments.getLast().equals(PARENT_SEGMENT)) {
@@ -474,7 +474,7 @@
*/
public Path getCanonicalPath() {
if (!this.isAbsolute()) {
- String msg = CoreI18n.pathIsNotAbsolute.text(this);
+ String msg = CommonI18n.pathIsNotAbsolute.text(this);
throw new InvalidPathException(msg);
}
if (this.isNormalized()) return this;
@@ -491,11 +491,11 @@
public Path relativeTo( Path startingPath ) {
ArgCheck.isNotNull(startingPath, "to");
if (!this.isAbsolute()) {
- String msg = CoreI18n.pathIsNotAbsolute.text(this);
+ String msg = CommonI18n.pathIsNotAbsolute.text(this);
throw new InvalidPathException(msg);
}
if (!startingPath.isAbsolute()) {
- String msg = CoreI18n.pathIsNotAbsolute.text(startingPath);
+ String msg = CommonI18n.pathIsNotAbsolute.text(startingPath);
throw new InvalidPathException(msg);
}
@@ -540,11 +540,11 @@
public Path resolve( Path relativePath ) {
ArgCheck.isNotNull(relativePath, "relative path");
if (!this.isAbsolute()) {
- String msg = CoreI18n.pathIsAlreadyAbsolute.text(this.path);
+ String msg = CommonI18n.pathIsAlreadyAbsolute.text(this.path);
throw new InvalidPathException(msg);
}
if (relativePath.isAbsolute()) {
- String msg = CoreI18n.pathIsNotRelative.text(relativePath);
+ String msg = CommonI18n.pathIsNotRelative.text(relativePath);
throw new InvalidPathException(msg);
}
// If the relative path is the self or parent reference ...
@@ -655,7 +655,7 @@
if (this.isRoot()) return this;
int endIndex = this.segments.size() - degree;
if (endIndex < 0) {
- String msg = CoreI18n.pathAncestorDegreeIsInvalid.text(this.path, Inflector.getInstance().ordinalize(degree));
+ String msg = CommonI18n.pathAncestorDegreeIsInvalid.text(this.path, Inflector.getInstance().ordinalize(degree));
throw new PathNotFoundException(msg);
}
return createPath(this.segments.subList(0, endIndex), this.isAbsolute());
Modified: trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/LoggingProgressMonitor.java
===================================================================
--- trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/LoggingProgressMonitor.java 2008-04-22 14:59:02 UTC (rev 98)
+++ trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/LoggingProgressMonitor.java 2008-04-22 15:16:43 UTC (rev 99)
@@ -22,7 +22,7 @@
package org.jboss.dna.common.monitor;
-import org.jboss.dna.common.CoreI18n;
+import org.jboss.dna.common.CommonI18n;
import org.jboss.dna.common.i18n.I18n;
import org.jboss.dna.common.util.Logger;
@@ -48,7 +48,7 @@
@Override
public void beginTask( double totalWork, I18n name, Object... params ) {
super.beginTask(totalWork, name, params);
- this.logger.log(level, CoreI18n.progressMonitorBeginTask, getActivityName(), name.text(params));
+ this.logger.log(level, CommonI18n.progressMonitorBeginTask, getActivityName(), name.text(params));
}
/**
@@ -57,7 +57,7 @@
@Override
public void done() {
super.done();
- this.logger.log(level, CoreI18n.progressMonitorStatus, super.getStatus());
+ this.logger.log(level, CommonI18n.progressMonitorStatus, super.getStatus());
}
/**
@@ -66,7 +66,7 @@
@Override
public void setCancelled( boolean value ) {
super.setCancelled(value);
- this.logger.log(level, CoreI18n.progressMonitorStatus, super.getStatus());
+ this.logger.log(level, CommonI18n.progressMonitorStatus, super.getStatus());
}
/**
@@ -75,7 +75,7 @@
@Override
public void worked( double work ) {
super.worked(work);
- this.logger.log(level, CoreI18n.progressMonitorStatus, super.getStatus());
+ this.logger.log(level, CommonI18n.progressMonitorStatus, super.getStatus());
}
}
Modified: trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/SimpleProgressMonitor.java
===================================================================
--- trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/SimpleProgressMonitor.java 2008-04-22 14:59:02 UTC (rev 98)
+++ trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/SimpleProgressMonitor.java 2008-04-22 15:16:43 UTC (rev 99)
@@ -25,7 +25,7 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.jboss.dna.common.CoreI18n;
+import org.jboss.dna.common.CommonI18n;
import org.jboss.dna.common.i18n.I18n;
import net.jcip.annotations.GuardedBy;
import net.jcip.annotations.ThreadSafe;
@@ -54,7 +54,7 @@
public SimpleProgressMonitor( String activityName ) {
this.activityName = activityName != null ? activityName.trim() : "";
- this.taskName = CoreI18n.empty;
+ this.taskName = CommonI18n.empty;
}
/**
Modified: trunk/dna-common/src/main/java/org/jboss/dna/common/util/ArgCheck.java
===================================================================
--- trunk/dna-common/src/main/java/org/jboss/dna/common/util/ArgCheck.java 2008-04-22 14:59:02 UTC (rev 98)
+++ trunk/dna-common/src/main/java/org/jboss/dna/common/util/ArgCheck.java 2008-04-22 15:16:43 UTC (rev 99)
@@ -24,7 +24,7 @@
import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
-import org.jboss.dna.common.CoreI18n;
+import org.jboss.dna.common.CommonI18n;
/**
* Utility class that checks arguments to methods. This class is to be used only in API methods, where failure to supply correct
@@ -42,7 +42,7 @@
*/
public static void isNonNegative( int argument, String name ) {
if (argument < 0) {
- throw new IllegalArgumentException(CoreI18n.argumentMayNotBeNegative.text(name, argument));
+ throw new IllegalArgumentException(CommonI18n.argumentMayNotBeNegative.text(name, argument));
}
}
@@ -54,7 +54,7 @@
*/
public static void isNonPositive( int argument, String name ) {
if (argument > 0) {
- throw new IllegalArgumentException(CoreI18n.argumentMayNotBePositive.text(name, argument));
+ throw new IllegalArgumentException(CommonI18n.argumentMayNotBePositive.text(name, argument));
}
}
@@ -66,7 +66,7 @@
*/
public static void isNegative( int argument, String name ) {
if (argument >= 0) {
- throw new IllegalArgumentException(CoreI18n.argumentMustBeNegative.text(name, argument));
+ throw new IllegalArgumentException(CommonI18n.argumentMustBeNegative.text(name, argument));
}
}
@@ -78,7 +78,7 @@
*/
public static void isPositive( int argument, String name ) {
if (argument <= 0) {
- throw new IllegalArgumentException(CoreI18n.argumentMustBePositive.text(name, argument));
+ throw new IllegalArgumentException(CommonI18n.argumentMustBePositive.text(name, argument));
}
}
@@ -92,7 +92,7 @@
*/
public static void isNonNegative( long argument, String name ) {
if (argument < 0) {
- throw new IllegalArgumentException(CoreI18n.argumentMayNotBeNegative.text(name, argument));
+ throw new IllegalArgumentException(CommonI18n.argumentMayNotBeNegative.text(name, argument));
}
}
@@ -104,7 +104,7 @@
*/
public static void isNonPositive( long argument, String name ) {
if (argument > 0) {
- throw new IllegalArgumentException(CoreI18n.argumentMayNotBePositive.text(name, argument));
+ throw new IllegalArgumentException(CommonI18n.argumentMayNotBePositive.text(name, argument));
}
}
@@ -116,7 +116,7 @@
*/
public static void isNegative( long argument, String name ) {
if (argument >= 0) {
- throw new IllegalArgumentException(CoreI18n.argumentMustBeNegative.text(name, argument));
+ throw new IllegalArgumentException(CommonI18n.argumentMustBeNegative.text(name, argument));
}
}
@@ -128,7 +128,7 @@
*/
public static void isPositive( long argument, String name ) {
if (argument <= 0) {
- throw new IllegalArgumentException(CoreI18n.argumentMustBePositive.text(name, argument));
+ throw new IllegalArgumentException(CommonI18n.argumentMustBePositive.text(name, argument));
}
}
@@ -142,7 +142,7 @@
*/
public static void isNonNegative( double argument, String name ) {
if (argument < 0.0) {
- throw new IllegalArgumentException(CoreI18n.argumentMayNotBeNegative.text(name, argument));
+ throw new IllegalArgumentException(CommonI18n.argumentMayNotBeNegative.text(name, argument));
}
}
@@ -154,7 +154,7 @@
*/
public static void isNonPositive( double argument, String name ) {
if (argument > 0.0) {
- throw new IllegalArgumentException(CoreI18n.argumentMayNotBePositive.text(name, argument));
+ throw new IllegalArgumentException(CommonI18n.argumentMayNotBePositive.text(name, argument));
}
}
@@ -166,7 +166,7 @@
*/
public static void isNegative( double argument, String name ) {
if (argument >= 0.0) {
- throw new IllegalArgumentException(CoreI18n.argumentMustBeNegative.text(name, argument));
+ throw new IllegalArgumentException(CommonI18n.argumentMustBeNegative.text(name, argument));
}
}
@@ -178,7 +178,7 @@
*/
public static void isPositive( double argument, String name ) {
if (argument <= 0.0) {
- throw new IllegalArgumentException(CoreI18n.argumentMustBePositive.text(name, argument));
+ throw new IllegalArgumentException(CommonI18n.argumentMustBePositive.text(name, argument));
}
}
@@ -190,7 +190,7 @@
*/
public static void isNotNan( double argument, String name ) {
if (Double.isNaN(argument)) {
- throw new IllegalArgumentException(CoreI18n.argumentMustBeNumber.text(name));
+ throw new IllegalArgumentException(CommonI18n.argumentMustBeNumber.text(name));
}
}
@@ -205,7 +205,7 @@
public static void isNotZeroLength( String argument, String name ) {
isNotNull(argument, name);
if (argument.length() <= 0) {
- throw new IllegalArgumentException(CoreI18n.argumentMayNotBeNullOrZeroLength.text(name));
+ throw new IllegalArgumentException(CommonI18n.argumentMayNotBeNullOrZeroLength.text(name));
}
}
@@ -218,7 +218,7 @@
public static void isNotEmpty( String argument, String name ) {
isNotZeroLength(argument, name);
if (argument != null && argument.trim().length() == 0) {
- throw new IllegalArgumentException(CoreI18n.argumentMayNotBeNullOrZeroLengthOrEmpty.text(name));
+ throw new IllegalArgumentException(CommonI18n.argumentMayNotBeNullOrZeroLengthOrEmpty.text(name));
}
}
@@ -232,7 +232,7 @@
*/
public static void isNotNull( Object argument, String name ) {
if (argument == null) {
- throw new IllegalArgumentException(CoreI18n.argumentMayNotBeNull.text(name));
+ throw new IllegalArgumentException(CommonI18n.argumentMayNotBeNull.text(name));
}
}
@@ -257,7 +257,7 @@
*/
public static void isNull( Object argument, String name ) {
if (argument != null) {
- throw new IllegalArgumentException(CoreI18n.argumentMustBeNull.text(name));
+ throw new IllegalArgumentException(CommonI18n.argumentMustBeNull.text(name));
}
}
@@ -271,7 +271,7 @@
public static void isInstanceOf( Object argument, Class expectedClass, String name ) {
isNotNull(argument, name);
if (!expectedClass.isInstance(argument)) {
- throw new IllegalArgumentException(CoreI18n.argumentMustBeInstanceOf.text(name, argument.getClass(), expectedClass.getName()));
+ throw new IllegalArgumentException(CommonI18n.argumentMustBeInstanceOf.text(name, argument.getClass(), expectedClass.getName()));
}
}
@@ -305,7 +305,7 @@
public static <T> void isSame( final T argument, String argumentName, final T object, String objectName ) {
if (argument != object) {
if (objectName == null) objectName = getObjectName(object);
- throw new IllegalArgumentException(CoreI18n.argumentMustBeSameAs.text(argumentName, objectName));
+ throw new IllegalArgumentException(CommonI18n.argumentMustBeSameAs.text(argumentName, objectName));
}
}
@@ -323,7 +323,7 @@
public static <T> void isNotSame( final T argument, String argumentName, final T object, String objectName ) {
if (argument == object) {
if (objectName == null) objectName = getObjectName(object);
- throw new IllegalArgumentException(CoreI18n.argumentMustNotBeSameAs.text(argumentName, objectName));
+ throw new IllegalArgumentException(CommonI18n.argumentMustNotBeSameAs.text(argumentName, objectName));
}
}
@@ -341,7 +341,7 @@
public static <T> void isEquals( final T argument, String argumentName, final T object, String objectName ) {
if (!argument.equals(object)) {
if (objectName == null) objectName = getObjectName(object);
- throw new IllegalArgumentException(CoreI18n.argumentMustBeEquals.text(argumentName, objectName));
+ throw new IllegalArgumentException(CommonI18n.argumentMustBeEquals.text(argumentName, objectName));
}
}
@@ -359,7 +359,7 @@
public static <T> void isNotEquals( final T argument, String argumentName, final T object, String objectName ) {
if (argument.equals(object)) {
if (objectName == null) objectName = getObjectName(object);
- throw new IllegalArgumentException(CoreI18n.argumentMustNotBeEquals.text(argumentName, objectName));
+ throw new IllegalArgumentException(CommonI18n.argumentMustNotBeEquals.text(argumentName, objectName));
}
}
@@ -374,7 +374,7 @@
public static void isNotEmpty( Iterator argument, String name ) {
isNotNull(argument, name);
if (!argument.hasNext()) {
- throw new IllegalArgumentException(CoreI18n.argumentMayNotBeEmpty.text(name));
+ throw new IllegalArgumentException(CommonI18n.argumentMayNotBeEmpty.text(name));
}
}
@@ -389,7 +389,7 @@
public static void isNotEmpty( Collection argument, String name ) {
isNotNull(argument, name);
if (argument.isEmpty()) {
- throw new IllegalArgumentException(CoreI18n.argumentMayNotBeEmpty.text(name));
+ throw new IllegalArgumentException(CommonI18n.argumentMayNotBeEmpty.text(name));
}
}
@@ -402,7 +402,7 @@
public static void isNotEmpty( Map argument, String name ) {
isNotNull(argument, name);
if (argument.isEmpty()) {
- throw new IllegalArgumentException(CoreI18n.argumentMayNotBeEmpty.text(name));
+ throw new IllegalArgumentException(CommonI18n.argumentMayNotBeEmpty.text(name));
}
}
@@ -415,7 +415,7 @@
public static void isNotEmpty( Object[] argument, String name ) {
isNotNull(argument, name);
if (argument.length == 0) {
- throw new IllegalArgumentException(CoreI18n.argumentMayNotBeEmpty.text(name));
+ throw new IllegalArgumentException(CommonI18n.argumentMayNotBeEmpty.text(name));
}
}
@@ -433,7 +433,7 @@
public static void contains( Collection argument, Object value, String name ) {
isNotNull(argument, name);
if (!argument.contains(value)) {
- throw new IllegalArgumentException(CoreI18n.argumentDidNotContainObject.text(name, getObjectName(value)));
+ throw new IllegalArgumentException(CommonI18n.argumentDidNotContainObject.text(name, getObjectName(value)));
}
}
@@ -447,7 +447,7 @@
public static void containsKey( Map argument, Object key, String name ) {
isNotNull(argument, name);
if (!argument.containsKey(key)) {
- throw new IllegalArgumentException(CoreI18n.argumentDidNotContainKey.text(name, getObjectName(key)));
+ throw new IllegalArgumentException(CommonI18n.argumentDidNotContainKey.text(name, getObjectName(key)));
}
}
@@ -462,7 +462,7 @@
int i = 0;
for (Object object : argument) {
if (object == null) {
- throw new IllegalArgumentException(CoreI18n.argumentMayNotContainNullValue.text(name, i));
+ throw new IllegalArgumentException(CommonI18n.argumentMayNotContainNullValue.text(name, i));
}
++i;
}
@@ -479,7 +479,7 @@
int i = 0;
for (Object object : argument) {
if (object == null) {
- throw new IllegalArgumentException(CoreI18n.argumentMayNotContainNullValue.text(name, i));
+ throw new IllegalArgumentException(CommonI18n.argumentMayNotContainNullValue.text(name, i));
}
++i;
}
Modified: trunk/dna-common/src/main/java/org/jboss/dna/common/util/ClassUtil.java
===================================================================
--- trunk/dna-common/src/main/java/org/jboss/dna/common/util/ClassUtil.java 2008-04-22 14:59:02 UTC (rev 98)
+++ trunk/dna-common/src/main/java/org/jboss/dna/common/util/ClassUtil.java 2008-04-22 15:16:43 UTC (rev 99)
@@ -118,7 +118,7 @@
*/
public static String nonPackageQualifiedName( final Class clazz ) {
// if (clazz == null) {
- // throw new IllegalArgumentException(I18n.format(CoreI18n.mustNotBeNull, "Class")); //$NON-NLS-1$
+ // throw new IllegalArgumentException(I18n.format(CommonI18n.mustNotBeNull, "Class")); //$NON-NLS-1$
// }
String name = clazz.getName();
return name.substring(name.lastIndexOf('.') + 1);
@@ -131,7 +131,7 @@
*/
public static String nonPackageQualifiedName( final Object object ) {
// if (object == null) {
- // throw new IllegalArgumentException(I18n.format(CoreI18n.mustNotBeNull, "Object")); //$NON-NLS-1$
+ // throw new IllegalArgumentException(I18n.format(CommonI18n.mustNotBeNull, "Object")); //$NON-NLS-1$
// }
return nonPackageQualifiedName(object.getClass());
}
Modified: trunk/dna-common/src/main/java/org/jboss/dna/common/util/DateUtil.java
===================================================================
--- trunk/dna-common/src/main/java/org/jboss/dna/common/util/DateUtil.java 2008-04-22 14:59:02 UTC (rev 98)
+++ trunk/dna-common/src/main/java/org/jboss/dna/common/util/DateUtil.java 2008-04-22 15:16:43 UTC (rev 99)
@@ -30,7 +30,7 @@
import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.jboss.dna.common.CoreI18n;
+import org.jboss.dna.common.CommonI18n;
import net.jcip.annotations.ThreadSafe;
/**
@@ -157,7 +157,7 @@
final Pattern pattern = Pattern.compile(regex);
final Matcher matcher = pattern.matcher(dateString);
if (!matcher.matches()) {
- throw new ParseException(CoreI18n.dateParsingFailure.text(dateString), 0);
+ throw new ParseException(CommonI18n.dateParsingFailure.text(dateString), 0);
}
String year = matcher.group(1);
String week = matcher.group(4);
Copied: trunk/dna-common/src/main/resources/org/jboss/dna/common/CommonI18n.properties (from rev 98, trunk/dna-common/src/main/resources/org/jboss/dna/common/CoreI18n.properties)
===================================================================
--- trunk/dna-common/src/main/resources/org/jboss/dna/common/CommonI18n.properties (rev 0)
+++ trunk/dna-common/src/main/resources/org/jboss/dna/common/CommonI18n.properties 2008-04-22 15:16:43 UTC (rev 99)
@@ -0,0 +1,55 @@
+# Make sure the following I18n.java-related properties are defined before all other properties to ensure a valid error message is
+# produced in the event of a missing/duplicate/unused property
+
+i18nArgumentsMismatchedParameter = {0} arguments were specified for internationalization object "{1}", but {2} parameter is required: "{3}" => "{4}"
+i18nArgumentMismatchedParameters = {0} argument was specified for internationalization object "{1}", but {2} parameters are required: "{3}" => "{4}"
+i18nArgumentsMismatchedParameters = {0} arguments were specified for internationalization object "{1}", but {2} parameters are required: "{3}" => "{4}"
+i18nReplaceArgumentsMismatchedParameter = {0} arguments were specified, but {1} parameter is required: "{2}" => "{3}"
+i18nReplaceArgumentMismatchedParameters = {0} argument was specified, but {1} parameters are required: "{2}" => "{3}"
+i18nReplaceArgumentsMismatchedParameters = {0} arguments were specified, but {1} parameters are required: "{2}" => "{3}"
+i18nClassInterface = Class {0} must not be an interface.
+i18nClassNotPublic = Class {0} must be public.
+i18nFieldFinal = Internationalization field "{0}" in {1} must not be final.
+i18nFieldInvalidType = Internationalization field "{0}" in {1} must be of type {2}.
+i18nFieldNotPublic = Internationalization field "{0}" in {1} must be public.
+i18nFieldNotStatic = Internationalization field "{0}" in {1} must be static.
+i18nPropertiesFileNotFound = No variant of the localization file for "{0}" could be found.
+i18nPropertyDuplicate = Duplicate property values were found for property "{0}" in localization file "{1}";
+i18nPropertyMissing = Missing property "{0}" in localization file {1}.
+i18nPropertyUnused = An unused property, "{0}", was found in localization file "{1}".
+
+# Core-related fields
+componentClassnameNotValid = The class name {0} specified for {1} is not a valid Java class name
+componentNotConfigured = The component {0} was not configured and will not be used
+progressMonitorBeginTask = Beginning {0} ({1})
+progressMonitorStatus = {0}
+
+argumentMayNotBeNegative = The {0} argument value, {1}, may not be negative
+argumentMayNotBePositive = The {0} argument value, {1}, may not be positive
+argumentMustBeNegative = The {0} argument value, {1}, must be negative
+argumentMustBePositive = The {0} argument value, {1}, must be positive
+argumentMustBeNumber = The {0} argument value must be a number
+argumentMayNotBeNullOrZeroLength = The {0} argument may not be null or zero-length
+argumentMayNotBeNullOrZeroLengthOrEmpty = The {0} argument may not be empty or contain only whitespace
+argumentMayNotBeNull = The {0} argument may not be null
+argumentMustBeNull = The {0} argument must be null
+argumentMustBeInstanceOf = The {0} argument was an instance of {1} but was expected to be an instance of {2}
+argumentMustBeSameAs = The {0} argument is not the same as "{1}"
+argumentMustNotBeSameAs = The {0} argument is the same as "{1}"
+argumentMustBeEquals = The {0} argument is not equal to {1}
+argumentMustNotBeEquals = The {0} argument is equal to {1}
+argumentMayNotBeEmpty = The {0} argument may not be empty
+argumentDidNotContainObject = "The {0} argument did not contain the expected object {1}
+argumentDidNotContainKey = "The {0} argument did not contain the expected key {1}
+argumentMayNotContainNullValue = The {0} argument may not contain a null value (first null found at position {1})
+
+pathAncestorDegreeIsInvalid = Unable to obtain the {1} ancestor for {0}
+pathIsAlreadyAbsolute = The path {0} is already an absolute path
+pathIsNotAbsolute = The path {0} is not an absolute path
+pathIsNotRelative = The path {0} is not a relative path
+pathCannotBeNormalized = The path {0} is invalid and cannot be normalized
+
+dateParsingFailure = Unable to parse the date "{0}" using the standard ISO 8601 format
+
+passthrough = {0}
+empty =
Deleted: trunk/dna-common/src/main/resources/org/jboss/dna/common/CoreI18n.properties
===================================================================
--- trunk/dna-common/src/main/resources/org/jboss/dna/common/CoreI18n.properties 2008-04-22 14:59:02 UTC (rev 98)
+++ trunk/dna-common/src/main/resources/org/jboss/dna/common/CoreI18n.properties 2008-04-22 15:16:43 UTC (rev 99)
@@ -1,55 +0,0 @@
-# Make sure the following I18n.java-related properties are defined before all other properties to ensure a valid error message is
-# produced in the event of a missing/duplicate/unused property
-
-i18nArgumentsMismatchedParameter = {0} arguments were specified for internationalization object "{1}", but {2} parameter is required: "{3}" => "{4}"
-i18nArgumentMismatchedParameters = {0} argument was specified for internationalization object "{1}", but {2} parameters are required: "{3}" => "{4}"
-i18nArgumentsMismatchedParameters = {0} arguments were specified for internationalization object "{1}", but {2} parameters are required: "{3}" => "{4}"
-i18nReplaceArgumentsMismatchedParameter = {0} arguments were specified, but {1} parameter is required: "{2}" => "{3}"
-i18nReplaceArgumentMismatchedParameters = {0} argument was specified, but {1} parameters are required: "{2}" => "{3}"
-i18nReplaceArgumentsMismatchedParameters = {0} arguments were specified, but {1} parameters are required: "{2}" => "{3}"
-i18nClassInterface = Class {0} must not be an interface.
-i18nClassNotPublic = Class {0} must be public.
-i18nFieldFinal = Internationalization field "{0}" in {1} must not be final.
-i18nFieldInvalidType = Internationalization field "{0}" in {1} must be of type {2}.
-i18nFieldNotPublic = Internationalization field "{0}" in {1} must be public.
-i18nFieldNotStatic = Internationalization field "{0}" in {1} must be static.
-i18nPropertiesFileNotFound = No variant of the localization file for "{0}" could be found.
-i18nPropertyDuplicate = Duplicate property values were found for property "{0}" in localization file "{1}";
-i18nPropertyMissing = Missing property "{0}" in localization file {1}.
-i18nPropertyUnused = An unused property, "{0}", was found in localization file "{1}".
-
-# Core-related fields
-componentClassnameNotValid = The class name {0} specified for {1} is not a valid Java class name
-componentNotConfigured = The component {0} was not configured and will not be used
-progressMonitorBeginTask = Beginning {0} ({1})
-progressMonitorStatus = {0}
-
-argumentMayNotBeNegative = The {0} argument value, {1}, may not be negative
-argumentMayNotBePositive = The {0} argument value, {1}, may not be positive
-argumentMustBeNegative = The {0} argument value, {1}, must be negative
-argumentMustBePositive = The {0} argument value, {1}, must be positive
-argumentMustBeNumber = The {0} argument value must be a number
-argumentMayNotBeNullOrZeroLength = The {0} argument may not be null or zero-length
-argumentMayNotBeNullOrZeroLengthOrEmpty = The {0} argument may not be empty or contain only whitespace
-argumentMayNotBeNull = The {0} argument may not be null
-argumentMustBeNull = The {0} argument must be null
-argumentMustBeInstanceOf = The {0} argument was an instance of {1} but was expected to be an instance of {2}
-argumentMustBeSameAs = The {0} argument is not the same as "{1}"
-argumentMustNotBeSameAs = The {0} argument is the same as "{1}"
-argumentMustBeEquals = The {0} argument is not equal to {1}
-argumentMustNotBeEquals = The {0} argument is equal to {1}
-argumentMayNotBeEmpty = The {0} argument may not be empty
-argumentDidNotContainObject = "The {0} argument did not contain the expected object {1}
-argumentDidNotContainKey = "The {0} argument did not contain the expected key {1}
-argumentMayNotContainNullValue = The {0} argument may not contain a null value (first null found at position {1})
-
-pathAncestorDegreeIsInvalid = Unable to obtain the {1} ancestor for {0}
-pathIsAlreadyAbsolute = The path {0} is already an absolute path
-pathIsNotAbsolute = The path {0} is not an absolute path
-pathIsNotRelative = The path {0} is not a relative path
-pathCannotBeNormalized = The path {0} is invalid and cannot be normalized
-
-dateParsingFailure = Unable to parse the date "{0}" using the standard ISO 8601 format
-
-passthrough = {0}
-empty =
Modified: trunk/dna-common/src/test/java/org/jboss/dna/common/component/MockComponentA.java
===================================================================
--- trunk/dna-common/src/test/java/org/jboss/dna/common/component/MockComponentA.java 2008-04-22 14:59:02 UTC (rev 98)
+++ trunk/dna-common/src/test/java/org/jboss/dna/common/component/MockComponentA.java 2008-04-22 15:16:43 UTC (rev 99)
@@ -24,7 +24,7 @@
import java.util.concurrent.atomic.AtomicInteger;
import net.jcip.annotations.ThreadSafe;
-import org.jboss.dna.common.CoreI18n;
+import org.jboss.dna.common.CommonI18n;
import org.jboss.dna.common.monitor.ProgressMonitor;
/**
@@ -49,7 +49,7 @@
*/
public void doSomething( ProgressMonitor progressMonitor ) {
try {
- progressMonitor.beginTask(1, CoreI18n.passthrough, "Incrementing counter");
+ progressMonitor.beginTask(1, CommonI18n.passthrough, "Incrementing counter");
// increment the counter and record the progress ...
this.counter.incrementAndGet();
progressMonitor.worked(1);
Modified: trunk/dna-common/src/test/java/org/jboss/dna/common/component/MockComponentB.java
===================================================================
--- trunk/dna-common/src/test/java/org/jboss/dna/common/component/MockComponentB.java 2008-04-22 14:59:02 UTC (rev 98)
+++ trunk/dna-common/src/test/java/org/jboss/dna/common/component/MockComponentB.java 2008-04-22 15:16:43 UTC (rev 99)
@@ -24,7 +24,7 @@
import java.util.concurrent.atomic.AtomicInteger;
import net.jcip.annotations.ThreadSafe;
-import org.jboss.dna.common.CoreI18n;
+import org.jboss.dna.common.CommonI18n;
import org.jboss.dna.common.monitor.ProgressMonitor;
/**
@@ -49,7 +49,7 @@
*/
public void doSomething( ProgressMonitor progressMonitor ) {
try {
- progressMonitor.beginTask(1, CoreI18n.passthrough, "Incrementing counter");
+ progressMonitor.beginTask(1, CommonI18n.passthrough, "Incrementing counter");
// increment the counter and record the progress ...
this.counter.incrementAndGet();
progressMonitor.worked(1);
Modified: trunk/dna-common/src/test/java/org/jboss/dna/common/i18n/I18nTest.java
===================================================================
--- trunk/dna-common/src/test/java/org/jboss/dna/common/i18n/I18nTest.java 2008-04-22 14:59:02 UTC (rev 98)
+++ trunk/dna-common/src/test/java/org/jboss/dna/common/i18n/I18nTest.java 2008-04-22 15:16:43 UTC (rev 99)
@@ -28,7 +28,7 @@
import static org.hamcrest.core.IsNull.notNullValue;
import static org.hamcrest.core.IsNull.nullValue;
import static org.junit.Assert.assertThat;
-import org.jboss.dna.common.CoreI18n;
+import org.jboss.dna.common.CommonI18n;
import org.jboss.dna.common.SystemFailureException;
import org.junit.Before;
import org.junit.Test;
@@ -74,7 +74,7 @@
try {
I18n.initialize(TestI18nFinalField.class);
} catch (SystemFailureException err) {
- assertThat(err.getMessage(), is(CoreI18n.i18nFieldFinal.text("testMessage", TestI18nFinalField.class)));
+ assertThat(err.getMessage(), is(CommonI18n.i18nFieldFinal.text("testMessage", TestI18nFinalField.class)));
System.err.println(err);
throw err;
}
@@ -85,7 +85,7 @@
try {
I18n.initialize(TestI18nNotPublicField.class);
} catch (RuntimeException err) {
- assertThat(err.getMessage(), is(CoreI18n.i18nFieldNotPublic.text("testMessage", TestI18nNotPublicField.class)));
+ assertThat(err.getMessage(), is(CommonI18n.i18nFieldNotPublic.text("testMessage", TestI18nNotPublicField.class)));
System.err.println(err);
throw err;
}
@@ -96,7 +96,7 @@
try {
I18n.initialize(TestI18nNotStaticField.class);
} catch (RuntimeException err) {
- assertThat(err.getMessage(), is(CoreI18n.i18nFieldNotStatic.text("testMessage", TestI18nNotStaticField.class)));
+ assertThat(err.getMessage(), is(CommonI18n.i18nFieldNotStatic.text("testMessage", TestI18nNotStaticField.class)));
System.err.println(err);
throw err;
}
@@ -123,7 +123,7 @@
try {
I18n.initialize(TestI18nInterface.class);
} catch (IllegalArgumentException err) {
- assertThat(err.getMessage(), is(CoreI18n.i18nClassInterface.text(TestI18nInterface.class.getName())));
+ assertThat(err.getMessage(), is(CommonI18n.i18nClassInterface.text(TestI18nInterface.class.getName())));
System.err.println(err);
throw err;
}
@@ -176,7 +176,7 @@
try {
TestI18n.testMessage1.text();
} catch (IllegalArgumentException err) {
- assertThat(err.getMessage(), is(CoreI18n.i18nArgumentsMismatchedParameter.text(0, "testMessage1", 1, "{0}", "{0}")));
+ assertThat(err.getMessage(), is(CommonI18n.i18nArgumentsMismatchedParameter.text(0, "testMessage1", 1, "{0}", "{0}")));
System.err.println(err);
throw err;
}
@@ -187,7 +187,7 @@
try {
TestI18n.testMessage1.text("Test", "Message");
} catch (IllegalArgumentException err) {
- assertThat(err.getMessage(), is(CoreI18n.i18nArgumentsMismatchedParameter.text(2, "testMessage1", 1, "{0}", "Test")));
+ assertThat(err.getMessage(), is(CommonI18n.i18nArgumentsMismatchedParameter.text(2, "testMessage1", 1, "{0}", "Test")));
System.err.println(err);
throw err;
}
Modified: trunk/dna-common/src/test/java/org/jboss/dna/common/monitor/SimpleProgressMonitorTest.java
===================================================================
--- trunk/dna-common/src/test/java/org/jboss/dna/common/monitor/SimpleProgressMonitorTest.java 2008-04-22 14:59:02 UTC (rev 98)
+++ trunk/dna-common/src/test/java/org/jboss/dna/common/monitor/SimpleProgressMonitorTest.java 2008-04-22 15:16:43 UTC (rev 99)
@@ -28,7 +28,7 @@
import static org.hamcrest.core.Is.is;
import static org.hamcrest.number.IsCloseTo.closeTo;
import static org.junit.Assert.assertThat;
-import org.jboss.dna.common.CoreI18n;
+import org.jboss.dna.common.CommonI18n;
import org.junit.Before;
import org.junit.Test;
@@ -64,7 +64,7 @@
@Test
public void shouldHaveProgressOfZeroPercentUponBeginningTask() {
- this.monitor.beginTask(100, CoreI18n.passthrough, validTaskName);
+ this.monitor.beginTask(100, CommonI18n.passthrough, validTaskName);
ProgressStatus status = monitor.getStatus();
assertThat(status, is(notNullValue()));
assertThat(status.getActivityName(), is(sameInstance(monitor.getActivityName())));
@@ -74,7 +74,7 @@
@Test
public void shouldShowProperProgress() {
- this.monitor.beginTask(1000, CoreI18n.passthrough, validTaskName);
+ this.monitor.beginTask(1000, CommonI18n.passthrough, validTaskName);
ProgressStatus status = monitor.getStatus();
assertThat(status, is(notNullValue()));
assertThat(status.getActivityName(), is(sameInstance(monitor.getActivityName())));
@@ -102,7 +102,7 @@
@Test
public void shouldShowProperProgressUsingSubtasks() {
- monitor.beginTask(1000, CoreI18n.passthrough, validTaskName);
+ monitor.beginTask(1000, CommonI18n.passthrough, validTaskName);
ProgressStatus status = monitor.getStatus();
assertThat(status, is(notNullValue()));
assertThat(status.getActivityName(), is(sameInstance(monitor.getActivityName())));
@@ -117,7 +117,7 @@
assertThat(((SubProgressMonitor)subtask).getParent(), is(sameInstance(monitor)));
String subtaskName = "Subtask " + i;
- subtask.beginTask(10, CoreI18n.passthrough, subtaskName); // note the different total work for the subtask
+ subtask.beginTask(10, CommonI18n.passthrough, subtaskName); // note the different total work for the subtask
for (int j = 1; j <= 10; ++j) {
// Work the subtask
subtask.worked(1);
@@ -155,7 +155,7 @@
@Test
public void shouldAllowDoneToBeCalledEvenAfterFinished() {
- monitor.beginTask(1000, CoreI18n.passthrough, validTaskName);
+ monitor.beginTask(1000, CommonI18n.passthrough, validTaskName);
ProgressStatus status = monitor.getStatus();
assertThat(status, is(notNullValue()));
assertThat(status.getActivityName(), is(sameInstance(monitor.getActivityName())));
@@ -184,7 +184,7 @@
@Test
public void shouldAllowCancelToBeRejected() {
- monitor.beginTask(1000, CoreI18n.passthrough, validTaskName);
+ monitor.beginTask(1000, CommonI18n.passthrough, validTaskName);
ProgressStatus status = monitor.getStatus();
assertThat(status, is(notNullValue()));
assertThat(status.getActivityName(), is(sameInstance(monitor.getActivityName())));
@@ -218,7 +218,7 @@
@Test
public void shouldContinueToRecordWorkEvenWhenCancelled() {
- monitor.beginTask(1000, CoreI18n.passthrough, validTaskName);
+ monitor.beginTask(1000, CommonI18n.passthrough, validTaskName);
ProgressStatus status = monitor.getStatus();
assertThat(status, is(notNullValue()));
assertThat(status.getActivityName(), is(sameInstance(monitor.getActivityName())));
Modified: trunk/dna-common/src/test/java/org/jboss/dna/common/stats/HistogramTest.java
===================================================================
--- trunk/dna-common/src/test/java/org/jboss/dna/common/stats/HistogramTest.java 2008-04-22 14:59:02 UTC (rev 98)
+++ trunk/dna-common/src/test/java/org/jboss/dna/common/stats/HistogramTest.java 2008-04-22 15:16:43 UTC (rev 99)
@@ -26,7 +26,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Random;
-import org.jboss.dna.common.CoreI18n;
+import org.jboss.dna.common.CommonI18n;
import org.jboss.dna.common.math.FloatOperations;
import org.jboss.dna.common.math.MathOperations;
import org.jboss.dna.common.stats.Histogram;
@@ -55,7 +55,7 @@
}
public static <T extends Number> void writeHistogramToLog( Logger logger, Histogram<T> histogram, int barLength, String description ) {
- logger.info(CoreI18n.passthrough, description != null ? description : "Histogram:");
+ logger.info(CommonI18n.passthrough, description != null ? description : "Histogram:");
List<String> barGraph = histogram.getTextGraph(barLength);
for (String line : barGraph) {
logger.debug(" " + line);
Modified: trunk/dna-common/src/test/java/org/jboss/dna/common/util/LogContextTest.java
===================================================================
--- trunk/dna-common/src/test/java/org/jboss/dna/common/util/LogContextTest.java 2008-04-22 14:59:02 UTC (rev 98)
+++ trunk/dna-common/src/test/java/org/jboss/dna/common/util/LogContextTest.java 2008-04-22 15:16:43 UTC (rev 99)
@@ -22,7 +22,7 @@
package org.jboss.dna.common.util;
-import org.jboss.dna.common.CoreI18n;
+import org.jboss.dna.common.CommonI18n;
import org.jboss.dna.common.util.LogContext;
import org.jboss.dna.common.util.Logger;
import org.junit.After;
@@ -46,8 +46,8 @@
@Test
public void shouldAcceptValidKeys() {
LogContext.set("username", "jsmith");
- logger.info(CoreI18n.passthrough, "tracking activity for username");
- logger.info(CoreI18n.passthrough, "A second log message");
+ logger.info(CommonI18n.passthrough, "tracking activity for username");
+ logger.info(CommonI18n.passthrough, "A second log message");
}
}
Modified: trunk/dna-integration-tests/src/test/java/org/jboss/dna/tests/integration/jackrabbit/JackrabbitBasicFunctionTest.java
===================================================================
--- trunk/dna-integration-tests/src/test/java/org/jboss/dna/tests/integration/jackrabbit/JackrabbitBasicFunctionTest.java 2008-04-22 14:59:02 UTC (rev 98)
+++ trunk/dna-integration-tests/src/test/java/org/jboss/dna/tests/integration/jackrabbit/JackrabbitBasicFunctionTest.java 2008-04-22 15:16:43 UTC (rev 99)
@@ -31,7 +31,7 @@
import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
import org.apache.jackrabbit.core.TransientRepository;
-import org.jboss.dna.common.CoreI18n;
+import org.jboss.dna.common.CommonI18n;
import org.jboss.dna.common.util.FileUtil;
import org.jboss.dna.common.util.Logger;
import org.junit.After;
@@ -76,7 +76,7 @@
assertNotNull(session);
String username = session.getUserID();
String name = repository.getDescriptor(Repository.REP_NAME_DESC);
- logger.info(CoreI18n.passthrough, "Logged in as " + username + " to a " + name + " repository");
+ logger.info(CommonI18n.passthrough, "Logged in as " + username + " to a " + name + " repository");
} finally {
if (session != null) session.logout();
}
@@ -91,7 +91,7 @@
assertNotNull(session);
String username = session.getUserID();
String name = repository.getDescriptor(Repository.REP_NAME_DESC);
- logger.info(CoreI18n.passthrough, "Logged in as " + username + " to a " + name + " repository");
+ logger.info(CommonI18n.passthrough, "Logged in as " + username + " to a " + name + " repository");
} finally {
if (session != null) session.logout();
}
@@ -106,7 +106,7 @@
Session session = this.repository.login(creds);
assertNotNull(session);
sessions.add(session);
- logger.info(CoreI18n.passthrough, "Logged in as " + session.getUserID());
+ logger.info(CommonI18n.passthrough, "Logged in as " + session.getUserID());
}
} finally {
while (!sessions.isEmpty()) {
@@ -150,8 +150,8 @@
// Retrieve content ...
Node node = root.getNode("hello/world");
- this.logger.info(CoreI18n.passthrough, "Node 'hello/world' has path: " + node.getPath());
- this.logger.info(CoreI18n.passthrough, "Node 'hello/world' has 'message' property: " + node.getProperty("message").getString());
+ this.logger.info(CommonI18n.passthrough, "Node 'hello/world' has path: " + node.getPath());
+ this.logger.info(CommonI18n.passthrough, "Node 'hello/world' has 'message' property: " + node.getProperty("message").getString());
} finally {
if (session != null) session.logout();
}
@@ -163,11 +163,11 @@
// Retrieve content
Node node = root.getNode("hello/world");
- this.logger.info(CoreI18n.passthrough, "Node 'hello/world' has path: " + node.getPath());
- this.logger.info(CoreI18n.passthrough, "Node 'hello/world' has 'message' property: " + node.getProperty("message").getString());
+ this.logger.info(CommonI18n.passthrough, "Node 'hello/world' has path: " + node.getPath());
+ this.logger.info(CommonI18n.passthrough, "Node 'hello/world' has 'message' property: " + node.getProperty("message").getString());
// Remove content
- this.logger.info(CoreI18n.passthrough, "Node 'hello' is being removed");
+ this.logger.info(CommonI18n.passthrough, "Node 'hello' is being removed");
root.getNode("hello").remove();
session.save();
} finally {
Modified: trunk/dna-integration-tests/src/test/java/org/jboss/dna/tests/integration/jackrabbit/JackrabbitDerbyStressTest.java
===================================================================
--- trunk/dna-integration-tests/src/test/java/org/jboss/dna/tests/integration/jackrabbit/JackrabbitDerbyStressTest.java 2008-04-22 14:59:02 UTC (rev 98)
+++ trunk/dna-integration-tests/src/test/java/org/jboss/dna/tests/integration/jackrabbit/JackrabbitDerbyStressTest.java 2008-04-22 15:16:43 UTC (rev 99)
@@ -27,7 +27,7 @@
import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
import org.apache.jackrabbit.core.TransientRepository;
-import org.jboss.dna.common.CoreI18n;
+import org.jboss.dna.common.CommonI18n;
import org.jboss.dna.common.stats.HistogramTest;
import org.jboss.dna.common.stats.Stopwatch;
import org.jboss.dna.common.util.FileUtil;
@@ -65,7 +65,7 @@
logger = Logger.getLogger(JackrabbitDerbyStressTest.class);
// Set up the transient repository ...
- logger.info(CoreI18n.passthrough, "Creating test repository for stress test and logging in with user " + USERNAME);
+ logger.info(CommonI18n.passthrough, "Creating test repository for stress test and logging in with user " + USERNAME);
this.repository = new TransientRepository(REPOSITORY_CONFIG_PATH, REPOSITORY_DIRECTORY_PATH);
SimpleCredentials creds = new SimpleCredentials(USERNAME, PASSWORD);
@@ -95,7 +95,7 @@
}
rootNode.save();
HistogramTest.writeHistogramToLog(logger, stopwatch.getHistogram(3).setBucketCount(50), 80, "create 100 nodes with no children and no properties");
- this.logger.info(CoreI18n.passthrough, stopwatch.toString());
+ this.logger.info(CommonI18n.passthrough, stopwatch.toString());
}
@Test
@@ -109,7 +109,7 @@
}
rootNode.save();
HistogramTest.writeHistogramToLog(logger, stopwatch.getHistogram(1).setBucketCount(50), 80, "create 1000 nodes with no children and no properties");
- this.logger.info(CoreI18n.passthrough, stopwatch.toString());
+ this.logger.info(CommonI18n.passthrough, stopwatch.toString());
}
@Test
@@ -123,7 +123,7 @@
}
rootNode.save();
HistogramTest.writeHistogramToLog(logger, stopwatch.getHistogram(1).setBucketCount(50), 80, "create 5000 nodes with no children and no properties");
- this.logger.info(CoreI18n.passthrough, stopwatch.toString());
+ this.logger.info(CommonI18n.passthrough, stopwatch.toString());
}
@Test
@@ -137,7 +137,7 @@
}
rootNode.save();
HistogramTest.writeHistogramToLog(logger, stopwatch.getHistogram(1).setBucketCount(50), 80, "create 10000 nodes with no children and no properties");
- this.logger.info(CoreI18n.passthrough, stopwatch.toString());
+ this.logger.info(CommonI18n.passthrough, stopwatch.toString());
}
@Test
@@ -153,7 +153,7 @@
}
rootNode.save();
HistogramTest.writeHistogramToLog(logger, stopwatch.getHistogram(3).setBucketCount(50), 80, "create 100 nodes with no children and several properties");
- this.logger.info(CoreI18n.passthrough, stopwatch.toString());
+ this.logger.info(CommonI18n.passthrough, stopwatch.toString());
}
//
// @Test
Modified: trunk/dna-integration-tests/src/test/java/org/jboss/dna/tests/integration/jackrabbit/JackrabbitInMemoryTest.java
===================================================================
--- trunk/dna-integration-tests/src/test/java/org/jboss/dna/tests/integration/jackrabbit/JackrabbitInMemoryTest.java 2008-04-22 14:59:02 UTC (rev 98)
+++ trunk/dna-integration-tests/src/test/java/org/jboss/dna/tests/integration/jackrabbit/JackrabbitInMemoryTest.java 2008-04-22 15:16:43 UTC (rev 99)
@@ -27,7 +27,7 @@
import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
import org.apache.jackrabbit.core.TransientRepository;
-import org.jboss.dna.common.CoreI18n;
+import org.jboss.dna.common.CommonI18n;
import org.jboss.dna.common.stats.HistogramTest;
import org.jboss.dna.common.stats.Stopwatch;
import org.jboss.dna.common.util.FileUtil;
@@ -64,7 +64,7 @@
logger = Logger.getLogger(JackrabbitInMemoryTest.class);
// Set up the transient repository ...
- logger.info(CoreI18n.passthrough, "Creating test repository for stress test and logging in with user " + USERNAME);
+ logger.info(CommonI18n.passthrough, "Creating test repository for stress test and logging in with user " + USERNAME);
this.repository = new TransientRepository(REPOSITORY_CONFIG_PATH, REPOSITORY_DIRECTORY_PATH);
SimpleCredentials creds = new SimpleCredentials(USERNAME, PASSWORD);
@@ -119,7 +119,7 @@
}
rootNode.save();
HistogramTest.writeHistogramToLog(logger, nodeStopwatch.getHistogram(3).setBucketCount(50), 80, "create 100 nodes with no children and no properties");
- this.logger.info(CoreI18n.passthrough, nodeStopwatch.toString());
+ this.logger.info(CommonI18n.passthrough, nodeStopwatch.toString());
}
@Test
@@ -133,8 +133,8 @@
HistogramTest.writeHistogramToLog(logger, nodeStopwatch.getHistogram(3).setBucketCount(50), 80, "create tree of " + numNodes + " nodes (2 deep, 10 children at every node)");
HistogramTest.writeHistogramToLog(logger, saveStopwatch.getHistogram(3).setBucketCount(50), 80, "1 save of 2x10 tree of " + numNodes + " nodes");
- this.logger.info(CoreI18n.passthrough, "Node operation times: " + nodeStopwatch.toString());
- this.logger.info(CoreI18n.passthrough, "Save times: " + saveStopwatch.toString());
+ this.logger.info(CommonI18n.passthrough, "Node operation times: " + nodeStopwatch.toString());
+ this.logger.info(CommonI18n.passthrough, "Save times: " + saveStopwatch.toString());
}
@Test
Modified: trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencers/MockSequencerA.java
===================================================================
--- trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencers/MockSequencerA.java 2008-04-22 14:59:02 UTC (rev 98)
+++ trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencers/MockSequencerA.java 2008-04-22 15:16:43 UTC (rev 99)
@@ -28,7 +28,7 @@
import java.util.concurrent.atomic.AtomicInteger;
import javax.jcr.Node;
import net.jcip.annotations.ThreadSafe;
-import org.jboss.dna.common.CoreI18n;
+import org.jboss.dna.common.CommonI18n;
import org.jboss.dna.common.monitor.ProgressMonitor;
import org.jboss.dna.repository.observation.NodeChange;
import org.jboss.dna.repository.sequencers.Sequencer;
@@ -67,7 +67,7 @@
*/
public void execute( Node input, String sequencedPropertyName, NodeChange changes, Set<RepositoryNodePath> outputPaths, ExecutionContext context, ProgressMonitor progress ) {
try {
- progress.beginTask(1, CoreI18n.passthrough, "Incrementing counter");
+ progress.beginTask(1, CommonI18n.passthrough, "Incrementing counter");
// increment the counter and record the progress ...
this.counter.incrementAndGet();
this.latch.countDown();
Modified: trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencers/MockSequencerB.java
===================================================================
--- trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencers/MockSequencerB.java 2008-04-22 14:59:02 UTC (rev 98)
+++ trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencers/MockSequencerB.java 2008-04-22 15:16:43 UTC (rev 99)
@@ -28,7 +28,7 @@
import java.util.concurrent.atomic.AtomicInteger;
import javax.jcr.Node;
import net.jcip.annotations.ThreadSafe;
-import org.jboss.dna.common.CoreI18n;
+import org.jboss.dna.common.CommonI18n;
import org.jboss.dna.common.monitor.ProgressMonitor;
import org.jboss.dna.repository.observation.NodeChange;
import org.jboss.dna.repository.sequencers.Sequencer;
@@ -67,7 +67,7 @@
*/
public void execute( Node input, String sequencedPropertyName, NodeChange changes, Set<RepositoryNodePath> outputPaths, ExecutionContext context, ProgressMonitor progress ) {
try {
- progress.beginTask(1, CoreI18n.passthrough, "Incrementing counter");
+ progress.beginTask(1, CommonI18n.passthrough, "Incrementing counter");
// increment the counter and record the progress ...
this.counter.incrementAndGet();
this.latch.countDown();
More information about the dna-commits
mailing list