[jboss-osgi-commits] JBoss-OSGI SVN: r93817 - in projects/jboss-osgi/trunk/distribution/installer/src/main/resources: jbossas and 1 other directory.

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

Author: thomas.diesler at jboss.com
Date: 2009-09-21 14:41:26 -0400 (Mon, 21 Sep 2009)
New Revision: 93817

Modified:
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/auto-install-template.xml
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml
Log:
Explicitly define jndi/jmx host

Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/auto-install-template.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/auto-install-template.xml	2009-09-21 18:24:16 UTC (rev 93816)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/auto-install-template.xml	2009-09-21 18:41:26 UTC (rev 93817)
@@ -6,7 +6,7 @@
   <com.izforge.izpack.panels.TreePacksPanel>
     <pack name="JBossOSGi Distribution" index="0" selected="true" />
     <pack name="JBossOSGi Runtime" index="1" selected="true" />
-    <pack name="JBossOSGi Integration" index="2" selected="@jboss.integration@" />
+    <pack name="JBossAS Integration" index="2" selected="@jboss.integration@" />
   </com.izforge.izpack.panels.TreePacksPanel>
   <com.izforge.izpack.panels.UserInputPanel>
     <userInput>

Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml	2009-09-21 18:24:16 UTC (rev 93816)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml	2009-09-21 18:41:26 UTC (rev 93817)
@@ -49,6 +49,20 @@
           If set to 'false' bundles must be deployed in the order that is required to start them. 
         -->
         <entry><key>org.jboss.osgi.deferred.start</key><value>true</value></entry>
+        <!-- Husky socket connector properties -->
+        <entry><key>org.jboss.osgi.husky.runtime.connector.host</key><value>${jboss.bind.address}</value></entry>
+        <entry><key>org.jboss.osgi.husky.runtime.connector.port</key><value>5401</value></entry>
+        <!-- HTTP Service Port -->
+        <entry><key>org.osgi.service.http.port</key><value>8090</value></entry>
+        <!-- Config Admin Service -->
+        <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/data/osgi-configadmin</value></entry>
+        <!-- JMX bundle properties -->
+        <entry><key>org.jboss.osgi.jmx.host</key><value>${jboss.bind.address}</value></entry>
+        <entry><key>org.jboss.osgi.jmx.port</key><value>1098</value></entry>
+        <!-- JNDI bundle properties -->
+        <entry><key>org.jboss.osgi.jndi.host</key><value>${jboss.bind.address}</value></entry>
+        <entry><key>org.jboss.osgi.jndi.rmi.port</key><value>1098</value></entry>
+        <entry><key>org.jboss.osgi.jndi.port</key><value>1099</value></entry>
       </map>
     </property>
     <property name="autoInstall">

Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml	2009-09-21 18:24:16 UTC (rev 93816)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml	2009-09-21 18:41:26 UTC (rev 93817)
@@ -66,11 +66,20 @@
           If set to 'false' bundles must be deployed in the order that is required to start them. 
         -->
         <entry><key>org.jboss.osgi.deferred.start</key><value>true</value></entry>
-        <!-- 
-          Husky socket connector properties
-        -->
+        <!-- Husky socket connector properties -->
         <entry><key>org.jboss.osgi.husky.runtime.connector.host</key><value>${jboss.bind.address}</value></entry>
         <entry><key>org.jboss.osgi.husky.runtime.connector.port</key><value>5401</value></entry>
+        <!-- HTTP Service Port -->
+        <entry><key>org.osgi.service.http.port</key><value>8090</value></entry>
+        <!-- Config Admin Service -->
+        <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/data/osgi-configadmin</value></entry>
+        <!-- JMX bundle properties -->
+        <entry><key>org.jboss.osgi.jmx.host</key><value>${jboss.bind.address}</value></entry>
+        <entry><key>org.jboss.osgi.jmx.port</key><value>1098</value></entry>
+        <!-- JNDI bundle properties -->
+        <entry><key>org.jboss.osgi.jndi.host</key><value>${jboss.bind.address}</value></entry>
+        <entry><key>org.jboss.osgi.jndi.rmi.port</key><value>1098</value></entry>
+        <entry><key>org.jboss.osgi.jndi.port</key><value>1099</value></entry>
       </map>
     </property>
     <property name="autoInstall">