Author: thomas.diesler(a)jboss.com Date: 2010-02-04 11:29:46 -0500 (Thu, 04 Feb 2010) New Revision: 100424 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-felix.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml Log: [JBOSGI-99] No explicit control over bundle.start() 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 2010-02-04 16:20:49 UTC (rev 100423) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-02-04 16:29:46 UTC (rev 100424) @@ -23,7 +23,6 @@ <entry><key>org.osgi.service.http.port</key><value>8090</value></entry> <entry><key>osgi.framework</key><value>${jboss.server.home.url}/deployers/osgi.deployer/org.eclipse.osgi.jar</value></entry> <entry><key>osgi.install.area</key><value>${jboss.server.data.dir}/equinox</value></entry> - <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/osgi-configadmin</value></entry> <entry> <key>org.osgi.framework.system.packages.extra</key> <value> @@ -69,7 +68,7 @@ <!-- 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> + <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/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> 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 2010-02-04 16:20:49 UTC (rev 100423) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-02-04 16:29:46 UTC (rev 100424) @@ -21,7 +21,6 @@ <entry><key>org.osgi.framework.storage</key><value>${jboss.server.data.dir}/osgi-store</value></entry> <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> <entry><key>org.osgi.service.http.port</key><value>8090</value></entry> - <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/osgi-configadmin</value></entry> <entry><key>felix.bootdelegation.implicit</key><value>false</value></entry> <entry><key>org.osgi.framework.bootdelegation</key><value>sun.reflect</value></entry> <entry> @@ -74,7 +73,7 @@ <!-- 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> + <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/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> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-02-04 16:20:49 UTC (rev 100423) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-02-04 16:29:46 UTC (rev 100424) @@ -17,7 +17,7 @@ </constructor> <property name="properties"> <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>org.osgi.framework.storage</key><value>${jboss.server.data.dir}/data/osgi-store</value></entry> + <entry><key>org.osgi.framework.storage</key><value>${jboss.server.data.dir}/osgi-store</value></entry> <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> <entry><key>org.osgi.framework.system.packages.extra</key><value> @@ -60,7 +60,7 @@ <!-- 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> + <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/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>