September 2009 - jboss-osgi-commits

JBoss-OSGI SVN: r93612 - projects/jboss-osgi/projects/runtime/microcontainer/trunk.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-09-16 10:30:42 -0400 (Wed, 16 Sep 2009) New Revision: 93612 Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml Log: Set version explicitly Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml 2009-09-16 13:39:45 UTC (rev 93611) +++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml 2009-09-16 14:30:42 UTC (rev 93612) @@ -25,6 +25,8 @@ <artifactId>jboss-osgi-runtime-microcontainer</artifactId> <packaging>jar</packaging> + <version>1.0.0-SNAPSHOT</version> + <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId>

16 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r93609 - in projects/jboss-osgi/trunk: distribution/installer/src/main/resources/jbossas and 5 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-09-16 09:29:05 -0400 (Wed, 16 Sep 2009) New Revision: 93609 Added: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-felix.xml projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium.xml projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-felix.xml projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium.xml Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml projects/jboss-osgi/trunk/testsuite/example/pom.xml projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml projects/jboss-osgi/trunk/testsuite/functional/pom.xml projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml projects/jboss-osgi/trunk/testsuite/pom.xml Log: Fix jbossas/felix integration 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 2009-09-16 13:25:33 UTC (rev 93608) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-09-16 13:29:05 UTC (rev 93609) @@ -356,9 +356,10 @@ <include name="jboss-osgi-apache-xerces.jar" /> <include name="jboss-osgi-blueprint.jar" /> <include name="jboss-osgi-common.jar" /> + <include name="jboss-osgi-common-core.jar" /> <include name="jboss-osgi-jaxb.jar" /> + <include name="jboss-osgi-jmx.jar" /> <include name="jboss-osgi-webconsole.jar" /> - <include name="jboss-osgi-xml-binding.jar" /> <include name="org.apache.felix.http.jetty.jar" /> <include name="org.apache.felix.log.jar" /> </fileset> @@ -431,9 +432,8 @@ </fileset> <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> - <include name="jboss-osgi-common-core.jar" /> - <include name="jboss-osgi-jmx.jar" /> <include name="jboss-osgi-jndi.jar" /> + <include name="jboss-osgi-xml-binding.jar" /> </fileset> </pack> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2009-09-16 13:25:33 UTC (rev 93608) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2009-09-16 13:29:05 UTC (rev 93609) @@ -28,9 +28,10 @@  javax.xml.bind.annotation;version=2.1, org.apache.xerces.dom;version=2.9, + org.jnp.interfaces;version=5.0,  - org.jboss.osgi.jmx;version=1.0, + org.jboss.osgi.jbossxb;version=2.0, org.jboss.osgi.jndi;version=1.0, org.jboss.osgi.microcontainer;version=1.0, org.jboss.osgi.spi;version=1.0, Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-09-16 13:25:33 UTC (rev 93608) +++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-09-16 13:29:05 UTC (rev 93609) @@ -10,16 +10,13 @@   - -  - + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -140,10 +137,10 @@ <url>http://repository.jboss.org/maven2</url> </repository> </repositories> - +  <profiles> - +  + <dependencySets> + +  + <dependencySet> + <outputDirectory>bundles</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <includes> + <include>org.apache.felix:org.osgi.compendium:jar</include> + </includes> + <useStrictFiltering>false</useStrictFiltering> + <scope>provided</scope> + <unpack>false</unpack> + </dependencySet> + + </dependencySets> +</assembly> Added: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium.xml (rev 0) +++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium.xml 2009-09-16 13:29:05 UTC (rev 93609) @@ -0,0 +1,26 @@ +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + + <id>compendium</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + +  + <dependencySets> + +  + <dependencySet> + <outputDirectory>bundles</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <includes> + <include>org.osgi:org.osgi.compendium:jar</include> + </includes> + <useStrictFiltering>false</useStrictFiltering> + <scope>provided</scope> + <unpack>false</unpack> + </dependencySet> + + </dependencySets> +</assembly> Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-09-16 13:25:33 UTC (rev 93608) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-09-16 13:29:05 UTC (rev 93609) @@ -164,6 +164,26 @@ <build> <plugins> <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>compendium</id> + <phase>test-compile</phase> + <goals> + <goal>directory-single</goal> + </goals> + <configuration> + <finalName>test-libs</finalName> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-compendium-felix.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> @@ -195,6 +215,26 @@ <build> <plugins> <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>compendium</id> + <phase>test-compile</phase> + <goals> + <goal>directory-single</goal> + </goals> + <configuration> + <finalName>test-libs</finalName> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-compendium.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> @@ -220,6 +260,26 @@ <build> <plugins> <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>compendium</id> + <phase>test-compile</phase> + <goals> + <goal>directory-single</goal> + </goals> + <configuration> + <finalName>test-libs</finalName> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-compendium.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-09-16 13:25:33 UTC (rev 93608) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-09-16 13:29:05 UTC (rev 93609) @@ -15,16 +15,6 @@ <outputDirectory>bundles</outputDirectory> <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> <includes> - <include>*:org.osgi.compendium:jar</include> - </includes> - <useStrictFiltering>false</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>bundles</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <includes> <include>*:jboss-osgi-apache-xerces:jar</include> <include>*:jboss-osgi-common:jar</include> <include>*:jboss-osgi-common-core:jar</include> Added: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-felix.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-felix.xml (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-felix.xml 2009-09-16 13:29:05 UTC (rev 93609) @@ -0,0 +1,26 @@ +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + + <id>compendium</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + +  + <dependencySets> + +  + <dependencySet> + <outputDirectory>bundles</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <includes> + <include>org.apache.felix:org.osgi.compendium:jar</include> + </includes> + <useStrictFiltering>false</useStrictFiltering> + <scope>provided</scope> + <unpack>false</unpack> + </dependencySet> + + </dependencySets> +</assembly> Added: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium.xml (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium.xml 2009-09-16 13:29:05 UTC (rev 93609) @@ -0,0 +1,26 @@ +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + + <id>compendium</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + +  + <dependencySets> + +  + <dependencySet> + <outputDirectory>bundles</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <includes> + <include>org.osgi:org.osgi.compendium:jar</include> + </includes> + <useStrictFiltering>false</useStrictFiltering> + <scope>provided</scope> + <unpack>false</unpack> + </dependencySet> + + </dependencySets> +</assembly> Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-09-16 13:25:33 UTC (rev 93608) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-09-16 13:29:05 UTC (rev 93609) @@ -35,6 +35,7 @@  <properties> <version.jmx.invoker.adaptor.client>5.0.1.GA</version.jmx.invoker.adaptor.client> + <version.jnp.client>5.0.1.GA</version.jnp.client> </properties>  @@ -137,6 +138,18 @@  <dependency> + <groupId>org.jboss.naming</groupId> + <artifactId>jnp-client</artifactId> + <version>${version.jnp.client}</version> + <exclusions> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </exclusion> + </exclusions> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging-log4j</artifactId> <scope>test</scope>

