JBoss-OSGI SVN: r93066 - projects/jboss-osgi/projects/parent/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-09-01 06:19:24 -0400 (Tue, 01 Sep 2009)
New Revision: 93066
Modified:
projects/jboss-osgi/projects/parent/trunk/pom.xml
Log:
Remove mc framework properties
Modified: projects/jboss-osgi/projects/parent/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-09-01 09:55:55 UTC (rev 93065)
+++ projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-09-01 10:19:24 UTC (rev 93066)
@@ -264,31 +264,26 @@
</profile>
<!--
- Name: framework-default
- Descr: Setup for default framework integration testing
+ Name: framework-felix
+ Descr: Setup for Felix framework integration testing
-->
<profile>
- <id>framework-default</id>
+ <id>framework-felix</id>
<activation>
<property>
- <name>!framework</name>
+ <name>framework</name>
+ <value>felix</value>
</property>
</activation>
<properties>
<jboss.osgi.framework.properties>jboss-osgi-felix.properties</jboss.osgi.framework.properties>
</properties>
</profile>
-
- <!--
- Name: framework-felix
- Descr: Setup for Felix framework integration testing
- -->
<profile>
- <id>framework-felix</id>
+ <id>framework-default</id>
<activation>
<property>
- <name>framework</name>
- <value>felix</value>
+ <name>!framework</name>
</property>
</activation>
<properties>
@@ -312,23 +307,6 @@
<jboss.osgi.framework.properties>jboss-osgi-equinox.properties</jboss.osgi.framework.properties>
</properties>
</profile>
-
- <!--
- Name: framework-jbossmc
- Descr: Setup for JBossMC framework integration testing
- -->
- <profile>
- <id>framework-jbossmc</id>
- <activation>
- <property>
- <name>framework</name>
- <value>jbossmc</value>
- </property>
- </activation>
- <properties>
- <jboss.osgi.framework.properties>jboss-osgi-jbossmc.properties</jboss.osgi.framework.properties>
- </properties>
- </profile>
<!--
Name: embedded-testing
16 years, 3 months
JBoss-OSGI SVN: r93065 - projects/jboss-osgi/trunk/testsuite/example.
by jboss-osgi-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-09-01 05:55:55 -0400 (Tue, 01 Sep 2009)
New Revision: 93065
Modified:
projects/jboss-osgi/trunk/testsuite/example/pom.xml
Log:
Give surefire 512m head for mc framework
Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-09-01 08:01:24 UTC (rev 93064)
+++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-09-01 09:55:55 UTC (rev 93065)
@@ -221,6 +221,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <argLine>-Xmx512m</argLine>
<excludes>
<exclude>${target.container.excludes}</exclude>
</excludes>
16 years, 3 months
JBoss-OSGI SVN: r93063 - projects/jboss-osgi/trunk/testsuite/functional.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-09-01 03:48:43 -0400 (Tue, 01 Sep 2009)
New Revision: 93063
Modified:
projects/jboss-osgi/trunk/testsuite/functional/pom.xml
Log:
Explicitly exclude functional tests
Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-09-01 07:23:54 UTC (rev 93062)
+++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-09-01 07:48:43 UTC (rev 93063)
@@ -127,7 +127,17 @@
<configuration>
<excludes>
<exclude>${target.container.excludes}</exclude>
- <exclude>org/jboss/test/osgi/**</exclude>
+ <exclude>org/jboss/test/osgi/capabilities/**</exclude>
+ <exclude>org/jboss/test/osgi/jbosgi37/**</exclude>
+ <exclude>org/jboss/test/osgi/jbosgi38/**</exclude>
+ <exclude>org/jboss/test/osgi/jbosgi39/**</exclude>
+ <exclude>org/jboss/test/osgi/jbosgi41/**</exclude>
+ <exclude>org/jboss/test/osgi/jbosgi99/**</exclude>
+ <exclude>org/jboss/test/osgi/jbosgi108/**</exclude>
+ <exclude>org/jboss/test/osgi/jbosgi112/**</exclude>
+ <exclude>org/jboss/test/osgi/jbosgi143/**</exclude>
+ <exclude>org/jboss/test/osgi/service/microcontainer/**</exclude>
+ <exclude>org/jboss/test/osgi/service/startlevel/**</exclude>
</excludes>
</configuration>
</plugin>
16 years, 3 months
JBoss-OSGI SVN: r93062 - in projects/jboss-osgi/projects/runtime/jbossas/trunk: src/main/java/org/jboss/osgi/microcontainer/integration and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-09-01 03:23:54 -0400 (Tue, 01 Sep 2009)
New Revision: 93062
Modified:
projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java
Log:
Migrate to SPI provided MC service
Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml 2009-09-01 07:07:49 UTC (rev 93061)
+++ projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml 2009-09-01 07:23:54 UTC (rev 93062)
@@ -26,12 +26,12 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.1</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<properties>
- <version.jboss.osgi.microcontainer>1.0.0</version.jboss.osgi.microcontainer>
- <version.osgi>r4v41</version.osgi>
+ <version.jboss.osgi.microcontainer>1.0.1-SNAPSHOT</version.jboss.osgi.microcontainer>
+ <version.osgi>r4v42-20090728</version.osgi>
</properties>
<!-- Dependencies -->
@@ -101,7 +101,6 @@
org/jboss/osgi/jbossxb/*.class,
org/jboss/osgi/jmx/*.class,
org/jboss/osgi/jndi/*.class,
- org/jboss/osgi/microcontainer/*.class,
org/jboss/osgi/microcontainer/integration/*.class,
org/jboss/osgi/xml/*.class
</includes>
Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java
===================================================================
--- projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java 2009-09-01 07:07:49 UTC (rev 93061)
+++ projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java 2009-09-01 07:23:54 UTC (rev 93062)
@@ -34,9 +34,9 @@
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.logging.Logger;
import org.jboss.osgi.jbossxb.XMLBindingService;
-import org.jboss.osgi.microcontainer.MicrocontainerService;
import org.jboss.osgi.spi.management.MicrocontainerServiceMBean;
import org.jboss.osgi.spi.service.DeployerService;
+import org.jboss.osgi.spi.service.MicrocontainerService;
import org.osgi.framework.BundleContext;
/**
16 years, 3 months
JBoss-OSGI SVN: r93061 - projects/jboss-osgi/trunk/distribution.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-09-01 03:07:49 -0400 (Tue, 01 Sep 2009)
New Revision: 93061
Modified:
projects/jboss-osgi/trunk/distribution/pom.xml
Log:
Fix dependency on jboss-osgi-runtime-microcontainer
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2009-09-01 06:47:12 UTC (rev 93060)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2009-09-01 07:07:49 UTC (rev 93061)
@@ -365,12 +365,12 @@
<!-- JBossMC Dependencies -->
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-jbossmc</artifactId>
+ <artifactId>jboss-osgi-runtime-microcontainer</artifactId>
<version>${version.jboss.osgi.runtime.jbossmc}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-jbossmc</artifactId>
+ <artifactId>jboss-osgi-runtime-microcontainer</artifactId>
<version>${version.jboss.osgi.runtime.jbossmc}</version>
<classifier>sources</classifier>
</dependency>
16 years, 3 months
JBoss-OSGI SVN: r93060 - projects/jboss-osgi/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-09-01 02:47:12 -0400 (Tue, 01 Sep 2009)
New Revision: 93060
Modified:
projects/jboss-osgi/trunk/pom.xml
Log:
Update jboss-osgi-jaxb
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-09-01 06:46:07 UTC (rev 93059)
+++ projects/jboss-osgi/trunk/pom.xml 2009-09-01 06:47:12 UTC (rev 93060)
@@ -48,7 +48,7 @@
<version.jboss.osgi.common.core>2.2.13-SNAPSHOT</version.jboss.osgi.common.core>
<version.jboss.osgi.hotdeploy>1.0.0</version.jboss.osgi.hotdeploy>
<version.jboss.osgi.husky>1.0.0</version.jboss.osgi.husky>
- <version.jboss.osgi.jaxb>2.1.10.SP1</version.jboss.osgi.jaxb>
+ <version.jboss.osgi.jaxb>2.1.10-SNAPSHOT</version.jboss.osgi.jaxb>
<version.jboss.osgi.jmx>1.0.1-SNAPSHOT</version.jboss.osgi.jmx>
<version.jboss.osgi.jndi>1.0.1-SNAPSHOT</version.jboss.osgi.jndi>
<version.jboss.osgi.microcontainer>1.0.1-SNAPSHOT</version.jboss.osgi.microcontainer>
16 years, 3 months
JBoss-OSGI SVN: r93059 - in projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing: internal and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-09-01 02:46:07 -0400 (Tue, 01 Sep 2009)
New Revision: 93059
Modified:
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiBundle.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedBundle.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteBundle.java
Log:
Use Bundle.getVersion(). Better error handling on getBundle() after install.
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiBundle.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiBundle.java 2009-09-01 06:21:54 UTC (rev 93058)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiBundle.java 2009-09-01 06:46:07 UTC (rev 93059)
@@ -25,6 +25,7 @@
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
+import org.osgi.framework.Version;
/**
* An abstraction of an OSGi {@link Bundle}.
@@ -45,9 +46,9 @@
public abstract String getSymbolicName();
/**
- * Returns the version of this bundle as specified by its Bundle-Version manifest header.
+ * Returns the version of this bundle.
*/
- public abstract String getVersion();
+ public abstract Version getVersion();
/**
* Returns this bundle's Manifest headers and values.
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedBundle.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedBundle.java 2009-09-01 06:21:54 UTC (rev 93058)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedBundle.java 2009-09-01 06:46:07 UTC (rev 93059)
@@ -27,7 +27,7 @@
import org.jboss.osgi.spi.testing.OSGiBundle;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
-import org.osgi.framework.Constants;
+import org.osgi.framework.Version;
/**
* An OSGi Test Case
@@ -64,9 +64,9 @@
}
@Override
- public String getVersion()
+ public Version getVersion()
{
- return getHeaders().get(Constants.BUNDLE_VERSION);
+ return bundle.getVersion();
}
@Override
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java 2009-09-01 06:21:54 UTC (rev 93058)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java 2009-09-01 06:46:07 UTC (rev 93059)
@@ -77,7 +77,7 @@
{
DeployerService service = (DeployerService)context.getService(sref);
service.deploy(bundleURL);
- bundle = getBundle(symbolicName, version);
+ bundle = getBundle(symbolicName, version, true);
}
else
{
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java 2009-09-01 06:21:54 UTC (rev 93058)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java 2009-09-01 06:46:07 UTC (rev 93059)
@@ -25,6 +25,7 @@
import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
@@ -49,6 +50,7 @@
import org.osgi.framework.BundleException;
import org.osgi.framework.Constants;
import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.Version;
/**
* An abstract implementation of the {@link OSGiRuntime}
@@ -184,21 +186,33 @@
public OSGiBundle getBundle(String symbolicName, String version)
{
+ OSGiBundle bundle = getBundle(symbolicName, version, false);
+ return bundle;
+ }
+
+ protected OSGiBundle getBundle(String symbolicName, String versionStr, boolean mustExist)
+ {
OSGiBundle bundle = null;
- for (OSGiBundle aux : getBundles())
+ Version version = Version.parseVersion(versionStr);
+ List<OSGiBundle> bundles = Arrays.asList(getBundles());
+ for (OSGiBundle aux : bundles)
{
if (aux.getSymbolicName().equals(symbolicName))
{
- if (version == null || version.equals(aux.getVersion()))
+ if (versionStr == null || version.equals(aux.getVersion()))
{
bundle = aux;
break;
}
}
}
+
+ if (bundle == null && mustExist == true)
+ throw new IllegalStateException("Cannot obtain bundle: " + symbolicName + "-" + version + ". We have " + bundles);
+
return bundle;
}
-
+
protected String getManifestEntry(String location, String key)
{
Manifest manifest = getManifest(location);
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteBundle.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteBundle.java 2009-09-01 06:21:54 UTC (rev 93058)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteBundle.java 2009-09-01 06:46:07 UTC (rev 93059)
@@ -29,6 +29,7 @@
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
import org.osgi.framework.Constants;
+import org.osgi.framework.Version;
/**
* An implementation of a remote {@link OSGiBundle}
@@ -48,7 +49,7 @@
private long bundleId;
private String symbolicName;
- private String version;
+ private Version version;
public RemoteBundle(OSGiRuntimeImpl runtime, ManagedBundleMBean bundle, String location)
{
@@ -58,7 +59,9 @@
this.bundleId = bundle.getBundleId();
this.symbolicName = bundle.getSymbolicName();
- this.version = getHeaders().get(Constants.BUNDLE_VERSION);
+
+ String versionStr = getHeaders().get(Constants.BUNDLE_VERSION);
+ this.version = Version.parseVersion(versionStr);
}
@Override
@@ -80,7 +83,7 @@
}
@Override
- public String getVersion()
+ public Version getVersion()
{
return version;
}
16 years, 3 months
JBoss-OSGI SVN: r93058 - projects/jboss-osgi/trunk/testsuite/functional.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-09-01 02:21:54 -0400 (Tue, 01 Sep 2009)
New Revision: 93058
Modified:
projects/jboss-osgi/trunk/testsuite/functional/pom.xml
Log:
Revert default framework back to felix
Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-09-01 04:34:03 UTC (rev 93057)
+++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-09-01 06:21:54 UTC (rev 93058)
@@ -161,17 +161,11 @@
</plugins>
</build>
</profile>
-
- <!--
- Name: framework-jbossmc
- Descr: Setup for JBossMC framework integration testing
- -->
<profile>
- <id>framework-jbossmc</id>
+ <id>framework-default</id>
<activation>
<property>
- <name>framework</name>
- <value>jbossmc</value>
+ <name>!framework</name>
</property>
</activation>
<build>
@@ -181,24 +175,24 @@
<configuration>
<excludes>
<exclude>${target.container.excludes}</exclude>
- <exclude>org/jboss/test/osgi/jbosgi38/**</exclude>
- <exclude>org/jboss/test/osgi/jbosgi39/**</exclude>
- <exclude>org/jboss/test/osgi/jbosgi41/**</exclude>
- <exclude>org/jboss/test/osgi/jbosgi108/**</exclude>
- <exclude>org/jboss/test/osgi/jbosgi143/**</exclude>
- <exclude>org/jboss/test/osgi/service/microcontainer/**</exclude>
- <exclude>org/jboss/test/osgi/service/startlevel/**</exclude>
+ <exclude>org/jboss/test/osgi/jbosgi142/**</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
+
+ <!--
+ Name: framework-jbossmc
+ Descr: Setup for JBossMC framework integration testing
+ -->
<profile>
- <id>framework-default</id>
+ <id>framework-jbossmc</id>
<activation>
<property>
- <name>!framework</name>
+ <name>framework</name>
+ <value>jbossmc</value>
</property>
</activation>
<build>
16 years, 3 months