[jboss-cvs] JBossAS SVN: r86747 - in projects/jboss-osgi/trunk: build/distribution/src/main/resources/installer and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Apr 3 09:22:37 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-04-03 09:22:37 -0400 (Fri, 03 Apr 2009)
New Revision: 86747
Modified:
projects/jboss-osgi/trunk/build/distribution/pom.xml
projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/microcontainer/osgi-int/.classpath
projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml
projects/jboss-osgi/trunk/runtime/deployer/.classpath
projects/jboss-osgi/trunk/runtime/equinox/.classpath
projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml
projects/jboss-osgi/trunk/runtime/felix/pom.xml
projects/jboss-osgi/trunk/service/logging/pom.xml
Log:
Profide explicit framework reference for equinox
Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-03 13:22:29 UTC (rev 86746)
+++ projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-03 13:22:37 UTC (rev 86747)
@@ -133,8 +133,18 @@
<version>${version}</version>
</dependency>
- <!-- felix -->
+ <!-- Equinox Dependencies -->
<dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.osgi.services</artifactId>
+ </dependency>
+
+ <!-- Felix Dependencies -->
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>javax.servlet</artifactId>
</dependency>
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 13:22:29 UTC (rev 86746)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-04-03 13:22:37 UTC (rev 86747)
@@ -168,29 +168,30 @@
<!-- Felix Integration -->
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer" override="true" condition="isFelix">
+ <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer" override="true">
<include name="jboss-osgi-runtime-felix.jar" />
<include name="org.apache.felix.framework.jar" />
<include name="org.osgi.core.jar" />
</fileset>
- <fileset dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-felix" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer/META-INF"
- override="true" condition="isFelix">
+ <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-felix" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer/META-INF" override="true">
<include name="osgi-deployers-jboss-beans.xml" />
</fileset>
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deploy/osgi" override="true" condition="isFelix">
+ <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deploy/osgi" override="true">
<include name="org.osgi.compendium.jar" />
</fileset>
<!-- Equinox Integration -->
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer" override="true" condition="isEquinox">
+ <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer" override="true">
<include name="jboss-osgi-runtime-equinox.jar" />
- <include name="osgi.jar" />
+ <include name="org.eclipse.osgi.jar" />
</fileset>
- <fileset dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-equinox" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer/META-INF"
- override="true" condition="isEquinox">
+ <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-equinox" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer/META-INF" override="true">
<include name="osgi-deployers-jboss-beans.xml" />
</fileset>
+ <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deploy/osgi" override="true">
+ <include name="org.eclipse.osgi.services.jar" />
+ </fileset>
</pack>
@@ -207,21 +208,15 @@
<description>Integration with an existing JBossAS instance</description>
<!-- deployers -->
- <fileset dir="@{deploy.artifacts.dir}/etc/jboss501/server/deployers" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers" override="true" condition="isJBoss501">
+ <fileset condition="isJBoss501" dir="@{deploy.artifacts.dir}/etc/jboss501/server/deployers" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers" override="true">
<include name="metadata-deployer-jboss-beans.xml" />
</fileset>
<!-- deployers/osgi.deployer -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
<include name="jboss-osgi-runtime-deployer.jar" />
- <include name="jboss-osgi-runtime-felix.jar" />
<include name="jboss-osgi-runtime-spi.jar" />
- <include name="org.apache.felix.framework.jar" />
- <include name="org.osgi.core.jar" />
</fileset>
- <fileset dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-felix" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" override="true">
- <include name="osgi-deployers-jboss-beans.xml" />
- </fileset>
<!-- deploy/osgi -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
@@ -235,28 +230,30 @@
<!-- Felix Integration -->
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true" condition="isFelix">
+ <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
<include name="jboss-osgi-runtime-felix.jar" />
<include name="org.apache.felix.framework.jar" />
</fileset>
- <fileset dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-felix" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF"
- override="true" condition="isFelix">
+ <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-felix" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" override="true">
<include name="osgi-deployers-jboss-beans.xml" />
</fileset>
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true" condition="isFelix">
+ <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
<include name="org.osgi.compendium.jar" />
</fileset>
<!-- Equinox Integration -->
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true" condition="isEquinox">
+ <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
<include name="jboss-osgi-runtime-equinox.jar" />
<include name="org.apache.equinox.framework.jar" />
+ <include name="org.eclipse.osgi.jar"/>
</fileset>
- <fileset dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-equinox" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF"
- override="true" condition="isEquinox">
+ <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-equinox" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" override="true">
<include name="osgi-deployers-jboss-beans.xml" />
</fileset>
+ <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
+ <include name="org.eclipse.osgi.services.jar" />
+ </fileset>
</pack>
Modified: projects/jboss-osgi/trunk/microcontainer/osgi-int/.classpath
===================================================================
--- projects/jboss-osgi/trunk/microcontainer/osgi-int/.classpath 2009-04-03 13:22:29 UTC (rev 86746)
+++ projects/jboss-osgi/trunk/microcontainer/osgi-int/.classpath 2009-04-03 13:22:37 UTC (rev 86747)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/javacc"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
Modified: projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml 2009-04-03 13:22:29 UTC (rev 86746)
+++ projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml 2009-04-03 13:22:37 UTC (rev 86747)
@@ -11,24 +11,6 @@
<version>1.0.0.Beta1</version>
</parent>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <version>2.1</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>javacc</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<!-- Global dependencies -->
<dependency>
@@ -93,6 +75,7 @@
</exclusion>
</exclusions>
</dependency>
+
<!-- Test dependencies -->
<dependency>
<groupId>org.jboss</groupId>
@@ -120,4 +103,23 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <version>2.1</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>javacc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: projects/jboss-osgi/trunk/runtime/deployer/.classpath
===================================================================
--- projects/jboss-osgi/trunk/runtime/deployer/.classpath 2009-04-03 13:22:29 UTC (rev 86746)
+++ projects/jboss-osgi/trunk/runtime/deployer/.classpath 2009-04-03 13:22:37 UTC (rev 86747)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
Modified: projects/jboss-osgi/trunk/runtime/equinox/.classpath
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/.classpath 2009-04-03 13:22:29 UTC (rev 86746)
+++ projects/jboss-osgi/trunk/runtime/equinox/.classpath 2009-04-03 13:22:37 UTC (rev 86747)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="src" path="src/testsuite/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
Modified: projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-03 13:22:29 UTC (rev 86746)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-03 13:22:37 UTC (rev 86747)
@@ -4,23 +4,46 @@
<!-- The OSGiFramework -->
<bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.equinox.framework.EquinoxIntegration">
- <property name="frameworkProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
- </map>
- </property>
+ <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.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</key>
+ <value>
+ javax.management,
+ javax.xml.parsers,
+ org.jboss.logging,
+ org.jboss.osgi.service,
+ org.jboss.osgi.spi.management,
+ org.osgi.framework; version=1.4,
+ org.osgi.service.packageadmin; version=1.2,
+ org.osgi.service.startlevel; version=1.1,
+ org.xml.sax
+ </value>
+ </entry>
+ <!--
+ If set to 'true' bundles can be deployed in any order. Deployed bundle will get started when their dependencies can be resolved.
+ 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>
+ </map>
+ </property>
</bean>
<!-- The Framework Management -->
<bean name="jboss.osgi:service=ManagedFramework" class="org.jboss.osgi.spi.management.ManagedFramework">
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
</bean>
<!-- A Service that gives access to the Microcontainer Kernel -->
<bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.service.MicrocontainerService">
- <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property>
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
- <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
+ <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property>
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
</bean>
<!-- The OSGi MetaData Deployer -->
Modified: projects/jboss-osgi/trunk/runtime/felix/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-03 13:22:29 UTC (rev 86746)
+++ projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-03 13:22:37 UTC (rev 86747)
@@ -127,54 +127,7 @@
<!-- Profiles -->
<profiles>
-
<!--
- Name: framework-default
- Descr: Setup for default integration testing
- -->
- <profile>
- <id>framework-default</id>
- <activation>
- <property>
- <name>!framework</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-testsuite</artifactId>
- <type>zip</type>
- <outputDirectory>src/testsuite</outputDirectory>
- <excludes>test-libs/**</excludes>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-testsuite</artifactId>
- <type>zip</type>
- <outputDirectory>target</outputDirectory>
- <includes>test-libs/**</includes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
Name: framework-felix
Descr: Setup for Felix integration testing
-->
Modified: projects/jboss-osgi/trunk/service/logging/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/service/logging/pom.xml 2009-04-03 13:22:29 UTC (rev 86746)
+++ projects/jboss-osgi/trunk/service/logging/pom.xml 2009-04-03 13:22:37 UTC (rev 86747)
@@ -22,7 +22,12 @@
<!-- Dependencies -->
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
More information about the jboss-cvs-commits
mailing list