* @return true if classes have been generated.
*/
public boolean generatedClassesExist(ClassLoader loader){
- return ((ClassLoaderWeavingAdaptor)WeaverContainer.getWeaver(loader, weavingContext)).generatedClassesExist();
+ return ((ClassLoaderWeavingAdaptor)WeaverContainer.getWeaver(loader, weavingContext)).generatedClassesExistFor(null);
}
public void flushGeneratedClasses(ClassLoader loader){
((ClassLoaderWeavingAdaptor)WeaverContainer.getWeaver(loader, weavingContext)).flushGeneratedClasses();
}
-}
+}
\ No newline at end of file
while (xmls.hasMoreElements()) {
URL xml = (URL) xmls.nextElement();
- info("using " + xml.getFile());
+ info("using configuration " + weavingContext.getFile(xml));
definitions.add(DocumentParser.parse(xml));
}
}
String aspectClassName = (String) aspects.next();
if (acceptAspect(aspectClassName)) {
info("register aspect " + aspectClassName);
+// System.err.println("? ClassLoaderWeavingAdaptor.registerAspects() aspectName=" + aspectClassName + ", loader=" + loader + ", bundle=" + weavingContext.getClassLoaderName());
/*ResolvedType aspect = */weaver.addLibraryAspect(aspectClassName);
//generate key for SC
}
}
}
+// System.out.println("ClassLoaderWeavingAdaptor.registerAspects() classloader=" + weavingContext.getClassLoaderName() + ", namespace=" + namespace);
/* We didn't register any aspects so disable the adaptor */
if (namespace == null) {
* @return Returns the key.
*/
public String getNamespace() {
+// System.out.println("ClassLoaderWeavingAdaptor.getNamespace() classloader=" + weavingContext.getClassLoaderName() + ", namespace=" + namespace);
if(namespace==null) return "";
else return new String(namespace);
}
/**
* Check to see if any classes are stored in the generated classes cache.
* Then flush the cache if it is not empty
+ * @param className TODO
* @return true if a class has been generated and is stored in the cache
*/
- public boolean generatedClassesExist(){
- if(generatedClasses.size()>0) {
- return true;
- }
- return false;
+ public boolean generatedClassesExistFor (String className) {
+// System.err.println("? ClassLoaderWeavingAdaptor.generatedClassesExist() classname=" + className + ", size=" + generatedClasses);
+ if (className == null) return !generatedClasses.isEmpty();
+ else return generatedClasses.containsKey(className);
}
/**
* Flush the generated classes cache
*/
- public void flushGeneratedClasses(){
+ public void flushGeneratedClasses() {
+// System.err.println("? ClassLoaderWeavingAdaptor.flushGeneratedClasses() generatedClasses=" + generatedClasses);
generatedClasses = new HashMap();
}
* @return null as we are not in an OSGi environment (therefore no bundles)
*/
public String getBundleIdFromURL(URL url) {
- return null;
+ return "";
}
/**
return ((loader!=null)?loader.getClass().getName()+"@"+loader.hashCode():"null");
}
+ /**
+ * @return filename
+ */
+ public String getFile(URL url) {
+ return url.getFile();
+ }
}
*/
public String getClassLoaderName ();
+ /**
+ * Format a URL
+ * @return filename
+ */
+ public String getFile(URL url);
+
}
public void acceptClass (String name, byte[] bytes) {
generatedClasses.put(name,bytes);
}
+
+// protected synchronized Class loadClass(String name, boolean resolve) throws ClassNotFoundException {
+// System.err.println("> WeavingURLClassLoader.loadClass() name=" + name);
+// Class clazz= super.loadClass(name, resolve);
+// System.err.println("< WeavingURLClassLoader.loadClass() clazz=" + clazz + ", loader=" + clazz.getClassLoader());
+// return clazz;
+// }
// private interface ClassPreProcessorAdaptor extends ClassPreProcessor {
// public void addURL(URL url);
--- /dev/null
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Matthew Webster - initial implementation
+ *******************************************************************************/
+package org.aspectj.weaver.loadtime;
+
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import junit.framework.TestCase;
+
+public class AjTest extends TestCase {
+
+ public void testAj() {
+ Aj aj = new Aj();
+ }
+
+ public void testAjIWeavingContext() {
+ ClassLoader loader = new URLClassLoader(new URL[] {}, null);
+ IWeavingContext weavingContext = new DefaultWeavingContext(loader);
+ Aj aj = new Aj(weavingContext);
+ }
+
+ public void testInitialize() {
+ Aj aj = new Aj();
+ aj.initialize();
+ }
+
+ public void testPreProcess() {
+ ClassLoader loader = new URLClassLoader(new URL[] {}, null);
+ Aj aj = new Aj();
+ aj.preProcess("Junk", new byte[] {}, loader);
+ }
+
+ public void testGetNamespace() {
+ ClassLoader loader = new URLClassLoader(new URL[] {}, null);
+ Aj aj = new Aj();
+ String namespace = aj.getNamespace(loader);
+ assertEquals("Namespace should be empty","",namespace);
+ }
+
+ public void testGeneratedClassesExist() {
+ ClassLoader loader = new URLClassLoader(new URL[] {}, null);
+ Aj aj = new Aj();
+ boolean exist = aj.generatedClassesExist(loader);
+ assertFalse("There should be no generated classes",exist);
+ }
+
+ public void testFlushGeneratedClasses() {
+ ClassLoader loader = new URLClassLoader(new URL[] {}, null);
+ Aj aj = new Aj();
+ aj.flushGeneratedClasses(loader);
+ boolean exist = aj.generatedClassesExist(loader);
+ assertFalse("There should be no generated classes",exist);
+ }
+
+}
--- /dev/null
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Matthew Webster - initial implementation
+ *******************************************************************************/
+package org.aspectj.weaver.loadtime;
+
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import junit.framework.TestCase;
+
+public class ClassLoaderWeavingAdaptorTest extends TestCase {
+
+ public void testClassLoaderWeavingAdaptor() {
+ ClassLoader loader = new URLClassLoader(new URL[] {}, null);
+ ClassLoaderWeavingAdaptor adaptor = new ClassLoaderWeavingAdaptor(loader,null);
+ }
+
+ public void testGetNamespace() {
+ ClassLoader loader = new URLClassLoader(new URL[] {}, null);
+ ClassLoaderWeavingAdaptor adaptor = new ClassLoaderWeavingAdaptor(loader,null);
+ String namespace = adaptor.getNamespace();
+ assertEquals("Namespace should be empty","",namespace);
+ }
+
+ public void testGeneratedClassesExistFor() {
+ ClassLoader loader = new URLClassLoader(new URL[] {}, null);
+ ClassLoaderWeavingAdaptor adaptor = new ClassLoaderWeavingAdaptor(loader,null);
+ boolean exist = adaptor.generatedClassesExistFor("Junk");
+ assertFalse("There should be no generated classes",exist);
+ }
+
+ public void testFlushGeneratedClasses() {
+ ClassLoader loader = new URLClassLoader(new URL[] {}, null);
+ ClassLoaderWeavingAdaptor adaptor = new ClassLoaderWeavingAdaptor(loader,null);
+ adaptor.flushGeneratedClasses();
+ boolean exist = adaptor.generatedClassesExistFor("Junk");
+ assertFalse("There should be no generated classes",exist);
+ }
+
+}
for (int i = 0; i < urls.length; i++) {
Object pathElement;
URL url = urls[i];
- File file = new File(url.getFile());
+ if (debug) System.out.println("JRockitClassLoader.JRockitClassLoader() url=" + url.getPath());
+ File file = new File(encode(url.getFile()));
if (debug) System.out.println("JRockitClassLoader.JRockitClassLoader() file" + file);
if (file.isDirectory()) pathElement = file;
- else if (file.getName().endsWith(".jar")) pathElement = new JarFile(file);
+ else if (file.exists() && file.getName().endsWith(".jar")) pathElement = new JarFile(file);
else throw new RuntimeException(file.getAbsolutePath().toString());
path.add(pathElement);
}
preProcess = agentClazz.getMethod("preProcess",parameterTypes);
}
+ /* Get rid of escaped characters */
+ private String encode (String s) {
+ StringBuffer result = new StringBuffer();
+ int i = s.indexOf("%");
+ while (i != -1) {
+ result.append(s.substring(0,i));
+ String escaped = s.substring(i+1,i+3);
+ s = s.substring(i+3);
+ Integer value = Integer.valueOf(escaped,16);
+ result.append(new Character((char)value.intValue()));
+ i = s.indexOf("%");
+ }
+ result.append(s);
+ return result.toString();
+ }
+
protected Class findClass(String name) throws ClassNotFoundException {
if (debug) System.out.println("> JRockitClassLoader.findClass() name=" + name);
Class clazz = null;
--- /dev/null
+public aspect EmptyAspect {
+
+}
\ No newline at end of file
--- /dev/null
+public class EmptyTest1 {
+
+ public static void main (String[] args) {
+ System.out.println("EmptyTest1.main()");
+ EmptyTest2.main(args);
+ }
+
+}
\ No newline at end of file
--- /dev/null
+public class EmptyTest2 {
+
+ public static void main (String[] args) {
+ System.out.println("EmptyTest2.main()");
+ }
+
+}
\ No newline at end of file
--- /dev/null
+<aspectj>
+ <aspects>
+ <aspect name="EmptyAspect"/>
+ </aspects>
+ <weaver options="-verbose">
+ <include within="*1"/>
+ </weaver>
+</aspectj>
\ No newline at end of file
<line text="info register classloader"/>
<line text="info using"/>
<line text="info register aspect ataspectj.EmptyAspect"/>
+ <line text="info not weaving 'com.foo.bar.Test$$EnhancerByCGLIB$$12345'"/>
<line text="info weaving 'com.foo.bar.Test'"/>
</stderr>
</run>
runTest("Ensure no weaving without included aspects");
}
+ public void testWeaveinfoMessages (){
+ runTest("weaveinfo messages with include and exclude");
+ }
+
// tests that can't be included for some reason
// Not valid whilst the ajc compiler forces debug on (ignores -g:none) - it will be green but is invalid, trust me
</run>
</ajc-test>
+ <ajc-test dir="ltw" title="weaveinfo messages with include and exclude">
+ <compile files="EmptyTest1.java, EmptyTest2.java"/>
+ <compile files="EmptyAspect.aj"/>
+ <run class="EmptyTest1" ltw="aop-emptytests.xml">
+ <stdout>
+ <line text="EmptyTest1.main()"/>
+ <line text="EmptyTest2.main()"/>
+ </stdout>
+ <stderr>
+ <line text="info AspectJ Weaver Version"/>
+ <line text="info register classloader org.aspectj.weaver.loadtime.WeavingURLClassLoader"/>
+ <line text="info using configuration"/>
+ <line text="info register aspect EmptyAspect"/>
+ <line text="info weaving"/>
+ <line text="info not weaving"/>
+ </stderr>
+ </run>
+ </ajc-test>
+
</suite>
\ No newline at end of file
info("weaving '" + name + "'");
bytes = getAtAspectJAspectBytes(name, bytes);
}
+ else {
+ info("not weaving '" + name + "'");
+ }
}
return bytes;
}
private boolean shouldWeaveName (String name) {
- return !((/*(name.startsWith("org.apache.bcel.")//FIXME AV why ? bcel is wrapped in org.aspectj.
+ boolean should =
+ !((/*(name.startsWith("org.apache.bcel.")//FIXME AV why ? bcel is wrapped in org.aspectj.
||*/ name.startsWith("org.aspectj.")
|| name.startsWith("java.")
|| name.startsWith("javax."))
//|| name.startsWith("$Proxy")//JDK proxies//FIXME AV is that 1.3 proxy ? fe. ataspect.$Proxy0 is a java5 proxy...
|| name.startsWith("sun.reflect."));//JDK reflect
+ return should;
}
/**
/* Classes generated by weaver e.g. around closure advice */
else {
String className = result.getClassName();
+ System.err.println("? WeavingClassFileProvider.acceptResult() " + wovenClass.getClassName() + "->" + className);
generatedClasses.put(className,result);
+ generatedClasses.put(wovenClass.getClassName(),result);
generatedClassHandler.acceptClass(className,result.getBytes());
}
}
};
}
}
-}
+}
\ No newline at end of file
projects / aspectj.git / commitdiff