Author: thomas.diesler(a)jboss.com Date: 2009-04-03 03:21:29 -0400 (Fri, 03 Apr 2009) New Revision: 86728 Modified: projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml Log: Install core/compendium for Felix only Modified: projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml =================================================================== --- projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-04-03 07:16:04 UTC (rev 86727) +++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-04-03 07:21:29 UTC (rev 86728) @@ -76,6 +76,7 @@ <panel classname="TreePacksPanel" /> <panel classname="UserInputPanel" /> <panel classname="UserInputPanel" /> + <panel classname="UserInputPanel" /> <panel classname="SummaryPanel" /> <panel classname="InstallPanel" /> <panel classname="FinishPanel" /> @@ -153,7 +154,6 @@ <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer" override="true"> <include name="jboss-osgi-runtime-deployer.jar" /> <include name="jboss-osgi-runtime-spi.jar" /> - <include name="org.osgi.core.jar" /> </fileset> <!-- JBossOSGi Runtime deploy/osgi --> @@ -162,7 +162,6 @@ <include name="org.apache.felix.http.jetty.jar" /> <include name="org.apache.felix.log.jar" /> <include name="org.apache.felix.metatype.jar" /> - <include name="org.osgi.compendium.jar" /> <include name="jboss-osgi-service-logging.jar" /> <include name="jboss-osgi-service-webconsole.jar" /> </fileset> @@ -172,11 +171,15 @@ <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer" override="true" condition="isFelix"> <include name="jboss-osgi-runtime-felix.jar" /> <include name="org.apache.felix.framework.jar" /> + <include name="org.osgi.core.jar" /> </fileset> <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jboss-osgi-runtime-felix&quot; targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer/META-INF" override="true" condition="isFelix"> <include name="osgi-deployers-jboss-beans.xml" /> </fileset> + <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/runtime/server/default/deploy/osgi" override="true" condition="isFelix"> + <include name="org.osgi.compendium.jar" /> + </fileset> <!-- Equinox Integration --> @@ -226,7 +229,6 @@ <include name="org.apache.felix.http.jetty.jar" /> <include name="org.apache.felix.log.jar" /> <include name="org.apache.felix.metatype.jar" /> - <include name="org.osgi.compendium.jar" /> <include name="jboss-osgi-service-logging.jar" /> <include name="jboss-osgi-service-webconsole.jar" /> </fileset> @@ -241,6 +243,9 @@ override="true" condition="isFelix"> <include name="osgi-deployers-jboss-beans.xml" /> </fileset> + <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true" condition="isFelix"> + <include name="org.osgi.compendium.jar" /> + </fileset> <!-- Equinox Integration -->