[jboss-cvs] JBossAS SVN: r74002 - projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 3 10:50:30 EDT 2008
Author: kabir.khan at jboss.com
Date: 2008-06-03 10:50:30 -0400 (Tue, 03 Jun 2008)
New Revision: 74002
Modified:
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/ArrayBinding.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/ArrayReplacement.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/AspectBinding.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/ClassMetaData.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/IntroductionBinding.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/LifecycleBinding.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/PrecedenceDef.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/Prepare.java
Log:
[JBMICROCONT-296] Only calculate GUIDs for the names when absolutely necessary
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/ArrayBinding.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/ArrayBinding.java 2008-06-03 14:34:03 UTC (rev 74001)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/ArrayBinding.java 2008-06-03 14:50:30 UTC (rev 74002)
@@ -39,7 +39,7 @@
{
private static final Logger log = Logger.getLogger(ArrayBinding.class);
AspectManager manager;
- String name = GUID.asString();
+ String name;
String type;
List<BindingEntry> advices;
@@ -93,6 +93,10 @@
{
throw new IllegalArgumentException("Null type");
}
+ if (name == null)
+ {
+ name = GUID.asString();
+ }
Type theType = Type.valueOf(type);
ArrayList<InterceptorFactory> interceptors = null;
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/ArrayReplacement.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/ArrayReplacement.java 2008-06-03 14:34:03 UTC (rev 74001)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/ArrayReplacement.java 2008-06-03 14:50:30 UTC (rev 74002)
@@ -37,7 +37,7 @@
public class ArrayReplacement
{
AspectManager manager;
- String name = GUID.asString();
+ String name;
String classes;
String expr;
@@ -95,6 +95,10 @@
{
throw new IllegalArgumentException("Cannot define both expr and classes");
}
+ if (name == null)
+ {
+ name = GUID.asString();
+ }
org.jboss.aop.array.ArrayReplacement pcut = null;
if (classes != null)
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/AspectBinding.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/AspectBinding.java 2008-06-03 14:34:03 UTC (rev 74001)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/AspectBinding.java 2008-06-03 14:50:30 UTC (rev 74002)
@@ -42,7 +42,7 @@
protected AspectManager manager;
- protected String name = GUID.asString();
+ protected String name;
protected String pointcut;
@@ -126,6 +126,9 @@
throw new IllegalArgumentException("Null pointcut");
if (manager == null)
throw new IllegalArgumentException("Null manager");
+ if (name == null)
+ name = GUID.asString();
+
AdviceBinding binding = new AdviceBinding(name, pointcut, cflow);
if (advices != null)
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/ClassMetaData.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/ClassMetaData.java 2008-06-03 14:34:03 UTC (rev 74001)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/ClassMetaData.java 2008-06-03 14:50:30 UTC (rev 74002)
@@ -35,7 +35,7 @@
public class ClassMetaData
{
AspectManager manager;
- String name = GUID.asString();
+ String name;
//Should we read these from the element instead?
String tag;
@@ -101,6 +101,8 @@
throw new IllegalArgumentException("Null tag");
if (className == null)
throw new IllegalArgumentException("Null className");
+ if (name == null)
+ name = GUID.asString();
ClassMetaDataLoader loader = manager.findClassMetaDataLoader(tag);
try
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/IntroductionBinding.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/IntroductionBinding.java 2008-06-03 14:34:03 UTC (rev 74001)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/IntroductionBinding.java 2008-06-03 14:50:30 UTC (rev 74002)
@@ -39,7 +39,7 @@
public class IntroductionBinding
{
protected AspectManager manager;
- protected String name = GUID.asString();
+ protected String name;
protected String classes;
protected String expr;
protected List<String> interfaces;
@@ -150,6 +150,8 @@
throw new IllegalArgumentException("Cannot set both classes and expr");
if (interfaces == null && mixins == null)
throw new IllegalArgumentException("Neither interfaces nor mixins set");
+ if (name == null)
+ name = GUID.asString();
String[] intfs = (interfaces != null) ? interfaces.toArray(new String[interfaces.size()]) : null;
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/LifecycleBinding.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/LifecycleBinding.java 2008-06-03 14:34:03 UTC (rev 74001)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/LifecycleBinding.java 2008-06-03 14:50:30 UTC (rev 74002)
@@ -33,7 +33,7 @@
*/
public class LifecycleBinding
{
- protected String name = GUID.asString();
+ protected String name;
protected AspectManager manager;
private String classes;
private String expr;
@@ -94,6 +94,9 @@
throw new IllegalArgumentException("Null callback bean");
if (state == null)
throw new IllegalArgumentException("Null controller state");
+ if (name == null)
+ name = GUID.asString();
+
LifecycleCallbackBinding binding = new LifecycleCallbackBinding(name, classes, expr, state);
binding.addLifecycleCallback(callbackBean, installMethod, uninstallMethod);
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/PrecedenceDef.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/PrecedenceDef.java 2008-06-03 14:34:03 UTC (rev 74001)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/PrecedenceDef.java 2008-06-03 14:50:30 UTC (rev 74002)
@@ -35,7 +35,7 @@
{
private AspectManager manager;
private List<PrecedenceDefEntry> entries;
- private String name = GUID.asString();
+ private String name;
public AspectManager getManager()
{
@@ -75,7 +75,9 @@
throw new IllegalArgumentException("Null entries");
if (entries.size() == 0)
throw new IllegalArgumentException("No entries");
-
+ if (name == null)
+ name = GUID.asString();
+
org.jboss.aop.advice.PrecedenceDefEntry[] pentries = new org.jboss.aop.advice.PrecedenceDefEntry[entries.size()];
int i = 0;
for (PrecedenceDefEntry entry : entries)
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/Prepare.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/Prepare.java 2008-06-03 14:34:03 UTC (rev 74001)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/Prepare.java 2008-06-03 14:50:30 UTC (rev 74002)
@@ -36,7 +36,7 @@
{
protected AspectManager manager;
- protected String name = GUID.asString();
+ protected String name;
protected String expr;
@@ -80,6 +80,11 @@
{
throw new IllegalArgumentException("No pointcut");
}
+ if (name == null)
+ {
+ name = GUID.asString();
+ }
+
Pointcut p = null;
try
{
More information about the jboss-cvs-commits
mailing list