incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lin...@apache.org
Subject svn commit: r1040686 - in /incubator/aries/trunk/subsystem: pom.xml subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/itests/ScopeSecurityTest.java
Date Tue, 30 Nov 2010 18:37:13 GMT
Author: linsun
Date: Tue Nov 30 18:37:12 2010
New Revision: 1040686

URL: http://svn.apache.org/viewvc?rev=1040686&view=rev
Log:
add scope projects to root pom and minor update in scope itests

Modified:
    incubator/aries/trunk/subsystem/pom.xml
    incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/itests/ScopeSecurityTest.java

Modified: incubator/aries/trunk/subsystem/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/subsystem/pom.xml?rev=1040686&r1=1040685&r2=1040686&view=diff
==============================================================================
--- incubator/aries/trunk/subsystem/pom.xml (original)
+++ incubator/aries/trunk/subsystem/pom.xml Tue Nov 30 18:37:12 2010
@@ -51,6 +51,16 @@
                 <version>${version}</version>
             </dependency>
             <dependency>
+                <groupId>org.apache.aries.subsystem</groupId>
+                <artifactId>org.apache.aries.subsystem.scope.api</artifactId>
+                <version>${version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.aries.subsystem</groupId>
+                <artifactId>org.apache.aries.subsystem.scope.impl</artifactId>
+                <version>${version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.aries.testsupport</groupId>
                 <artifactId>org.apache.aries.testsupport.unit</artifactId>
                 <version>${version}</version>

Modified: incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/itests/ScopeSecurityTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/itests/ScopeSecurityTest.java?rev=1040686&r1=1040685&r2=1040686&view=diff
==============================================================================
--- incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/itests/ScopeSecurityTest.java
(original)
+++ incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/itests/ScopeSecurityTest.java
Tue Nov 30 18:37:12 2010
@@ -83,12 +83,14 @@ public class ScopeSecurityTest extends A
     int modifyEventCount;
     int removeEventCount;
     private final static PermissionInfo[] adminAllowInfo = {
+        new PermissionInfo("java.security.AllPermission", "*", "*"),
         new PermissionInfo("java.lang.RuntimePermission", "loadLibrary.*", "*"),
         new PermissionInfo("java.lang.RuntimePermission", "queuePrintJob", "*"),
         new PermissionInfo("java.net.SocketPermission", "*", "connect"),
         new PermissionInfo("java.util.PropertyPermission", "*", "read"),
         new PermissionInfo("org.osgi.framework.PackagePermission", "*", "exportonly,import"),
         new PermissionInfo("org.osgi.framework.ServicePermission", "*", "get,register"),
+        new PermissionInfo("org.osgi.framework.AdminPermission", "*", "execute,resolve"),
     };
     
     @After
@@ -223,7 +225,7 @@ public class ScopeSecurityTest extends A
                 ConditionInfo[] conditionInfo = new ConditionInfo[] {new ConditionInfo("org.osgi.service.condpermadmin.BundleLocationCondition",
new String[]{b.getLocation()})}; 
                 // Set up permissions which are common to all applications
                 infos.add(permAdmin.newConditionalPermissionInfo(null, conditionInfo, adminAllowInfo,
"allow"));
-
+                update.commit();
             }
             
         }
@@ -378,9 +380,9 @@ public class ScopeSecurityTest extends A
             mavenBundle("org.apache.aries.subsystem", "org.apache.aries.subsystem.scope.api"),
             mavenBundle("org.apache.aries.subsystem", "org.apache.aries.subsystem.scope.impl"),
 
-            //org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
-Xorg.osgi.framework.security=osgi"),
             // uncomment the following line if you want to turn on security.  the policy
file can be found in src/test/resources dir and you want to update the value of -Djava.security.policy
to 
             // the exact location of the policy file.
+            //org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Declipse.security=osgi
-Djava.security.policy=/policy"),
             //org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
-Declipse.security=osgi -Djava.security.policy=/policy"),
 
             PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),



Mime
View raw message