1:20 p.m.
Author: thomas.diesler(a)jboss.com
Date: 2009-12-08 14:20:42 -0500 (Tue, 08 Dec 2009)
New Revision: 97557
Added:
projects/jboss-osgi/projects/bundles/jmx/tags/jboss-osgi-jmx-1.0.2.SP1/
projects/jboss-osgi/projects/bundles/jmx/tags/jboss-osgi-jmx-1.0.2.SP1/pom.xml
Removed:
projects/jboss-osgi/projects/bundles/jmx/tags/jboss-osgi-jmx-1.0.2.SP1/pom.xml
Modified:
projects/jboss-osgi/projects/bundles/jmx/tags/jboss-osgi-jmx-1.0.2.SP1/src/main/java/org/jboss/osgi/jmx/internal/ManagedFrameworkImpl.java
Log:
[maven-release-plugin] copy for tag jboss-osgi-jmx-1.0.2.SP1
Copied: projects/jboss-osgi/projects/bundles/jmx/tags/jboss-osgi-jmx-1.0.2.SP1 (from rev
97553, projects/jboss-osgi/projects/bundles/jmx/trunk)
Property changes on:
projects/jboss-osgi/projects/bundles/jmx/tags/jboss-osgi-jmx-1.0.2.SP1
___________________________________________________________________
Name: svn:ignore
+ target
felix-cache
Name: svn:mergeinfo
+
Deleted: projects/jboss-osgi/projects/bundles/jmx/tags/jboss-osgi-jmx-1.0.2.SP1/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2009-12-08 17:36:49 UTC (rev
97553)
+++
projects/jboss-osgi/projects/bundles/jmx/tags/jboss-osgi-jmx-1.0.2.SP1/pom.xml 2009-12-08
19:20:42 UTC (rev 97557)
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
- <!-- ====================================================================== -->
- <!-- -->
- <!-- JBoss, the OpenSource J2EE webOS -->
- <!-- -->
- <!-- Distributable under LGPL license. -->
- <!-- See terms of license at http://www.gnu.org. -->
- <!-- -->
- <!-- ====================================================================== -->
-
- <!-- $Id$ -->
-
-<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 Reactor - JMX</name>
- <description>The JBossOSGi Management</description>
-
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jmx</artifactId>
- <packaging>bundle</packaging>
-
- <version>1.0.3-SNAPSHOT</version>
-
- <!-- Parent -->
- <parent>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.4</version>
- </parent>
-
- <!-- Subversion -->
- <scm>
-
<connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jbo...
-
<developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projec...
- <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url>
- </scm>
-
- <!-- Properties -->
- <properties>
-
<version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
- <version.jboss.osgi.jndi>1.0.2</version.jboss.osgi.jndi>
- <version.jboss.osgi.spi>1.0.3</version.jboss.osgi.spi>
- <version.osgi>4.2.0</version.osgi>
- </properties>
-
- <!-- Dependencies -->
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common-core</artifactId>
- <version>${version.jboss.osgi.common.core}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jndi</artifactId>
- <version>${version.jboss.osgi.jndi}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
- <version>${version.jboss.osgi.spi}</version>
- </dependency>
-
- <!-- OSGi Dependencies -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
-
<Bundle-Activator>org.jboss.osgi.jmx.internal.JMXServiceActivator</Bundle-Activator>
- <Export-Package>
- org.jboss.osgi.jmx;version=${version}
- </Export-Package>
- <Import-Package>
-
- <!-- system -->
- javax.management*,
- javax.naming,
- javax.naming.spi,
-
- <!-- jboss-osgi -->
- org.jboss.osgi.spi.capability;version=1.0,
- org.jboss.osgi.spi.management;version=1.0,
-
- <!-- osgi -->
- org.osgi.framework;version=1.4,
- org.osgi.service.log,
- org.osgi.service.packageadmin,
- org.osgi.util.tracker,
-
- <!-- logging -->
- org.slf4j,
-
- <!-- FIXME optional -->
- org.jboss.osgi.jndi,
- org.jboss.net.sockets,
- org.jnp.interfaces,
-
- <!--
- org.jboss.osgi.jndi;resolution:=optional,
- org.jboss.net.sockets;resolution:=optional,
- org.jnp.interfaces;resolution:=optional,
- -->
- </Import-Package>
- <DynamicImport-Package>*</DynamicImport-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <!-- For some reason the distribution javadoc module needs this
-->
- <file>target/${artifactId}-${version}-sources.jar</file>
- <classifier>sources</classifier>
- <type>jar</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
Copied: projects/jboss-osgi/projects/bundles/jmx/tags/jboss-osgi-jmx-1.0.2.SP1/pom.xml
(from rev 97556, projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml)
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/tags/jboss-osgi-jmx-1.0.2.SP1/pom.xml
(rev 0)
+++
projects/jboss-osgi/projects/bundles/jmx/tags/jboss-osgi-jmx-1.0.2.SP1/pom.xml 2009-12-08
19:20:42 UTC (rev 97557)
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+ <!-- ====================================================================== -->
+ <!-- -->
+ <!-- JBoss, the OpenSource J2EE webOS -->
+ <!-- -->
+ <!-- Distributable under LGPL license. -->
+ <!-- See terms of license at http://www.gnu.org. -->
+ <!-- -->
+ <!-- ====================================================================== -->
+
+ <!-- $Id$ -->
+
+<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 Reactor - JMX</name>
+ <description>The JBossOSGi Management</description>
+
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jmx</artifactId>
+ <packaging>bundle</packaging>
+
+ <version>1.0.2.SP1</version>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.4</version>
+ </parent>
+
+ <!-- Subversion -->
+ <scm>
+
<connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jbo...
+
<developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projec...
+
<url>http://fisheye.jboss.com/qsearch/JBossOSGi/tags/jboss-osgi-jmx-1.0...
+ </scm>
+
+ <!-- Properties -->
+ <properties>
+
<version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
+ <version.jboss.osgi.jndi>1.0.2</version.jboss.osgi.jndi>
+ <version.jboss.osgi.spi>1.0.3.SP1</version.jboss.osgi.spi>
+ <version.osgi>4.2.0</version.osgi>
+ </properties>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common-core</artifactId>
+ <version>${version.jboss.osgi.common.core}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jndi</artifactId>
+ <version>${version.jboss.osgi.jndi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-spi</artifactId>
+ <version>${version.jboss.osgi.spi}</version>
+ </dependency>
+
+ <!-- OSGi Dependencies -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${version.osgi}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+
<Bundle-Activator>org.jboss.osgi.jmx.internal.JMXServiceActivator</Bundle-Activator>
+ <Export-Package>
+ org.jboss.osgi.jmx;version=${version}
+ </Export-Package>
+ <Import-Package>
+
+ <!-- system -->
+ javax.management*,
+ javax.naming,
+ javax.naming.spi,
+
+ <!-- jboss-osgi -->
+ org.jboss.osgi.spi.capability;version=1.0,
+ org.jboss.osgi.spi.management;version=1.0,
+
+ <!-- osgi -->
+ org.osgi.framework;version=1.4,
+ org.osgi.service.log,
+ org.osgi.service.packageadmin,
+ org.osgi.util.tracker,
+
+ <!-- logging -->
+ org.slf4j,
+
+ <!-- FIXME optional -->
+ org.jboss.osgi.jndi,
+ org.jboss.net.sockets,
+ org.jnp.interfaces,
+
+ <!--
+ org.jboss.osgi.jndi;resolution:=optional,
+ org.jboss.net.sockets;resolution:=optional,
+ org.jnp.interfaces;resolution:=optional,
+ -->
+ </Import-Package>
+ <DynamicImport-Package>*</DynamicImport-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <!-- For some reason the distribution javadoc module needs this
-->
+ <file>target/${artifactId}-${version}-sources.jar</file>
+ <classifier>sources</classifier>
+ <type>jar</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Modified:
projects/jboss-osgi/projects/bundles/jmx/tags/jboss-osgi-jmx-1.0.2.SP1/src/main/java/org/jboss/osgi/jmx/internal/ManagedFrameworkImpl.java
===================================================================
---
projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedFrameworkImpl.java 2009-12-08
17:36:49 UTC (rev 97553)
+++
projects/jboss-osgi/projects/bundles/jmx/tags/jboss-osgi-jmx-1.0.2.SP1/src/main/java/org/jboss/osgi/jmx/internal/ManagedFrameworkImpl.java 2009-12-08
19:20:42 UTC (rev 97557)
@@ -136,7 +136,7 @@
public Set<ObjectName> getBundles()
{
// [JBAS-6571] JMX filtering does not work with wildcards
- // ObjectName pattern = ObjectNameFactory.create(Constants.DOMAIN_NAME +
":sname=*,*");
+ // ObjectName pattern = ObjectNameFactory.create(Constants.DOMAIN_NAME +
":name=*,*");
// Set<ObjectName> names = mbeanServer.queryNames(pattern, null);
ObjectName pattern = ObjectNameFactory.create(DOMAIN_NAME + ":*");