[jboss-cvs] JBossAS SVN: r97111 - in projects/jboss-osgi: projects/bundles/jboss-reflect/trunk/src/main/java/org/jboss/osgi and 11 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 27 10:12:59 EST 2009
Author: thomas.diesler at jboss.com
Date: 2009-11-27 10:12:58 -0500 (Fri, 27 Nov 2009)
New Revision: 97111
Removed:
projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/src/main/java/org/jboss/osgi/jbossxb/
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/jboss-xml-binding/trunk/scripts/assembly-bundles.xml
projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingCapability.java
projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml
projects/jboss-osgi/projects/bundles/microcontainer/trunk/scripts/assembly-bundles.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/reactor/blueprint/pom.xml
projects/jboss-osgi/trunk/reactor/blueprint/scripts/assembly-bundles.xml
projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml
projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Use jboss-osgi-reflect
Modified: projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/pom.xml 2009-11-27 14:45:30 UTC (rev 97110)
+++ projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/pom.xml 2009-11-27 15:12:58 UTC (rev 97111)
@@ -39,6 +39,7 @@
<!-- Properties -->
<properties>
+ <version.javassist>3.9.0.GA</version.javassist>
<version.jboss.reflect>2.0.2.GA</version.jboss.reflect>
</properties>
@@ -49,6 +50,11 @@
<artifactId>bnd</artifactId>
</dependency>
<dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${version.javassist}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-reflect</artifactId>
<version>${version.jboss.reflect}</version>
@@ -65,8 +71,20 @@
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
<Embed-Transitive>true</Embed-Transitive>
+ <Import-Package>
+
+ <!-- import -->
+ org.jboss.logging,
+ org.jboss.util,
+ org.jboss.util.collection,
+ org.jboss.util.propertyeditor,
+
+ <!-- ignore -->
+ !com.sun.jdi*
+ </Import-Package>
<Embed-Dependency>
jboss-reflect;inline=false,
+ javassist;inline=false,
</Embed-Dependency>
<_exportcontents>
org.jboss.beans.info*;version=${version.jboss.reflect},
Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml 2009-11-27 14:45:30 UTC (rev 97110)
+++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml 2009-11-27 15:12:58 UTC (rev 97111)
@@ -41,13 +41,12 @@
<properties>
<version.jboss.osgi.runtime.felix>2.0.2-SNAPSHOT</version.jboss.osgi.runtime.felix>
<version.jboss.xb>2.0.2.Beta3</version.jboss.xb>
- <version.javassist>3.9.0.GA</version.javassist>
<version.jboss.osgi.common>1.0.4-SNAPSHOT</version.jboss.osgi.common>
<version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
<version.jboss.osgi.husky>1.0.2-SNAPSHOT</version.jboss.osgi.husky>
<version.jboss.osgi.jaxb>2.1.10-SNAPSHOT</version.jboss.osgi.jaxb>
+ <version.jboss.osgi.reflect>2.0.2-SNAPSHOT</version.jboss.osgi.reflect>
<version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi>
- <version.jboss.reflect>2.0.2.GA</version.jboss.reflect>
<version.osgi>4.2.0</version.osgi>
</properties>
@@ -58,11 +57,6 @@
<artifactId>bnd</artifactId>
</dependency>
<dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>${version.javassist}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
<version>${version.jboss.osgi.spi}</version>
@@ -108,6 +102,12 @@
<version>${version.jboss.osgi.jaxb}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-reflect</artifactId>
+ <version>${version.jboss.osgi.reflect}</version>
+ <scope>provided</scope>
+ </dependency>
<!-- OSGi Dependencies -->
<dependency>
@@ -173,21 +173,18 @@
org.osgi.service.log,
org.osgi.util.tracker,
- <!-- ignore -->
- !com.sun.jdi*
+ <!-- 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)",
</Import-Package>
<Embed-Dependency>
- javassist;inline=false,
jbossxb;inline=false,
- jboss-reflect;inline=false,
</Embed-Dependency>
<_exportcontents>
- org.jboss.beans.info*;version=${version.jboss.reflect},
- 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.spi*;version=${version.jboss.reflect},
org.jboss.xb.annotations;version=${version.jboss.xb},
org.jboss.xb.binding.sunday.unmarshalling;version=${version.jboss.xb},
org.jboss.xb.binding;version=${version.jboss.xb},
Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/scripts/assembly-bundles.xml 2009-11-27 14:45:30 UTC (rev 97110)
+++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/scripts/assembly-bundles.xml 2009-11-27 15:12:58 UTC (rev 97111)
@@ -20,6 +20,7 @@
<include>*:jboss-osgi-common-core:jar</include>
<include>*:jboss-osgi-husky:jar</include>
<include>*:jboss-osgi-jaxb:jar</include>
+ <include>*:jboss-osgi-reflect:jar</include>
<include>*:org.osgi.compendium:jar</include>
</includes>
<useStrictFiltering>true</useStrictFiltering>
Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingCapability.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingCapability.java 2009-11-27 14:45:30 UTC (rev 97110)
+++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingCapability.java 2009-11-27 15:12:58 UTC (rev 97111)
@@ -47,6 +47,7 @@
addDependency(new JAXBCapability());
addBundle("bundles/jboss-osgi-common-core.jar");
+ addBundle("bundles/jboss-osgi-reflect.jar");
addBundle("bundles/jboss-osgi-xml-binding.jar");
}
}
\ No newline at end of file
Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-11-27 14:45:30 UTC (rev 97110)
+++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-11-27 15:12:58 UTC (rev 97111)
@@ -48,6 +48,7 @@
<version.jboss.osgi.husky>1.0.2-SNAPSHOT</version.jboss.osgi.husky>
<version.jboss.osgi.jaxb>2.1.10-SNAPSHOT</version.jboss.osgi.jaxb>
<version.jboss.osgi.jmx>1.0.2-SNAPSHOT</version.jboss.osgi.jmx>
+ <version.jboss.osgi.reflect>2.0.2-SNAPSHOT</version.jboss.osgi.reflect>
<version.jboss.osgi.runtime.deployers>1.0.3</version.jboss.osgi.runtime.deployers>
<version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi>
<version.jboss.osgi.xml.binding>2.0.2-SNAPSHOT</version.jboss.osgi.xml.binding>
@@ -131,6 +132,12 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-reflect</artifactId>
+ <version>${version.jboss.osgi.reflect}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-xml-binding</artifactId>
<version>${version.jboss.osgi.xml.binding}</version>
<scope>provided</scope>
Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/microcontainer/trunk/scripts/assembly-bundles.xml 2009-11-27 14:45:30 UTC (rev 97110)
+++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/scripts/assembly-bundles.xml 2009-11-27 15:12:58 UTC (rev 97111)
@@ -22,6 +22,7 @@
<include>*:jboss-osgi-jaxb:jar</include>
<include>*:jboss-osgi-jndi:jar</include>
<include>*:jboss-osgi-jmx:jar</include>
+ <include>*:jboss-osgi-reflect:jar</include>
<include>*:jboss-osgi-xml-binding:jar</include>
<include>*:org.osgi.compendium:jar</include>
</includes>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-11-27 14:45:30 UTC (rev 97110)
+++ projects/jboss-osgi/trunk/pom.xml 2009-11-27 15:12:58 UTC (rev 97111)
@@ -62,6 +62,7 @@
<version.jboss.osgi.jndi>1.0.2-SNAPSHOT</version.jboss.osgi.jndi>
<version.jboss.osgi.jta>1.0.0</version.jboss.osgi.jta>
<version.jboss.osgi.microcontainer>2.0.9-SNAPSHOT</version.jboss.osgi.microcontainer>
+ <version.jboss.osgi.reflect>2.0.2-SNAPSHOT</version.jboss.osgi.reflect>
<version.jboss.osgi.runtime.deployers>1.0.3</version.jboss.osgi.runtime.deployers>
<version.jboss.osgi.runtime.equinox>3.5.1-SNAPSHOT</version.jboss.osgi.runtime.equinox>
<version.jboss.osgi.runtime.felix>2.0.2-SNAPSHOT</version.jboss.osgi.runtime.felix>
@@ -147,6 +148,11 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-reflect</artifactId>
+ <version>${version.jboss.osgi.reflect}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-webapp</artifactId>
<version>${version.jboss.osgi.webapp}</version>
</dependency>
Modified: projects/jboss-osgi/trunk/reactor/blueprint/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/blueprint/pom.xml 2009-11-27 14:45:30 UTC (rev 97110)
+++ projects/jboss-osgi/trunk/reactor/blueprint/pom.xml 2009-11-27 15:12:58 UTC (rev 97111)
@@ -94,6 +94,11 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-reflect</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-xml-binding</artifactId>
<scope>provided</scope>
</dependency>
Modified: projects/jboss-osgi/trunk/reactor/blueprint/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/blueprint/scripts/assembly-bundles.xml 2009-11-27 14:45:30 UTC (rev 97110)
+++ projects/jboss-osgi/trunk/reactor/blueprint/scripts/assembly-bundles.xml 2009-11-27 15:12:58 UTC (rev 97111)
@@ -23,6 +23,7 @@
<include>*:jboss-osgi-jmx:jar</include>
<include>*:jboss-osgi-jndi:jar</include>
<include>*:jboss-osgi-microcontainer:jar</include>
+ <include>*:jboss-osgi-reflect:jar</include>
<include>*:jboss-osgi-xml-binding:jar</include>
</includes>
<useStrictFiltering>true</useStrictFiltering>
Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-11-27 14:45:30 UTC (rev 97110)
+++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-11-27 15:12:58 UTC (rev 97111)
@@ -25,8 +25,9 @@
<include>*:jboss-osgi-jndi:jar</include>
<include>*:jboss-osgi-jta:jar</include>
<include>*:jboss-osgi-microcontainer:jar</include>
+ <include>*:jboss-osgi-reflect:jar</include>
+ <include>*:jboss-osgi-webapp:jar</include>
<include>*:jboss-osgi-xml-binding:jar</include>
- <include>*:jboss-osgi-webapp:jar</include>
<include>*:org.apache.felix.configadmin:jar</include>
<include>*:org.apache.felix.log:jar</include>
<include>*:org.apache.felix.metatype:jar</include>
Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-11-27 14:45:30 UTC (rev 97110)
+++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-11-27 15:12:58 UTC (rev 97111)
@@ -24,8 +24,9 @@
<include>*:jboss-osgi-jmx:jar</include>
<include>*:jboss-osgi-jndi:jar</include>
<include>*:jboss-osgi-microcontainer:jar</include>
+ <include>*:jboss-osgi-reflect:jar</include>
+ <include>*:jboss-osgi-webapp:jar</include>
<include>*:jboss-osgi-xml-binding:jar</include>
- <include>*:jboss-osgi-webapp:jar</include>
<include>*:org.apache.felix.configadmin:jar</include>
<include>*:org.apache.felix.log:jar</include>
<include>*:org.apache.felix.metatype:jar</include>
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-11-27 14:45:30 UTC (rev 97110)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-11-27 15:12:58 UTC (rev 97111)
@@ -140,6 +140,11 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-reflect</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-xml-binding</artifactId>
<scope>provided</scope>
</dependency>
More information about the jboss-cvs-commits
mailing list