[jboss-cvs] JBossAS SVN: r93135 - in projects/jboss-osgi/trunk/distribution/installer/src/main/resources: jbossas and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Sep 2 12:32:07 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-09-02 12:32:07 -0400 (Wed, 02 Sep 2009)
New Revision: 93135
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/user-input-spec.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml
Log:
#3 jbossas integration (wip)
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-09-02 16:31:13 UTC (rev 93134)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-09-02 16:32:07 UTC (rev 93135)
@@ -56,6 +56,10 @@
<name>frameworkSelection</name>
<value>jbossmc</value>
</condition>
+ <condition type="or" id="isFelixOrEquinox">
+ <condition type="ref" refid="isFelix"/>
+ <condition type="ref" refid="isEquinox"/>
+ </condition>
<condition type="variable" id="isJBoss501">
<name>jbossSelection</name>
<value>jboss501</value>
@@ -79,9 +83,10 @@
<panel classname="HelloPanel" />
<panel classname="TargetPanel" />
<panel classname="TreePacksPanel" />
- <panel classname="UserInputPanel" />
- <panel classname="UserInputPanel" />
- <panel classname="UserInputPanel" />
+ <panel classname="UserInputPanel" id="framework.select"/>
+ <panel classname="UserInputPanel" id="jbossas.select.felix.equinox" condition="isFelixOrEquinox"/>
+ <panel classname="UserInputPanel" id="jbossas.select.jbossmc" condition="isJBossMC"/>
+ <panel classname="UserInputPanel" id="jboss.home.select" />
<panel classname="SummaryPanel" />
<panel classname="InstallPanel" />
<panel classname="FinishPanel" />
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/user-input-spec.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/user-input-spec.xml 2009-09-02 16:31:13 UTC (rev 93134)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/user-input-spec.xml 2009-09-02 16:32:07 UTC (rev 93135)
@@ -1,5 +1,5 @@
<userInput>
- <panel order="0">
+ <panel order="0" id="framework.select">
<field type="radio" variable="frameworkSelection">
<description align="left" txt="Please choose the OSGi Framework" />
<spec>
@@ -9,7 +9,7 @@
</spec>
</field>
</panel>
- <panel order="1">
+ <panel order="1" id="jbossas.select.felix.equinox">
<createForPack name="JBossAS Integration" />
<field type="radio" variable="jbossSelection">
<description align="left" txt="Please choose your target container" />
@@ -24,8 +24,21 @@
<spec txt="Server:" size="15" set="default" />
</field>
</panel>
- <panel order="2">
+ <panel order="2" id="jbossas.select.jbossmc">
<createForPack name="JBossAS Integration" />
+ <field type="radio" variable="jbossSelection">
+ <description align="left" txt="Please choose your target container" />
+ <spec>
+ <choice txt="JBoss-5.2.0" value="jboss520" set="true"/>
+ <choice txt="JBoss-6.0.0" value="jboss600"/>
+ </spec>
+ </field>
+ <field type="text" variable="jbossTargetServer">
+ <spec txt="Server:" size="15" set="default" />
+ </field>
+ </panel>
+ <panel order="3" id="jboss.home.select">
+ <createForPack name="JBossAS Integration" />
<field type="dir" align="left" variable="jbossInstallPath">
<spec txt="JBoss Home:" size="25" set="${jboss.home}" />
</field>
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 2009-09-02 16:31:13 UTC (rev 93134)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2009-09-02 16:32:07 UTC (rev 93135)
@@ -17,6 +17,12 @@
<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.clean</key><value>onFirstInit</value></entry>
+ <entry><key>org.osgi.framework.system.packages</key><value>
+ javax.management,
+ org.jboss.logging;version=2.0,
+ org.osgi.framework;version=1.4,
+ org.osgi.service.startlevel;version=1.1,
+ </value></entry>
<entry><key>org.osgi.framework.system.packages.extra</key><value>
org.jboss.beans.metadata.plugins;version=2.0,
@@ -25,7 +31,6 @@
org.jboss.beans.metadata.spi.builder;version=2.0,
org.jboss.dependency.spi;version=2.0,
org.jboss.kernel.spi.dependency;version=2.0,
- org.jboss.logging;version=2.0,
org.jboss.osgi.spi;version=1.0,
org.jboss.osgi.spi.capability;version=1.0,
@@ -49,6 +54,14 @@
<uncallback method="removePlugin" />
</bean>
+ <!--
+ ********************************
+ * *
+ * OSGi Framework Plugins *
+ * *
+ ********************************
+ -->
+
<bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.plugins.facade.plugins.FrameworkEventsPluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
@@ -74,8 +87,11 @@
<bean name="OSGiManifestParsingDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiManifestParsingDeployer" />
<bean name="OSGiBundleStateDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleStateDeployer">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ <property name="autoInstall">true</property>
</bean>
- <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer"/>
+ <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer">
+ <property name="classLoaderSystem"><inject bean="ClassLoaderSystem"/></property>
+ </bean>
<bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer" />
<!--
@@ -86,9 +102,22 @@
********************************
-->
- <!-- ClassLoading -->
+ <!-- ClassLoading
<bean name="OSGiClassLoaderSystem" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderSystem" >
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
+ -->
+ <!--
+ ********************************
+ * *
+ * OSGi Lifecycle *
+ * *
+ ********************************
+ -->
+
+ <bean name="OSGiBundleManagerLifecycle" class="org.jboss.osgi.plugins.facade.bundle.OSGiBundleManagerLifecycle">
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ </bean>
+
</deployment>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list