[jboss-cvs] JBossAS SVN: r67460 - in projects/microcontainer/trunk/aop-mc-int/src: tests/org/jboss/test/microcontainer/beans/woven/test and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 26 17:14:56 EST 2007
Author: kabir.khan at jboss.com
Date: 2007-11-26 17:14:56 -0500 (Mon, 26 Nov 2007)
New Revision: 67460
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/tests/org/jboss/test/microcontainer/beans/woven/test/TestArrayAspect.java
Log:
Disable some commented out code pending the aop release
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 2007-11-26 21:34:28 UTC (rev 67459)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/ArrayBinding.java 2007-11-26 22:14:56 UTC (rev 67460)
@@ -2,7 +2,7 @@
* 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.
+* 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
@@ -18,7 +18,7 @@
* 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.aop.microcontainer.beans;
import java.util.ArrayList;
@@ -26,12 +26,12 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.advice.InterceptorFactory;
-import org.jboss.aop.array.Type;
+//import org.jboss.aop.array.Type;
import org.jboss.logging.Logger;
import org.jboss.util.id.GUID;
/**
- *
+ *
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision: 1.1 $
*/
@@ -42,47 +42,47 @@
String name = GUID.asString();
String type;
List<BindingEntry> advices;
-
+
public AspectManager getManager()
{
return manager;
}
-
+
public void setManager(AspectManager manager)
{
this.manager = manager;
}
-
+
public String getName()
{
return name;
}
-
+
public void setName(String name)
{
this.name = name;
}
-
+
public String getType()
{
return type;
}
-
+
public void setType(String type)
{
this.type = type;
}
-
+
public List<BindingEntry> getAdvices()
{
return advices;
}
-
+
public void setAdvices(List<BindingEntry> advices)
{
this.advices = advices;
}
-
+
public void start() throws Exception
{
if (manager == null)
@@ -111,9 +111,10 @@
}
}
InterceptorFactory[] facs = interceptors != null ? interceptors.toArray(new InterceptorFactory[interceptors.size()]) : new InterceptorFactory[0];
- org.jboss.aop.array.ArrayBinding binding = new org.jboss.aop.array.ArrayBinding(name, facs, theType);
- manager.addArrayBinding(binding);
- log.debug("Bound array binding " + name);
+ System.out.println("ENABLE COMMENTED OUT CODE");
+ //org.jboss.aop.array.ArrayBinding binding = new org.jboss.aop.array.ArrayBinding(name, facs, theType);
+ //manager.addArrayBinding(binding);
+ //log.debug("Bound array binding " + name);
}
public void stop() throws Exception
@@ -137,5 +138,5 @@
{
stop();
start();
- }
+ }
}
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 2007-11-26 21:34:28 UTC (rev 67459)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/ArrayReplacement.java 2007-11-26 22:14:56 UTC (rev 67460)
@@ -2,7 +2,7 @@
* 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.
+* 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
@@ -18,7 +18,7 @@
* 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.aop.microcontainer.beans;
import java.io.StringReader;
@@ -30,7 +30,7 @@
import org.jboss.util.id.GUID;
/**
- *
+ *
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision: 1.1 $
*/
@@ -40,47 +40,47 @@
String name = GUID.asString();
String classes;
String expr;
-
+
public AspectManager getManager()
{
return manager;
}
-
+
public void setManager(AspectManager manager)
{
this.manager = manager;
}
-
+
public String getName()
{
return name;
}
-
+
public void setName(String name)
{
this.name = name;
}
-
+
public String getClasses()
{
return classes;
}
-
+
public void setClasses(String classes)
{
this.classes = classes;
}
-
+
public String getExpr()
{
return expr;
}
-
+
public void setExpr(String expr)
{
this.expr = expr;
}
-
+
public void start()
{
if (manager == null)
@@ -96,30 +96,31 @@
throw new IllegalArgumentException("Cannot define both expr and classes");
}
- org.jboss.aop.array.ArrayReplacement pcut = null;
- if (classes != null)
- {
- pcut = new org.jboss.aop.array.ArrayReplacement(name, classes);
+ System.out.println("ENABLE COMMENTED OUT CODE");
+ //org.jboss.aop.array.ArrayReplacement pcut = null;
+ //if (classes != null)
+ //{
+ // pcut = new org.jboss.aop.array.ArrayReplacement(name, classes);
+ //}
+ //else
+ //{
+ // try
+ // {
+ // ASTStart start = new TypeExpressionParser(new StringReader(expr)).Start();
+ // pcut = new org.jboss.aop.array.ArrayReplacement(name, start);
+ // }
+ // catch (ParseException e)
+ // {
+ // throw new IllegalArgumentException("Could not parse type expression " + expr, e);
+ // }
}
- else
- {
- try
- {
- ASTStart start = new TypeExpressionParser(new StringReader(expr)).Start();
- pcut = new org.jboss.aop.array.ArrayReplacement(name, start);
- }
- catch (ParseException e)
- {
- throw new IllegalArgumentException("Could not parse type expression " + expr, e);
- }
- }
manager.addArrayReplacement(pcut);
-
+
}
-
+
public void stop()
{
manager.removeArrayReplacement(name);
}
-
+
}
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/woven/test/TestArrayAspect.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/woven/test/TestArrayAspect.java 2007-11-26 21:34:28 UTC (rev 67459)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/woven/test/TestArrayAspect.java 2007-11-26 22:14:56 UTC (rev 67460)
@@ -2,7 +2,7 @@
* 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.
+* 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
@@ -18,14 +18,14 @@
* 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.microcontainer.beans.woven.test;
-import org.jboss.aop.array.IntArrayElementReadInvocation;
-import org.jboss.aop.array.IntArrayElementWriteInvocation;
+//import org.jboss.aop.array.IntArrayElementReadInvocation;
+//import org.jboss.aop.array.IntArrayElementWriteInvocation;
/**
- *
+ *
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision: 1.1 $
*/
@@ -33,20 +33,20 @@
{
public static int value;
public static int index;
-
- public Object advice(IntArrayElementWriteInvocation invocation) throws Throwable
- {
- value = invocation.getIntValue();
- index = invocation.getIndex();
- return invocation.invokeNext();
- }
-
- public Object advice(IntArrayElementReadInvocation invocation) throws Throwable
- {
- index = invocation.getIndex();
- return invocation.invokeNext();
- }
+// public Object advice(IntArrayElementWriteInvocation invocation) throws Throwable
+// {
+// value = invocation.getIntValue();
+// index = invocation.getIndex();
+// return invocation.invokeNext();
+// }
+//
+// public Object advice(IntArrayElementReadInvocation invocation) throws Throwable
+// {
+// index = invocation.getIndex();
+// return invocation.invokeNext();
+// }
+
public static void reset()
{
value = -1;
More information about the jboss-cvs-commits
mailing list