Author: mbenson
Date: Wed Jul 31 01:10:55 2013
New Revision: 1508698
URL: http://svn.apache.org/r1508698
Log:
compiler bug in java 6, use String value for invisible annotation
Modified:
commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilized.java
commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizerCleaner.java
commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizerWeaver.java
commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizingVisitor.java
Modified:
commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilized.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilized.java?rev=1508698&r1=1508697&r2=1508698&view=diff
==============================================================================
---
commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilized.java
(original)
+++
commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilized.java
Wed Jul 31 01:10:55 2013
@@ -26,5 +26,5 @@ import java.lang.annotation.Target;
*/
@Target(ElementType.TYPE)
public @interface Privilized {
- Policy value();
+ String value();
}
\ No newline at end of file
Modified:
commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizerCleaner.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizerCleaner.java?rev=1508698&r1=1508697&r2=1508698&view=diff
==============================================================================
---
commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizerCleaner.java
(original)
+++
commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizerCleaner.java
Wed Jul 31 01:10:55 2013
@@ -50,7 +50,7 @@ public class PrivilizerCleaner implement
LOG.log(Level.FINE, "Cleaning classes privilized with policy other
than {0}", privilizer.policy);
for (WeavableClass<?> weavableClass :
scanner.scan(scanRequest).getClasses().with(Privilized.class)) {
- final Policy privilizedPolicy =
weavableClass.getAnnotation(Privilized.class).value();
+ final Policy privilizedPolicy =
Policy.valueOf(weavableClass.getAnnotation(Privilized.class).value());
if (privilizedPolicy == privilizer.policy) {
continue;
}
Modified:
commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizerWeaver.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizerWeaver.java?rev=1508698&r1=1508697&r2=1508698&view=diff
==============================================================================
---
commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizerWeaver.java
(original)
+++
commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizerWeaver.java
Wed Jul 31 01:10:55 2013
@@ -77,8 +77,8 @@ public class PrivilizerWeaver implements
if (marker == null) {
return privilizer.policy != Policy.NEVER;
}
- Validate.validState(privilizer.policy == marker.value(), "%s already
privilized with policy %s", type
- .getTarget().getName(), marker.value());
+ Validate.validState(privilizer.policy.name().equals(marker.value()),
"%s already privilized with policy %s",
+ type.getTarget().getName(), marker.value());
return false;
}
}
Modified:
commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizingVisitor.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizingVisitor.java?rev=1508698&r1=1508697&r2=1508698&view=diff
==============================================================================
---
commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizingVisitor.java
(original)
+++
commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizingVisitor.java
Wed Jul 31 01:10:55 2013
@@ -63,7 +63,7 @@ class PrivilizingVisitor extends Privili
annotated = true;
final AnnotationVisitor privilizedVisitor =
super.visitAnnotation(Type.getType(Privilized.class).getDescriptor(), false);
- privilizedVisitor.visitEnum("value",
Type.getType(Policy.class).getDescriptor(), policy.name());
+ privilizedVisitor.visit("value", policy.name());
privilizedVisitor.visitEnd();
}
}
