[jboss-osgi-commits] JBoss-OSGI SVN: r97879 - in projects/jboss-osgi/projects: bundles/jboss-xml-binding/trunk and 6 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Wed Dec 16 06:22:20 EST 2009
Author: thomas.diesler at jboss.com
Date: 2009-12-16 06:22:19 -0500 (Wed, 16 Dec 2009)
New Revision: 97879
Modified:
projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/pom.xml
projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml
projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/AbstractMicrocontainerDeployerService.java
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/resources/jboss-osgi-framework.properties
projects/jboss-osgi/projects/runtime/deployers/trunk/pom.xml
projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleContainedBeansDeployer.java
projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml
Log:
Update to kernel & reflect 2.2.0-SNAPSHOT
Modified: projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/pom.xml 2009-12-16 11:09:44 UTC (rev 97878)
+++ projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/pom.xml 2009-12-16 11:22:19 UTC (rev 97879)
@@ -21,7 +21,7 @@
<artifactId>jboss-osgi-reflect</artifactId>
<packaging>bundle</packaging>
- <version>2.0.3-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -40,8 +40,7 @@
<!-- Properties -->
<properties>
<version.javassist>3.9.0.GA</version.javassist>
- <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
- <version.jboss.reflect>2.0.2.GA</version.jboss.reflect>
+ <version.jboss.reflect>2.2.0-SNAPSHOT</version.jboss.reflect>
</properties>
<!-- Dependencies -->
@@ -59,19 +58,7 @@
<groupId>org.jboss</groupId>
<artifactId>jboss-reflect</artifactId>
<version>${version.jboss.reflect}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common-core</artifactId>
- <version>${version.jboss.osgi.common.core}</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
@@ -104,7 +91,7 @@
org.jboss.classadapter.spi*;version=${version.jboss.reflect},
org.jboss.config*;version=${version.jboss.reflect},
org.jboss.joinpoint*;version=${version.jboss.reflect},
- org.jboss.reflect.plugins.introspection;version=${version.jboss.reflect},
+ org.jboss.reflect.plugins.*;version=${version.jboss.reflect},
org.jboss.reflect.spi*;version=${version.jboss.reflect},
</_exportcontents>
</instructions>
Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml 2009-12-16 11:09:44 UTC (rev 97878)
+++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml 2009-12-16 11:22:19 UTC (rev 97879)
@@ -21,7 +21,7 @@
<artifactId>jboss-osgi-xml-binding</artifactId>
<packaging>bundle</packaging>
- <version>2.0.3-SNAPSHOT</version>
+ <version>2.0.2-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -45,7 +45,7 @@
<version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
<version.jboss.osgi.husky>1.0.2</version.jboss.osgi.husky>
<version.jboss.osgi.jaxb>2.1.10.SP3</version.jboss.osgi.jaxb>
- <version.jboss.osgi.reflect>2.0.2</version.jboss.osgi.reflect>
+ <version.jboss.osgi.reflect>2.2.0-SNAPSHOT</version.jboss.osgi.reflect>
<version.jboss.osgi.spi>1.0.3</version.jboss.osgi.spi>
<version.osgi>4.2.0</version.osgi>
</properties>
@@ -172,12 +172,12 @@
org.osgi.util.tracker,
<!-- jboss-osgi-reflect -->
- org.jboss.beans.info.spi;version="[2.0,2.1)",
- org.jboss.config.plugins.property;version="[2.0,2.1)",
- org.jboss.config.spi;version="[2.0,2.1)",
- org.jboss.joinpoint.plugins;version="[2.0,2.1)",
- org.jboss.reflect.plugins.introspection;version="[2.0,2.1)",
- org.jboss.reflect.spi;version="[2.0,2.1)",
+ org.jboss.beans.info.spi;version="[2.2,2.3)",
+ org.jboss.config.plugins.property;version="[2.2,2.3)",
+ org.jboss.config.spi;version="[2.2,2.3)",
+ org.jboss.joinpoint.plugins;version="[2.2,2.3)",
+ org.jboss.reflect.plugins.introspection;version="[2.2,2.3)",
+ org.jboss.reflect.spi;version="[2.2,2.3)",
</Import-Package>
<Embed-Dependency>
jbossxb;inline=false,
Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-12-16 11:09:44 UTC (rev 97878)
+++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-12-16 11:22:19 UTC (rev 97879)
@@ -21,7 +21,7 @@
<artifactId>jboss-osgi-microcontainer</artifactId>
<packaging>bundle</packaging>
- <version>2.0.9-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -40,18 +40,18 @@
<!-- Properties -->
<properties>
<version.jboss.osgi.runtime.felix>2.0.2</version.jboss.osgi.runtime.felix>
- <version.jboss.deployers>2.0.9.GA</version.jboss.deployers>
- <version.jboss.microcontainer>2.0.9.GA</version.jboss.microcontainer>
+ <version.jboss.deployers>2.2.0-SNAPSHOT</version.jboss.deployers>
+ <version.jboss.kernel>2.2.0-SNAPSHOT</version.jboss.kernel>
<version.jboss.osgi.common>1.0.3</version.jboss.osgi.common>
<version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
<version.jboss.osgi.deployment>1.0.1-SNAPSHOT</version.jboss.osgi.deployment>
<version.jboss.osgi.husky>1.0.3-SNAPSHOT</version.jboss.osgi.husky>
<version.jboss.osgi.jaxb>2.1.10.SP3</version.jboss.osgi.jaxb>
<version.jboss.osgi.jmx>1.0.2</version.jboss.osgi.jmx>
- <version.jboss.osgi.reflect>2.0.2</version.jboss.osgi.reflect>
+ <version.jboss.osgi.reflect>2.2.0-SNAPSHOT</version.jboss.osgi.reflect>
<version.jboss.osgi.runtime.deployers>1.0.4-SNAPSHOT</version.jboss.osgi.runtime.deployers>
<version.jboss.osgi.spi>1.0.4-SNAPSHOT</version.jboss.osgi.spi>
- <version.jboss.osgi.xml.binding>2.0.2.Beta3</version.jboss.osgi.xml.binding>
+ <version.jboss.osgi.xml.binding>2.0.2-SNAPSHOT</version.jboss.osgi.xml.binding>
<version.osgi>4.2.0</version.osgi>
</properties>
@@ -69,9 +69,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>${version.jboss.microcontainer}</version>
+ <version>${version.jboss.kernel}</version>
<exclusions>
<exclusion>
<groupId>org.jboss</groupId>
@@ -182,7 +182,7 @@
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.jboss.osgi.microcontainer.internal.MicrocontainerServiceActivator</Bundle-Activator>
<Export-Package>
- org.jboss.osgi.microcontainer;version=2.0.9
+ org.jboss.osgi.microcontainer;version=${version}
</Export-Package>
<Private-Package>
org.jboss.osgi.microcontainer.internal
@@ -198,11 +198,11 @@
javax.xml.transform*,
javax.xml.validation,
- org.jboss.beans*;version="[2.0,2.1)",
- org.jboss.classadapter.spi;version="[2.0,2.1)",
- org.jboss.config*;version="[2.0,2.1)",
- org.jboss.joinpoint*;version="[2.0,2.1)",
- org.jboss.reflect*;version="[2.0,2.1)",
+ org.jboss.beans*;version="[2.2,2.3)",
+ org.jboss.classadapter.spi;version="[2.2,2.3)",
+ org.jboss.config*;version="[2.2,2.3)",
+ org.jboss.joinpoint*;version="[2.2,2.3)",
+ org.jboss.reflect*;version="[2.2,2.3)",
org.jboss.logging,
@@ -251,11 +251,12 @@
jboss-mdr;inline=false,
jboss-osgi-deployers;inline=false,
jboss-kernel;inline=false,
+ mcann-core;inline=false,
</Embed-Dependency>
<_exportcontents>
- org.jboss.beans.metadata*;version=2.0.9,
- org.jboss.dependency.spi*;version=2.0.9,
- org.jboss.kernel.spi*;version=2.0.9,
+ org.jboss.beans.metadata*;version=${version.jboss.kernel},
+ org.jboss.dependency.spi*;version=${version.jboss.kernel},
+ org.jboss.kernel.spi*;version=${version.jboss.kernel},
</_exportcontents>
</instructions>
</configuration>
Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/AbstractMicrocontainerDeployerService.java
===================================================================
--- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/AbstractMicrocontainerDeployerService.java 2009-12-16 11:09:44 UTC (rev 97878)
+++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/AbstractMicrocontainerDeployerService.java 2009-12-16 11:22:19 UTC (rev 97879)
@@ -100,17 +100,6 @@
}
}
- private DeployerService getSystemDeployerService() throws InvalidSyntaxException
- {
- BundleContext context = getBundleContext();
- ServiceReference[] srefs = context.getServiceReferences(DeployerService.class.getName(), "(provider=system)");
- if (srefs == null)
- throw new IllegalStateException("Cannot obtain system DeployerService");
-
- DeployerService service = (DeployerService)context.getService(srefs[0]);
- return service;
- }
-
public void deploy(Deployment[] depArr) throws BundleException
{
ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
@@ -187,6 +176,17 @@
}
}
+ private DeployerService getSystemDeployerService() throws InvalidSyntaxException
+ {
+ BundleContext context = getBundleContext();
+ ServiceReference[] srefs = context.getServiceReferences(DeployerService.class.getName(), "(provider=system)");
+ if (srefs == null)
+ throw new IllegalStateException("Cannot obtain system DeployerService");
+
+ DeployerService service = (DeployerService)context.getService(srefs[0]);
+ return service;
+ }
+
private VFSDeployment createVFSDeployment(VirtualFile root)
{
if (deploymentFactory == null)
Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/resources/jboss-osgi-framework.properties
===================================================================
--- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/resources/jboss-osgi-framework.properties 2009-12-16 11:09:44 UTC (rev 97878)
+++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/resources/jboss-osgi-framework.properties 2009-12-16 11:22:19 UTC (rev 97879)
@@ -30,6 +30,7 @@
org.jboss.virtual.plugins.registry;version=2.1, \
org.jboss.virtual.plugins.context.jar;version=2.1, \
org.jboss.virtual.plugins.vfs.helpers;version=2.1, \
+ org.jboss.virtual.plugins.vfs;version=2.1, \
org.jboss.virtual.protocol;version=2.1, \
org.osgi.framework;version=1.5, \
org.slf4j;version=1.5
Modified: projects/jboss-osgi/projects/runtime/deployers/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/deployers/trunk/pom.xml 2009-12-16 11:09:44 UTC (rev 97878)
+++ projects/jboss-osgi/projects/runtime/deployers/trunk/pom.xml 2009-12-16 11:22:19 UTC (rev 97879)
@@ -30,7 +30,7 @@
</parent>
<properties>
- <version.jboss.deployers>2.0.9.GA</version.jboss.deployers>
+ <version.jboss.deployers>2.2.0-SNAPSHOT</version.jboss.deployers>
<version.jboss.osgi.deployment>1.0.1-SNAPSHOT</version.jboss.osgi.deployment>
<version.jboss.osgi.spi>1.0.4-SNAPSHOT</version.jboss.osgi.spi>
<version.osgi>4.2.0</version.osgi>
Modified: projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleContainedBeansDeployer.java
===================================================================
--- projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleContainedBeansDeployer.java 2009-12-16 11:09:44 UTC (rev 97878)
+++ projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleContainedBeansDeployer.java 2009-12-16 11:22:19 UTC (rev 97879)
@@ -73,7 +73,7 @@
return KernelDeployment.class;
}
- protected List<BeanMetaData> getBeans(KernelDeployment deployment)
+ protected List<BeanMetaData> getComponents(KernelDeployment deployment)
{
return deployment.getBeans();
}
@@ -89,7 +89,7 @@
return BeanMetaData.class;
}
- protected List<BeanMetaData> getBeans(BeanMetaData deployment)
+ protected List<BeanMetaData> getComponents(BeanMetaData deployment)
{
return Collections.singletonList(deployment);
}
Modified: projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml 2009-12-16 11:09:44 UTC (rev 97878)
+++ projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml 2009-12-16 11:22:19 UTC (rev 97879)
@@ -54,10 +54,13 @@
<artifactId>jboss-osgi-spi</artifactId>
<version>${version.jboss.osgi.spi}</version>
</dependency>
+
+ <!-- Provided Dependencies -->
<dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-vfs</artifactId>
<version>${version.jboss.deployers}</version>
+ <scope>provided</scope>
</dependency>
<!-- OSGi Dependencies -->
More information about the jboss-osgi-commits
mailing list