Fixed bugs:

40943: Binary weaving should copy non-Java resources from "-inja...  
36071: 1.1 rc1 should copy resources similar to java compiler 
40826: ajbrowser does not report errors properly  
40774: task list icons don't show in ajbrowser

2 files changed, 17 insertions, 0 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java
index 872936b27..7eedd3e1c 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java
@@ -41,6 +41,7 @@ public class AjBuildConfig { // XXX needs bootclasspath?
 	private List/*File*/ sourceRoots = new ArrayList();
 	private List/*File*/ files = new ArrayList();
 	private List/*File*/ inJars = new ArrayList();
+	private Map/*String->File*/ sourcePathResources = new HashMap();
 	private List/*File*/ aspectpath = new ArrayList();
 	private List/*String*/ classpath = new ArrayList();
 	private Map javaOptions = new HashMap();
@@ -193,6 +194,10 @@ public class AjBuildConfig { // XXX needs bootclasspath?
 		return inJars;
 	}
 
+	public Map getSourcePathResources() {
+		return sourcePathResources;
+	}
+
 	public void setOutputJar(File outputJar) {
 		this.outputJar = outputJar;
 	}
@@ -420,4 +425,8 @@ public class AjBuildConfig { // XXX needs bootclasspath?
         }
     }
 
+	public void setSourcePathResources(Map map) {
+		sourcePathResources = map;
+	}
+
 }
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
index 436fda9d0..ab0551dbe 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
@@ -221,6 +221,14 @@ public class AjBuildManager {
 			bcelWeaver.addJarFile(inJar, buildConfig.getOutputDir());
 		}
 		
+		if (buildConfig.getSourcePathResources() != null) {
+			for (Iterator i = buildConfig.getSourcePathResources().keySet().iterator(); i.hasNext(); ) {
+	//			File resource = (File)i.next();
+				String resource = (String)i.next();
+				bcelWeaver.addResource(resource, (File)buildConfig.getSourcePathResources().get(resource), buildConfig.getOutputDir());
+	//			bcelWeaver.addResource(resource, buildConfig.getOutputDir());
+			}
+		}
 		//check for org.aspectj.runtime.JoinPoint
 		bcelWorld.resolve("org.aspectj.lang.JoinPoint");
 	}