### Eclipse Workspace Patch 1.0
#P weaver
Index: .project
===================================================================
RCS file: /cvsroot/tools/org.aspectj/modules/weaver/.project,v
retrieving revision 1.1
diff -u -r1.1 .project
--- .project	16 Dec 2002 18:02:43 -0000	1.1
+++ .project	26 Oct 2007 15:12:06 -0000
@@ -11,12 +11,13 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
+			<name>org.eclipse.ajdt.core.ajbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.ajdt.ui.ajnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
Index: .classpath
===================================================================
RCS file: /cvsroot/tools/org.aspectj/modules/weaver/.classpath,v
retrieving revision 1.6
diff -u -r1.6 .classpath
--- .classpath	26 Oct 2006 10:17:34 -0000	1.6
+++ .classpath	26 Oct 2007 15:12:06 -0000
@@ -2,15 +2,16 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="testsrc"/>
-	<classpathentry sourcepath="JRE_SRC" kind="var" path="JRE_LIB"/>
+	<classpathentry kind="var" path="JRE_LIB" sourcepath="JRE_SRC"/>
 	<classpathentry kind="src" path="/runtime"/>
-	<classpathentry sourcepath="/lib/junit/src.jar" kind="lib" path="/lib/junit/junit.jar"/>
+	<classpathentry kind="lib" path="/lib/junit/junit.jar" sourcepath="/lib/junit/src.jar"/>
 	<classpathentry kind="src" path="/util"/>
 	<classpathentry kind="src" path="/testing-util"/>
 	<classpathentry kind="src" path="/bridge"/>
 	<classpathentry kind="src" path="/asm"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/aspectj5rt"/>
-	<classpathentry sourcepath="/lib/bcel/bcel-src.zip" kind="lib" path="/lib/bcel/bcel.jar"/>
-	<classpathentry sourcepath="/lib/commons/commons-src.zip" kind="lib" path="/lib/commons/commons.jar"/>
+	<classpathentry kind="lib" path="/lib/bcel/bcel.jar" sourcepath="/lib/bcel/bcel-src.zip"/>
+	<classpathentry kind="lib" path="/lib/commons/commons.jar" sourcepath="/lib/commons/commons-src.zip"/>
+	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: src/org/aspectj/weaver/CustomMungerFactory.java
===================================================================
RCS file: src/org/aspectj/weaver/CustomMungerFactory.java
diff -N src/org/aspectj/weaver/CustomMungerFactory.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/aspectj/weaver/CustomMungerFactory.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,13 @@
+package org.aspectj.weaver;
+
+import java.util.Collection;
+
+import org.aspectj.weaver.AjAttribute.TypeMunger;
+import org.aspectj.weaver.patterns.Declare;
+
+public interface CustomMungerFactory {
+	public Collection<TypeMunger> createCustomTypeMungers(ResolvedType aspectType);
+	public Collection<ShadowMunger> createCustomShadowMungers(ResolvedType aspectType);
+	public Collection<Declare> createCustomDeclares(ResolvedType aspectType);
+
+}
Index: src/org/aspectj/weaver/CustomMungerExtension.aj
===================================================================
RCS file: src/org/aspectj/weaver/CustomMungerExtension.aj
diff -N src/org/aspectj/weaver/CustomMungerExtension.aj
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/aspectj/weaver/CustomMungerExtension.aj	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,49 @@
+package org.aspectj.weaver;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.aspectj.weaver.AjAttribute.TypeMunger;
+import org.aspectj.weaver.patterns.Declare;
+
+public privileged aspect CustomMungerExtension {
+
+	private List<CustomMungerFactory> customMungerFactories = new ArrayList<CustomMungerFactory>();
+	private boolean enabled = false;
+
+	pointcut addOrReplaceAspect(ResolvedType aspectType, boolean inWeavingPhase):
+	  execution(* CrosscuttingMembersSet.addOrReplaceAspect(..)) && args(aspectType, inWeavingPhase);
+
+	after(ResolvedType aspectType, boolean inWeavingPhase,
+			CrosscuttingMembersSet xSet):
+		addOrReplaceAspect(aspectType, inWeavingPhase) && this(xSet) {
+		if (inWeavingPhase && isEnabled()) {
+			CrosscuttingMembers xcut = (CrosscuttingMembers) xSet.members
+					.get(aspectType);
+			for (CustomMungerFactory factory : customMungerFactories) {
+				Collection<TypeMunger> customTypeMungers = factory.createCustomTypeMungers(aspectType);
+				if (customTypeMungers != null)
+					xcut.addTypeMungers(customTypeMungers);
+				Collection<ShadowMunger> customShadowMungers = factory.createCustomShadowMungers(aspectType);
+				if (customShadowMungers != null)
+					xcut.addShadowMungers(customShadowMungers);
+				Collection<Declare> customDeclare = factory.createCustomDeclares(aspectType);
+				if (customDeclare != null)
+					xcut.addDeclares(customDeclare);
+			}
+		}
+	}
+
+	public boolean isEnabled() {
+		return enabled;
+	}
+	
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
+
+	public void addCustomMungerFactory(CustomMungerFactory factory) {
+		customMungerFactories.add(factory);
+	}
+}