Fixes to storing conditional permissions.

5 files changed, 35 insertions, 14 deletions

diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/BundleLocationCondition.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/BundleLocationCondition.java
index d34592a5d..4f792b3d2 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/BundleLocationCondition.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/BundleLocationCondition.java
@@ -1,5 +1,5 @@
 /*
- * $Header$
+ * $Header: /cvshome/build/org.osgi.service.condpermadmin/src/org/osgi/service/condpermadmin/BundleLocationCondition.java,v 1.5 2005/01/23 07:31:31 breed Exp $
  * 
  * Copyright (c) OSGi Alliance (2005). All Rights Reserved.
  * 
@@ -36,7 +36,7 @@ import org.osgi.service.condpermadmin.Condition;
  * Checks to see if a Bundle matches the given location pattern. Pattern matching
  * is done using FilePermission style patterns.
  * 
- * @version $Revision$
+ * @version $Revision: 1.5 $
  */
 public class BundleLocationCondition implements Condition {
 	boolean	satisfied;
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionInfo.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionInfo.java
index 675ba625c..09fea525c 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionInfo.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionInfo.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /cvshome/repository/org/osgi/service/permissionadmin/PermissionInfo.java,v 1.9 2003/12/16 02:15:32 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.condpermadmin/src/org/osgi/service/condpermadmin/ConditionInfo.java,v 1.4 2005/01/21 22:22:39 breed Exp $
  *
  * Copyright (c) The Open Services Gateway Initiative (2001, 2002).
  * All Rights Reserved.
@@ -28,7 +28,6 @@
 
 package org.osgi.service.condpermadmin;
 
-import java.io.Serializable;
 import java.util.Vector;
 
 /**
@@ -46,9 +45,7 @@ import java.util.Vector;
  * 
  */
 
-/* TODO This Serializable can't stay here since it is part of the public class */
-public class ConditionInfo implements Serializable {
-	private static final long serialVersionUID = 3689354325134618934L;
+public class ConditionInfo {
 
 	private String type;
 
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionAdmin.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionAdmin.java
index e5d948da9..fec741cdf 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionAdmin.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionAdmin.java
@@ -1,5 +1,5 @@
 /*
- * $Header$
+ * $Header: /cvshome/build/org.osgi.service.condpermadmin/src/org/osgi/service/condpermadmin/ConditionalPermissionAdmin.java,v 1.4 2005/01/21 22:22:39 breed Exp $
  * 
  * Copyright (c) OSGi Alliance (2005). All Rights Reserved.
  * 
@@ -35,7 +35,7 @@ import org.osgi.service.permissionadmin.PermissionInfo;
  * This is a framework service that allows ConditionalPermissionInfos to be
  * added to, retrieved from, and removed from the framework.
  * 
- * @version $Revision$
+ * @version $Revision: 1.4 $
  */
 public interface ConditionalPermissionAdmin {
 	/**
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionInfo.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionInfo.java
index 249af4ed2..74b225e35 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionInfo.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionInfo.java
@@ -1,3 +1,31 @@
+/*
+ * $Header: /cvshome/build/org.osgi.service.condpermadmin/src/org/osgi/service/condpermadmin/ConditionalPermissionInfo.java,v 1.4 2005/01/21 22:22:39 breed Exp $
+ *
+ * Copyright (c) The Open Services Gateway Initiative (2001, 2002).
+ * All Rights Reserved.
+ *
+ * Implementation of certain elements of the Open Services Gateway Initiative
+ * (OSGI) Specification may be subject to third party intellectual property
+ * rights, including without limitation, patent rights (such a third party may
+ * or may not be a member of OSGi). OSGi is not responsible and shall not be
+ * held responsible in any manner for identifying or failing to identify any or
+ * all such third party intellectual property rights.
+ *
+ * This document and the information contained herein are provided on an "AS
+ * IS" basis and OSGI DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+ * BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL
+ * NOT INFRINGE ANY RIGHTS AND ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
+ * FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT WILL OSGI BE LIABLE FOR ANY
+ * LOSS OF PROFITS, LOSS OF BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF
+ * BUSINESS, OR FOR DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTIAL,
+ * PUNITIVE OR CONSEQUENTIAL DAMAGES OF ANY KIND IN CONNECTION WITH THIS
+ * DOCUMENT OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH LOSS OR DAMAGE.
+ *
+ * All Company, brand and product names may be trademarks that are the sole
+ * property of their respective owners. All rights reserved.
+ */
+ 
 package org.osgi.service.condpermadmin;
 
 import org.osgi.service.permissionadmin.PermissionInfo;
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/permissionadmin/PermissionInfo.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/permissionadmin/PermissionInfo.java
index c14f31a64..4c96b885a 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/permissionadmin/PermissionInfo.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/permissionadmin/PermissionInfo.java
@@ -27,8 +27,6 @@
 
 package org.osgi.service.permissionadmin;
 
-import java.io.Serializable;
-
 /**
  * Permission representation used by the Permission Admin service.
  * 
@@ -48,9 +46,7 @@ import java.io.Serializable;
  * 
  * @version $Revision: 1.6 $
  */
-/* TODO the Serializable can't stay here since this is a public class */
-public class PermissionInfo implements Serializable {
-	private static final long serialVersionUID = 4050763784350348345L;
+public class PermissionInfo {
 	private String	type;
 	private String	name;
 	private String	actions;