You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pa...@apache.org on 2013/02/12 15:33:38 UTC
svn commit: r1445182 - in /felix/trunk/framework.security: pom.xml
src/main/java/org/apache/felix/framework/security/condpermadmin/ConditionalPermissionAdminImpl.java
Author: pauls
Date: Tue Feb 12 14:33:38 2013
New Revision: 1445182
URL: http://svn.apache.org/r1445182
Log:
Make it possible to compile with java > 6
Modified:
felix/trunk/framework.security/pom.xml
felix/trunk/framework.security/src/main/java/org/apache/felix/framework/security/condpermadmin/ConditionalPermissionAdminImpl.java
Modified: felix/trunk/framework.security/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/framework.security/pom.xml?rev=1445182&r1=1445181&r2=1445182&view=diff
==============================================================================
--- felix/trunk/framework.security/pom.xml (original)
+++ felix/trunk/framework.security/pom.xml Tue Feb 12 14:33:38 2013
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.3.0</version>
+ <version>5.0.0</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -54,8 +54,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <target>jsr14</target>
- <source>1.5</source>
+ <target>1.3</target>
+ <source>1.3</source>
</configuration>
</plugin>
<plugin>
Modified: felix/trunk/framework.security/src/main/java/org/apache/felix/framework/security/condpermadmin/ConditionalPermissionAdminImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework.security/src/main/java/org/apache/felix/framework/security/condpermadmin/ConditionalPermissionAdminImpl.java?rev=1445182&r1=1445181&r2=1445182&view=diff
==============================================================================
--- felix/trunk/framework.security/src/main/java/org/apache/felix/framework/security/condpermadmin/ConditionalPermissionAdminImpl.java (original)
+++ felix/trunk/framework.security/src/main/java/org/apache/felix/framework/security/condpermadmin/ConditionalPermissionAdminImpl.java Tue Feb 12 14:33:38 2013
@@ -461,7 +461,7 @@ public final class ConditionalPermission
return 0;
}
- public <A> A adapt(Class<A> arg0) {
+ public Object adapt(Class arg0) {
// TODO Auto-generated method stub
return null;
}
@@ -470,6 +470,11 @@ public final class ConditionalPermission
// TODO Auto-generated method stub
return null;
}
+
+ public int compareTo(Object t)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
}
private static class FakeCert extends X509Certificate
@@ -808,7 +813,7 @@ public final class ConditionalPermission
* it keeps track it builds up a list of postponed tuples which it will
* evaluate at the last domain. See the core spec 9.5.1 and following for a
* general description.
- *
+ *
* @param felixBundle
* the bundle in question.
* @param loader