From 18189f0d42f7375660762dc6c885cf31683ae562 Mon Sep 17 00:00:00 2001
From: Pascal Rapicault
Date: Wed, 13 Jan 2010 17:29:41 +0000
Subject: Merging api branch back to HEAD

---
 bundles/org.eclipse.equinox.p2.testserver/META-INF/MANIFEST.MF      | 3 ++-
 .../src/org/eclipse/equinox/p2/testserver/SecureAction.java         | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'bundles/org.eclipse.equinox.p2.testserver')

diff --git a/bundles/org.eclipse.equinox.p2.testserver/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.testserver/META-INF/MANIFEST.MF
index 415da60d8..3e35f7599 100644
--- a/bundles/org.eclipse.equinox.p2.testserver/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.testserver/META-INF/MANIFEST.MF
@@ -5,7 +5,8 @@ Bundle-SymbolicName: org.eclipse.equinox.p2.testserver;singleton:=true
 Bundle-Version: 1.0.0
 Bundle-Activator: org.eclipse.equinox.p2.testserver.Activator
 Bundle-Vendor: Eclipse
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: J2SE-1.5,
+ J2SE-1.4
 Import-Package: org.eclipse.equinox.http,
  org.osgi.framework;version="1.3.0"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.equinox.p2.testserver/src/org/eclipse/equinox/p2/testserver/SecureAction.java b/bundles/org.eclipse.equinox.p2.testserver/src/org/eclipse/equinox/p2/testserver/SecureAction.java
index af7142dd0..93a536db0 100755
--- a/bundles/org.eclipse.equinox.p2.testserver/src/org/eclipse/equinox/p2/testserver/SecureAction.java
+++ b/bundles/org.eclipse.equinox.p2.testserver/src/org/eclipse/equinox/p2/testserver/SecureAction.java
@@ -14,7 +14,11 @@ package org.eclipse.equinox.p2.testserver;
 import java.io.IOException;
 import java.net.URL;
 import java.net.URLConnection;
-import java.security.*;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
 import org.osgi.framework.Bundle;
 
 /**
-- 
cgit v1.2.3