[jboss-osgi-commits] JBoss-OSGI SVN: r86720 - in projects/jboss-osgi/trunk: build/distribution/src/main/resources/installer and 4 other directories.

[jboss-osgi-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-04-03 02:02:34 -0400 (Fri, 03 Apr 2009)
New Revision: 86720

Added:
   projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jndi.properties
   projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/tst.policy
   projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jndi.properties
   projects/jboss-osgi/trunk/runtime/felix/src/test/resources/tst.policy
Removed:
   projects/jboss-osgi/trunk/testsuite/src/test/resources/jndi.properties
   projects/jboss-osgi/trunk/testsuite/src/test/resources/tst.policy
Modified:
   projects/jboss-osgi/trunk/build/distribution/pom.xml
   projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/auto-install-template.xml
   projects/jboss-osgi/trunk/build/hudson/build.xml
Log:
Fix missing dependency on Equniox

Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/pom.xml	2009-04-03 05:45:11 UTC (rev 86719)
+++ projects/jboss-osgi/trunk/build/distribution/pom.xml	2009-04-03 06:02:34 UTC (rev 86720)
@@ -53,6 +53,23 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.osgi</groupId>
+      <artifactId>jboss-osgi-runtime-equinox</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.osgi</groupId>
+      <artifactId>jboss-osgi-runtime-equinox</artifactId>
+      <classifier>config</classifier>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.osgi</groupId>
+      <artifactId>jboss-osgi-runtime-equinox</artifactId>
+      <classifier>sources</classifier>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.osgi</groupId>
       <artifactId>jboss-osgi-runtime-felix</artifactId>
       <version>${version}</version>
     </dependency>

Modified: projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/auto-install-template.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/auto-install-template.xml	2009-04-03 05:45:11 UTC (rev 86719)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/auto-install-template.xml	2009-04-03 06:02:34 UTC (rev 86720)
@@ -10,6 +10,11 @@
   </com.izforge.izpack.panels.TreePacksPanel>
   <com.izforge.izpack.panels.UserInputPanel>
     <userInput>
+      <entry key="runtimeSelection" value="@runtime@" />
+    </userInput>
+  </com.izforge.izpack.panels.UserInputPanel>
+  <com.izforge.izpack.panels.UserInputPanel>
+    <userInput>
       <entry key="jbossTargetServer" value="default" />
       <entry key="jbossSelection" value="@target.container@" />
     </userInput>

Modified: projects/jboss-osgi/trunk/build/hudson/build.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/build.xml	2009-04-03 05:45:11 UTC (rev 86719)
+++ projects/jboss-osgi/trunk/build/hudson/build.xml	2009-04-03 06:02:34 UTC (rev 86720)
@@ -144,13 +144,6 @@
         <filter token="hudson.home" value="${hudson.home}"/>
       </filterset>
     </copy>
-    <concat destfile="${hudson.dir}/apache-tomcat/conf/catalina.policy" append="true">
-    grant { 
-      permission java.io.FilePermission "/tmp", "read";
-      permission java.io.FilePermission "/tmp/*", "read";
-      permission java.io.FilePermission "/tmp/surefire*", "read";
-    };
-    </concat>
     
     <!-- Configure Hudson Home -->
     <copy todir="${hudson.home}" overwrite="false">

Added: projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jndi.properties
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jndi.properties	                        (rev 0)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jndi.properties	2009-04-03 06:02:34 UTC (rev 86720)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=jnp://@jboss.bind.address@:1099

Added: projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/tst.policy
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/tst.policy	                        (rev 0)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/tst.policy	2009-04-03 06:02:34 UTC (rev 86720)
@@ -0,0 +1,4 @@
+grant {
+	permission java.security.AllPermission;
+};
+

Copied: projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jndi.properties (from rev 86719, projects/jboss-osgi/trunk/testsuite/src/test/resources/jndi.properties)
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jndi.properties	                        (rev 0)
+++ projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jndi.properties	2009-04-03 06:02:34 UTC (rev 86720)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=jnp://@jboss.bind.address@:1099

Copied: projects/jboss-osgi/trunk/runtime/felix/src/test/resources/tst.policy (from rev 86719, projects/jboss-osgi/trunk/testsuite/src/test/resources/tst.policy)
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/test/resources/tst.policy	                        (rev 0)
+++ projects/jboss-osgi/trunk/runtime/felix/src/test/resources/tst.policy	2009-04-03 06:02:34 UTC (rev 86720)
@@ -0,0 +1,4 @@
+grant {
+	permission java.security.AllPermission;
+};
+

Deleted: projects/jboss-osgi/trunk/testsuite/src/test/resources/jndi.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/resources/jndi.properties	2009-04-03 05:45:11 UTC (rev 86719)
+++ projects/jboss-osgi/trunk/testsuite/src/test/resources/jndi.properties	2009-04-03 06:02:34 UTC (rev 86720)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=jnp://@jboss.bind.address@:1099

Deleted: projects/jboss-osgi/trunk/testsuite/src/test/resources/tst.policy
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/resources/tst.policy	2009-04-03 05:45:11 UTC (rev 86719)
+++ projects/jboss-osgi/trunk/testsuite/src/test/resources/tst.policy	2009-04-03 06:02:34 UTC (rev 86720)
@@ -1,4 +0,0 @@
-grant {
-	permission java.security.AllPermission;
-};
-