JBoss-OSGI SVN: r102667 - in projects/jboss-osgi/projects: bundles/serviceloader/trunk and 3 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-20 13:08:08 -0400 (Sat, 20 Mar 2010)
New Revision: 102667
Modified:
projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
projects/jboss-osgi/projects/bundles/serviceloader/trunk/pom.xml
projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml
projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml
projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml
Log:
Upgrade deployment groupId
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2010-03-20 16:43:32 UTC (rev 102666)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2010-03-20 17:08:08 UTC (rev 102667)
@@ -67,7 +67,7 @@
<version>${version.jboss.osgi.jmx}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.deployment</groupId>
<artifactId>jboss-osgi-deployment</artifactId>
<version>${version.jboss.osgi.deployment}</version>
</dependency>
@@ -128,8 +128,8 @@
<!-- Test Dependencies -->
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-felix</artifactId>
+ <groupId>org.jboss.osgi.felix</groupId>
+ <artifactId>jboss-osgi-felix</artifactId>
<version>${version.jboss.osgi.felix}</version>
<scope>test</scope>
</dependency>
Modified: projects/jboss-osgi/projects/bundles/serviceloader/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/serviceloader/trunk/pom.xml 2010-03-20 16:43:32 UTC (rev 102666)
+++ projects/jboss-osgi/projects/bundles/serviceloader/trunk/pom.xml 2010-03-20 17:08:08 UTC (rev 102667)
@@ -47,7 +47,7 @@
<!-- Dependencies -->
<dependencies>
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.deployment</groupId>
<artifactId>jboss-osgi-deployment</artifactId>
<version>${version.jboss.osgi.deployment}</version>
</dependency>
Modified: projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml 2010-03-20 16:43:32 UTC (rev 102666)
+++ projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml 2010-03-20 17:08:08 UTC (rev 102667)
@@ -47,7 +47,7 @@
<!-- Dependencies -->
<dependencies>
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.deployment</groupId>
<artifactId>jboss-osgi-deployment</artifactId>
<version>${version.jboss.osgi.deployment}</version>
</dependency>
Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2010-03-20 16:43:32 UTC (rev 102666)
+++ projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2010-03-20 17:08:08 UTC (rev 102667)
@@ -52,7 +52,7 @@
<version>${version.jboss.osgi.spi}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.deployment</groupId>
<artifactId>jboss-osgi-deployment</artifactId>
<version>${version.jboss.osgi.deployment}</version>
</dependency>
Modified: projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2010-03-20 16:43:32 UTC (rev 102666)
+++ projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2010-03-20 17:08:08 UTC (rev 102667)
@@ -39,7 +39,7 @@
<properties>
<version.felix.framework>2.0.2</version.felix.framework>
<version.jboss.osgi.deployment>1.0.2-SNAPSHOT</version.jboss.osgi.deployment>
- <version.jboss.osgi.husky>1.0.3-SNAPSHOT</version.jboss.osgi.husky>
+ <version.jboss.osgi.husky>1.0.4-SNAPSHOT</version.jboss.osgi.husky>
<version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
<version.osgi>4.2.0</version.osgi>
</properties>
@@ -52,7 +52,7 @@
<version>${version.jboss.osgi.spi}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.deployment</groupId>
<artifactId>jboss-osgi-deployment</artifactId>
<version>${version.jboss.osgi.deployment}</version>
</dependency>
14 years, 3 months
JBoss-OSGI SVN: r102666 - in projects/jboss-osgi/projects: runtime and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-20 12:43:32 -0400 (Sat, 20 Mar 2010)
New Revision: 102666
Added:
projects/jboss-osgi/projects/deployment/
Removed:
projects/jboss-osgi/projects/runtime/deployment/
Log:
Align svn location with groupId
Copied: projects/jboss-osgi/projects/deployment (from rev 102665, projects/jboss-osgi/projects/runtime/deployment)
14 years, 3 months
JBoss-OSGI SVN: r102662 - projects/jboss-osgi/projects/runtime/deployment/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-20 03:11:52 -0400 (Sat, 20 Mar 2010)
New Revision: 102662
Modified:
projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml
Log:
Remove dependency on compendium
Modified: projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml 2010-03-20 07:10:59 UTC (rev 102661)
+++ projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml 2010-03-20 07:11:52 UTC (rev 102662)
@@ -62,12 +62,6 @@
<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>
<!-- Test Dependecies -->
<dependency>
14 years, 3 months
JBoss-OSGI SVN: r102661 - in projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment: internal and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-20 03:10:59 -0400 (Sat, 20 Mar 2010)
New Revision: 102661
Modified:
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/interceptor/AbstractLifecycleInterceptorService.java
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/SystemDeployerService.java
Log:
Remove dependency on compendium
Modified: projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/interceptor/AbstractLifecycleInterceptorService.java
===================================================================
--- projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/interceptor/AbstractLifecycleInterceptorService.java 2010-03-20 06:12:15 UTC (rev 102660)
+++ projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/interceptor/AbstractLifecycleInterceptorService.java 2010-03-20 07:10:59 UTC (rev 102661)
@@ -35,8 +35,11 @@
import org.jboss.osgi.spi.util.ConstantsHelper;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceEvent;
+import org.osgi.framework.ServiceListener;
import org.osgi.framework.ServiceReference;
-import org.osgi.util.tracker.ServiceTracker;
/**
* A basic service that manages bundle lifecycle interceptors.
@@ -44,50 +47,55 @@
* @author thomas.diesler(a)jboss.com
* @since 15-Oct-2009
*/
-public abstract class AbstractLifecycleInterceptorService implements LifecycleInterceptorService
+public abstract class AbstractLifecycleInterceptorService implements LifecycleInterceptorService, ServiceListener
{
// Provide logging
private static final Logger log = Logger.getLogger(AbstractLifecycleInterceptorService.class);
// The system bundle context
private BundleContext context;
-
+
// The interceptor chain
private List<LifecycleInterceptor> interceptorChain = new ArrayList<LifecycleInterceptor>();
-
+
protected AbstractLifecycleInterceptorService(BundleContext context)
{
if (context == null)
throw new IllegalStateException("Null context");
this.context = context;
-
- // Track the LifecycleInterceptor services
- ServiceTracker tracker = new ServiceTracker(context, LifecycleInterceptor.class.getName(), null)
+
+ String filter = "(" + Constants.OBJECTCLASS + "=" + LifecycleInterceptor.class.getName() + ")";
+ try
{
- @Override
- public Object addingService(ServiceReference reference)
- {
- LifecycleInterceptor interceptor = (LifecycleInterceptor)super.addingService(reference);
- addInterceptor(interceptor);
- return interceptor;
- }
+ context.addServiceListener(this, filter);
+ }
+ catch (InvalidSyntaxException ex)
+ {
+ // ignore
+ }
+ }
- @Override
- public void removedService(ServiceReference reference, Object service)
- {
- super.removedService(reference, service);
- LifecycleInterceptor interceptor = (LifecycleInterceptor)service;
- removeInterceptor(interceptor);
- }
- };
- tracker.open();
- }
-
public BundleContext getSystemContext()
{
return context;
}
+ @Override
+ public void serviceChanged(ServiceEvent event)
+ {
+ ServiceReference reference = event.getServiceReference();
+ LifecycleInterceptor interceptor = (LifecycleInterceptor)context.getService(reference);
+ switch (event.getType())
+ {
+ case ServiceEvent.REGISTERED:
+ addInterceptor(interceptor);
+ break;
+ case ServiceEvent.UNREGISTERING:
+ removeInterceptor(interceptor);
+ break;
+ }
+ }
+
/**
* Add a LifecycleInterceptor to the service.
*
@@ -100,20 +108,20 @@
{
if (interceptor == null)
throw new IllegalArgumentException("Null interceptor");
-
+
log.debug("Add interceptor: " + new InterceptorWrapper(interceptor));
-
+
synchronized (interceptorChain)
{
Set<LifecycleInterceptor> unsortedSet = new HashSet<LifecycleInterceptor>();
unsortedSet.addAll(interceptorChain);
unsortedSet.add(interceptor);
-
+
List<LifecycleInterceptor> sortedList = new ArrayList<LifecycleInterceptor>();
-
+
// Add interceptors with no inputs first
Iterator<LifecycleInterceptor> itUnsorted = unsortedSet.iterator();
- while(itUnsorted.hasNext())
+ while (itUnsorted.hasNext())
{
LifecycleInterceptor aux = itUnsorted.next();
if (aux.getInput() == null)
@@ -131,16 +139,16 @@
if (auxOutput != null)
providedOutputs.addAll(auxOutput);
}
-
+
// Add interceptors with sattisfied inputs
itUnsorted = unsortedSet.iterator();
- while(itUnsorted.hasNext())
+ while (itUnsorted.hasNext())
{
LifecycleInterceptor aux = itUnsorted.next();
Set<Class<?>> input = aux.getInput();
if (input == null)
throw new IllegalStateException("Interceptor with no inputs should have been added already");
-
+
if (providedOutputs.containsAll(input))
{
addWithRelativeOrder(sortedList, aux);
@@ -153,7 +161,7 @@
{
addWithRelativeOrder(sortedList, aux);
}
-
+
// Log the interceptor order
StringBuffer buffer = new StringBuffer();
for (LifecycleInterceptor aux : sortedList)
@@ -162,7 +170,7 @@
buffer.append("\n " + wrapper.toLongString());
}
log.debug("Resulting interceptor chain" + buffer.toString());
-
+
// Use the sorted result as the new interceptor chain
interceptorChain.clear();
interceptorChain.addAll(sortedList);
@@ -174,12 +182,12 @@
Set<Class<?>> providedOutputs = new HashSet<Class<?>>();
int relOrder = interceptor.getRelativeOrder();
Set<Class<?>> input = interceptor.getInput();
-
+
for (int i = 0; i < sortedList.size(); i++)
{
LifecycleInterceptor aux = sortedList.get(i);
int auxOrder = aux.getRelativeOrder();
-
+
// Add if all inputs are satisfied and the rel order is less or equal
boolean inputsProvided = (input == null || providedOutputs.containsAll(input));
if (inputsProvided && relOrder <= auxOrder)
@@ -193,11 +201,11 @@
if (auxOutput != null)
providedOutputs.addAll(auxOutput);
}
-
+
// If not added yet, add at end
sortedList.add(interceptor);
}
-
+
/**
* Remove an LifecycleInterceptor to the service.
*
@@ -207,9 +215,9 @@
{
if (interceptor == null)
throw new IllegalArgumentException("Null interceptor");
-
+
log.debug("Remove interceptor: " + new InterceptorWrapper(interceptor));
-
+
synchronized (interceptorChain)
{
interceptorChain.remove(interceptor);
@@ -238,16 +246,16 @@
// Nothing to do
if (interceptorChain.size() == 0)
return;
-
+
InvocationContext inv = getInvocationContext(bundle);
if (inv == null)
throw new IllegalStateException("Cannot get invocation context for: " + bundle);
-
+
// Call the interceptor chain
for (LifecycleInterceptor aux : interceptorChain)
{
Set<Class<?>> input = aux.getInput();
-
+
boolean doInvocation = true;
if (input != null)
{
@@ -261,7 +269,7 @@
}
}
}
-
+
if (doInvocation == true)
{
InterceptorWrapper wrapper = new InterceptorWrapper(aux);
Modified: projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/SystemDeployerService.java
===================================================================
--- projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/SystemDeployerService.java 2010-03-20 06:12:15 UTC (rev 102660)
+++ projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/SystemDeployerService.java 2010-03-20 07:10:59 UTC (rev 102661)
@@ -42,7 +42,6 @@
import org.osgi.framework.Version;
import org.osgi.service.packageadmin.PackageAdmin;
import org.osgi.service.startlevel.StartLevel;
-import org.osgi.util.tracker.ServiceTracker;
/**
* A {@link DeployerService} that installs/uninstalls the bundles directly on the OSGi framework.
@@ -56,7 +55,6 @@
private static final Logger log = Logger.getLogger(SystemDeployerService.class);
private BundleContext context;
- private ServiceTracker startLevelTracker;
public SystemDeployerService(BundleContext context)
{
@@ -188,11 +186,7 @@
private StartLevel getStartLevel()
{
- if (startLevelTracker == null)
- {
- startLevelTracker = new ServiceTracker(context, StartLevel.class.getName(), null);
- startLevelTracker.open();
- }
- return (StartLevel)startLevelTracker.getService();
+ ServiceReference sref = context.getServiceReference(StartLevel.class.getName());
+ return sref != null ? (StartLevel)context.getService(sref) : null;
}
}
\ No newline at end of file
14 years, 3 months
JBoss-OSGI SVN: r102660 - in projects/jboss-osgi/projects: runtime/framework/trunk/bundle and 5 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)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);
14 years, 3 months
JBoss-OSGI SVN: r102657 - in projects/jboss-osgi/projects/runtime/framework/trunk: bundle and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-19 21:23:26 -0400 (Fri, 19 Mar 2010)
New Revision: 102657
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/pom.xml
Log:
Promote the vfs dependency up to framework-vfs30
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-20 01:04:47 UTC (rev 102656)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-20 01:23:26 UTC (rev 102657)
@@ -42,10 +42,6 @@
<artifactId>jboss-osgi-framework-core</artifactId>
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- </dependency>
<!-- Test bundles dependencies -->
<dependency>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-20 01:04:47 UTC (rev 102656)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-20 01:23:26 UTC (rev 102657)
@@ -50,7 +50,6 @@
<version.jboss.deployers>2.2.0.Alpha4</version.jboss.deployers>
<version.jboss.kernel>2.2.0.Alpha9</version.jboss.kernel>
<version.jboss.logging>2.2.0.CR1</version.jboss.logging>
- <version.jboss.vfs>3.0.0.CR5</version.jboss.vfs>
<version.jboss.mdr>2.2.0.Alpha2</version.jboss.mdr>
<version.jboss.osgi.apache.xerces>2.9.1.SP3</version.jboss.osgi.apache.xerces>
<version.jboss.osgi.common>1.0.3</version.jboss.osgi.common>
@@ -127,11 +126,6 @@
<artifactId>jboss-mdr</artifactId>
<version>${version.jboss.mdr}</version>
</dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <version>${version.jboss.vfs}</version>
- </dependency>
<!-- JBoss OSGi Dependencies -->
<dependency>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/pom.xml 2010-03-20 01:04:47 UTC (rev 102656)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/pom.xml 2010-03-20 01:23:26 UTC (rev 102657)
@@ -27,6 +27,11 @@
<version>1.0.0.Alpha4-SNAPSHOT</version>
</parent>
+ <!-- Properties -->
+ <properties>
+ <version.jboss.vfs>3.0.0.CR5</version.jboss.vfs>
+ </properties>
+
<!-- Dependencies -->
<dependencies>
<dependency>
@@ -42,6 +47,11 @@
<groupId>org.jboss.osgi.vfs</groupId>
<artifactId>jboss-osgi-vfs30</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <version>${version.jboss.vfs}</version>
+ </dependency>
</dependencies>
<build>
14 years, 3 months
JBoss-OSGI SVN: r102656 - projects/jboss-osgi/projects/osgitck/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-19 21:04:47 -0400 (Fri, 19 Mar 2010)
New Revision: 102656
Modified:
projects/jboss-osgi/projects/osgitck/trunk/build.xml
projects/jboss-osgi/projects/osgitck/trunk/readme.txt
Log:
Fix the tck build (somewhat)
Modified: projects/jboss-osgi/projects/osgitck/trunk/build.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/build.xml 2010-03-20 01:03:36 UTC (rev 102655)
+++ projects/jboss-osgi/projects/osgitck/trunk/build.xml 2010-03-20 01:04:47 UTC (rev 102656)
@@ -52,7 +52,7 @@
<fail message="Cannot find: ${aQute.bnd.jar}" unless="aQute.bnd.available" />
<!-- Check if the jboss.osgi.framework jar is available -->
- <property name="jboss.osgi.framework.jar" value="${maven.local.repository}/org/jboss/osgi/runtime/jboss-osgi-framework/${framework.version}/jboss-osgi-framework-${framework.version}-all.jar" />
+ <property name="jboss.osgi.framework.jar" value="${maven.local.repository}/org/jboss/osgi/framework/jboss-osgi-framework/${framework.version}/jboss-osgi-framework-${framework.version}-all.jar" />
<available property="jboss.osgi.framework.available" file="${jboss.osgi.framework.jar}" />
<fail message="Cannot find: ${jboss.osgi.framework.jar}" unless="jboss.osgi.framework.available" />
@@ -91,6 +91,7 @@
<target name="update-framework" description="Update the JBoss OSGi Framework" depends="init">
<!-- Copy the OSGi Framework -->
<mkdir dir="${osgitck.dir}/licensed/repo/org.jboss.osgi.framework" />
+ <echo message="jboss.osgi.framework.jar=${jboss.osgi.framework.jar}"/>
<copy file="${jboss.osgi.framework.jar}" tofile="${osgitck.dir}/licensed/repo/org.jboss.osgi.framework/org.jboss.osgi.framework-1.0.0.jar"
overwrite="true" />
</target>
Modified: projects/jboss-osgi/projects/osgitck/trunk/readme.txt
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/readme.txt 2010-03-20 01:03:36 UTC (rev 102655)
+++ projects/jboss-osgi/projects/osgitck/trunk/readme.txt 2010-03-20 01:04:47 UTC (rev 102656)
@@ -14,13 +14,13 @@
Running the OSGi TCK against the RI (Equinox)
ant clean setup.ri
- ant run-tests
+ ant run-core-tests
ant test-reports
Running the OSGi TCK against the JBoss OSGi Framework
- ant clean setup.jboss
- ant run-tests
+ ant clean setup.vi
+ ant run-core-tests
ant test-reports
Setup the OSGi TCK Hudson instance
@@ -34,4 +34,4 @@
Running Tests with JPDA
-----------------------
-export ANT_OPTS="-Djpda=-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"
\ No newline at end of file
+export ANT_OPTS="-Djpda=-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"
14 years, 3 months
JBoss-OSGI SVN: r102655 - in projects/jboss-osgi: projects/runtime/framework/trunk/bundle and 12 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-19 21:03:36 -0400 (Fri, 19 Mar 2010)
New Revision: 102655
Added:
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/main/
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/main/resources/
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/main/resources/META-INF/
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/main/resources/META-INF/MANIFEST.MF
Modified:
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/bundle/src/test/java/org/jboss/test/osgi/launch/FrameworkLaunchTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml
projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
projects/jboss-osgi/trunk/distribution/pom.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Use explicit manifest.
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-20 01:00:12 UTC (rev 102654)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-20 01:03:36 UTC (rev 102655)
@@ -24,7 +24,7 @@
<name>JBossOSGi Framework - Bundle</name>
<groupId>org.jboss.osgi.framework</groupId>
<artifactId>jboss-osgi-framework</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<parent>
<groupId>org.jboss.osgi.framework</groupId>
@@ -42,6 +42,10 @@
<artifactId>jboss-osgi-framework-core</artifactId>
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ </dependency>
<!-- Test bundles dependencies -->
<dependency>
@@ -180,6 +184,12 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
@@ -236,32 +246,14 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-idea-plugin</artifactId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
- <downloadSources>true</downloadSources>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
</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-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>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xmx512m</argLine>
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 01:00:12 UTC (rev 102654)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/scripts/assembly-all.xml 2010-03-20 01:03:36 UTC (rev 102655)
@@ -36,8 +36,12 @@
<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>
@@ -52,12 +56,71 @@
<includes>
<include>*:jboss-logging-log4j:jar</include>
<include>*:jboss-osgi-deployers-vfs30:jar</include>
- <include>*:jboss-vfs:jar</include>
+ <include>*:jboss-osgi-framework-vfs30:jar</include>
+ <include>*:jboss-osgi-vfs30: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 01:00:12 UTC (rev 102654)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/etc/osgitck/jboss-osgi-bootstrap.xml 2010-03-20 01:03:36 UTC (rev 102655)
@@ -89,7 +89,7 @@
<bean name="StartLevelService" class="org.jboss.osgi.framework.service.internal.StartLevelImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
- <bean name="PackageAdminService" class="org.jboss.osgi.framework.service.internal.PackageAdminImpl">
+ <bean name="PackageAdminService" class="org.jboss.osgi.framework.packageadmin.PackageAdminImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
Added: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/main/resources/META-INF/MANIFEST.MF
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/main/resources/META-INF/MANIFEST.MF (rev 0)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/main/resources/META-INF/MANIFEST.MF 2010-03-20 01:03:36 UTC (rev 102655)
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-Name: JBossOSGi Framework
+Bundle-ManifestVersion: 2
+Bundle-License: http://repository.jboss.com/licenses/lgpl.txt
+Bundle-Description: JBossOSGi Native Framework
+Bundle-SymbolicName: org.jboss.osgi.framework
+Bundle-Version: ${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"
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/launch/FrameworkLaunchTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/launch/FrameworkLaunchTestCase.java 2010-03-20 01:00:12 UTC (rev 102654)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/launch/FrameworkLaunchTestCase.java 2010-03-20 01:03:36 UTC (rev 102655)
@@ -25,8 +25,17 @@
import static org.junit.Assert.assertEquals;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Map;
+
+import org.jboss.osgi.framework.launch.OSGiFrameworkFactory;
import org.jboss.osgi.spi.util.ConstantsHelper;
import org.jboss.osgi.spi.util.ServiceLoader;
+import org.junit.Ignore;
import org.junit.Test;
import org.osgi.framework.BundleException;
import org.osgi.framework.launch.Framework;
@@ -38,28 +47,58 @@
* @author thomas.diesler(a)jboss.com
* @since 27-Jul-2009
*/
-public class FrameworkLaunchTestCase
+public class FrameworkLaunchTestCase
{
@Test
public void testFrameworkLaunch() throws BundleException
{
FrameworkFactory factory = ServiceLoader.loadService(FrameworkFactory.class);
Framework framework = factory.newFramework(null);
-
+
assertEquals("BundleId == 0", 0, framework.getBundleId());
assertEquals("SymbolicName", "system.bundle", framework.getSymbolicName());
-
+
String state = ConstantsHelper.bundleState(framework.getState());
assertEquals("INSTALLED", state);
-
+
framework.init();
-
+
state = ConstantsHelper.bundleState(framework.getState());
assertEquals("STARTING", state);
-
+
framework.start();
-
+
state = ConstantsHelper.bundleState(framework.getState());
assertEquals("ACTIVE", state);
}
+
+ @Ignore
+ public void testFrameworkAllLaunch() throws Exception
+ {
+ // Get the aggregated framework jar
+ File[] files = new File("./target").listFiles(new FilenameFilter()
+ {
+ public boolean accept(File dir, String name)
+ {
+ return name.startsWith("jboss-osgi-framework-") && name.endsWith("-all.jar");
+ }
+ });
+ assertEquals(1, files.length);
+
+ // Use a classloader that only contains the aggregated framework jar
+ URL frameworkAllURL = files[0].toURI().toURL();
+ URLClassLoader loader = new URLClassLoader(new URL[] { frameworkAllURL }, null);
+
+ // Load the FrameworkFactory
+ Class<?> factoryClass = loader.loadClass(OSGiFrameworkFactory.class.getName());
+ Object frameworkFactory = factoryClass.newInstance();
+
+ // Construct the Framework
+ Method method = factoryClass.getMethod("newFramework", Map.class);
+ Object framework = method.invoke(frameworkFactory, new Object[] { null });
+
+ // Start the Framework
+ method = framework.getClass().getMethod("start", new Class[] {});
+ method.invoke(framework, new Object[] {});
+ }
}
\ No newline at end of file
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml 2010-03-20 01:00:12 UTC (rev 102654)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml 2010-03-20 01:03:36 UTC (rev 102655)
@@ -59,11 +59,6 @@
<parameter><inject bean="OSGiDeploymentRegistry" /></parameter>
</constructor>
</bean>
- <!--
- <bean name="OSGiBundleResolver" class="org.jboss.osgi.framework.resolver.internal.basic.BasicResolverImpl">
- <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
- </bean>
- -->
<bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
@@ -97,9 +92,6 @@
<bean name="PackageAdminService" class="org.jboss.osgi.framework.packageadmin.PackageAdminImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
- <bean name="DeployerService" class="org.jboss.osgi.framework.service.internal.DeployerServiceImpl">
- <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
- </bean>
<bean name="LifecycleInterceptorService" class="org.jboss.osgi.framework.service.internal.LifecycleInterceptorServiceImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml 2010-03-20 01:00:12 UTC (rev 102654)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml 2010-03-20 01:03:36 UTC (rev 102655)
@@ -48,7 +48,7 @@
<artifactId>jboss-osgi-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.deployment</groupId>
<artifactId>jboss-osgi-deployment</artifactId>
</dependency>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-20 01:00:12 UTC (rev 102654)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-20 01:03:36 UTC (rev 102655)
@@ -50,6 +50,7 @@
<version.jboss.deployers>2.2.0.Alpha4</version.jboss.deployers>
<version.jboss.kernel>2.2.0.Alpha9</version.jboss.kernel>
<version.jboss.logging>2.2.0.CR1</version.jboss.logging>
+ <version.jboss.vfs>3.0.0.CR5</version.jboss.vfs>
<version.jboss.mdr>2.2.0.Alpha2</version.jboss.mdr>
<version.jboss.osgi.apache.xerces>2.9.1.SP3</version.jboss.osgi.apache.xerces>
<version.jboss.osgi.common>1.0.3</version.jboss.osgi.common>
@@ -126,6 +127,11 @@
<artifactId>jboss-mdr</artifactId>
<version>${version.jboss.mdr}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <version>${version.jboss.vfs}</version>
+ </dependency>
<!-- JBoss OSGi Dependencies -->
<dependency>
@@ -144,7 +150,7 @@
<version>${version.jboss.osgi.deployers}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.deployment</groupId>
<artifactId>jboss-osgi-deployment</artifactId>
<version>${version.jboss.osgi.deployment}</version>
</dependency>
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2010-03-20 01:00:12 UTC (rev 102654)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2010-03-20 01:03:36 UTC (rev 102655)
@@ -370,30 +370,28 @@
<version>${version.jboss.osgi.xml.binding}</version>
<classifier>javadoc</classifier>
</dependency>
-
- <!-- jboss.osgi.runtime -->
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.deployment</groupId>
<artifactId>jboss-osgi-deployment</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.deployment</groupId>
<artifactId>jboss-osgi-deployment</artifactId>
<version>${version.jboss.osgi.deployment}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.deployment</groupId>
<artifactId>jboss-osgi-deployment</artifactId>
<version>${version.jboss.osgi.deployment}</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.jbossas</groupId>
<artifactId>jboss-osgi-jbossas</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.jbossas</groupId>
<artifactId>jboss-osgi-jbossas</artifactId>
<version>${version.jboss.osgi.jbossas}</version>
<classifier>sources</classifier>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2010-03-20 01:00:12 UTC (rev 102654)
+++ projects/jboss-osgi/trunk/pom.xml 2010-03-20 01:03:36 UTC (rev 102655)
@@ -221,15 +221,13 @@
<artifactId>jboss-osgi-xml-binding</artifactId>
<version>${version.jboss.osgi.xml.binding}</version>
</dependency>
-
- <!-- jboss.osgi.runtime -->
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.deployment</groupId>
<artifactId>jboss-osgi-deployment</artifactId>
<version>${version.jboss.osgi.deployment}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.jbossas</groupId>
<artifactId>jboss-osgi-jbossas</artifactId>
<version>${version.jboss.osgi.jbossas}</version>
</dependency>
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-20 01:00:12 UTC (rev 102654)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-20 01:03:36 UTC (rev 102655)
@@ -49,7 +49,7 @@
<artifactId>jboss-osgi-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.deployment</groupId>
<artifactId>jboss-osgi-deployment</artifactId>
</dependency>
14 years, 3 months
JBoss-OSGI SVN: r102654 - in projects/jboss-osgi/projects/runtime: jbossas/trunk and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-19 21:00:12 -0400 (Fri, 19 Mar 2010)
New Revision: 102654
Modified:
projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml
projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml
Log:
Use dedicated groupId
Modified: projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml 2010-03-20 00:39:01 UTC (rev 102653)
+++ projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml 2010-03-20 01:00:12 UTC (rev 102654)
@@ -16,7 +16,7 @@
<name>JBossOSGi Reactor - Deployment</name>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.deployment</groupId>
<artifactId>jboss-osgi-deployment</artifactId>
<packaging>jar</packaging>
Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml 2010-03-20 00:39:01 UTC (rev 102653)
+++ projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml 2010-03-20 01:00:12 UTC (rev 102654)
@@ -16,7 +16,7 @@
<name>JBossOSGi Runtime - JBossAS</name>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.jbossas</groupId>
<artifactId>jboss-osgi-jbossas</artifactId>
<packaging>jar</packaging>
14 years, 3 months