Fix for Bugzilla Bug 71339

	  	AJC produces partial output jar file, when there are warnings during weaving

diff --git a/weaver/src/org/aspectj/weaver/WeaverMessages.java b/weaver/src/org/aspectj/weaver/WeaverMessages.java
index bca503756f3608ed043a97a59726b3016e0897b9..ae03329d38095ba2b27c21bcb63ba999270b2e58 100644 (file)
--- a/weaver/src/org/aspectj/weaver/WeaverMessages.java
+++ b/weaver/src/org/aspectj/weaver/WeaverMessages.java
@@ -88,6 +88,7 @@ public class WeaverMessages {
        public static final String ZIPFILE_ENTRY_MISSING = "zipfileEntryMissing";
        public static final String ZIPFILE_ENTRY_INVALID = "zipfileEntryInvalid";
        public static final String DIRECTORY_ENTRY_MISSING = "directoryEntryMissing";
+       public static final String OUTJAR_IN_INPUT_PATH = "outjarInInputPath";
        
        public static final String XLINT_LOAD_ERROR = "problemLoadingXLint";
        public static final String XLINTDEFAULT_LOAD_ERROR = "unableToLoadXLintDefault";

diff --git a/weaver/src/org/aspectj/weaver/weaver-messages.properties b/weaver/src/org/aspectj/weaver/weaver-messages.properties
index 3e6caeb53777dc25a149a3a4cc71bde4959be58d..5052d27ce80a66eee9bd0887a1339b1aac2deae9 100644 (file)
--- a/weaver/src/org/aspectj/weaver/weaver-messages.properties
+++ b/weaver/src/org/aspectj/weaver/weaver-messages.properties
@@ -93,6 +93,7 @@ classTooBig=The class {0} exceeds the maximum class size supported by the JVM (c
 zipfileEntryMissing=zipfile classpath entry does not exist: {0}
 zipfileEntryInvalid=zipfile classpath entry is invalid: {0} <{1}>
 directoryEntryMissing=directory classpath entry does not exist: {0}
+outjarInInputPath=-outjar cannot be a member of -injars, -inpath or -aspectpath
 
 # Lint messages
 problemLoadingXLint=problem loading Xlint properties file: {0}, {1}