[jboss-cvs] JBossAS SVN: r101815 - in projects/kernel/trunk: dependency and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 4 06:49:52 EST 2010
Author: adrian at jboss.org
Date: 2010-03-04 06:49:51 -0500 (Thu, 04 Mar 2010)
New Revision: 101815
Added:
projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/TrackingDependencyInfo.java
projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/TrackingDependencyItem.java
Removed:
projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/OnDemandDependencyUninstallTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/support/LoggerDecorator.java
Modified:
projects/kernel/trunk/dependency/pom.xml
projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractDependencyInfo.java
projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractDependencyItem.java
projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/support/RecursiveDependencyItem.java
projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/ControllerTestSuite.java
projects/kernel/trunk/kernel/pom.xml
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/UninstallNoOptionalContextDependencyTestCase.java
projects/kernel/trunk/pom.xml
Log:
[JBKERNEL-104][JBKERNEL-106] - DependencyInfo optimization and logging 2.2.0CR1
Modified: projects/kernel/trunk/dependency/pom.xml
===================================================================
--- projects/kernel/trunk/dependency/pom.xml 2010-03-04 11:11:24 UTC (rev 101814)
+++ projects/kernel/trunk/dependency/pom.xml 2010-03-04 11:49:51 UTC (rev 101815)
@@ -47,6 +47,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossxb</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractDependencyInfo.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractDependencyInfo.java 2010-03-04 11:11:24 UTC (rev 101814)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractDependencyInfo.java 2010-03-04 11:49:51 UTC (rev 101815)
@@ -24,18 +24,20 @@
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CopyOnWriteArraySet;
import org.jboss.dependency.spi.CallbackItem;
import org.jboss.dependency.spi.Controller;
import org.jboss.dependency.spi.ControllerState;
-import org.jboss.dependency.spi.DependencyInfo;
import org.jboss.dependency.spi.DependencyItem;
import org.jboss.dependency.spi.LifecycleCallbackItem;
import org.jboss.util.JBossObject;
import org.jboss.util.JBossStringBuilder;
+import org.jboss.util.collection.ConcurrentSet;
/**
* A DependencyInfo.
@@ -44,25 +46,31 @@
* @author <a href="ales.justin at jboss.com">Ales Justin</a>
* @version $Revision$
*/
-public class AbstractDependencyInfo extends JBossObject implements DependencyInfo
+public class AbstractDependencyInfo extends JBossObject implements TrackingDependencyInfo
{
/** My dependencies */
- private Set<DependencyItem> iDependOn = new CopyOnWriteArraySet<DependencyItem>();
+ private Set<DependencyItem> iDependOn;
/** Dependencies referencing me */
- private Set<DependencyItem> dependsOnMe = new CopyOnWriteArraySet<DependencyItem>();
+ private Set<DependencyItem> dependsOnMe;
/** Install callbacks */
- private Set<CallbackItem<?>> installCallbacks = new CopyOnWriteArraySet<CallbackItem<?>>();
+ private Set<CallbackItem<?>> installCallbacks;
/** Uninstall callbacks */
- private Set<CallbackItem<?>> uninstallCallbacks = new CopyOnWriteArraySet<CallbackItem<?>>();
+ private Set<CallbackItem<?>> uninstallCallbacks;
/** Lifecycle callbacks */
- private List<LifecycleCallbackItem> lifecycleCallbacks = new CopyOnWriteArrayList<LifecycleCallbackItem>();
-
+ private List<LifecycleCallbackItem> lifecycleCallbacks;
+
/** Whether this is an autowire candidate */
private boolean autowireCandidate = true;
+
+ /** Whether we are tracking */
+ boolean tracking = true;
+
+ /** The unresolved dependencies by state */
+ private Map<ControllerState, Set<DependencyItem>> unresolved;
/**
* Create an abstract dependency info
@@ -71,8 +79,42 @@
{
}
+ public void resolved(DependencyItem item)
+ {
+ if (tracking)
+ {
+ ControllerState whenRequired = item.getWhenRequired();
+ if (unresolved != null)
+ {
+ Set<DependencyItem> items = unresolved.get(whenRequired);
+ if (items != null)
+ items.remove(item);
+ }
+ }
+ }
+
+ public void unresolved(DependencyItem item)
+ {
+ if (tracking)
+ {
+ ControllerState whenRequired = item.getWhenRequired();
+ if (unresolved == null)
+ unresolved = new ConcurrentHashMap<ControllerState, Set<DependencyItem>>();
+ Set<DependencyItem> items = unresolved.get(whenRequired);
+ if (items == null)
+ {
+ items = new ConcurrentSet<DependencyItem>();
+ unresolved.put(whenRequired, items);
+ }
+ items.add(item);
+ }
+ }
+
public Set<DependencyItem> getIDependOn(Class<?> type)
{
+ Set<DependencyItem> iDependOn = this.iDependOn;
+ if (iDependOn == null)
+ iDependOn = Collections.emptySet();
if (type == null || iDependOn.isEmpty())
return iDependOn;
else
@@ -89,18 +131,69 @@
public void addIDependOn(DependencyItem dependency)
{
+ if (iDependOn == null)
+ iDependOn = new CopyOnWriteArraySet<DependencyItem>();
iDependOn.add(dependency);
flushJBossObjectCache();
+ if (dependency instanceof TrackingDependencyItem)
+ {
+ ((TrackingDependencyItem) dependency).setDependencyInfo(this);
+ if (tracking)
+ {
+ if (dependency.isResolved() == false)
+ {
+ ControllerState whenRequired = dependency.getWhenRequired();
+ if (unresolved == null)
+ unresolved = new ConcurrentHashMap<ControllerState, Set<DependencyItem>>();
+ Set<DependencyItem> items = unresolved.get(whenRequired);
+ if (items == null)
+ {
+ items = new ConcurrentSet<DependencyItem>();
+ unresolved.put(whenRequired, items);
+ }
+ items.add(dependency);
+ }
+ }
+ }
+ else
+ {
+ if (tracking)
+ {
+ log.debug("Cannot track " + dependency);
+ tracking = false;
+ unresolved = null;
+ }
+ }
}
public void removeIDependOn(DependencyItem dependency)
{
+ if (iDependOn == null)
+ return;
iDependOn.remove(dependency);
flushJBossObjectCache();
+ if (dependency instanceof TrackingDependencyItem)
+ {
+ ((TrackingDependencyItem) dependency).setDependencyInfo(null);
+ if (tracking)
+ {
+ ControllerState whenRequired = dependency.getWhenRequired();
+ if (unresolved != null)
+ {
+ Set<DependencyItem> items = unresolved.get(whenRequired);
+ if (items != null)
+ items.remove(dependency);
+ }
+ }
+ }
}
public Set<DependencyItem> getDependsOnMe(Class<?> type)
{
+ Set<DependencyItem> dependsOnMe = this.dependsOnMe;
+ if (dependsOnMe == null)
+ dependsOnMe = Collections.emptySet();
+
if (type == null || dependsOnMe.isEmpty())
return dependsOnMe;
else
@@ -117,12 +210,16 @@
public void addDependsOnMe(DependencyItem dependency)
{
+ if (dependsOnMe == null)
+ dependsOnMe = new CopyOnWriteArraySet<DependencyItem>();
dependsOnMe.add(dependency);
flushJBossObjectCache();
}
public void removeDependsOnMe(DependencyItem dependency)
{
+ if (dependsOnMe == null)
+ return;
dependsOnMe.remove(dependency);
flushJBossObjectCache();
}
@@ -144,10 +241,20 @@
public Set<DependencyItem> getUnresolvedDependencies(ControllerState state)
{
- if (iDependOn.isEmpty())
+ if (iDependOn == null || iDependOn.isEmpty())
return Collections.emptySet();
+
+ Set<DependencyItem> result = null;
- Set<DependencyItem> result = null;
+ if (tracking && state != null)
+ {
+ if (unresolved != null)
+ result = unresolved.get(state);
+ if (result == null)
+ result = Collections.emptySet();
+ return result;
+ }
+
for (DependencyItem item : iDependOn)
{
if (state == null || state.equals(item.getWhenRequired()))
@@ -167,45 +274,61 @@
public <T> void addInstallItem(CallbackItem<T> callbackItem)
{
+ if (installCallbacks == null)
+ installCallbacks = new CopyOnWriteArraySet<CallbackItem<?>>();
installCallbacks.add(callbackItem);
flushJBossObjectCache();
}
public <T> void removeInstallItem(CallbackItem<T> callbackItem)
{
+ if (installCallbacks == null)
+ return;
installCallbacks.remove(callbackItem);
flushJBossObjectCache();
}
public Set<CallbackItem<?>> getInstallItems()
{
+ if (installCallbacks == null)
+ return Collections.emptySet();
return installCallbacks;
}
public <T> void addUninstallItem(CallbackItem<T> callbackItem)
{
+ if (uninstallCallbacks == null)
+ uninstallCallbacks = new CopyOnWriteArraySet<CallbackItem<?>>();
uninstallCallbacks.add(callbackItem);
flushJBossObjectCache();
}
public <T> void removeUninstallItem(CallbackItem<T> callbackItem)
{
+ if (uninstallCallbacks == null)
+ return;
uninstallCallbacks.remove(callbackItem);
flushJBossObjectCache();
}
public Set<CallbackItem<?>> getUninstallItems()
{
+ if (uninstallCallbacks == null)
+ return Collections.emptySet();
return uninstallCallbacks;
}
public void addLifecycleCallback(LifecycleCallbackItem lifecycleCallbackItem)
{
+ if (lifecycleCallbacks == null)
+ lifecycleCallbacks = new CopyOnWriteArrayList<LifecycleCallbackItem>();
lifecycleCallbacks.add(lifecycleCallbackItem);
}
public List<LifecycleCallbackItem> getLifecycleCallbacks()
{
+ if (lifecycleCallbacks == null)
+ return Collections.emptyList();
return lifecycleCallbacks;
}
@@ -221,7 +344,8 @@
public void toString(JBossStringBuilder buffer)
{
- buffer.append("idependOn=").append(iDependOn);
+ if (iDependOn != null)
+ buffer.append("idependOn=").append(iDependOn);
try
{
Set<DependencyItem> unresolved = getUnresolvedDependencies(null);
Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractDependencyItem.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractDependencyItem.java 2010-03-04 11:11:24 UTC (rev 101814)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractDependencyItem.java 2010-03-04 11:49:51 UTC (rev 101815)
@@ -25,7 +25,6 @@
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.dependency.spi.DependencyInfo;
-import org.jboss.dependency.spi.DependencyItem;
import org.jboss.logging.Logger;
import org.jboss.util.JBossObject;
import org.jboss.util.JBossStringBuilder;
@@ -37,11 +36,14 @@
* @author <a href="ales.justin at jboss.com">Ales Justin</a>
* @version $Revision$
*/
-public class AbstractDependencyItem extends JBossObject implements DependencyItem
+public class AbstractDependencyItem extends JBossObject implements TrackingDependencyItem
{
/** The log */
protected static final Logger log = Logger.getLogger(AbstractDependencyItem.class);
+ /** The dependency info */
+ private volatile TrackingDependencyInfo info;
+
/** What I depend on */
private volatile Object iDependOn;
@@ -79,10 +81,17 @@
{
this.name = name;
setIDependOn(iDependOn);
+ if (whenRequired == null)
+ whenRequired = ControllerState.DESCRIBED;
this.whenRequired = whenRequired;
this.dependentState = dependentState;
}
+ public void setDependencyInfo(TrackingDependencyInfo info)
+ {
+ this.info = info;
+ }
+
public Object getName()
{
return name;
@@ -111,41 +120,25 @@
public boolean resolve(Controller controller)
{
indexStates(controller, ControllerState.DESCRIBED, ControllerState.INSTALLED);
- boolean previous = resolved;
ControllerState state = dependentState == null ? ControllerState.INSTALLED : dependentState;
ControllerContext context = controller.getContext(iDependOn, state, true);
if (context == null)
{
- resolved = false;
+ setResolved(false);
+ return false;
}
else
{
addDependsOnMe(controller, context);
- resolved = true;
+ setResolved(true);
+ return true;
}
- if (previous != resolved)
- {
- flushJBossObjectCache();
- if (log.isTraceEnabled())
- {
- if (resolved)
- log.trace("Resolved " + this);
- else
- log.trace("Unresolved " + this);
- }
- }
- return resolved;
}
public void unresolved()
{
- if (resolved)
- {
- resolved = false;
- flushJBossObjectCache();
- log.trace("Forced unresolved " + this);
- }
+ setResolved(false);
}
public boolean unresolved(Controller controller)
@@ -211,8 +204,26 @@
*/
protected void setResolved(boolean resolved)
{
+ boolean previous = this.resolved;
this.resolved = resolved;
- flushJBossObjectCache();
+ if (previous != resolved)
+ {
+ flushJBossObjectCache();
+ if (info != null)
+ {
+ if (resolved)
+ info.resolved(this);
+ else
+ info.unresolved(this);
+ }
+ if (log.isTraceEnabled())
+ {
+ if (resolved)
+ log.trace("Resolved " + this);
+ else
+ log.trace("Unresolved " + this);
+ }
+ }
}
public String toHumanReadableString()
Added: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/TrackingDependencyInfo.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/TrackingDependencyInfo.java (rev 0)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/TrackingDependencyInfo.java 2010-03-04 11:49:51 UTC (rev 101815)
@@ -0,0 +1,47 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2010, Red Hat Inc., and individual contributors as indicated
+* 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.dependency.plugins;
+
+import org.jboss.dependency.spi.DependencyInfo;
+import org.jboss.dependency.spi.DependencyItem;
+
+/**
+ * TrackingDependencyInfo
+ *
+ * @author adrian at jboss.org
+ */
+public interface TrackingDependencyInfo extends DependencyInfo
+{
+ /**
+ * The item is resolved
+ *
+ * @param item the item
+ */
+ void resolved(DependencyItem item);
+
+ /**
+ * The item is unresolved
+ *
+ * @param item the item
+ */
+ void unresolved(DependencyItem item);
+}
Added: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/TrackingDependencyItem.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/TrackingDependencyItem.java (rev 0)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/TrackingDependencyItem.java 2010-03-04 11:49:51 UTC (rev 101815)
@@ -0,0 +1,39 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2010, Red Hat Inc., and individual contributors as indicated
+* 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.dependency.plugins;
+
+import org.jboss.dependency.spi.DependencyItem;
+
+/**
+ * TrackingDependencyItem
+ *
+ * @author adrian at jboss.org
+ */
+public interface TrackingDependencyItem extends DependencyItem
+{
+ /**
+ * Set the dependency info
+ *
+ * @param info the dependency info
+ */
+ void setDependencyInfo(TrackingDependencyInfo info);
+}
Modified: projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/support/RecursiveDependencyItem.java
===================================================================
--- projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/support/RecursiveDependencyItem.java 2010-03-04 11:11:24 UTC (rev 101814)
+++ projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/support/RecursiveDependencyItem.java 2010-03-04 11:49:51 UTC (rev 101815)
@@ -61,6 +61,7 @@
return false;
}
addDependsOnMe(controller, other);
+ setResolved(true);
return true;
}
}
Modified: projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/ControllerTestSuite.java
===================================================================
--- projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/ControllerTestSuite.java 2010-03-04 11:11:24 UTC (rev 101814)
+++ projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/ControllerTestSuite.java 2010-03-04 11:49:51 UTC (rev 101815)
@@ -61,7 +61,6 @@
suite.addTest(ErrorControllerActionTestCase.suite());
suite.addTest(ManualControllerTestCase.suite());
suite.addTest(OnDemandDependencyTestCase.suite());
- suite.addTest(OnDemandDependencyUninstallTestCase.suite());
suite.addTest(PreconfiguredScopeTestCase.suite());
suite.addTest(RecursiveControllerActionTestCase.suite());
suite.addTest(SelfDependencyTestCase.suite());
Deleted: projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/OnDemandDependencyUninstallTestCase.java
===================================================================
--- projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/OnDemandDependencyUninstallTestCase.java 2010-03-04 11:11:24 UTC (rev 101814)
+++ projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/OnDemandDependencyUninstallTestCase.java 2010-03-04 11:49:51 UTC (rev 101815)
@@ -1,547 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* 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.test.dependency.controller.test;
-
-import java.lang.reflect.Field;
-
-import junit.framework.Test;
-
-import org.jboss.dependency.plugins.AbstractDependencyItem;
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.dependency.spi.ControllerMode;
-import org.jboss.dependency.spi.ControllerState;
-import org.jboss.logging.Logger;
-import org.jboss.logging.LoggerPlugin;
-import org.jboss.test.AbstractTestDelegate;
-import org.jboss.test.dependency.controller.support.TestDelegate;
-
-/**
- * A OnDemandDependencyUninstallTestCase.
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @author <a href="ales.justin at jboss.org">Ales Justin</a>
- */
-public class OnDemandDependencyUninstallTestCase extends AbstractDependencyTest
-{
- public static Test suite()
- {
- return suite(OnDemandDependencyUninstallTestCase.class);
- }
-
- public OnDemandDependencyUninstallTestCase(String name)
- {
- super(name);
- }
-
- public void testNoUglyError() throws Throwable
- {
- Field logField = getLoggerField();
- Logger old = (Logger) logField.get(controller);
- LoggerDecorator newLogger = new LoggerDecorator(old);
- try
- {
- logField.set(controller, newLogger);
- TestDelegate delegate1 = getDelegate1();
- ControllerContext context1 = assertInstall(delegate1, ControllerState.DESCRIBED);
-
- TestDelegate delegate2 = getDelegate2();
- ControllerContext context2 = assertInstall(delegate2);
-
- assertContext(context1);
-
- assertUninstall(context1);
-
- assertContext(context2, ControllerState.CONFIGURED);
- assertNull(context2.getError());
- assertNull(context1.getError());
-
- assertFalse(newLogger.warnErrorCalled);
- }
- finally
- {
- logField.set(controller, old);
- }
- }
-
- private Field getLoggerField()
- {
- Class<?> clazz = controller.getClass();
- Field field = null;
-
- while (field == null && clazz != null)
- {
- try
- {
- field = clazz.getDeclaredField("log");
- field.setAccessible(true);
- break;
- }
- catch (Exception e)
- {
- }
- clazz = clazz.getSuperclass();
- }
-
- assertNotNull(field);
- return field;
- }
-
- protected TestDelegate getDelegate1()
- {
- TestDelegate result = new TestDelegate("Name1");
- result.setMode(ControllerMode.ON_DEMAND);
- return result;
- }
-
- protected TestDelegate getDelegate2()
- {
- TestDelegate result = new TestDelegate("Name2");
- result.addDependency(new AbstractDependencyItem("Name2", "Name1", ControllerState.CREATE, ControllerState.INSTALLED));
- return result;
- }
-
- protected TestDelegate getDelegate3()
- {
- TestDelegate result = new TestDelegate("Name3");
- result.addDependency(new AbstractDependencyItem("Name3", "Name1", ControllerState.CREATE, ControllerState.INSTALLED));
- return result;
- }
-
- static class LoggerDecorator extends Logger
- {
- Logger delegate;
- boolean warnErrorCalled;
-
- protected LoggerDecorator(Logger delegate)
- {
- // FIXME LoggerDecorator constructor
- super(delegate.getName());
- this.delegate = delegate;
- }
-
- /**
- * @param message
- * @param t
- * @see org.jboss.logging.Logger#debug(java.lang.Object, java.lang.Throwable)
- */
- public void debug(Object message, Throwable t)
- {
- delegate.debug(message, t);
- }
-
- /**
- * @param message
- * @see org.jboss.logging.Logger#debug(java.lang.Object)
- */
- public void debug(Object message)
- {
- delegate.debug(message);
- }
-
- /**
- * @param loggerFqcn
- * @param message
- * @param t
- * @see org.jboss.logging.Logger#debug(java.lang.String, java.lang.Object, java.lang.Throwable)
- */
- public void debug(String loggerFqcn, Object message, Throwable t)
- {
- delegate.debug(loggerFqcn, message, t);
- }
-
- /**
- * @param format
- * @param params
- * @see org.jboss.logging.Logger#debugf(java.lang.String, java.lang.Object[])
- */
- public void debugf(String format, Object... params)
- {
- delegate.debugf(format, params);
- }
-
- /**
- * @param t
- * @param format
- * @param params
- * @see org.jboss.logging.Logger#debugf(java.lang.Throwable, java.lang.String, java.lang.Object[])
- */
- public void debugf(Throwable t, String format, Object... params)
- {
- delegate.debugf(t, format, params);
- }
-
- /**
- * @param obj
- * @return
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object obj)
- {
- return delegate.equals(obj);
- }
-
- /**
- * @param message
- * @param t
- * @see org.jboss.logging.Logger#error(java.lang.Object, java.lang.Throwable)
- */
- public void error(Object message, Throwable t)
- {
- delegate.error(message, t);
- warnErrorCalled = true;
- }
-
- /**
- * @param message
- * @see org.jboss.logging.Logger#error(java.lang.Object)
- */
- public void error(Object message)
- {
- delegate.error(message);
- warnErrorCalled = true;
- }
-
- /**
- * @param loggerFqcn
- * @param message
- * @param t
- * @see org.jboss.logging.Logger#error(java.lang.String, java.lang.Object, java.lang.Throwable)
- */
- public void error(String loggerFqcn, Object message, Throwable t)
- {
- delegate.error(loggerFqcn, message, t);
- warnErrorCalled = true;
- }
-
- /**
- * @param format
- * @param params
- * @see org.jboss.logging.Logger#errorf(java.lang.String, java.lang.Object[])
- */
- public void errorf(String format, Object... params)
- {
- delegate.errorf(format, params);
- warnErrorCalled = true;
- }
-
- /**
- * @param t
- * @param format
- * @param params
- * @see org.jboss.logging.Logger#errorf(java.lang.Throwable, java.lang.String, java.lang.Object[])
- */
- public void errorf(Throwable t, String format, Object... params)
- {
- delegate.errorf(t, format, params);
- warnErrorCalled = true;
- }
-
- /**
- * @param message
- * @param t
- * @see org.jboss.logging.Logger#fatal(java.lang.Object, java.lang.Throwable)
- */
- public void fatal(Object message, Throwable t)
- {
- delegate.fatal(message, t);
- warnErrorCalled = true;
- }
-
- /**
- * @param message
- * @see org.jboss.logging.Logger#fatal(java.lang.Object)
- */
- public void fatal(Object message)
- {
- delegate.fatal(message);
- warnErrorCalled = true;
- }
-
- /**
- * @param loggerFqcn
- * @param message
- * @param t
- * @see org.jboss.logging.Logger#fatal(java.lang.String, java.lang.Object, java.lang.Throwable)
- */
- public void fatal(String loggerFqcn, Object message, Throwable t)
- {
- delegate.fatal(loggerFqcn, message, t);
- warnErrorCalled = true;
- }
-
- /**
- * @param format
- * @param params
- * @see org.jboss.logging.Logger#fatalf(java.lang.String, java.lang.Object[])
- */
- public void fatalf(String format, Object... params)
- {
- delegate.fatalf(format, params);
- warnErrorCalled = true;
- }
-
- /**
- * @param t
- * @param format
- * @param params
- * @see org.jboss.logging.Logger#fatalf(java.lang.Throwable, java.lang.String, java.lang.Object[])
- */
- public void fatalf(Throwable t, String format, Object... params)
- {
- delegate.fatalf(t, format, params);
- warnErrorCalled = true;
- }
-
- /**
- * @return
- * @see org.jboss.logging.Logger#getLoggerPlugin()
- */
- public LoggerPlugin getLoggerPlugin()
- {
- return delegate.getLoggerPlugin();
- }
-
- /**
- * @return
- * @see org.jboss.logging.Logger#getName()
- */
- public String getName()
- {
- return delegate.getName();
- }
-
- /**
- * @return
- * @see java.lang.Object#hashCode()
- */
- public int hashCode()
- {
- return delegate.hashCode();
- }
-
- /**
- * @param message
- * @param t
- * @see org.jboss.logging.Logger#info(java.lang.Object, java.lang.Throwable)
- */
- public void info(Object message, Throwable t)
- {
- delegate.info(message, t);
- }
-
- /**
- * @param message
- * @see org.jboss.logging.Logger#info(java.lang.Object)
- */
- public void info(Object message)
- {
- delegate.info(message);
- }
-
- /**
- * @param loggerFqcn
- * @param message
- * @param t
- * @see org.jboss.logging.Logger#info(java.lang.String, java.lang.Object, java.lang.Throwable)
- */
- public void info(String loggerFqcn, Object message, Throwable t)
- {
- delegate.info(loggerFqcn, message, t);
- }
-
- /**
- * @param format
- * @param params
- * @see org.jboss.logging.Logger#infof(java.lang.String, java.lang.Object[])
- */
- public void infof(String format, Object... params)
- {
- delegate.infof(format, params);
- }
-
- /**
- * @param t
- * @param format
- * @param params
- * @see org.jboss.logging.Logger#infof(java.lang.Throwable, java.lang.String, java.lang.Object[])
- */
- public void infof(Throwable t, String format, Object... params)
- {
- delegate.infof(t, format, params);
- }
-
- /**
- * @return
- * @deprecated
- * @see org.jboss.logging.Logger#isDebugEnabled()
- */
- public boolean isDebugEnabled()
- {
- return delegate.isDebugEnabled();
- }
-
- /**
- * @return
- * @deprecated
- * @see org.jboss.logging.Logger#isInfoEnabled()
- */
- public boolean isInfoEnabled()
- {
- return delegate.isInfoEnabled();
- }
-
- /**
- * @return
- * @see org.jboss.logging.Logger#isTraceEnabled()
- */
- public boolean isTraceEnabled()
- {
- return delegate.isTraceEnabled();
- }
-
- /**
- * @return
- * @see java.lang.Object#toString()
- */
- public String toString()
- {
- return delegate.toString();
- }
-
- /**
- * @param message
- * @param t
- * @see org.jboss.logging.Logger#trace(java.lang.Object, java.lang.Throwable)
- */
- public void trace(Object message, Throwable t)
- {
- delegate.trace(message, t);
- }
-
- /**
- * @param message
- * @see org.jboss.logging.Logger#trace(java.lang.Object)
- */
- public void trace(Object message)
- {
- delegate.trace(message);
- }
-
- /**
- * @param loggerFqcn
- * @param message
- * @param t
- * @see org.jboss.logging.Logger#trace(java.lang.String, java.lang.Object, java.lang.Throwable)
- */
- public void trace(String loggerFqcn, Object message, Throwable t)
- {
- delegate.trace(loggerFqcn, message, t);
- }
-
- /**
- * @param format
- * @param params
- * @see org.jboss.logging.Logger#tracef(java.lang.String, java.lang.Object[])
- */
- public void tracef(String format, Object... params)
- {
- delegate.tracef(format, params);
- }
-
- /**
- * @param t
- * @param format
- * @param params
- * @see org.jboss.logging.Logger#tracef(java.lang.Throwable, java.lang.String, java.lang.Object[])
- */
- public void tracef(Throwable t, String format, Object... params)
- {
- delegate.tracef(t, format, params);
- }
-
- /**
- * @param message
- * @param t
- * @see org.jboss.logging.Logger#warn(java.lang.Object, java.lang.Throwable)
- */
- public void warn(Object message, Throwable t)
- {
- delegate.warn(message, t);
- warnErrorCalled = true;
- }
-
- /**
- * @param message
- * @see org.jboss.logging.Logger#warn(java.lang.Object)
- */
- public void warn(Object message)
- {
- delegate.warn(message);
- warnErrorCalled = true;
- }
-
- /**
- * @param loggerFqcn
- * @param message
- * @param t
- * @see org.jboss.logging.Logger#warn(java.lang.String, java.lang.Object, java.lang.Throwable)
- */
- public void warn(String loggerFqcn, Object message, Throwable t)
- {
- delegate.warn(loggerFqcn, message, t);
- warnErrorCalled = true;
- }
-
- /**
- * @param format
- * @param params
- * @see org.jboss.logging.Logger#warnf(java.lang.String, java.lang.Object[])
- */
- public void warnf(String format, Object... params)
- {
- delegate.warnf(format, params);
- warnErrorCalled = true;
- }
-
- /**
- * @param t
- * @param format
- * @param params
- * @see org.jboss.logging.Logger#warnf(java.lang.Throwable, java.lang.String, java.lang.Object[])
- */
- public void warnf(Throwable t, String format, Object... params)
- {
- delegate.warnf(t, format, params);
- warnErrorCalled = true;
- }
-
-
- }
-
- public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
- {
- AbstractTestDelegate delegate = new AbstractTestDelegate(clazz);
- delegate.enableSecurity = false;
- return delegate;
- }
-
-}
Modified: projects/kernel/trunk/kernel/pom.xml
===================================================================
--- projects/kernel/trunk/kernel/pom.xml 2010-03-04 11:11:24 UTC (rev 101814)
+++ projects/kernel/trunk/kernel/pom.xml 2010-03-04 11:49:51 UTC (rev 101815)
@@ -111,6 +111,10 @@
<artifactId>jboss-dependency</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.man</groupId>
<artifactId>jboss-managed</artifactId>
<optional>true</optional>
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/UninstallNoOptionalContextDependencyTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/UninstallNoOptionalContextDependencyTestCase.java 2010-03-04 11:11:24 UTC (rev 101814)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/UninstallNoOptionalContextDependencyTestCase.java 2010-03-04 11:49:51 UTC (rev 101815)
@@ -36,17 +36,15 @@
import org.jboss.kernel.plugins.dependency.ConfigureAction;
import org.jboss.kernel.plugins.dependency.KernelControllerContextAction;
import org.jboss.kernel.plugins.dependency.KernelControllerContextActions;
-import org.jboss.logging.Logger;
import org.jboss.test.AbstractTestDelegate;
import org.jboss.test.kernel.dependency.support.SimpleBeanImpl;
import org.jboss.test.kernel.dependency.support.SimpleBeanWithDependency;
import org.jboss.test.kernel.dependency.support.SimpleBeanWithDependencyImpl;
-import org.jboss.test.kernel.deployment.support.LoggerDecorator;
/**
* Constructor Dependency Test Case.
*
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision: 64400 $
*/
public class UninstallNoOptionalContextDependencyTestCase extends OldAbstractKernelDependencyTest
@@ -77,28 +75,14 @@
while (clazz != null && clazz != KernelControllerContextAction.class)
clazz = clazz.getSuperclass();
assertNotNull(clazz);
- field = getField(clazz, "log");
-
- Logger old = (Logger) field.get(action);
- LoggerDecorator newLogger = new LoggerDecorator(old);
- try
- {
- field.set(action, newLogger);
- uninstallOptionalInjectionNotPresent();
- ControllerContext context1 = assertInstall(0, "Name1");
-
- SimpleBeanWithDependency bean1 = (SimpleBeanWithDependency) context1.getTarget();
- assertNotNull(bean1);
- assertNull(bean1.getSimpleBean());
-
- uninstall("Name1");
-
- assertFalse(newLogger.isWarnErrorCalled());
- }
- finally
- {
- field.set(action, old);
- }
+ uninstallOptionalInjectionNotPresent();
+ ControllerContext context1 = assertInstall(0, "Name1");
+
+ SimpleBeanWithDependency bean1 = (SimpleBeanWithDependency) context1.getTarget();
+ assertNotNull(bean1);
+ assertNull(bean1.getSimpleBean());
+
+ uninstall("Name1");
}
public void uninstallOptionalInjectionNotPresent() throws Throwable
Deleted: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/support/LoggerDecorator.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/support/LoggerDecorator.java 2010-03-04 11:11:24 UTC (rev 101814)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/support/LoggerDecorator.java 2010-03-04 11:49:51 UTC (rev 101815)
@@ -1,451 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, 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.test.kernel.deployment.support;
-
-import java.lang.reflect.Field;
-
-import org.jboss.logging.Logger;
-import org.jboss.logging.LoggerPlugin;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class LoggerDecorator extends Logger
-{
- private static final long serialVersionUID = 1L;
-
- Logger delegate;
- boolean warnErrorCalled;
-
-
- public LoggerDecorator(Logger delegate)
- {
- // FIXME LoggerDecorator constructor
- super(delegate.getName());
- this.delegate = delegate;
- }
-
- public boolean isWarnErrorCalled()
- {
- return warnErrorCalled;
- }
-
- /**
- * @param message
- * @param t
- * @see org.jboss.logging.Logger#debug(java.lang.Object, java.lang.Throwable)
- */
- public void debug(Object message, Throwable t)
- {
- delegate.debug(message, t);
- }
-
- /**
- * @param message
- * @see org.jboss.logging.Logger#debug(java.lang.Object)
- */
- public void debug(Object message)
- {
- delegate.debug(message);
- }
-
- /**
- * @param loggerFqcn
- * @param message
- * @param t
- * @see org.jboss.logging.Logger#debug(java.lang.String, java.lang.Object, java.lang.Throwable)
- */
- public void debug(String loggerFqcn, Object message, Throwable t)
- {
- delegate.debug(loggerFqcn, message, t);
- }
-
- /**
- * @param format
- * @param params
- * @see org.jboss.logging.Logger#debugf(java.lang.String, java.lang.Object[])
- */
- public void debugf(String format, Object... params)
- {
- delegate.debugf(format, params);
- }
-
- /**
- * @param t
- * @param format
- * @param params
- * @see org.jboss.logging.Logger#debugf(java.lang.Throwable, java.lang.String, java.lang.Object[])
- */
- public void debugf(Throwable t, String format, Object... params)
- {
- delegate.debugf(t, format, params);
- }
-
- /**
- * @param obj
- * @return
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object obj)
- {
- return delegate.equals(obj);
- }
-
- /**
- * @param message
- * @param t
- * @see org.jboss.logging.Logger#error(java.lang.Object, java.lang.Throwable)
- */
- public void error(Object message, Throwable t)
- {
- delegate.error(message, t);
- warnErrorCalled = true;
- }
-
- /**
- * @param message
- * @see org.jboss.logging.Logger#error(java.lang.Object)
- */
- public void error(Object message)
- {
- delegate.error(message);
- warnErrorCalled = true;
- }
-
- /**
- * @param loggerFqcn
- * @param message
- * @param t
- * @see org.jboss.logging.Logger#error(java.lang.String, java.lang.Object, java.lang.Throwable)
- */
- public void error(String loggerFqcn, Object message, Throwable t)
- {
- delegate.error(loggerFqcn, message, t);
- warnErrorCalled = true;
- }
-
- /**
- * @param format
- * @param params
- * @see org.jboss.logging.Logger#errorf(java.lang.String, java.lang.Object[])
- */
- public void errorf(String format, Object... params)
- {
- delegate.errorf(format, params);
- warnErrorCalled = true;
- }
-
- /**
- * @param t
- * @param format
- * @param params
- * @see org.jboss.logging.Logger#errorf(java.lang.Throwable, java.lang.String, java.lang.Object[])
- */
- public void errorf(Throwable t, String format, Object... params)
- {
- delegate.errorf(t, format, params);
- warnErrorCalled = true;
- }
-
- /**
- * @param message
- * @param t
- * @see org.jboss.logging.Logger#fatal(java.lang.Object, java.lang.Throwable)
- */
- public void fatal(Object message, Throwable t)
- {
- delegate.fatal(message, t);
- warnErrorCalled = true;
- }
-
- /**
- * @param message
- * @see org.jboss.logging.Logger#fatal(java.lang.Object)
- */
- public void fatal(Object message)
- {
- delegate.fatal(message);
- warnErrorCalled = true;
- }
-
- /**
- * @param loggerFqcn
- * @param message
- * @param t
- * @see org.jboss.logging.Logger#fatal(java.lang.String, java.lang.Object, java.lang.Throwable)
- */
- public void fatal(String loggerFqcn, Object message, Throwable t)
- {
- delegate.fatal(loggerFqcn, message, t);
- warnErrorCalled = true;
- }
-
- /**
- * @param format
- * @param params
- * @see org.jboss.logging.Logger#fatalf(java.lang.String, java.lang.Object[])
- */
- public void fatalf(String format, Object... params)
- {
- delegate.fatalf(format, params);
- warnErrorCalled = true;
- }
-
- /**
- * @param t
- * @param format
- * @param params
- * @see org.jboss.logging.Logger#fatalf(java.lang.Throwable, java.lang.String, java.lang.Object[])
- */
- public void fatalf(Throwable t, String format, Object... params)
- {
- delegate.fatalf(t, format, params);
- warnErrorCalled = true;
- }
-
- /**
- * @return
- * @see org.jboss.logging.Logger#getLoggerPlugin()
- */
- public LoggerPlugin getLoggerPlugin()
- {
- return delegate.getLoggerPlugin();
- }
-
- /**
- * @return
- * @see org.jboss.logging.Logger#getName()
- */
- public String getName()
- {
- return delegate.getName();
- }
-
- /**
- * @return
- * @see java.lang.Object#hashCode()
- */
- public int hashCode()
- {
- return delegate.hashCode();
- }
-
- /**
- * @param message
- * @param t
- * @see org.jboss.logging.Logger#info(java.lang.Object, java.lang.Throwable)
- */
- public void info(Object message, Throwable t)
- {
- delegate.info(message, t);
- }
-
- /**
- * @param message
- * @see org.jboss.logging.Logger#info(java.lang.Object)
- */
- public void info(Object message)
- {
- delegate.info(message);
- }
-
- /**
- * @param loggerFqcn
- * @param message
- * @param t
- * @see org.jboss.logging.Logger#info(java.lang.String, java.lang.Object, java.lang.Throwable)
- */
- public void info(String loggerFqcn, Object message, Throwable t)
- {
- delegate.info(loggerFqcn, message, t);
- }
-
- /**
- * @param format
- * @param params
- * @see org.jboss.logging.Logger#infof(java.lang.String, java.lang.Object[])
- */
- public void infof(String format, Object... params)
- {
- delegate.infof(format, params);
- }
-
- /**
- * @param t
- * @param format
- * @param params
- * @see org.jboss.logging.Logger#infof(java.lang.Throwable, java.lang.String, java.lang.Object[])
- */
- public void infof(Throwable t, String format, Object... params)
- {
- delegate.infof(t, format, params);
- }
-
- /**
- * @return
- * @deprecated
- * @see org.jboss.logging.Logger#isDebugEnabled()
- */
- public boolean isDebugEnabled()
- {
- return delegate.isDebugEnabled();
- }
-
- /**
- * @return
- * @deprecated
- * @see org.jboss.logging.Logger#isInfoEnabled()
- */
- public boolean isInfoEnabled()
- {
- return delegate.isInfoEnabled();
- }
-
- /**
- * @return
- * @see org.jboss.logging.Logger#isTraceEnabled()
- */
- public boolean isTraceEnabled()
- {
- return delegate.isTraceEnabled();
- }
-
- /**
- * @return
- * @see java.lang.Object#toString()
- */
- public String toString()
- {
- return delegate.toString();
- }
-
- /**
- * @param message
- * @param t
- * @see org.jboss.logging.Logger#trace(java.lang.Object, java.lang.Throwable)
- */
- public void trace(Object message, Throwable t)
- {
- delegate.trace(message, t);
- }
-
- /**
- * @param message
- * @see org.jboss.logging.Logger#trace(java.lang.Object)
- */
- public void trace(Object message)
- {
- delegate.trace(message);
- }
-
- /**
- * @param loggerFqcn
- * @param message
- * @param t
- * @see org.jboss.logging.Logger#trace(java.lang.String, java.lang.Object, java.lang.Throwable)
- */
- public void trace(String loggerFqcn, Object message, Throwable t)
- {
- delegate.trace(loggerFqcn, message, t);
- }
-
- /**
- * @param format
- * @param params
- * @see org.jboss.logging.Logger#tracef(java.lang.String, java.lang.Object[])
- */
- public void tracef(String format, Object... params)
- {
- delegate.tracef(format, params);
- }
-
- /**
- * @param t
- * @param format
- * @param params
- * @see org.jboss.logging.Logger#tracef(java.lang.Throwable, java.lang.String, java.lang.Object[])
- */
- public void tracef(Throwable t, String format, Object... params)
- {
- delegate.tracef(t, format, params);
- }
-
- /**
- * @param message
- * @param t
- * @see org.jboss.logging.Logger#warn(java.lang.Object, java.lang.Throwable)
- */
- public void warn(Object message, Throwable t)
- {
- delegate.warn(message, t);
- warnErrorCalled = true;
- }
-
- /**
- * @param message
- * @see org.jboss.logging.Logger#warn(java.lang.Object)
- */
- public void warn(Object message)
- {
- delegate.warn(message);
- warnErrorCalled = true;
- }
-
- /**
- * @param loggerFqcn
- * @param message
- * @param t
- * @see org.jboss.logging.Logger#warn(java.lang.String, java.lang.Object, java.lang.Throwable)
- */
- public void warn(String loggerFqcn, Object message, Throwable t)
- {
- delegate.warn(loggerFqcn, message, t);
- warnErrorCalled = true;
- }
-
- /**
- * @param format
- * @param params
- * @see org.jboss.logging.Logger#warnf(java.lang.String, java.lang.Object[])
- */
- public void warnf(String format, Object... params)
- {
- delegate.warnf(format, params);
- warnErrorCalled = true;
- }
-
- /**
- * @param t
- * @param format
- * @param params
- * @see org.jboss.logging.Logger#warnf(java.lang.Throwable, java.lang.String, java.lang.Object[])
- */
- public void warnf(Throwable t, String format, Object... params)
- {
- delegate.warnf(t, format, params);
- warnErrorCalled = true;
- }
-
-
-}
Modified: projects/kernel/trunk/pom.xml
===================================================================
--- projects/kernel/trunk/pom.xml 2010-03-04 11:11:24 UTC (rev 101814)
+++ projects/kernel/trunk/pom.xml 2010-03-04 11:49:51 UTC (rev 101815)
@@ -35,8 +35,8 @@
<properties>
<version.jboss.common.core>2.2.17.GA</version.jboss.common.core>
- <version.jboss.logging.spi>2.1.1.GA</version.jboss.logging.spi>
- <version.jboss.logging.log4j>2.1.1.GA</version.jboss.logging.log4j>
+ <version.jboss.logging.spi>2.2.0.CR1</version.jboss.logging.spi>
+ <version.jboss.logging.log4j>2.2.0.CR1</version.jboss.logging.log4j>
<version.jbossxb>2.0.2.Beta4</version.jbossxb>
<version.jboss.man>2.1.1.SP1</version.jboss.man>
<version.javassist>3.11.0.GA</version.javassist>
More information about the jboss-cvs-commits
mailing list