Author: manik.surtani(a)jboss.com
Date: 2007-11-22 05:27:48 -0500 (Thu, 22 Nov 2007)
New Revision: 4773
Modified:
core/trunk/pom.xml
core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java
core/trunk/src/main/java/org/jboss/cache/InvocationContext.java
core/trunk/src/main/java/org/jboss/cache/Version.java
core/trunk/src/main/java/org/jboss/cache/util/CachePrinter.java
Log:
Rolled back updating version info to 2.2.0. Back to 2.1.0 now.
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2007-11-22 07:51:14 UTC (rev 4772)
+++ core/trunk/pom.xml 2007-11-22 10:27:48 UTC (rev 4773)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
- <jbosscache-core-version>2.2.0-SNAPSHOT</jbosscache-core-version>
+ <jbosscache-core-version>2.1.0-SNAPSHOT</jbosscache-core-version>
</properties>
<parent>
<groupId>org.jboss.cache</groupId>
Modified: core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java 2007-11-22 07:51:14
UTC (rev 4772)
+++ core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java 2007-11-22 10:27:48
UTC (rev 4773)
@@ -6,9 +6,11 @@
*/
package org.jboss.cache;
+import org.jboss.beans.metadata.api.annotations.Inject;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.ConfigurationException;
import org.jboss.cache.factories.XmlConfigurationParser;
+import org.jboss.kernel.Kernel;
import java.io.InputStream;
@@ -21,7 +23,18 @@
public class DefaultCacheFactory<K, V> implements CacheFactory<K, V>
{
private static CacheFactory<?, ?> singleton = new DefaultCacheFactory();
+ private Kernel kernel;
+ public DefaultCacheFactory()
+ {
+ this(new Kernel());
+ }
+
+ public DefaultCacheFactory(@Inject Kernel kernel)
+ {
+ this.kernel = kernel;
+ }
+
/**
* @return a singleton instance of this class.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/InvocationContext.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/InvocationContext.java 2007-11-22 07:51:14
UTC (rev 4772)
+++ core/trunk/src/main/java/org/jboss/cache/InvocationContext.java 2007-11-22 10:27:48
UTC (rev 4773)
@@ -28,10 +28,6 @@
private boolean localRollbackOnly;
private MethodCall methodCall;
- InvocationContext()
- {
- }
-
public void setLocalRollbackOnly(boolean localRollbackOnly)
{
this.localRollbackOnly = localRollbackOnly;
Modified: core/trunk/src/main/java/org/jboss/cache/Version.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/Version.java 2007-11-22 07:51:14 UTC (rev
4772)
+++ core/trunk/src/main/java/org/jboss/cache/Version.java 2007-11-22 10:27:48 UTC (rev
4773)
@@ -11,10 +11,10 @@
@Immutable
public class Version
{
- public static final String version = "2.2.0-SNAPSHOT";
- public static final String codename = "Poblano";
+ public static final String version = "2.1.0-SNAPSHOT";
+ public static final String codename = "Alegrias";
public static final String cvs = "$Id: Version.java 4592 2007-10-10 16:44:36Z
manik.surtani(a)jboss.com $";
- static final byte[] version_id = {'0', '2', '2', '0',
'S'};
+ static final byte[] version_id = {'0', '2', '1', '0',
'S'};
private static final int MAJOR_SHIFT = 11;
private static final int MINOR_SHIFT = 6;
Modified: core/trunk/src/main/java/org/jboss/cache/util/CachePrinter.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/util/CachePrinter.java 2007-11-22 07:51:14
UTC (rev 4772)
+++ core/trunk/src/main/java/org/jboss/cache/util/CachePrinter.java 2007-11-22 10:27:48
UTC (rev 4773)
@@ -3,6 +3,7 @@
import org.jboss.cache.Cache;
import org.jboss.cache.CacheImpl;
import org.jboss.cache.CacheSPI;
+import org.jboss.cache.factories.injection.ComponentFactory;
import org.jboss.cache.interceptors.Interceptor;
/**
@@ -55,4 +56,27 @@
}
return b.toString();
}
+
+ public static String printDependencyGraph(ComponentFactory.Component c)
+ {
+ StringBuilder b = new StringBuilder();
+ b.append("Dependency graph of component " + c.getType());
+ b.append("\n");
+ addNode(b, 0, c);
+ return b.toString();
+ }
+
+ private static void addNode(StringBuilder b, int level, ComponentFactory.Component c)
+ {
+ addIndent(b, level);
+ b.append("--> ");
+ b.append(c.getType().getName());
+ b.append("\n");
+ for (ComponentFactory.Component d : c.getDependencies()) addNode(b, level + 3, d);
+ }
+
+ private static void addIndent(StringBuilder b, int level)
+ {
+ for (int i=0; i<level; i++) b.append(" ");
+ }
}