2:09 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2009-05-20 03:09:00 -0400 (Wed, 20 May 2009)
New Revision: 89165
Added:
projects/jboss-osgi/projects/husky/trunk/src/
Removed:
projects/jboss-osgi/projects/husky/trunk/harness/
projects/jboss-osgi/projects/husky/trunk/testsuite/
projects/jboss-osgi/projects/parent/
Modified:
projects/jboss-osgi/projects/husky/trunk/pom.xml
projects/jboss-osgi/projects/pom.xml
projects/jboss-osgi/projects/repository/trunk/api/pom.xml
projects/jboss-osgi/projects/repository/trunk/pom.xml
Log:
restructure svn - WIP
Modified: projects/jboss-osgi/projects/husky/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/husky/trunk/pom.xml 2009-05-20 07:07:48 UTC (rev 89164)
+++ projects/jboss-osgi/projects/husky/trunk/pom.xml 2009-05-20 07:09:00 UTC (rev 89165)
@@ -15,12 +15,12 @@
<modelVersion>4.0.0</modelVersion>
- <name>JBossOSGi - Husky</name>
+ <name>JBossOSGi Project - Husky Test Harness</name>
<description>JBoss OSGi Bundle Testsuite</description>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-husky</artifactId>
- <packaging>pom</packaging>
+ <packaging>bundle</packaging>
<version>1.0.0-SNAPSHOT</version>
@@ -31,126 +31,82 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
- <!-- Modules -->
- <modules>
- <module>harness</module>
- <module>testsuite</module>
- </modules>
-
<!-- Properties -->
<properties>
+ <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common>
+ <version.osgi>r4v41</version.osgi>
</properties>
- <!-- DependencyManagement -->
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <version>${version.jboss.osgi}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jmx</artifactId>
- <version>${version.jboss.osgi}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-logging</artifactId>
- <version>${version.jboss.osgi}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-felix</artifactId>
- <version>${version.jboss.osgi}</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+
+ <!-- Bundles -->
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common</artifactId>
+ <version>${version.jboss.osgi.common}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Provided Dependencies -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${version.osgi}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
- <!-- Build -->
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <instructions>
+ <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+
<Bundle-Activator>org.jboss.osgi.husky.runtime.osgi.Activator</Bundle-Activator>
+ <Private-Package>
+ org.jboss.osgi.husky.internal,
+ org.jboss.osgi.husky.runtime*,
+ </Private-Package>
+ <Export-Package>
+ org.jboss.osgi.husky;version=${version},
+ org.jboss.osgi.husky.annotation;version=${version}
+ </Export-Package>
+ <Embed-Transitive>true</Embed-Transitive>
+ <Embed-Dependency>
+ junit;inline=false,
+ </Embed-Dependency>
+
<_exportcontents>org.junit;version=${version.junit}</_exportcontents>
+ </instructions>
</configuration>
</plugin>
- </plugins>
-
- <!-- PluginManagement -->
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <dependencies>
- <dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>bnd</artifactId>
- <version>${version.aqute.bnd}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <!-- SCM -->
- <scm>
- <connection>scm:svn:http://jbpm.dyndns.org/repos/playground/bunit
- </connection>
-
<developerConnection>scm:svn:http://jbpm.dyndns.org/repos/playground/bu...
- </scm>
-
- <!-- Licenses -->
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt
- </url>
- </license>
- </licenses>
-
- <!-- DistributionManagement -->
- <distributionManagement>
- <!--
- Add this to your ~/.m2/settings.xml <servers> <server>
<id>jbpm.dyndns.org</id> <username>yourname</username>
<privateKey>/home/yourname/.ssh/id_rsa</privateKey>
- <passphrase>yourpass</passphrase> </server> </servers>
- -->
- <site>
- <id>jbpm.dyndns.org</id>
- <url>scp://jbpm.dyndns.org/var/www/html/husky
- </url>
- </site>
- </distributionManagement>
-
- <!-- Reporting -->
- <reporting>
- <plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
- <show>public</show>
-
<excludePackageNames>*.internal:*.incubator:*.test</excludePackageNames>
+ <quiet>true</quiet>
+ <excludePackageNames>*.internal</excludePackageNames>
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
</plugins>
- </reporting>
+ </build>
</project>
Copied: projects/jboss-osgi/projects/husky/trunk/src (from rev 89162,
projects/jboss-osgi/projects/husky/trunk/harness/src)
Modified: projects/jboss-osgi/projects/pom.xml
===================================================================
--- projects/jboss-osgi/projects/pom.xml 2009-05-20 07:07:48 UTC (rev 89164)
+++ projects/jboss-osgi/projects/pom.xml 2009-05-20 07:09:00 UTC (rev 89165)
@@ -21,7 +21,9 @@
<!-- Modules -->
<modules>
<module>spi/trunk</module>
+ <module>husky/trunk</module>
<module>deployers/trunk</module>
+ <module>repository/trunk</module>
<module>bundles</module>
<module>runtime</module>
</modules>
Modified: projects/jboss-osgi/projects/repository/trunk/api/pom.xml
===================================================================
--- projects/jboss-osgi/projects/repository/trunk/api/pom.xml 2009-05-20 07:07:48 UTC (rev
89164)
+++ projects/jboss-osgi/projects/repository/trunk/api/pom.xml 2009-05-20 07:09:00 UTC (rev
89165)
@@ -1,21 +1,27 @@
<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 - Repository API</name>
+ <name>JBossOSGi Project - Repository API</name>
<artifactId>jboss-osgi-repository-api</artifactId>
<packaging>jar</packaging>
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-repository</artifactId>
- <version>1.0.0.Beta2</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
- <!-- Do not add version information here, use ../pom.xml instead -->
+ <!-- Properties -->
+ <properties>
+ <version.osgi>r4v41</version.osgi>
+ </properties>
+
+ <!-- Dependencies -->
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>${version.osgi}</version>
</dependency>
</dependencies>
</project>
Modified: projects/jboss-osgi/projects/repository/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/repository/trunk/pom.xml 2009-05-20 07:07:48 UTC (rev
89164)
+++ projects/jboss-osgi/projects/repository/trunk/pom.xml 2009-05-20 07:09:00 UTC (rev
89165)
@@ -1,14 +1,16 @@
<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 - Repository</name>
+ <name>JBossOSGi Project - Repository</name>
<artifactId>jboss-osgi-repository</artifactId>
<packaging>pom</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta2</version>
+ <artifactId>jboss-osgi-projects</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<modules>