river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peter_firmst...@apache.org
Subject svn commit: r1023455 - in /incubator/river/jtsk/skunk/pepe/src/org/apache/river: imp/ impl/ impl/security/ impl/security/dos/ impl/security/policy/cdc/ impl/security/policy/se/ impl/security/policy/spi/ impl/security/policy/util/ impl/util/
Date Sun, 17 Oct 2010 11:03:16 GMT
Author: peter_firmstone
Date: Sun Oct 17 11:03:15 2010
New Revision: 1023455

URL: http://svn.apache.org/viewvc?rev=1023455&view=rev
Log:
River-362 Denial of Service and change package tree org.apache.river.imp to org.apache.river.impl
as per Sim's request.

Added:
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/
      - copied from r1001134, incubator/river/jtsk/skunk/pepe/src/org/apache/river/imp/
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/
      - copied from r1023452, incubator/river/jtsk/skunk/pepe/src/org/apache/river/imp/security/
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/dos/ProxyIsolate.java
      - copied, changed from r1004236, incubator/river/jtsk/skunk/pepe/src/org/apache/river/imp/security/dos/SmartProxyIsolate.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/util/
      - copied from r1023452, incubator/river/jtsk/skunk/pepe/src/org/apache/river/imp/util/
Removed:
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/imp/
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/dos/SmartProxyIsolate.java
Modified:
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/cdc/DynamicPolicyProviderImpl.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/ConcurrentPermissions.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/ConcurrentPolicyFile.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/DynamicConcurrentPolicyProvider.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/MultiReadPermissionCollection.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/PermissionPendingResolution.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/PermissionPendingResolutionCollection.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/spi/RevokeableDynamicPolicySpi.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/CertificateGrant.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/ClassLoaderGrant.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/CodeSourceGrant.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/DefaultPolicyParser.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/DefaultPolicyScanner.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/DenyImpl.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/Messages.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/NullPolicyParser.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/PermissionGrantBuilderImp.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/PolicyParser.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/PolicyUtils.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/PrincipalGrant.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/ProtectionDomainGrant.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/UnresolvedPrincipal.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/Util.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/util/ConcurrentCollections.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/util/ConcurrentSoftMap.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/util/ConcurrentWeakIdentityMap.java
    incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/util/ConcurrentWeakMap.java

Copied: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/dos/ProxyIsolate.java
(from r1004236, incubator/river/jtsk/skunk/pepe/src/org/apache/river/imp/security/dos/SmartProxyIsolate.java)
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/dos/ProxyIsolate.java?p2=incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/dos/ProxyIsolate.java&p1=incubator/river/jtsk/skunk/pepe/src/org/apache/river/imp/security/dos/SmartProxyIsolate.java&r1=1004236&r2=1023455&rev=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/imp/security/dos/SmartProxyIsolate.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/dos/ProxyIsolate.java
Sun Oct 17 11:03:15 2010
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.river.imp.security.dos;
+package org.apache.river.impl.security.dos;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationHandler;
@@ -37,6 +37,10 @@ import net.jini.io.MarshalledInstance;
  * don't need to wait for remote method returns.  I'll create a new interface
  * for this, that can be implemented by services directly too.
  * 
+ * Alternative, only maintain this data structure for as long as it takes
+ * to verify proxy trust, then return proxy to the client or have the client
+ * thread call the smart proxy via the reflection proxy directly.
+ * 
  * REMIND: Investigate subclass method returns, this would be simple, if the
  * smart proxy is confined to it's own ClassLoader, we just check the class
  * of the object returned isn't from that ClassLoader, unless the smart proxy
@@ -44,13 +48,13 @@ import net.jini.io.MarshalledInstance;
  * 
  * @author Peter Firmstone
  */
