Author: simoneg
Date: Wed Jan 6 02:27:26 2010
New Revision: 896307
URL: http://svn.apache.org/viewvc?rev=896307&view=rev
Log:
AspectJ 1.6.7
Added:
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/classloading/AspectJAdaptor.java
Modified:
labs/magma/trunk/maven-magma-plugin/pom.xml
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/classloading/AspectJClassTransformer.java
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/JettyClassLoaderWeavingAdaptor.java
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MavenMessageHandler.java
Modified: labs/magma/trunk/maven-magma-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/pom.xml?rev=896307&r1=896306&r2=896307&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/pom.xml (original)
+++ labs/magma/trunk/maven-magma-plugin/pom.xml Wed Jan 6 02:27:26 2010
@@ -37,12 +37,12 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjtools</artifactId>
- <version>1.6.6</version>
+ <version>1.6.7</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.6.6</version>
+ <version>1.6.7</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
Added:
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/classloading/AspectJAdaptor.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/classloading/AspectJAdaptor.java?rev=896307&view=auto
==============================================================================
---
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/classloading/AspectJAdaptor.java
(added)
+++
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/classloading/AspectJAdaptor.java
Wed Jan 6 02:27:26 2010
@@ -0,0 +1,17 @@
+package org.apache.magma.tools.classloading;
+
+import org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptor;
+import org.aspectj.weaver.loadtime.IWeavingContext;
+import org.aspectj.weaver.tools.WeavingClassLoader;
+
+public class AspectJAdaptor extends ClassLoaderWeavingAdaptor {
+
+ @Override
+ public void initialize(ClassLoader classLoader, IWeavingContext
context) {
+ super.initialize(classLoader, context);
+ if (classLoader instanceof WeavingClassLoader) {
+ this.generatedClassHandler =
(WeavingClassLoader)classLoader;
+ }
+ }
+
+}
Modified:
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/classloading/AspectJClassTransformer.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/classloading/AspectJClassTransformer.java?rev=896307&r1=896306&r2=896307&view=diff
==============================================================================
---
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/classloading/AspectJClassTransformer.java
(original)
+++
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/classloading/AspectJClassTransformer.java
Wed Jan 6 02:27:26 2010
@@ -21,6 +21,7 @@
import java.security.ProtectionDomain;
import org.aspectj.bridge.AbortException;
+import org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptor;
import org.aspectj.weaver.tools.WeavingAdaptor;
import org.aspectj.weaver.tools.WeavingClassLoader;
@@ -34,11 +35,15 @@
public AspectJClassTransformer(ClassLoader parent, URL[] aspects) {
super(parent);
this.aspects = aspects;
- adaptor = new WeavingAdaptor(this);
+ AspectJAdaptor cla = new AspectJAdaptor();
+ cla.initialize(this, null);
+ adaptor = cla;
+ //adaptor = new WeavingAdaptor(this);
}
public byte[] transform(String classname, byte[] classbytecode,
ProtectionDomain domain) {
+ //System.out.println("_AspectJ weaving " + classname);
try {
byte[] nbuff = adaptor.weaveClass(classname,
classbytecode);
return nbuff.length == classbytecode.length ? null :
nbuff;
@@ -55,6 +60,7 @@
public void acceptClass(String name, byte[] bytes) {
+ //System.out.println("_AspectJ pushed " + name);
this.receiver.acceptClass(name, bytes);
}
Modified:
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/JettyClassLoaderWeavingAdaptor.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/JettyClassLoaderWeavingAdaptor.java?rev=896307&r1=896306&r2=896307&view=diff
==============================================================================
---
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/JettyClassLoaderWeavingAdaptor.java
(original)
+++
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/JettyClassLoaderWeavingAdaptor.java
Wed Jan 6 02:27:26 2010
@@ -22,7 +22,7 @@
public class JettyClassLoaderWeavingAdaptor extends ClassLoaderWeavingAdaptor {
@Override
- protected void initialize(ClassLoader classLoader, IWeavingContext
context) {
+ public void initialize(ClassLoader classLoader, IWeavingContext
context) {
// TODO Auto-generated method stub
super.initialize(classLoader, context);
}
Modified:
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MavenMessageHandler.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MavenMessageHandler.java?rev=896307&r1=896306&r2=896307&view=diff
==============================================================================
---
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MavenMessageHandler.java
(original)
+++
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MavenMessageHandler.java
Wed Jan 6 02:27:26 2010
@@ -104,6 +104,8 @@
else if ( message.getKind().equals( IMessage.TASKTAG ) && !isIgnoring(
IMessage.TASKTAG ) )
{
log.debug( (CharSequence) message.getMessage() );
+ } else {
+ log.debug( (CharSequence) message.getMessage() );
}
return super.handleMessage( message );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
