[jboss-osgi-commits] JBoss-OSGI SVN: r86850 - in projects/jboss-osgi/trunk: build/distribution/scripts and 4 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-04-06 09:49:41 -0400 (Mon, 06 Apr 2009) New Revision: 86850 Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/user-input-spec.xml projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml Log: Kopflerfish container integration Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml =================================================================== --- projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-06 13:36:36 UTC (rev 86849) +++ projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-06 13:49:41 UTC (rev 86850) @@ -53,40 +53,6 @@ </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> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <classifier>config</classifier> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <classifier>sources</classifier> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-spi</artifactId> <version>${version}</version> </dependency> @@ -135,6 +101,23 @@ <!-- Equinox Dependencies --> <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.eclipse.equinox</groupId> <artifactId>org.eclipse.osgi</artifactId> </dependency> @@ -145,6 +128,23 @@ <!-- Felix Dependencies --> <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-felix</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-felix</artifactId> + <classifier>config</classifier> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-felix</artifactId> + <classifier>sources</classifier> + <version>${version}</version> + </dependency> + <dependency> <groupId>org.apache.felix</groupId> <artifactId>javax.servlet</artifactId> </dependency> @@ -165,6 +165,29 @@ <artifactId>org.apache.felix.metatype</artifactId> </dependency> + <!-- Knopflerfish Dependencies --> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-knopflerfish</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-knopflerfish</artifactId> + <classifier>config</classifier> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-knopflerfish</artifactId> + <classifier>sources</classifier> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.knopflerfish</groupId> + <artifactId>org.knopflerfish.framework</artifactId> + </dependency> + <!-- izpack --> <dependency> <groupId>org.codehaus.izpack</groupId> Modified: projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml =================================================================== --- projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml 2009-04-06 13:36:36 UTC (rev 86849) +++ projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml 2009-04-06 13:49:41 UTC (rev 86850) @@ -45,6 +45,14 @@ </includes> <unpack>true</unpack> </dependencySet> + <dependencySet> + <outputDirectory>resources/jboss-osgi-runtime-knopflerfish</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jboss-osgi-runtime-knopflerfish:jar:config</include> + </includes> + <unpack>true</unpack> + </dependencySet> <!-- source --> <dependencySet> 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-06 13:36:36 UTC (rev 86849) +++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-04-06 13:49:41 UTC (rev 86850) @@ -51,6 +51,10 @@ <name>frameworkSelection</name> <value>equinox</value> </condition> + <condition type="variable" id="isKnopflerfish"> + <name>frameworkSelection</name> + <value>knopflerfish</value> + </condition> <condition type="variable" id="isJBoss501"> <name>jbossSelection</name> <value>jboss501</value> @@ -193,6 +197,19 @@ <include name="org.eclipse.osgi.services.jar" /> </fileset> + <!-- Knopflerfish Integration --> + + <fileset condition="isKnopflerfish" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer" override="true"> + <include name="jboss-osgi-runtime-knopflerfish.jar" /> + <include name="org.knopflerfish.framework.jar" /> + </fileset> + <fileset condition="isKnopflerfish" dir=&quot;(a){deploy.artifacts.dir}/resources/jboss-osgi-runtime-knopflerfish&quot; targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer/META-INF" override="true"> + <include name="osgi-deployers-jboss-beans.xml" /> + </fileset> + <fileset condition="isKnopflerfish" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/runtime/server/default/deploy/osgi" override="true"> + <include name="org.osgi.compendium.jar" /> + </fileset> + </pack> <!-- @@ -255,6 +272,19 @@ <include name="org.eclipse.osgi.services.jar" /> </fileset> + <!-- Knopflerfish Integration --> + + <fileset condition="isKnopflerfish" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> + <include name="jboss-osgi-runtime-knopflerfish.jar" /> + <include name="org.knopflerfish.framework.jar" /> + </fileset> + <fileset condition="isKnopflerfish" dir=&quot;(a){deploy.artifacts.dir}/resources/jboss-osgi-runtime-knopflerfish&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" override="true"> + <include name="osgi-deployers-jboss-beans.xml" /> + </fileset> + <fileset condition="isKnopflerfish" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> + <include name="org.osgi.compendium.jar" /> + </fileset> + </pack> </packs> Modified: projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/user-input-spec.xml =================================================================== --- projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/user-input-spec.xml 2009-04-06 13:36:36 UTC (rev 86849) +++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/user-input-spec.xml 2009-04-06 13:49:41 UTC (rev 86850) @@ -5,6 +5,7 @@ <spec> <choice txt="Felix" value="felix" set="true"/> <choice txt="Equinox" value="equinox"/> + <choice txt="Knopflerfish" value="knopflerfish"/> </spec> </field> </panel> Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml =================================================================== --- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml 2009-04-06 13:36:36 UTC (rev 86849) +++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml 2009-04-06 13:49:41 UTC (rev 86850) @@ -35,6 +35,8 @@ <name>framework</name> <values> <string>felix</string> + <string>equinox</string> + <string>knopflerfish</string> </values> </axis> <axis> Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-06 13:36:36 UTC (rev 86849) +++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-06 13:49:41 UTC (rev 86850) @@ -8,7 +8,7 @@ <map keyClass="java.lang.String" valueClass="java.lang.String"> <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>osgi.install.area</key><value>${jboss.server.data.dir}/equinox</value></entry> + <entry><key>org.osgi.framework.dir</key><value>${jboss.server.data.dir}/knopflerfish</value></entry> <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/osgi-configadmin</value></entry> <entry> <key>org.osgi.framework.system.packages</key> Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml 2009-04-06 13:36:36 UTC (rev 86849) +++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml 2009-04-06 13:49:41 UTC (rev 86850) @@ -8,7 +8,6 @@ <property name="frameworkProperties"> <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> - <entry><key>org.knopflerfish.osgi.registerserviceurlhandler</key><value>false</value></entry> </map> </property> </bean>