[jboss-osgi-commits] JBoss-OSGI SVN: r100401 - in projects/jboss-osgi: projects/runtime/deployment/trunk and 7 other directories.

Author: thomas.diesler(a)jboss.com Date: 2010-02-04 05:22:04 -0500 (Thu, 04 Feb 2010) New Revision: 100401 Added: projects/jboss-osgi/trunk/testsuite/functional/tree.text Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleTracker.java projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BasicResolverImpl.java projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium.xml projects/jboss-osgi/trunk/testsuite/functional/pom.xml projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium.xml projects/jboss-osgi/trunk/testsuite/pom.xml Log: Fix dependency:tree with -Dtarget.container=jboss601 Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleTracker.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleTracker.java 2010-02-04 10:05:37 UTC (rev 100400) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleTracker.java 2010-02-04 10:22:04 UTC (rev 100401) @@ -46,13 +46,14 @@ // Provide logging private Logger log = LoggerFactory.getLogger(ManagedBundleTracker.class); - private BundleContext context; + private BundleContext systemContext; private MBeanServer mbeanServer; public ManagedBundleTracker(BundleContext context, MBeanServer mbeanServer) { super(context, Bundle.INSTALLED | Bundle.RESOLVED | Bundle.ACTIVE | Bundle.UNINSTALLED, null); this.mbeanServer = mbeanServer; + this.systemContext = context; } @Override @@ -74,7 +75,7 @@ { try { - ManagedBundle mb = new ManagedBundle(context, bundle); + ManagedBundle mb = new ManagedBundle(systemContext, bundle); ObjectName oname = mb.getObjectName(); if (mbeanServer.isRegistered(oname) == false) Modified: projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml 2010-02-04 10:05:37 UTC (rev 100400) +++ projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml 2010-02-04 10:22:04 UTC (rev 100401) @@ -38,7 +38,7 @@ <!-- Properties --> <properties> - <version.jboss.deployers>2.2.0-SNAPSHOT</version.jboss.deployers> + <version.jboss.deployers>2.2.0.Alpha1</version.jboss.deployers> <version.jboss.osgi.spi>1.0.4-SNAPSHOT</version.jboss.osgi.spi> <version.osgi>4.2.0</version.osgi> </properties> Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-02-04 10:05:37 UTC (rev 100400) +++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-02-04 10:22:04 UTC (rev 100401) @@ -51,6 +51,7 @@ <version.jboss.deployers>2.2.0.Alpha1</version.jboss.deployers> <version.jboss.kernel>2.2.0.Alpha2</version.jboss.kernel> <version.jboss.logging>2.1.0.GA</version.jboss.logging> + <version.jboss.mdr>2.2.0.Alpha1</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> <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core> @@ -93,11 +94,36 @@ </dependency> <dependency> <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-client</artifactId> + <version>${version.jboss.deployers}</version> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-client-spi</artifactId> + <version>${version.jboss.deployers}</version> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-core</artifactId> + <version>${version.jboss.deployers}</version> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-core-spi</artifactId> + <version>${version.jboss.deployers}</version> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> <artifactId>jboss-deployers-impl</artifactId> <version>${version.jboss.deployers}</version> </dependency> <dependency> <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-structure-spi</artifactId> + <version>${version.jboss.deployers}</version> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> <artifactId>jboss-deployers-vfs-spi</artifactId> <version>${version.jboss.deployers}</version> </dependency> @@ -122,6 +148,11 @@ <version>${version.jboss.logging}</version> </dependency> <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-mdr</artifactId> + <version>${version.jboss.mdr}</version> + </dependency> + <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-spi</artifactId> <version>${version.jboss.osgi.spi}</version> Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BasicResolverImpl.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BasicResolverImpl.java 2010-02-04 10:05:37 UTC (rev 100400) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BasicResolverImpl.java 2010-02-04 10:22:04 UTC (rev 100401) @@ -81,9 +81,12 @@ public ResolverBundle removeBundle(Bundle bundle) { + // Ignore the system bundle and fragments + AbstractBundleState bundleState = AbstractBundleState.assertBundleState(bundle); + if (bundleState instanceof OSGiBundleState == false) + return null; + ResolverBundle removedBundle = super.removeBundle(bundle); - - AbstractDeployedBundleState bundleState = OSGiBundleState.assertBundleState(bundle); bundleCapabilitiesMap.remove(bundleState); List<BundleRequirement> bundleRequirements = bundleRequirementsMap.remove(bundleState); Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-02-04 10:05:37 UTC (rev 100400) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-02-04 10:22:04 UTC (rev 100401) @@ -433,9 +433,6 @@ override="true"> <include name="org.osgi.compendium.jar" /> </fileset> - <fileset condition="isFelix" dir=&quot;(a){deploy.artifacts.dir}/resources/jbossas&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> - <include name="microcontainer-service-jboss-beans.xml" /> - </fileset> <!-- Equinox Integration --> @@ -454,9 +451,6 @@ <include name="org.eclipse.osgi.util.jar" /> <include name="pax-web-extender-war.jar" /> </fileset> - <fileset condition="isEquinox" dir=&quot;(a){deploy.artifacts.dir}/resources/jbossas&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> - <include name="microcontainer-service-jboss-beans.xml" /> - </fileset> <!-- JBossMC Integration --> Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml 2010-02-04 10:05:37 UTC (rev 100400) +++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml 2010-02-04 10:22:04 UTC (rev 100401) @@ -18,7 +18,6 @@ <include>org.eclipse.equinox:org.eclipse.osgi.util:jar</include> </includes> <useStrictFiltering>false</useStrictFiltering> - <scope>provided</scope> <unpack>false</unpack> </dependencySet> Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium.xml 2010-02-04 10:05:37 UTC (rev 100400) +++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium.xml 2010-02-04 10:22:04 UTC (rev 100401) @@ -18,7 +18,6 @@ <include>org.osgi:org.osgi.compendium:jar</include> </includes> <useStrictFiltering>false</useStrictFiltering> - <scope>provided</scope> <unpack>false</unpack> </dependencySet> Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2010-02-04 10:05:37 UTC (rev 100400) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2010-02-04 10:22:04 UTC (rev 100401) @@ -47,6 +47,12 @@ <groupId>org.jboss.kernel</groupId> <artifactId>jboss-aop-mc-int</artifactId> <version>${version.jboss.aop.mc.int}</version> + <exclusions> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-mdr</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>javax.ejb</groupId> Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml 2010-02-04 10:05:37 UTC (rev 100400) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml 2010-02-04 10:22:04 UTC (rev 100401) @@ -18,7 +18,6 @@ <include>org.eclipse.equinox:org.eclipse.osgi.util:jar</include> </includes> <useStrictFiltering>false</useStrictFiltering> - <scope>provided</scope> <unpack>false</unpack> </dependencySet> Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium.xml 2010-02-04 10:05:37 UTC (rev 100400) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium.xml 2010-02-04 10:22:04 UTC (rev 100401) @@ -18,7 +18,6 @@ <include>org.osgi:org.osgi.compendium:jar</include> </includes> <useStrictFiltering>false</useStrictFiltering> - <scope>provided</scope> <unpack>false</unpack> </dependencySet> Added: projects/jboss-osgi/trunk/testsuite/functional/tree.text =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/tree.text (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/tree.text 2010-02-04 10:22:04 UTC (rev 100401) @@ -0,0 +1,267 @@ +[INFO] Scanning for projects... +[INFO] Searching repository for plugin with prefix: 'dependency'. +[INFO] ------------------------------------------------------------------------ +[INFO] Building JBossOSGi Testsuite - Functional +[INFO] task-segment: [dependency:tree] +[INFO] ------------------------------------------------------------------------ +[INFO] [dependency:tree {execution: default-cli}] +[INFO] org.jboss.osgi.testsuite:jboss-osgi-testsuite-functional:jar:1.0.0.Beta6 +[INFO] +- org.jboss.kernel:jboss-aop-mc-int:jar:2.2.0.Alpha2:compile +[INFO] | +- org.jboss.aop:jboss-aop:jar:2.1.0.CR3:compile +[INFO] | | +- org.apache.ant:ant:jar:1.7.0:compile +[INFO] | | | \- org.apache.ant:ant-launcher:jar:1.7.0:compile +[INFO] | | +- org.jboss:jboss-reflect:jar:2.2.0.Alpha2:compile +[INFO] | | +- qdox:qdox:jar:1.6.1:compile +[INFO] | | \- trove:trove:jar:2.1.1:compile +[INFO] | +- org.jboss.kernel:jboss-kernel:jar:2.2.0.Alpha2:compile +[INFO] | | +- org.jboss:jbossxb:jar:2.0.2.Beta3:compile +[INFO] | | | +- apache-xerces:xml-apis:jar:2.9.1:compile +[INFO] | | | +- apache-xerces:xercesImpl:jar:2.9.1:compile +[INFO] | | | +- wutka-dtdparser:dtdparser121:jar:1.2.1:compile +[INFO] | | | +- javax.activation:activation:jar:1.1.1:compile +[INFO] | | | \- sun-jaxb:jaxb-api:jar:2.1.9-brew:compile +[INFO] | | \- javax.inject:javax.inject:jar:1:compile +[INFO] | \- javassist:javassist:jar:3.11.0.GA:compile +[INFO] +- javax.ejb:ejb-api:jar:3.0:compile +[INFO] +- org.jboss.ejb3:jboss-ejb3-ext-api:jar:1.0.0:compile +[INFO] | \- org.jboss.javaee:jboss-ejb-api:jar:3.0.0.CR1:compile +[INFO] | +- org.jboss.javaee:jboss-transaction-api:jar:1.0.1.GA:compile +[INFO] | \- jboss.jbossws:jboss-jaxrpc:jar:1.0.4.GA:compile +[INFO] +- biz.aQute:bnd:jar:0.0.356:compile +[INFO] +- org.jboss.osgi:jboss-osgi-spi:jar:1.0.4-SNAPSHOT:compile +[INFO] | +- args4j:args4j:jar:2.0.12:compile +[INFO] | +- org.slf4j:slf4j-api:jar:1.5.8:compile +[INFO] | \- org.jboss:jboss-vfs:jar:2.1.3.SP1:compile +[INFO] | \- org.jboss:jboss-common-core:jar:2.2.16.GA:compile +[INFO] +- org.jboss.osgi.runtime:jboss-osgi-deployment:jar:1.0.1-SNAPSHOT:compile +[INFO] +- org.apache.aries.blueprint:org.apache.aries.blueprint:jar:1.0.0.20100120:provided +[INFO] | \- org.apache.aries:org.apache.aries.util:jar:1.0.0.20100120:provided +[INFO] +- org.apache.felix:org.apache.felix.log:jar:1.0.0:provided +[INFO] +- org.apache.felix:org.apache.felix.eventadmin:jar:1.0.0:provided +[INFO] +- org.apache.felix:org.apache.felix.metatype:jar:1.0.2:provided +[INFO] | \- net.sf.kxml:kxml2:jar:2.2.2:provided +[INFO] | \- xmlpull:xmlpull:jar:1.1.3.1:provided +[INFO] +- org.jboss.osgi.bundles:jboss-osgi-apache-xerces:jar:2.9.1.SP3:provided +[INFO] | \- xml-resolver:xml-resolver:jar:1.2:provided +[INFO] +- org.jboss.osgi.bundles:jboss-osgi-blueprint:jar:1.0.0.Beta1-SNAPSHOT:provided +[INFO] +- org.jboss.osgi.bundles:jboss-osgi-common:jar:1.0.3:provided +[INFO] | \- org.slf4j:jcl-over-slf4j:jar:1.5.8:provided +[INFO] +- org.jboss.osgi.bundles:jboss-osgi-husky:jar:1.0.3-SNAPSHOT:provided +[INFO] | \- junit:junit:jar:4.6:provided +[INFO] +- org.jboss.osgi.bundles:jboss-osgi-jaxb:jar:2.1.10.SP3:provided +[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.1.10:provided +[INFO] | \- javax.xml.bind:jaxb-api:jar:2.1:provided +[INFO] | \- javax.xml.stream:stax-api:jar:1.0-2:provided +[INFO] +- org.jboss.osgi.bundles:jboss-osgi-jmx:jar:1.0.3-SNAPSHOT:provided +[INFO] | \- org.jboss.osgi.bundles:jboss-osgi-common-core:jar:2.2.13.GA:provided +[INFO] +- org.jboss.osgi.bundles:jboss-osgi-jndi:jar:1.0.2:provided +[INFO] +- org.jboss.osgi.bundles:jboss-osgi-jta:jar:1.0.0:provided +[INFO] | +- jboss.jbossts:jbossjts:jar:4.6.1.GA:provided +[INFO] | \- jboss.jbossts:jbossts-common:jar:4.6.1.GA:provided +[INFO] +- org.jboss.osgi.bundles:jboss-osgi-reflect:jar:2.2.0-SNAPSHOT:provided +[INFO] +- org.jboss.osgi.bundles:jboss-osgi-serviceloader:jar:1.0.0-SNAPSHOT:provided +[INFO] +- org.jboss.osgi.bundles:jboss-osgi-webapp:jar:0.7.2.SP1-SNAPSHOT:provided +[INFO] | \- org.ops4j.pax.web:pax-web-api:jar:0.7.2:provided +[INFO] +- org.jboss.osgi.bundles:jboss-osgi-xml-binding:jar:2.0.2-SNAPSHOT:provided +[INFO] +- org.ops4j.pax.web:pax-web-extender-war:jar:0.7.2:provided +[INFO] | +- org.ops4j.base:ops4j-base-lang:jar:1.2.1:provided +[INFO] | +- org.ops4j.base:ops4j-base-util-xml:jar:1.2.1:provided +[INFO] | | \- org.ops4j.base:ops4j-base-util-collections:jar:1.2.1:provided +[INFO] | +- org.ops4j.pax.swissbox:pax-swissbox-core:jar:1.1.0:provided +[INFO] | | \- org.ops4j.pax.swissbox:pax-swissbox-lifecycle:jar:1.1.0:provided +[INFO] | +- org.ops4j.pax.swissbox:pax-swissbox-extender:jar:1.1.0:provided +[INFO] | +- org.ops4j.pax.swissbox:pax-swissbox-optional-jcl:jar:1.1.0:provided +[INFO] | \- org.ops4j.pax.swissbox:pax-swissbox-tracker:jar:1.1.0:provided +[INFO] +- org.ops4j.pax.web:pax-web-jetty-bundle:jar:0.7.2:provided +[INFO] +- org.jboss.naming:jnp-client:jar:5.0.1.GA:test +[INFO] +- org.slf4j:slf4j-log4j12:jar:1.5.8:test +[INFO] +- org.jboss.osgi.runtime:jboss-osgi-framework:jar:1.0.0.Alpha3-SNAPSHOT:compile +[INFO] | +- org.drools:drools-compiler:jar:5.0.1:compile +[INFO] | | +- org.drools:drools-core:jar:5.0.1:compile +[INFO] | | | +- org.drools:drools-api:jar:5.0.1:compile +[INFO] | | | \- joda-time:joda-time:jar:1.6:compile +[INFO] | | +- org.antlr:antlr-runtime:jar:3.1.1:compile +[INFO] | | +- org.eclipse.jdt:core:jar:3.4.2.v_883_R34x:compile +[INFO] | | +- janino:janino:jar:2.5.15:compile +[INFO] | | \- org.mvel:mvel2:jar:2.0.10:compile +[INFO] | +- org.jboss.cl:jboss-classloader:jar:2.2.0.Alpha1:compile +[INFO] | | \- org.jboss.integration:jboss-classloading-spi:jar:5.1.0.SP1:compile +[INFO] | +- org.jboss.cl:jboss-classloading:jar:2.2.0.Alpha1:compile +[INFO] | +- org.jboss.cl:jboss-classloading-vfs:jar:2.2.0.Alpha1:compile +[INFO] | +- org.jboss.deployers:jboss-deployers-client:jar:2.2.0.Alpha1:compile +[INFO] | +- org.jboss.deployers:jboss-deployers-client-spi:jar:2.2.0.Alpha1:compile +[INFO] | | \- org.jboss.man:jboss-managed:jar:2.1.1.SP1:compile +[INFO] | +- org.jboss.deployers:jboss-deployers-core:jar:2.2.0.Alpha1:compile +[INFO] | +- org.jboss.deployers:jboss-deployers-core-spi:jar:2.2.0.Alpha1:compile +[INFO] | +- org.jboss.deployers:jboss-deployers-impl:jar:2.2.0.Alpha1:compile +[INFO] | | +- org.jboss.deployers:jboss-deployers-spi:jar:2.2.0.Alpha1:compile +[INFO] | | \- org.jboss.mcann:mcann-core:jar:1.0.0.Alpha1:compile +[INFO] | +- org.jboss.deployers:jboss-deployers-structure-spi:jar:2.2.0.Alpha1:compile +[INFO] | +- org.jboss.deployers:jboss-deployers-vfs-spi:jar:2.2.0.Alpha1:compile +[INFO] | | \- stax:stax-api:jar:1.0:compile +[INFO] | +- org.jboss.deployers:jboss-deployers-vfs:jar:2.2.0.Alpha1:compile +[INFO] | | \- org.jboss.man:jboss-metatype:jar:2.1.1.SP1:compile +[INFO] | +- org.jboss.kernel:jboss-dependency:jar:2.2.0.Alpha2:compile +[INFO] | +- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile +[INFO] | +- org.jboss:jboss-mdr:jar:2.2.0.Alpha1:compile +[INFO] | +- org.jboss.osgi.runtime:jboss-osgi-deployers:jar:1.0.4-SNAPSHOT:compile +[INFO] | +- org.osgi:org.osgi.core:jar:4.2.0:compile +[INFO] | \- org.osgi:org.osgi.compendium:jar:4.2.0:compile +[INFO] +- org.jboss.logging:jboss-logging-log4j:jar:2.1.0.GA:compile +[INFO] | \- log4j:log4j:jar:1.2.14:compile +[INFO] +- org.apache.felix:org.apache.felix.configadmin:jar:1.2.4:provided +[INFO] \- org.jboss.jbossas:jboss-as-client:pom:6.0.0.M1:provided +[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided +[INFO] +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:provided +[INFO] +- org.hibernate.java-persistence:jpa-api:jar:2.0-cr-1:provided +[INFO] +- org.hibernate:hibernate-annotations:jar:3.5.0-Beta-2:provided +[INFO] | +- org.hibernate:hibernate-core:jar:3.5.0-Beta-2:provided +[INFO] | | +- antlr:antlr:jar:2.7.6:provided +[INFO] | | +- commons-collections:commons-collections:jar:3.1:provided +[INFO] | | +- dom4j:dom4j:jar:1.6.1:provided +[INFO] | | | \- xml-apis:xml-apis:jar:1.0.b2:provided +[INFO] | | \- javax.transaction:jta:jar:1.1:provided +[INFO] | +- org.hibernate:hibernate-commons-annotations:jar:3.2.0.Beta1:provided +[INFO] | \- hsqldb:hsqldb:jar:1.8.0.2:provided +[INFO] +- org.jboss.aop:jboss-aop:jar:client:2.1.6.GA:provided +[INFO] +- org.jboss.jbossas:jboss-as-ejb3:jar:client:6.0.0.M1:provided +[INFO] | +- cglib:cglib:jar:2.1.3:provided +[INFO] | +- jacorb:jacorb:jar:2.3.1jboss.patch01-brew:provided +[INFO] | +- org.hibernate:hibernate-entitymanager:jar:3.5.0-Beta-2:provided +[INFO] | +- javax.validation:validation-api:jar:1.0.0.GA:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-as-int:jar:1.1.21:provided +[INFO] | | +- org.jboss.ejb3:jboss-ejb3:pom:1.1.21:provided +[INFO] | | | +- org.jboss.ejb3:jboss-ejb3-core:jar:1.1.21:provided +[INFO] | | | \- org.jboss.ejb3:jboss-ejb3-deployers:jar:1.0.0:provided +[INFO] | | +- org.jboss.ejb3:jboss-ejb3-mc-int:jar:1.0.1:provided +[INFO] | | \- org.jboss.ejb3:jboss-ejb3-metrics-deployer:jar:1.0.1:provided +[INFO] | | \- org.jboss.microcontainer:jboss-jmx-mc-int:jar:2.2.0.M2:provided +[INFO] | | +- org.jboss.mx:jboss-jmx:jar:6.0.0.Beta2:provided +[INFO] | | | +- org.jboss.mx:jboss-j2se:jar:6.0.0.Beta2:provided +[INFO] | | | \- org.jboss.mx:jboss-mbeans:jar:6.0.0.Beta2:provided +[INFO] | | \- org.jboss.mx:jboss-mbeanserver:jar:6.0.0.Beta2:provided +[INFO] | +- org.jboss.javaee:jboss-jms-api:jar:1.1.0.GA:provided +[INFO] | +- org.jboss.jbossas:jboss-as-connector:jar:6.0.0.M1:provided +[INFO] | | +- org.jboss.jbossas:jboss-as-profileservice:jar:6.0.0.M1:provided +[INFO] | | \- javax.mail:mail:jar:1.4.2:provided +[INFO] | +- org.jboss.jbossas:jboss-as-iiop:jar:6.0.0.M1:provided +[INFO] | +- org.jboss.jbossas:jboss-as-server:jar:6.0.0.M1:provided +[INFO] | +- org.jboss.microcontainer:jboss-kernel:jar:2.0.9.GA:provided +[INFO] | \- org.jboss.integration:jboss-corba-ots-spi:jar:5.1.0.SP1:provided +[INFO] +- org.jboss.jbossas:jboss-as-server:jar:client:6.0.0.M1:provided +[INFO] | +- org.jboss.bootstrap:jboss-bootstrap-impl-as:jar:2.0.0-alpha-4:provided +[INFO] | | +- org.jboss.bootstrap:jboss-bootstrap-impl-mc:jar:2.0.0-alpha-3:provided +[INFO] | | | +- org.mortbay.jetty:jetty:jar:6.1.16:provided +[INFO] | | | | +- org.mortbay.jetty:jetty-util:jar:6.1.16:provided +[INFO] | | | | \- org.mortbay.jetty:servlet-api:jar:2.5-20081211:provided +[INFO] | | | +- org.jboss.bootstrap:jboss-bootstrap-impl-base:jar:2.0.0-alpha-4:provided +[INFO] | | | | \- org.jboss.bootstrap:jboss-bootstrap-spi:jar:2.0.0-alpha-3:provided +[INFO] | | | \- org.jboss.bootstrap:jboss-bootstrap-spi-mc:jar:2.0.0-alpha-2:provided +[INFO] | | | \- org.jboss.bootstrap:jboss-bootstrap-api-mc:jar:2.0.0-alpha-1:provided +[INFO] | | \- org.jboss.bootstrap:jboss-bootstrap-spi-as:jar:2.0.0-alpha-4:provided +[INFO] | | \- org.jboss.bootstrap:jboss-bootstrap-api-as:jar:2.0.0-alpha-1:provided +[INFO] | | \- org.jboss.bootstrap:jboss-bootstrap-api:jar:2.0.0-alpha-1:provided +[INFO] | +- org.jboss.integration:jboss-deployment-spi:jar:5.1.0.SP1:provided +[INFO] | +- org.jboss.jpa:jboss-jpa-deployers:jar:1.0.1:provided +[INFO] | | +- org.jboss.jpa:jboss-jpa-impl:jar:1.0.0:provided +[INFO] | | \- org.jboss.jpa:jboss-jpa-spi:jar:1.0.0:provided +[INFO] | +- org.jboss.security:jbosssx:jar:2.0.4.SP2:provided +[INFO] | +- org.jboss.metadata:jboss-metadata:jar:1.0.2.Beta2:provided +[INFO] | | +- org.hibernate:ejb3-persistence:jar:1.0.2.GA:provided +[INFO] | | \- jboss.jbossws:jboss-jaxws:jar:3.0.1-native-2.0.4.GA:provided +[INFO] | +- org.jboss.jbossas:jboss-as-system-jmx:jar:6.0.0.M1:provided +[INFO] | +- org.jboss.jbossas:jboss-as-jmx:jar:6.0.0.M1:provided +[INFO] | | \- org.jboss.jbossas:jboss-as-mbeans:jar:6.0.0.M1:provided +[INFO] | +- org.jboss.jbossas:jboss-as-system:jar:6.0.0.M1:provided +[INFO] | +- org.jboss.interceptor:jboss-interceptor-api:jar:1.0.1-CR1:provided +[INFO] | +- org.jboss.jbossas:jboss-as-security:jar:6.0.0.M1:provided +[INFO] | | +- org.jboss.javaee:jboss-jaspi-api:jar:1.0.0.GA:provided +[INFO] | | \- org.jboss.security:jbossxacml:jar:2.0.4:provided +[INFO] | +- org.jboss.integration:jboss-transaction-spi:jar:5.1.0.SP1:provided +[INFO] | +- org.jboss.javaee:jboss-jacc-api:jar:1.1.0.GA_SP1:provided +[INFO] | | \- jboss.web:servlet-api:jar:2.1.1.GA:provided +[INFO] | +- org.jboss.ws.native:jbossws-native-saaj:jar:3.2.1.GA:provided +[INFO] | +- javax.xml.ws:jaxws-api:jar:2.1:provided +[INFO] | +- org.jboss.javaee:jboss-jca-api:jar:1.5.0.GA:provided +[INFO] | +- bcel:bcel:jar:5.1:provided +[INFO] | +- org.jboss.naming:jnpserver:jar:5.0.4.GA:provided +[INFO] | \- gnu-getopt:getopt:jar:1.0.12-brew:provided +[INFO] +- org.jboss.jbossas:jboss-as-deployment:jar:6.0.0.M1:provided +[INFO] | \- org.jboss.javaee:jboss-jad-api:jar:1.2.0.GA:provided +[INFO] +- org.jboss.ejb3:jboss-ejb3-common:jar:client:1.0.1:provided +[INFO] +- org.jboss.ejb3:jboss-ejb3-core:jar:client:1.1.21:provided +[INFO] | +- org.jboss.integration:jboss-jca-spi:jar:5.0.3.GA:provided +[INFO] | +- org.jboss.cache:jbosscache-core:jar:3.1.0.GA:provided +[INFO] | +- org.jboss.aspects:jboss-remoting-aspects:jar:1.0.2:provided +[INFO] | | +- org.jboss.aspects:jboss-transaction-aspects:jar:1.0.0.GA:provided +[INFO] | | \- org.jboss.aspects:jboss-security-aspects:jar:1.0.0.GA:provided +[INFO] | | \- javax.security:jacc:jar:1.0:provided +[INFO] | +- org.jboss.cluster:jboss-ha-server-api:jar:1.1.1.GA:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-cache:jar:1.0.0:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-common:jar:1.0.1:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-endpoint:jar:0.1.0:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-jpa-int:jar:1.0.0:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-security:jar:1.0.0:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-timerservice-spi:jar:1.0.0:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-ext-api-impl:jar:1.0.0:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-interceptors:jar:1.0.5:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-metadata:jar:1.0.0:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-proxy-impl:jar:1.0.6:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-proxy-clustered:jar:1.0.2:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-proxy-spi:jar:1.0.0:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-transactions:jar:1.0.2:provided +[INFO] | +- org.jboss.ws:jbossws-spi:jar:1.0.3.GA:provided +[INFO] | +- quartz:quartz:jar:1.6.0:provided +[INFO] | +- sun-jaxws:jaxws-api:jar:2.1.1:provided +[INFO] | \- sun-jaxws:jsr181-api:jar:2.1.1:provided +[INFO] +- org.jboss.ejb3:jboss-ejb3-proxy-clustered:jar:client:1.0.2:provided +[INFO] +- org.jboss.ejb3:jboss-ejb3-proxy-impl:jar:client:1.0.6:provided +[INFO] | \- org.jboss.microcontainer:jboss-aop-mc-int:jar:2.0.8.GA:provided +[INFO] +- org.jboss.ejb3:jboss-ejb3-proxy-spi:jar:client:1.0.0:provided +[INFO] +- org.jboss.ejb3:jboss-ejb3-security:jar:client:1.0.0:provided +[INFO] | \- org.jboss.aspects:jboss-current-invocation-aspects:jar:1.0.0.CR1:provided +[INFO] +- org.jboss.cluster:jboss-ha-client:jar:1.1.1.GA:provided +[INFO] +- org.jboss.jbossas:jboss-as-cluster:jar:jboss-ha-legacy-client:6.0.0.M1:provided +[INFO] | +- jgroups:jgroups:jar:2.6.13.GA:provided +[INFO] | +- org.jboss.cluster:jboss-ha-server-cache-spi:jar:2.0.0.GA:provided +[INFO] | \- org.jboss.cluster:jboss-ha-server-cache-jbc:jar:2.1.0.GA:provided +[INFO] +- org.jboss.jbossas:jboss-as-iiop:jar:client:6.0.0.M1:provided +[INFO] | +- jboss.jbossts:jbossjts-jacorb:jar:4.6.1.GA:provided +[INFO] | \- org.jboss.jbossas:jboss-as-main:jar:6.0.0.M1:provided +[INFO] | \- org.jboss.logbridge:jboss-logbridge:jar:1.0.0.GA:provided +[INFO] | \- org.jboss.logmanager:jboss-logmanager:jar:1.0.0.GA:provided +[INFO] +- org.jboss.integration:jboss-integration:jar:5.1.0.SP1:provided +[INFO] +- org.jboss.jbossas:jboss-as-j2se:jar:6.0.0.M1:provided +[INFO] +- org.jboss.javaee:jboss-javaee:jar:5.2.0.Beta1:provided +[INFO] +- org.jboss.jbossas:jboss-as-management:jar:jsr77-client:6.0.0.M1:provided +[INFO] | \- org.jboss.jbossas:jboss-as-cluster:jar:6.0.0.M1:provided +[INFO] +- org.jboss.logging:jboss-logging-jdk:jar:2.1.1.GA:provided +[INFO] +- jboss.messaging:jboss-messaging:jar:1.4.3.GA:provided +[INFO] +- org.jboss.remoting:jboss-remoting:jar:2.5.2:provided +[INFO] +- org.jboss.security:jboss-security-spi:jar:2.0.4.SP2:provided +[INFO] +- jboss:jboss-serialization:jar:1.0.3.GA:provided +[INFO] +- org.jboss.jbossas:jboss-as-system:jar:client:6.0.0.M1:provided +[INFO] | +- org.jboss.integration:jboss-profileservice-spi:jar:5.1.0.SP1:provided +[INFO] | \- org.jboss.microcontainer:jboss-dependency:jar:2.0.9.GA:provided +[INFO] +- org.jboss.jbossas:jboss-as-system-jmx:jar:client:6.0.0.M1:provided +[INFO] +- org.jboss.jbossas:jboss-as-profileservice:jar:client:6.0.0.M1:provided +[INFO] | \- org.jboss.jbossas:jboss-as-aspects:jar:6.0.0.M1:provided +[INFO] | +- org.jboss.aop:jboss-aop-aspects:jar:2.1.6.GA:provided +[INFO] | | \- org.beanshell:bsh:jar:1.3.0:provided +[INFO] | +- org.jboss.aop:jboss-aop-asintegration-core:jar:2.1.6.GA:provided +[INFO] | | \- org.jboss.aop:pluggable-instrumentor:jar:2.1.6.GA:provided +[INFO] | +- org.jboss.aop:jboss-aop-asintegration-mc:jar:2.1.6.GA:provided +[INFO] | \- org.jboss.test:jboss-test:jar:1.1.5-alpha-2:provided +[INFO] | +- org.apache.ant:ant-junit:jar:1.7.0:provided +[INFO] | +- jboss.profiler.jvmti:jboss-profiler-jvmti:jar:1.0.0.CR5:provided +[INFO] | \- org.jboss.jbossas:jboss-server-manager:jar:1.0.3-alpha-2:provided +[INFO] +- org.jboss.security:jbosssx-client:jar:2.0.4.SP2:provided +[INFO] +- org.jboss.jbossas:jboss-as-server:jar:jmx-invoker-adaptor-client:6.0.0.M1:provided +[INFO] \- org.apache:xmlsec:jar:1.4.3:provided +[INFO] ------------------------------------------------------------------------ +[INFO] BUILD SUCCESSFUL +[INFO] ------------------------------------------------------------------------ +[INFO] Total time: 19 seconds +[INFO] Finished at: Thu Feb 04 11:10:49 CET 2010 +[INFO] Final Memory: 61M/155M +[INFO] ------------------------------------------------------------------------ Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-02-04 10:05:37 UTC (rev 100400) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-02-04 10:22:04 UTC (rev 100401) @@ -249,7 +249,6 @@ <dependency> <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jboss-osgi-runtime-equinox</artifactId> - <scope>provided</scope> </dependency> </dependencies> </profile> @@ -273,7 +272,6 @@ <dependency> <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jboss-osgi-runtime-felix</artifactId> - <scope>provided</scope> </dependency> </dependencies> </profile> @@ -294,12 +292,10 @@ <dependency> <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jboss-osgi-framework</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging-log4j</artifactId> - <scope>provided</scope> </dependency> </dependencies> </profile> @@ -314,12 +310,10 @@ <dependency> <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jboss-osgi-framework</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging-log4j</artifactId> - <scope>provided</scope> </dependency> </dependencies> </profile> @@ -416,6 +410,7 @@ <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jmx-invoker-adaptor-client</artifactId> <version>${version.jmx.invoker.adaptor.client}</version> + <scope>provided</scope> <type>pom</type> </dependency> </dependencies> @@ -441,6 +436,7 @@ <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jmx-invoker-adaptor-client</artifactId> <version>${version.jmx.invoker.adaptor.client}</version> + <scope>provided</scope> <type>pom</type> </dependency> </dependencies> @@ -466,6 +462,7 @@ <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-client</artifactId> <version>6.0.0.M1</version> + <scope>provided</scope> <exclusions> <exclusion> <groupId>org.jboss.slf4j</groupId> @@ -497,6 +494,7 @@ <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-client</artifactId> <version>6.0.0.M1</version> + <scope>provided</scope> <exclusions> <exclusion> <groupId>org.jboss.slf4j</groupId>