[jboss-osgi-commits] JBoss-OSGI SVN: r101785 - in projects/jboss-osgi/projects/runtime/framework/trunk: bundle and 2 other directories.

Author: thomas.diesler(a)jboss.com Date: 2010-03-03 11:50:20 -0500 (Wed, 03 Mar 2010) New Revision: 101785 Added: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/ Removed: projects/jboss-osgi/projects/runtime/framework/trunk/testsuite/ Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/pom.xml Log: Resurect framework bundle and all build Copied: projects/jboss-osgi/projects/runtime/framework/trunk/bundle (from rev 101775, projects/jboss-osgi/projects/runtime/framework/trunk/testsuite) Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/testsuite/pom.xml 2010-03-03 14:45:40 UTC (rev 101775) +++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-03 16:50:20 UTC (rev 101785) @@ -16,10 +16,10 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>JBossOSGi Framework - Testsuite</name> + <name>JBossOSGi Framework - Bundle</name> <groupId>org.jboss.osgi.framework</groupId> - <artifactId>jboss-osgi-framework-testsuite</artifactId> - <packaging>jar</packaging> + <artifactId>jboss-osgi-framework</artifactId> + <packaging>bundle</packaging> <parent> <groupId>org.jboss.osgi.framework</groupId> @@ -198,6 +198,21 @@ </descriptors> </configuration> </execution> + <execution> + <id>all</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>scripts/assembly-all.xml</descriptor> + </descriptors> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + </archive> + </configuration> + </execution> </executions> </plugin> <plugin> Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml 2010-03-03 16:49:46 UTC (rev 101784) +++ projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml 2010-03-03 16:50:20 UTC (rev 101785) @@ -19,7 +19,7 @@ <name>JBossOSGi Framework - Core</name> <groupId>org.jboss.osgi.framework</groupId> <artifactId>jboss-osgi-framework-core</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <parent> <groupId>org.jboss.osgi.framework</groupId> @@ -160,26 +160,6 @@ <build> <plugins> - <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-Name>JBossOSGi Framework</Bundle-Name> - <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> </plugins> </build> </project> Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-03 16:49:46 UTC (rev 101784) +++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-03 16:50:20 UTC (rev 101785) @@ -70,7 +70,7 @@ <module>core</module> <module>metadata</module> <module>vfs21</module> - <module>testsuite</module> + <module>bundle</module> </modules> <!-- Dependency Management --> Modified: projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/pom.xml 2010-03-03 16:49:46 UTC (rev 101784) +++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/pom.xml 2010-03-03 16:50:20 UTC (rev 101785) @@ -29,20 +29,19 @@ <!-- Properties --> <properties> - <version.jboss.vfs>2.1.3.SP1</version.jboss.vfs> </properties> <!-- Dependencies --> <dependencies> <dependency> <groupId>org.jboss.osgi.framework</groupId> - <artifactId>jboss-osgi-framework</artifactId> + <artifactId>jboss-osgi-framework-core</artifactId> <version>${version}</version> </dependency> <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - <version>${version.jboss.vfs}</version> + <groupId>org.jboss.osgi.vfs</groupId> + <artifactId>jboss-osgi-vfs21</artifactId> + <version>${version.jboss.osgi.vfs}</version> </dependency> </dependencies>