[jboss-cvs] JBossAS SVN: r102660 - in projects/jboss-osgi/projects: runtime/framework/trunk/bundle and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Mar 20 02:12:16 EDT 2010
Author: thomas.diesler at jboss.com
Date: 2010-03-20 02:12:15 -0400 (Sat, 20 Mar 2010)
New Revision: 102660
Modified:
projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.core.tests/config.xml
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/scripts/assembly-all.xml
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/etc/osgitck/jboss-osgi-bootstrap.xml
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/OSGiBundleStateCreateDeployer.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/OSGiBundleStateInstallDeployer.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java
Log:
More work on TCK setup
Modified: projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.core.tests/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.core.tests/config.xml 2010-03-20 02:31:40 UTC (rev 102659)
+++ projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.core.tests/config.xml 2010-03-20 06:12:15 UTC (rev 102660)
@@ -46,7 +46,7 @@
# Build and Install the Framework
cd $FRAMEWORKDIR
-mvn -U -fae clean install
+mvn -U -fae -Pall clean install
# Setup the TCK
cd $TCKSETUPDIR
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-20 02:31:40 UTC (rev 102659)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-20 06:12:15 UTC (rev 102660)
@@ -205,21 +205,6 @@
</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>
@@ -280,4 +265,38 @@
</plugins>
</build>
+ <profiles>
+ <!--
+ Name: all
+ Desc: Build the aggregated framework jar
+ -->
+ <profile>
+ <id>all</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ <executions>
+ <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>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/scripts/assembly-all.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/scripts/assembly-all.xml 2010-03-20 02:31:40 UTC (rev 102659)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/scripts/assembly-all.xml 2010-03-20 06:12:15 UTC (rev 102660)
@@ -58,69 +58,12 @@
<include>*:jboss-osgi-deployers-vfs30:jar</include>
<include>*:jboss-osgi-framework-vfs30:jar</include>
<include>*:jboss-osgi-vfs30:jar</include>
+ <include>*:log4j:jar</include>
</includes>
<useStrictFiltering>true</useStrictFiltering>
<scope>test</scope>
<unpack>true</unpack>
</dependencySet>
-
- <!-- dependencySet>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>*:args4j:jar</include>
- <include>*:javax.inject:jar</include>
- <include>*:jaxb-api:jar</include>
- <include>*:jboss-classloader:jar</include>
- <include>*:jboss-classloading:jar</include>
- <include>*:jboss-classloading-spi:jar</include>
- <include>*:jboss-classloading-vfs:jar</include>
- <include>*:jboss-common-core:jar</include>
- <include>*:jboss-dependency:jar</include>
- <include>*:jboss-deployers-client:jar</include>
- <include>*:jboss-deployers-client-spi:jar</include>
- <include>*:jboss-deployers-core:jar</include>
- <include>*:jboss-deployers-core-spi:jar</include>
- <include>*:jboss-deployers-impl:jar</include>
- <include>*:jboss-deployers-spi:jar</include>
- <include>*:jboss-deployers-structure-spi:jar</include>
- <include>*:jboss-deployers-vfs:jar</include>
- <include>*:jboss-deployers-vfs-spi:jar</include>
- <include>*:jboss-kernel:jar</include>
- <include>*:jboss-logging-spi:jar</include>
- <include>*:jboss-managed:jar</include>
- <include>*:jboss-mdr:jar</include>
- <include>*:jboss-metatype:jar</include>
- <include>*:jboss-osgi-deployment:jar</include>
- <include>*:jboss-osgi-framework-core:jar</include>
- <include>*:jboss-osgi-framework-metadata:jar</include>
- <include>*:jboss-osgi-spi:jar</include>
- <include>*:jboss-osgi-vfs:jar</include>
- <include>*:jboss-reflect:jar</include>
- <include>*:jboss-vfs:jar</include>
- <include>*:jbossxb:jar</include>
- <include>*:mcann-core:jar</include>
- <include>*:org.osgi.core:jar</include>
- <include>*:org.osgi.compendium:jar</include>
- </includes>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>compile</scope>
- <unpack>false</unpack>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>*:jboss-logging-log4j:jar</include>
- <include>*:jboss-osgi-deployers-vfs30:jar</include>
- <include>*:jboss-osgi-framework-vfs30:jar</include>
- <include>*:jboss-osgi-vfs30:jar</include>
- </includes>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>test</scope>
- <unpack>false</unpack>
- </dependencySet-->
-
</dependencySets>
<fileSets>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/etc/osgitck/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/etc/osgitck/jboss-osgi-bootstrap.xml 2010-03-20 02:31:40 UTC (rev 102659)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/etc/osgitck/jboss-osgi-bootstrap.xml 2010-03-20 06:12:15 UTC (rev 102660)
@@ -19,25 +19,13 @@
<entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
<entry><key>org.osgi.framework.system.packages.extra</key><value>
+ <!-- tck -->
+ junit.framework;version=3.8.2,
+ org.osgi.util.tracker;version=1.4,
+
<!-- logging -->
org.apache.log4j;version=1.2,
org.jboss.logging;version=2.1,
-
- <!-- jboss -->
- org.jboss.beans.metadata.plugins;version=2.2,
- org.jboss.beans.metadata.plugins.builder;version=2.2,
- org.jboss.beans.metadata.spi;version=2.2,
- org.jboss.beans.metadata.spi.builder;version=2.2,
- org.jboss.dependency.spi;version=2.2,
- org.jboss.kernel.spi.dependency;version=2.2,
-
- <!-- jboss-osgi -->
- org.jboss.osgi.spi;version=1.0,
- org.jboss.osgi.spi.capability;version=1.0,
- org.jboss.osgi.spi.framework;version=1.0,
- org.jboss.osgi.spi.service;version=1.0,
- org.jboss.osgi.spi.util;version=1.0,
- org.jboss.osgi.testing;version=1.0
</value></entry>
</map>
</property>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2010-03-20 02:31:40 UTC (rev 102659)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2010-03-20 06:12:15 UTC (rev 102660)
@@ -860,15 +860,21 @@
validateBundle(bundleState);
allBundles.add(bundleState);
-
- bundleState.changeState(Bundle.INSTALLED, true);
+ try
+ {
+ bundleState.changeState(Bundle.INSTALLED, true);
- // Add the bundle to the resolver
- // Note, plugins are not registered when the system bundle is added
- ResolverPlugin bundleResolver = getOptionalPlugin(ResolverPlugin.class);
- if (bundleResolver != null)
- bundleResolver.addBundle(bundleState);
-
+ // Add the bundle to the resolver
+ // Note, plugins are not registered when the system bundle is added
+ ResolverPlugin bundleResolver = getOptionalPlugin(ResolverPlugin.class);
+ if (bundleResolver != null)
+ bundleResolver.addBundle(bundleState);
+ }
+ catch (RuntimeException rte)
+ {
+ allBundles.remove(bundleState);
+ throw rte;
+ }
log.debug("Added: " + bundleState);
}
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/OSGiBundleStateCreateDeployer.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/OSGiBundleStateCreateDeployer.java 2010-03-20 02:31:40 UTC (rev 102659)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/OSGiBundleStateCreateDeployer.java 2010-03-20 06:12:15 UTC (rev 102660)
@@ -30,7 +30,7 @@
import org.jboss.osgi.framework.metadata.OSGiMetaData;
/**
- * A deployer that creates the bundle state through the bundle manager.
+ * A deployer that creates the {@link AbstractBundleState} through the {@link OSGiBundleManager}.
*
* The bundle is not yet INSTALLED.
*
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/OSGiBundleStateInstallDeployer.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/OSGiBundleStateInstallDeployer.java 2010-03-20 02:31:40 UTC (rev 102659)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/OSGiBundleStateInstallDeployer.java 2010-03-20 06:12:15 UTC (rev 102660)
@@ -30,7 +30,7 @@
import org.jboss.osgi.framework.bundle.OSGiBundleManager;
/**
- * A deployer that adds the bundle state to the bundle manager.
+ * A deployer that adds the {@link AbstractBundleState} to the {@link OSGiBundleManager}.
*
* This causes the bundle to get INSTALLED.
*
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java 2010-03-20 02:31:40 UTC (rev 102659)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java 2010-03-20 06:12:15 UTC (rev 102660)
@@ -120,6 +120,7 @@
for (String name : allPackages)
{
+ log.debug(" " + name);
int semiIndex = name.indexOf(';');
if (semiIndex > 0)
name = name.substring(0, semiIndex);
More information about the jboss-cvs-commits
mailing list