-public class SmartProxyIsolate implements InvocationHandler {
+public class ProxyIsolate implements InvocationHandler {
     private volatile Object smartProxy;
     private volatile ExecutorService proxyExecutor;
     private volatile Throwable thrown;
     
     @SuppressWarnings("unchecked")
-    public SmartProxyIsolate(MarshalledInstance proxy, 
+    public ProxyIsolate(MarshalledInstance proxy, 
 			    ClassLoader defaultLoader,
 			    boolean verifyCodebaseIntegrity, 
 			    ClassLoader verifierLoader,
@@ -113,8 +117,8 @@ public class SmartProxyIsolate implement
 	    tg.setDaemon(true);
 	    tg.setMaxPriority(4);
 	}
-	private final SmartProxyIsolate proxy;
-	Factory(SmartProxyIsolate spi){
+	private final ProxyIsolate proxy;
+	Factory(ProxyIsolate spi){
 	    proxy = spi;
 	}
 
@@ -126,15 +130,16 @@ public class SmartProxyIsolate implement
     }
     
     private static class ExceptionHandler implements Thread.UncaughtExceptionHandler{
-	private final SmartProxyIsolate proxy;
+	private final ProxyIsolate proxy;
 	
-	ExceptionHandler(SmartProxyIsolate spi){
+	ExceptionHandler(ProxyIsolate spi){
 	    proxy = spi;
 	}
 
 	public void uncaughtException(Thread t, Throwable e) {
 	    // For all other Exceptions we let the ExecutorService handle it.
 	    if ( e instanceof Error){
+		// Do we want to take different actions based on the error?
 		proxy.terminate(e);
 	    }
 	}
@@ -169,11 +174,11 @@ public class SmartProxyIsolate implement
     }
     
     private static class MethodInvocationTask implements Callable {
-	private final SmartProxyIsolate smartProxy;
+	private final ProxyIsolate smartProxy;
 	private final Object proxy;
 	private final Method method;
 	private final Object[] args;
-	MethodInvocationTask(SmartProxyIsolate target, Object proxy, Method method, Object[] args){
+	MethodInvocationTask(ProxyIsolate target, Object proxy, Method method, Object[] args){
 	    smartProxy = target;
 	    this.proxy = proxy;
 	    this.method = method;

Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/cdc/DynamicPolicyProviderImpl.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/cdc/DynamicPolicyProviderImpl.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/cdc/DynamicPolicyProviderImpl.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/cdc/DynamicPolicyProviderImpl.java
Sun Oct 17 11:03:15 2010
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.river.imp.security.policy.cdc;
+package org.apache.river.impl.security.policy.cdc;
 
 import java.security.cert.Certificate;
 import net.jini.security.policy.*;
@@ -49,7 +49,7 @@ import net.jini.security.GrantPermission
 import org.apache.river.api.security.Denied;
 import org.apache.river.api.security.PermissionGrant;
 import org.apache.river.api.security.PermissionGrantBuilder;
-import org.apache.river.imp.security.policy.spi.RevokeableDynamicPolicySpi;
+import org.apache.river.impl.security.policy.spi.RevokeableDynamicPolicySpi;
 
 /**
  * Security policy provider that supports dynamic granting of permissions at
@@ -581,4 +581,8 @@ public class DynamicPolicyProviderImpl e
     public List<PermissionGrant> getPermissionGrants() {
         throw new UnsupportedOperationException("Not supported.");
     }
+
+    public PermissionGrantBuilder getGrantBuilder() {
+	throw new UnsupportedOperationException("Not supported yet.");
+    }
 }

Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/ConcurrentPermissions.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/ConcurrentPermissions.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/ConcurrentPermissions.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/ConcurrentPermissions.java
Sun Oct 17 11:03:15 2010
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.river.imp.security.policy.se;
+package org.apache.river.impl.security.policy.se;
 
 import java.io.Serializable;
 import java.security.AllPermission;

Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/ConcurrentPolicyFile.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/ConcurrentPolicyFile.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/ConcurrentPolicyFile.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/ConcurrentPolicyFile.java
Sun Oct 17 11:03:15 2010
@@ -24,7 +24,7 @@
   * @version $Revision$
   */
 
-package org.apache.river.imp.security.policy.se;
+package org.apache.river.impl.security.policy.se;
 
 import java.io.File;
 import java.net.URL;
@@ -46,11 +46,11 @@ import java.util.concurrent.locks.Reentr
 import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 import org.apache.river.api.security.PermissionGrant;
-import org.apache.river.imp.security.policy.util.DefaultPolicyParser;
-import org.apache.river.imp.security.policy.util.PolicyParser;
-import org.apache.river.imp.security.policy.util.PolicyUtils;
-import org.apache.river.imp.util.ConcurrentCollections;
-import org.apache.river.imp.util.ConcurrentWeakIdentityMap;
+import org.apache.river.impl.security.policy.util.DefaultPolicyParser;
+import org.apache.river.impl.security.policy.util.PolicyParser;
+import org.apache.river.impl.security.policy.util.PolicyUtils;
+import org.apache.river.impl.util.ConcurrentCollections;
+import org.apache.river.impl.util.ConcurrentWeakIdentityMap;
 
 
 /**

Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/DynamicConcurrentPolicyProvider.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/DynamicConcurrentPolicyProvider.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/DynamicConcurrentPolicyProvider.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/DynamicConcurrentPolicyProvider.java
Sun Oct 17 11:03:15 2010
@@ -1,6 +1,6 @@
 
 
-package org.apache.river.imp.security.policy.se;
+package org.apache.river.impl.security.policy.se;
 
 import org.apache.river.api.security.InternetSecurityManager;
 import java.security.AccessController;
@@ -35,13 +35,13 @@ import net.jini.security.policy.DynamicP
 import net.jini.security.policy.PolicyInitializationException;
 import net.jini.security.policy.UmbrellaGrantPermission;
 import org.apache.river.api.security.PermissionGrant;
-import org.apache.river.imp.security.policy.spi.RevokeableDynamicPolicySpi;
+import org.apache.river.impl.security.policy.spi.RevokeableDynamicPolicySpi;
 import org.apache.river.api.security.PermissionGrantBuilder;
 import org.apache.river.api.security.RevokePermission;
 import org.apache.river.api.security.RevokeableDynamicPolicy;
-import org.apache.river.imp.security.policy.util.PermissionGrantBuilderImp;
-import org.apache.river.imp.security.policy.util.PolicyUtils;
-import org.apache.river.imp.util.ConcurrentWeakIdentityMap;
+import org.apache.river.impl.security.policy.util.PermissionGrantBuilderImp;
+import org.apache.river.impl.security.policy.util.PolicyUtils;
+import org.apache.river.impl.util.ConcurrentWeakIdentityMap;
 
 /**
  * <p>This is a Dynamic Policy Provider that supports concurrent access,
@@ -602,4 +602,8 @@ public class DynamicConcurrentPolicyProv
 	return grants;
     }
 
+    public PermissionGrantBuilder getGrantBuilder() {
+	return new PermissionGrantBuilderImp();
+    }
+
 }

Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/MultiReadPermissionCollection.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/MultiReadPermissionCollection.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/MultiReadPermissionCollection.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/MultiReadPermissionCollection.java
Sun Oct 17 11:03:15 2010
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.river.imp.security.policy.se;
+package org.apache.river.impl.security.policy.se;
 
 import java.io.InvalidObjectException;
 import java.io.ObjectInputStream;

Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/PermissionPendingResolution.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/PermissionPendingResolution.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/PermissionPendingResolution.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/PermissionPendingResolution.java
Sun Oct 17 11:03:15 2010
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.river.imp.security.policy.se;
+package org.apache.river.impl.security.policy.se;
 
 import java.lang.reflect.Constructor;
 import java.security.Permission;

Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/PermissionPendingResolutionCollection.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/PermissionPendingResolutionCollection.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/PermissionPendingResolutionCollection.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/se/PermissionPendingResolutionCollection.java
Sun Oct 17 11:03:15 2010
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.river.imp.security.policy.se;
+package org.apache.river.impl.security.policy.se;
 
 import java.security.AccessController;
 import java.security.Permission;

Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/spi/RevokeableDynamicPolicySpi.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/spi/RevokeableDynamicPolicySpi.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/spi/RevokeableDynamicPolicySpi.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/spi/RevokeableDynamicPolicySpi.java
Sun Oct 17 11:03:15 2010
@@ -3,7 +3,7 @@
  * and open the template in the editor.
  */
 
-package org.apache.river.imp.security.policy.spi;
+package org.apache.river.impl.security.policy.spi;
 
 import java.security.CodeSource;
 import java.security.Permission;

Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/CertificateGrant.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/CertificateGrant.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/CertificateGrant.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/CertificateGrant.java
Sun Oct 17 11:03:15 2010
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.river.imp.security.policy.util;
+package org.apache.river.impl.security.policy.util;
 
 import org.apache.river.api.security.PermissionGrantBuilder;
 import java.security.CodeSource;
@@ -30,7 +30,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import org.apache.river.api.security.Denied;
-import org.apache.river.imp.security.policy.util.DenyImpl;
+import org.apache.river.impl.security.policy.util.DenyImpl;
 
 /**
  *

Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/ClassLoaderGrant.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/ClassLoaderGrant.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/ClassLoaderGrant.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/ClassLoaderGrant.java
Sun Oct 17 11:03:15 2010
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.river.imp.security.policy.util;
+package org.apache.river.impl.security.policy.util;
 
 import org.apache.river.api.security.PermissionGrantBuilder;
 import java.lang.ref.WeakReference;

Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/CodeSourceGrant.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/CodeSourceGrant.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/CodeSourceGrant.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/CodeSourceGrant.java
Sun Oct 17 11:03:15 2010
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.river.imp.security.policy.util;
+package org.apache.river.impl.security.policy.util;
 
 import org.apache.river.api.security.PermissionGrantBuilder;
 import java.security.CodeSource;
@@ -26,7 +26,7 @@ import java.security.ProtectionDomain;
 import java.security.cert.Certificate;
 import java.util.Arrays;
 import java.util.List;
-import org.apache.river.imp.security.policy.util.DenyImpl;
+import org.apache.river.impl.security.policy.util.DenyImpl;
 
 /**
  *

Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/DefaultPolicyParser.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/DefaultPolicyParser.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/DefaultPolicyParser.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/DefaultPolicyParser.java
Sun Oct 17 11:03:15 2010
@@ -20,7 +20,7 @@
 * @version $Revision$
 */
 
-package org.apache.river.imp.security.policy.util;
+package org.apache.river.impl.security.policy.util;
 
 import java.io.BufferedReader;
 import java.io.InputStream;
@@ -48,10 +48,10 @@ import java.util.StringTokenizer;
 
 import org.apache.river.api.security.PermissionGrant;
 import org.apache.river.api.security.PermissionGrantBuilder;
-import org.apache.river.imp.security.policy.util.DefaultPolicyScanner.GrantEntry;
-import org.apache.river.imp.security.policy.util.DefaultPolicyScanner.KeystoreEntry;
-import org.apache.river.imp.security.policy.util.DefaultPolicyScanner.PermissionEntry;
-import org.apache.river.imp.security.policy.util.DefaultPolicyScanner.PrincipalEntry;
+import org.apache.river.impl.security.policy.util.DefaultPolicyScanner.GrantEntry;
+import org.apache.river.impl.security.policy.util.DefaultPolicyScanner.KeystoreEntry;
+import org.apache.river.impl.security.policy.util.DefaultPolicyScanner.PermissionEntry;
+import org.apache.river.impl.security.policy.util.DefaultPolicyScanner.PrincipalEntry;
 
 
 /**

Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/DefaultPolicyScanner.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/DefaultPolicyScanner.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/DefaultPolicyScanner.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/DefaultPolicyScanner.java
Sun Oct 17 11:03:15 2010
@@ -20,7 +20,7 @@
 * @version $Revision$
 */
 
-package org.apache.river.imp.security.policy.util;
+package org.apache.river.impl.security.policy.util;
 
 import java.io.IOException;
 import java.io.Reader;

Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/DenyImpl.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/DenyImpl.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/DenyImpl.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/DenyImpl.java
Sun Oct 17 11:03:15 2010
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.river.imp.security.policy.util;
+package org.apache.river.impl.security.policy.util;
 
 import org.apache.river.api.security.*;
 import java.net.URL;
@@ -27,7 +27,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import org.apache.river.imp.security.policy.util.PolicyUtils;
+import org.apache.river.impl.security.policy.util.PolicyUtils;
 
 /**
  * Immutable List of codebase URL's and CodeSource's to deny in a PermissionGrant. 

Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/Messages.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/Messages.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/Messages.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/Messages.java
Sun Oct 17 11:03:15 2010
@@ -21,7 +21,7 @@
  * if this tool runs again. Better make changes in the template file.
  */
 
-package org.apache.river.imp.security.policy.util;
+package org.apache.river.impl.security.policy.util;
 
 
 import java.security.AccessController;

Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/NullPolicyParser.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/NullPolicyParser.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/NullPolicyParser.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/NullPolicyParser.java
Sun Oct 17 11:03:15 2010
@@ -3,7 +3,7 @@
  * and open the template in the editor.
  */
 
-package org.apache.river.imp.security.policy.util;
+package org.apache.river.impl.security.policy.util;
 
 import java.net.URL;
 import java.util.Collection;

Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/PermissionGrantBuilderImp.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/PermissionGrantBuilderImp.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/PermissionGrantBuilderImp.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/PermissionGrantBuilderImp.java
Sun Oct 17 11:03:15 2010
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.river.imp.security.policy.util;
+package org.apache.river.impl.security.policy.util;
 
 import org.apache.river.api.security.Denied;
 import org.apache.river.api.security.PermissionGrantBuilder;

Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/PolicyParser.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/PolicyParser.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/PolicyParser.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/PolicyParser.java
Sun Oct 17 11:03:15 2010
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.river.imp.security.policy.util;
+package org.apache.river.impl.security.policy.util;
 
 import java.net.URL;
 import java.util.Collection;

Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/PolicyUtils.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/PolicyUtils.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/PolicyUtils.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/PolicyUtils.java
Sun Oct 17 11:03:15 2010
@@ -21,7 +21,7 @@
 * @version $Revision$
 */
 
-package org.apache.river.imp.security.policy.util;
+package org.apache.river.impl.security.policy.util;
 
 import java.io.File;
 import java.io.InputStream;
@@ -42,7 +42,7 @@ import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
-import org.apache.river.imp.security.policy.se.ConcurrentPermissions;
+import org.apache.river.impl.security.policy.se.ConcurrentPermissions;
 
 /**
  * This class consist of a number of static methods, which provide a common functionality


Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/PrincipalGrant.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/PrincipalGrant.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/PrincipalGrant.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/PrincipalGrant.java
Sun Oct 17 11:03:15 2010
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.river.imp.security.policy.util;
+package org.apache.river.impl.security.policy.util;
 
 import org.apache.river.api.security.PermissionGrantBuilder;
 import java.net.URL;

Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/ProtectionDomainGrant.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/ProtectionDomainGrant.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/ProtectionDomainGrant.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/ProtectionDomainGrant.java
Sun Oct 17 11:03:15 2010
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.river.imp.security.policy.util;
+package org.apache.river.impl.security.policy.util;
 
 import org.apache.river.api.security.PermissionGrantBuilder;
 import java.lang.ref.WeakReference;

Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/UnresolvedPrincipal.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/UnresolvedPrincipal.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/UnresolvedPrincipal.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/UnresolvedPrincipal.java
Sun Oct 17 11:03:15 2010
@@ -20,7 +20,7 @@
 * @version $Revision$
 */
 
-package org.apache.river.imp.security.policy.util;
+package org.apache.river.impl.security.policy.util;
 
 import java.security.Principal;
 

Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/Util.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/Util.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/Util.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/security/policy/util/Util.java
Sun Oct 17 11:03:15 2010
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.river.imp.security.policy.util;
+package org.apache.river.impl.security.policy.util;
 
 public class Util {
 

Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/util/ConcurrentCollections.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/util/ConcurrentCollections.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/util/ConcurrentCollections.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/util/ConcurrentCollections.java
Sun Oct 17 11:03:15 2010
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.river.imp.util;
+package org.apache.river.impl.util;
 
 import java.io.IOException;
 import java.io.ObjectOutputStream;

Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/util/ConcurrentSoftMap.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/util/ConcurrentSoftMap.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/util/ConcurrentSoftMap.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/util/ConcurrentSoftMap.java
Sun Oct 17 11:03:15 2010
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.river.imp.util;
+package org.apache.river.impl.util;
 
 
 import java.lang.ref.ReferenceQueue;

Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/util/ConcurrentWeakIdentityMap.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/util/ConcurrentWeakIdentityMap.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/util/ConcurrentWeakIdentityMap.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/util/ConcurrentWeakIdentityMap.java
Sun Oct 17 11:03:15 2010
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.river.imp.util;
+package org.apache.river.impl.util;
 
 
 import java.lang.ref.ReferenceQueue;

Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/util/ConcurrentWeakMap.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/util/ConcurrentWeakMap.java?rev=1023455&r1=1023452&r2=1023455&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/util/ConcurrentWeakMap.java
(original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/impl/util/ConcurrentWeakMap.java
Sun Oct 17 11:03:15 2010
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.river.imp.util;
+package org.apache.river.impl.util;
 
 
 import java.lang.ref.ReferenceQueue;



Mime
View raw message