16 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r93606 - in projects/jboss-osgi/projects: runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer and 1 other directory.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-09-16 09:16:38 -0400 (Wed, 16 Sep 2009) New Revision: 93606 Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleServiceImpl.java projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleManagementDeployer.java Log: Check if the managed bundle is already registered Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleServiceImpl.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleServiceImpl.java 2009-09-16 13:15:21 UTC (rev 93605) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleServiceImpl.java 2009-09-16 13:16:38 UTC (rev 93606) @@ -58,8 +58,11 @@ ManagedBundle mb = new ManagedBundle(bundle); ObjectName oname = mb.getObjectName(); - log.log(LogService.LOG_DEBUG, "Register managed bundle: " + oname); - mbeanServer.registerMBean(mb, oname); + if (mbeanServer.isRegistered(oname) == false) + { + log.log(LogService.LOG_DEBUG, "Register managed bundle: " + oname); + mbeanServer.registerMBean(mb, oname); + } return mb; } Modified: projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleManagementDeployer.java =================================================================== --- projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleManagementDeployer.java 2009-09-16 13:15:21 UTC (rev 93605) +++ projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleManagementDeployer.java 2009-09-16 13:16:38 UTC (rev 93606) @@ -60,8 +60,11 @@ ObjectName oname = mb.getObjectName(); try { - mbeanServer.registerMBean(mb, oname); - unit.addAttachment(ManagedBundle.class, mb); + if (mbeanServer.isRegistered(mb.getObjectName()) == false) + { + mbeanServer.registerMBean(mb, oname); + unit.addAttachment(ManagedBundle.class, mb); + } } catch (Exception ex) {

16 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r93605 - 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-16 09:15:21 -0400 (Wed, 16 Sep 2009) New Revision: 93605 Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.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 Log: Use org.osgi.framework Version where possible Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java 2009-09-16 12:31:48 UTC (rev 93604) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java 2009-09-16 13:15:21 UTC (rev 93605) @@ -28,6 +28,7 @@ import org.jboss.osgi.spi.capability.Capability; import org.osgi.framework.BundleException; import org.osgi.framework.InvalidSyntaxException; +import org.osgi.framework.Version; import org.osgi.service.packageadmin.PackageAdmin; /** @@ -72,7 +73,7 @@ * @param version may be null * @return The bundle or null if there is none */ - OSGiBundle getBundle(String symbolicName, String version); + OSGiBundle getBundle(String symbolicName, Version version); /** * Get the {@link OSGiBundle} for a given bundle id. 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-16 12:31:48 UTC (rev 93604) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java 2009-09-16 13:15:21 UTC (rev 93605) @@ -41,12 +41,14 @@ import org.jboss.osgi.spi.testing.OSGiRuntime; import org.jboss.osgi.spi.testing.OSGiServiceReference; import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.jboss.osgi.spi.util.BundleDeployment; +import org.jboss.osgi.spi.util.BundleDeploymentFactory; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; -import org.osgi.framework.Constants; import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceReference; +import org.osgi.framework.Version; import org.osgi.framework.launch.Framework; import org.osgi.service.packageadmin.PackageAdmin; @@ -65,13 +67,14 @@ public OSGiBundle installBundle(String location) throws BundleException { - String symbolicName = getManifestEntry(location, Constants.BUNDLE_SYMBOLICNAME); - String version = getManifestEntry(location, Constants.BUNDLE_VERSION); + URL bundleURL = getTestHelper().getTestArchiveURL(location); + BundleDeployment bundleDep = BundleDeploymentFactory.createBundleDeployment(bundleURL); + String symbolicName = bundleDep.getSymbolicName(); + Version version = bundleDep.getVersion(); OSGiBundle bundle; BundleContext context = getBundleContext(); - URL bundleURL = getTestHelper().getTestArchiveURL(location); ServiceReference sref = context.getServiceReference(DeployerService.class.getName()); if (sref != null) { 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-16 12:31:48 UTC (rev 93604) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java 2009-09-16 13:15:21 UTC (rev 93605) @@ -189,22 +189,21 @@ return helper.getServerHost(); } - public OSGiBundle getBundle(String symbolicName, String version) + public OSGiBundle getBundle(String symbolicName, Version version) { OSGiBundle bundle = getBundle(symbolicName, version, false); return bundle; } - protected OSGiBundle getBundle(String symbolicName, String versionStr, boolean mustExist) + protected OSGiBundle getBundle(String symbolicName, Version version, boolean mustExist) { OSGiBundle bundle = null; - Version version = Version.parseVersion(versionStr); List<OSGiBundle> bundles = Arrays.asList(getBundles()); for (OSGiBundle aux : bundles) { if (aux.getSymbolicName().equals(symbolicName)) { - if (versionStr == null || version.equals(aux.getVersion())) + if (version == null || version.equals(aux.getVersion())) { bundle = aux; break;

16 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r93596 - projects/jboss-osgi/projects/runtime/microcontainer/branches.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-09-16 05:22:57 -0400 (Wed, 16 Sep 2009) New Revision: 93596 Removed: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/ Log: Delete userbranch

16 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r93593 - projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-09-16 05:01:26 -0400 (Wed, 16 Sep 2009) New Revision: 93593 Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml Log: Update to jboss-vfs-2.1.3-SNAPSHOT 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 2009-09-16 09:00:08 UTC (rev 93592) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-09-16 09:01:26 UTC (rev 93593) @@ -419,6 +419,7 @@ <include name="jboss-classloader.jar" /> <include name="jboss-classloading.jar" /> <include name="jboss-dependency.jar" /> + <include name="jboss-vfs.jar" /> </fileset> <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">

16 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r93592 - projects/jboss-osgi/projects/spi/trunk.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-09-16 05:00:08 -0400 (Wed, 16 Sep 2009) New Revision: 93592 Modified: projects/jboss-osgi/projects/spi/trunk/pom.xml Log: Update to jboss-vfs-2.1.3-SNAPSHOT Modified: projects/jboss-osgi/projects/spi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/spi/trunk/pom.xml 2009-09-16 08:55:51 UTC (rev 93591) +++ projects/jboss-osgi/projects/spi/trunk/pom.xml 2009-09-16 09:00:08 UTC (rev 93592) @@ -33,7 +33,7 @@ <properties> <version.args4j>2.0.12</version.args4j> <version.jboss.logging>2.0.5.GA</version.jboss.logging> - <version.jboss.vfs>2.1.2.GA</version.jboss.vfs> + <version.jboss.vfs>2.1.3-SNAPSHOT</version.jboss.vfs> <version.osgi>r4v42-20090728</version.osgi> </properties>

16 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r93587 - projects/jboss-osgi/trunk/testsuite.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-09-16 03:22:10 -0400 (Wed, 16 Sep 2009) New Revision: 93587 Modified: projects/jboss-osgi/trunk/testsuite/pom.xml Log: Use jmx-invoker-adaptor-client with runtime Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-09-16 07:00:25 UTC (rev 93586) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-09-16 07:22:10 UTC (rev 93587) @@ -298,6 +298,12 @@ <target.container.excludes>org/jboss/test/osgi/jbossas/**</target.container.excludes> </properties> <dependencies> + <dependency> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jmx-invoker-adaptor-client</artifactId> + <version>${version.jmx.invoker.adaptor.client}</version> + <type>pom</type> + </dependency> </dependencies> </profile>

16 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r93572 - projects/jboss-osgi/trunk/testsuite/functional.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-09-15 23:18:52 -0400 (Tue, 15 Sep 2009) New Revision: 93572 Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml Log: Exclude equinox tests that don't work with jboss600 Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-09-16 03:12:03 UTC (rev 93571) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-09-16 03:18:52 UTC (rev 93572) @@ -128,7 +128,7 @@ <excludes> <exclude>${target.container.excludes}</exclude> <exclude>org/jboss/test/osgi/capabilities/**</exclude> - <exclude>org/jboss/test/osgi/jbosgi36/**</exclude> + <exclude>org/jboss/test/osgi/jbossas/jbosgi36/**</exclude> <exclude>org/jboss/test/osgi/jbosgi37/**</exclude> <exclude>org/jboss/test/osgi/jbosgi38/**</exclude> <exclude>org/jboss/test/osgi/jbosgi39/**</exclude>

16 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r93571 - in projects/jboss-osgi/trunk: reactor and 2 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-09-15 23:12:03 -0400 (Tue, 15 Sep 2009) New Revision: 93571 Added: projects/jboss-osgi/trunk/reactor/remotejmx/ projects/jboss-osgi/trunk/reactor/remotejmx/pom.xml Modified: projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/reactor/pom.xml projects/jboss-osgi/trunk/testsuite/pom.xml Log: Add JBossOSGi Runtime - JMX Invoker Adaptor Client Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-09-16 02:36:19 UTC (rev 93570) +++ projects/jboss-osgi/trunk/pom.xml 2009-09-16 03:12:03 UTC (rev 93571) @@ -264,15 +264,11 @@ <name>!target.container</name> </property> </activation> - <properties> - <surefire.argline.parent>-Djava.security.manager.disabled</surefire.argline.parent> - </properties> <build> <plugins> <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>${surefire.argline.parent}</argLine> <systemProperties> <property> <name>java.protocol.handler.pkgs</name> @@ -316,15 +312,11 @@ <name>target.container</name> </property> </activation> - <properties> - <surefire.argline.parent>-Djava.security.manager -Djava.security.policy=${project.build.directory}/test-classes/tst.policy</surefire.argline.parent> - </properties> <build> <plugins> <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>${surefire.argline.parent}</argLine> <systemProperties> <property> <name>java.protocol.handler.pkgs</name> Modified: projects/jboss-osgi/trunk/reactor/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/pom.xml 2009-09-16 02:36:19 UTC (rev 93570) +++ projects/jboss-osgi/trunk/reactor/pom.xml 2009-09-16 03:12:03 UTC (rev 93571) @@ -43,6 +43,7 @@ <modules> <module>blueprint</module> + <module>remotejmx</module> </modules> </project> Added: projects/jboss-osgi/trunk/reactor/remotejmx/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/remotejmx/pom.xml (rev 0) +++ projects/jboss-osgi/trunk/reactor/remotejmx/pom.xml 2009-09-16 03:12:03 UTC (rev 93571) @@ -0,0 +1,340 @@ +<?xml version="1.0" encoding="UTF-8"?> + +  +  +  +  +  +  +  +  + +  + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>JBossOSGi Runtime - JMX Invoker Adaptor Client</name> + + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jmx-invoker-adaptor-client</artifactId> + <packaging>pom</packaging> + + <version>5.0.1.GA</version> + +  + <parent> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-parent</artifactId> + <version>1.0.2-SNAPSHOT</version> + </parent> + + <properties> + <version.jbossas.server>5.0.1.GA</version.jbossas.server> + <version.jbossas.integration>5.0.1.GA</version.jbossas.integration> + <version.jboss.transaction.api>1.0.1.GA</version.jboss.transaction.api> + <version.jboss.security.spi>2.0.2.SP6</version.jboss.security.spi> + </properties> + +  + <dependencies> + <dependency> + <groupId>org.jboss.integration</groupId> + <artifactId>jboss-integration</artifactId> + <version>${version.jbossas.integration}</version> + </dependency> + <dependency> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-transaction-api</artifactId> + <version>${version.jboss.transaction.api}</version> + </dependency> + <dependency> + <groupId>org.jboss.security</groupId> + <artifactId>jboss-security-spi</artifactId> + <version>${version.jboss.security.spi}</version> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-server</artifactId> + <classifier>jmx-invoker-adaptor-client</classifier> + <version>${version.jbossas.server}</version> + <exclusions> +  + <exclusion> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-deployment</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-bootstrap</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.integration</groupId> + <artifactId>jboss-deployment-spi</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.jpa</groupId> + <artifactId>jboss-jpa-deployers</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.metadata</groupId> + <artifactId>jboss-metadata</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-system-jmx</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-system</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-ejb-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-j2se</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-security</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.integration</groupId> + <artifactId>jboss-transaction-spi</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-jacc-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-jms-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-saaj</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-jaxws</artifactId> + </exclusion> + <exclusion> + <groupId>javax.security</groupId> + <artifactId>jaas</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-jca-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx-client</artifactId> + </exclusion> + <exclusion> + <groupId>bcel</groupId> + <artifactId>bcel</artifactId> + </exclusion> + <exclusion> + <groupId>oswego-concurrent</groupId> + <artifactId>concurrent</artifactId> + </exclusion> + <exclusion> + <groupId>jpl-util</groupId> + <artifactId>jpl-util</artifactId> + </exclusion> + <exclusion> + <groupId>jpl-pattern</groupId> + <artifactId>jpl-pattern</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.naming</groupId> + <artifactId>jnpserver</artifactId> + </exclusion> + <exclusion> + <groupId>gnu-getopt</groupId> + <artifactId>getopt</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-server</artifactId> + <classifier>client</classifier> + <version>${version.jbossas.server}</version> + <exclusions> + <exclusion> + <groupId>jboss</groupId> + <artifactId>jboss-serialization</artifactId> + </exclusion> + <exclusion> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-deployment</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-bootstrap</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.integration</groupId> + <artifactId>jboss-deployment-spi</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.jpa</groupId> + <artifactId>jboss-jpa-deployers</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.metadata</groupId> + <artifactId>jboss-metadata</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-system-jmx</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-system</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-ejb-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-j2se</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-security</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.integration</groupId> + <artifactId>jboss-transaction-spi</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-jacc-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-jms-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-saaj</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-jaxws</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.naming</groupId> + <artifactId>jnp-client</artifactId> + </exclusion> + <exclusion> + <groupId>javax.security</groupId> + <artifactId>jaas</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-jca-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx-client</artifactId> + </exclusion> + <exclusion> + <groupId>bcel</groupId> + <artifactId>bcel</artifactId> + </exclusion> + <exclusion> + <groupId>oswego-concurrent</groupId> + <artifactId>concurrent</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.remoting</groupId> + <artifactId>jboss-remoting</artifactId> + </exclusion> + <exclusion> + <groupId>jpl-util</groupId> + <artifactId>jpl-util</artifactId> + </exclusion> + <exclusion> + <groupId>jpl-pattern</groupId> + <artifactId>jpl-pattern</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.naming</groupId> + <artifactId>jnpserver</artifactId> + </exclusion> + <exclusion> + <groupId>gnu-getopt</groupId> + <artifactId>getopt</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + +</project> Property changes on: projects/jboss-osgi/trunk/reactor/remotejmx/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-09-16 02:36:19 UTC (rev 93570) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-09-16 03:12:03 UTC (rev 93571) @@ -34,7 +34,7 @@  <properties> - <version.jboss.naming>5.0.1.GA</version.jboss.naming> + <version.jmx.invoker.adaptor.client>5.0.1.GA</version.jmx.invoker.adaptor.client> </properties>  @@ -137,18 +137,6 @@  <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnpserver</artifactId> - <version>${version.jboss.naming}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging-log4j</artifactId> <scope>test</scope> @@ -271,7 +259,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>-Xmx1024m ${surefire.argline.parent}</argLine> + <argLine>-Xmx1024m</argLine> </configuration> </plugin> </plugins> @@ -328,6 +316,14 @@ <properties> <target.container.excludes>org/jboss/test/osgi/nothing-to-exclude</target.container.excludes> </properties> + <dependencies> + <dependency> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jmx-invoker-adaptor-client</artifactId> + <version>${version.jmx.invoker.adaptor.client}</version> + <type>pom</type> + </dependency> + </dependencies> </profile> <!-- @@ -345,6 +341,14 @@ <properties> <target.container.excludes>org/jboss/test/osgi/nothing-to-exclude</target.container.excludes> </properties> + <dependencies> + <dependency> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jmx-invoker-adaptor-client</artifactId> + <version>${version.jmx.invoker.adaptor.client}</version> + <type>pom</type> + </dependency> + </dependencies> </profile> <!-- @@ -362,6 +366,14 @@ <properties> <target.container.excludes>org/jboss/test/osgi/nothing-to-exclude</target.container.excludes> </properties> + <dependencies> + <dependency> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jmx-invoker-adaptor-client</artifactId> + <version>${version.jmx.invoker.adaptor.client}</version> + <type>pom</type> + </dependency> + </dependencies> </profile> <!-- @@ -379,6 +391,14 @@ <properties> <target.container.excludes>org/jboss/test/osgi/nothing-to-exclude</target.container.excludes> </properties> + <dependencies> + <dependency> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jmx-invoker-adaptor-client</artifactId> + <version>${version.jmx.invoker.adaptor.client}</version> + <type>pom</type> + </dependency> + </dependencies> </profile> </profiles>

16 years, 10 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

jboss-osgi-commits September 2009