svn commit: r1511499 - in /commons/sandbox/weaver/trunk/modules/privilizer: ./ weaver/pom.xml weaver/src/main/java/org/apache/commons/weaver/privilizer/ActionGenerator.java weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizingVisitor.java

[mbenson]

Author: mbenson
Date: Wed Aug  7 21:13:41 2013
New Revision: 1511499

URL: http://svn.apache.org/r1511499
Log:
merge javassist excision from normalizer branch

Modified:
    commons/sandbox/weaver/trunk/modules/privilizer/   (props changed)
    commons/sandbox/weaver/trunk/modules/privilizer/weaver/pom.xml
    
commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/ActionGenerator.java
    
commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizingVisitor.java

Propchange: commons/sandbox/weaver/trunk/modules/privilizer/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Aug  7 21:13:41 2013
@@ -0,0 +1,4 @@
+/commons/sandbox/weaver/branches/fields/modules/privilizer:1460191-1465080
+/commons/sandbox/weaver/branches/mjb/modules/privilizer:1437127-1451119
+/commons/sandbox/weaver/branches/normalizer/modules/privilizer:1511498
+/commons/sandbox/weaver/branches/priv-asm/modules/privilizer:1476710-1508502

Modified: commons/sandbox/weaver/trunk/modules/privilizer/weaver/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/sandbox/weaver/trunk/modules/privilizer/weaver/pom.xml?rev=1511499&r1=1511498&r2=1511499&view=diff
==============================================================================
--- commons/sandbox/weaver/trunk/modules/privilizer/weaver/pom.xml (original)
+++ commons/sandbox/weaver/trunk/modules/privilizer/weaver/pom.xml Wed Aug  7 
21:13:41 2013
@@ -49,10 +49,6 @@ under the License.
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.javassist</groupId>
-      <artifactId>javassist</artifactId>
-    </dependency>
   </dependencies>
   <build>
     <plugins>

Modified: 
commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/ActionGenerator.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/ActionGenerator.java?rev=1511499&r1=1511498&r2=1511499&view=diff
==============================================================================
--- 
commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/ActionGenerator.java
 (original)
+++ 
commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/ActionGenerator.java
 Wed Aug  7 21:13:41 2013
@@ -18,12 +18,11 @@
  */
 package org.apache.commons.weaver.privilizer;
 
+import java.lang.reflect.Modifier;
 import java.security.PrivilegedAction;
 import java.security.PrivilegedExceptionAction;
 import java.util.Map;
 
-import javassist.Modifier;
-
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.builder.Builder;

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=1511499&r1=1511498&r2=1511499&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 Aug  7 21:13:41 2013
@@ -18,6 +18,7 @@
  */
 package org.apache.commons.weaver.privilizer;
 
+import java.lang.reflect.Modifier;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.security.PrivilegedActionException;
@@ -25,8 +26,6 @@ import java.security.PrivilegedException
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import javassist.Modifier;
-
 import org.apache.commons.lang3.ArrayUtils;
 import org.objectweb.asm.AnnotationVisitor;
 import org.objectweb.asm.ClassVisitor;