9:28 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2009-10-02 10:28:20 -0400 (Fri, 02 Oct 2009)
New Revision: 94274
Added:
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/etc/
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/etc/osgitck/
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/etc/osgitck/cnf/
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/etc/osgitck/cnf/build.bnd
Modified:
projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml
Log:
[JBOSGI-158] Framework itself must be a bundle
Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml 2009-10-02 13:55:27
UTC (rev 94273)
+++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml 2009-10-02 14:28:20
UTC (rev 94274)
@@ -1,15 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!-- ====================================================================== -->
+ <!-- ======================================================================
+-->
<!-- -->
<!-- JBoss, the OpenSource J2EE webOS -->
<!-- -->
<!-- Distributable under LGPL license. -->
<!-- See terms of license at http://www.gnu.org. -->
<!-- -->
- <!-- ====================================================================== -->
+ <!-- ======================================================================
+-->
- <!-- $Id$ -->
+ <!-- $Id$
+-->
<!--
Set these VM properties in your IDE debugger
@@ -23,18 +26,19 @@
<name>JBossOSGi Runtime - Microcontainer</name>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-framework</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<version>1.0.0-SNAPSHOT</version>
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
</parent>
<!-- Properties -->
<properties>
+ <version.aqute.bnd>0.0.356</version.aqute.bnd>
<version.apache.felix.configadmin>1.0.10</version.apache.felix.configadmin>
<version.apache.felix.http.jetty>1.0.1</version.apache.felix.http.jetty>
<version.apache.felix.log>1.0.0</version.apache.felix.log>
@@ -63,6 +67,7 @@
<dependency>
<groupId>biz.aQute</groupId>
<artifactId>bnd</artifactId>
+ <version>${version.aqute.bnd}</version>
</dependency>
<dependency>
<groupId>org.jboss.aop</groupId>
@@ -322,6 +327,9 @@
<descriptors>
<descriptor>scripts/assembly-all.xml</descriptor>
</descriptors>
+ <archive>
+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
</configuration>
</execution>
</executions>
@@ -365,6 +373,25 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+
<Bundle-SymbolicName>org.jboss.osgi.framework</Bundle-SymbolicName>
+ <Bundle-Version>${version}</Bundle-Version>
+ <Export-Package>
+ org.osgi.framework;version="1.5",
+ org.osgi.framework.launch;version="1.0",
+ org.osgi.framework.hooks.service;version="1.0",
+ org.osgi.service.packageadmin;version="1.2",
+ org.osgi.service.startlevel;version="1.1",
+ org.osgi.util.tracker;version="1.4"
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemProperties>
Added:
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/etc/osgitck/cnf/build.bnd
===================================================================
---
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/etc/osgitck/cnf/build.bnd
(rev 0)
+++
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/etc/osgitck/cnf/build.bnd 2009-10-02
14:28:20 UTC (rev 94274)
@@ -0,0 +1,99 @@
+# Very general
+project.dependson = ${p-dependson;:}
+project.bootclasspath = ${p-bootclasspath;:}
+project.buildpath = ${p-buildpath;:}
+project.sourcepath = ${p-sourcepath;:}
+project.allsourcepath = ${p-allsourcepath;:}
+project.output = ${p-output}
+project.testpath = ${p-testpath;:}
+project.workspace = ${workspace}
+project.dir = ${project}
+
+-verbose = true
+src = src
+bin = bin
+target = ${project}/${target-dir}
+release.target = ${if;${def;top};${def;top};${target}}
+build = ${workspace}/cnf
+licensed = ${workspace}/licensed
+repo = ${build}/repo
+licensed-repo = ${licensed}/repo
+target-dir = generated
+p = ${basename;${project}}
+project.name = ${p}
+bin.includes = ${project.name}.jar
+prebuild =
+
+# Java compiler options
+java = java
+javac = javac
+javac.debug = on
+javac.source = 1.3
+javac.target = 1.2
+
+
+#Bnd options
+-sources = true
+-sourcepath = ${project}/src
+
+-plugin = aQute.lib.deployer.FileRepo; \
+ location=${repo}, \
+ aQute.lib.deployer.FileRepo; \
+ location=${licensed-repo}; \
+ readonly=true, \
+ aQute.bnd.signing.JartoolSigner; \
+ keystore=${build}/keystore; \
+ keypass=testtest; \
+ storepass=testtest, \
+ Packaging; \
+ path:=${build}/${bin}; \
+ command:=-pack, \
+ SignatureTest; \
+ path:=${build}/${bin}; \
+ command:="-signaturetest"
+
+
+-make = \
+ (*).(jar); type=bnd; recipe="bnd/$1.bnd", \
+ (*).(ipa); type=bnd; recipe="ipa/$1.bnd"
+
+
+junit =
com.springsource.junit;version=3.8;export="junit.framework;version=3.8,junit.extensions;version=3.8"
+
+# Time options
+# base.modified is used by bnd to not make when files are not changed
+base.modified =
${fmodified;${build}/build.xml,${build}/build.bnd,${project}/build.properties,${project}/bnd.bnd,${project}/build.xml}
+base.modified.readable = ${long2date;${base.modified}}
+project.build = ${tstamp;yyyyMMddhhmm}
+
+copyright = Copyright (c) OSGi Alliance (2000, ${tstamp;yyyy}). All Rights Reserved.
+copyright.html = Copyright © OSGi Alliance (2000, ${tstamp;yyyy}). All Rights
Reserved.
+
+osgi.release = 4
+osgi.version = 4.2.0
+-versionpolicy = "[${version;==;${@}},${version;+;${@}})"
+
+osgi.release.version = ${osgi.version}.${project.build}
+core.release.version = ${osgi.release.version}
+cmpn.release.version = ${osgi.release.version}
+mobile.release.version = ${osgi.release.version}
+enterprise.release.version = ${osgi.release.version}
+proposed.release.version = ${osgi.release.version}
+
+
+# Documentation
+Bundle-Copyright = ${copyright}
+Bundle-Vendor = OSGi Alliance
+-removeheaders = Include-Resource, Private-Package
+
+# Define the OSGi vendor framework
+osgi.vendor.framework = org.jboss.osgi.framework
+osgi.vendor.version = 1.0.0
+
+-runpath = \
+ ${osgi.vendor.framework}; version=${osgi.vendor.version}, \
+ com.springsource.junit; version=3.8; export="junit.framework;version=3.8"
+
+testcases =
${classes;extending;junit.framework.TestCase|*DefaultTestBundleControl;concrete}
+
+