Author: gawor
Date: Thu Dec 24 06:52:39 2009
New Revision: 893701
URL: http://svn.apache.org/viewvc?rev=893701&view=rev
Log:
ARIES-92: create bundle for blueprint mbean api and implementation and also
update the intergration tests to run against the intergrated bundles
Added:
incubator/aries/trunk/jmx/jmx-blueprint-bundle/
incubator/aries/trunk/jmx/jmx-blueprint-bundle/pom.xml (with props)
Modified:
incubator/aries/trunk/jmx/jmx-api/pom.xml
incubator/aries/trunk/jmx/jmx-blueprint-api/pom.xml
incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml
incubator/aries/trunk/jmx/jmx-bundle/pom.xml
incubator/aries/trunk/jmx/jmx-core/pom.xml
incubator/aries/trunk/jmx/jmx-itests/pom.xml
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
incubator/aries/trunk/jmx/pom.xml
Modified: incubator/aries/trunk/jmx/jmx-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-api/pom.xml?rev=893701&r1=893700&r2=893701&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-api/pom.xml (original)
+++ incubator/aries/trunk/jmx/jmx-api/pom.xml Thu Dec 24 06:52:39 2009
@@ -23,7 +23,7 @@
<version>1.0.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>aries-jmx-api</artifactId>
+ <artifactId>org.apache.aries.jmx.api</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JMX API</name>
<description>
@@ -38,7 +38,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
-
<Bundle-SymbolicName>${pom.groupId}.api</Bundle-SymbolicName>
+
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Export-Package>
org.osgi.jmx;version="1.0.0";uses:="javax.management.openmbean",
org.osgi.jmx.framework;version="1.5.0";uses:="org.osgi.jmx,javax.management.openmbean",
Modified: incubator/aries/trunk/jmx/jmx-blueprint-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-api/pom.xml?rev=893701&r1=893700&r2=893701&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-api/pom.xml (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-api/pom.xml Thu Dec 24 06:52:39 2009
@@ -23,7 +23,7 @@
<version>1.0.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>aries-jmx-blueprint-api</artifactId>
+ <artifactId>org.apache.aries.jmx.blueprint.api</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JMX Blueprint API</name>
<description>
@@ -38,7 +38,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
-
<Bundle-SymbolicName>${pom.groupId}.api</Bundle-SymbolicName>
+
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Export-Package>
org.apache.aries.jmx.blueprint
</Export-Package>
Added: incubator/aries/trunk/jmx/jmx-blueprint-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-bundle/pom.xml?rev=893701&view=auto
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-bundle/pom.xml (added)
+++ incubator/aries/trunk/jmx/jmx-blueprint-bundle/pom.xml Thu Dec 24 06:52:39
2009
@@ -0,0 +1,188 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<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>
+ <parent>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>jmx</artifactId>
+ <version>1.0.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>aries-jmx-blueprint</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Aries JMX Blueprint Bundle</name>
+ <description>
+ This bundle contains the standalone implementation of the along with
the API.
+ </description>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.blueprint.api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.blueprint.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <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>${pom.groupId}.blueprint</Bundle-SymbolicName>
+ <Import-Package>
+ !org.apache.aries.jmx*,
+ javax.management,
+ javax.management.openmbean,
+ org.osgi.framework;version="1.5.0",
+ org.osgi.service.blueprint.container;version="1.0",
+ org.osgi.service.blueprint.reflect;version="1.0",
+ org.osgi.util.tracker;version="1.4",
+ *
+ </Import-Package>
+ <Export-Package>
+ org.apache.aries.jmx.blueprint
+ </Export-Package>
+
<Bundle-Activator>org.apache.aries.jmx.blueprint.impl.Activator</Bundle-Activator>
+
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+
<_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
+ <_failok>true</_failok>
+ </instructions>
+ <unpackBundle>true</unpackBundle>
+ </configuration>
+ </plugin>
+ <!--
+ Use the shade plugin with the dependency plugin to unjar the
two jars (api & core)
+ so that the associated sources and javadocs jars are complete.
To build the main
+ jar, the maven-bundle-plugin is used, that's why everything is
exluded
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+
<include>org.apache.aries.jmx:org.apache.aries.jmx.blueprint.api</include>
+
<include>org.apache.aries.jmx:org.apache.aries.jmx.blueprint.core</include>
+ </includes>
+ </artifactSet>
+
<createSourcesJar>${createSourcesJar}</createSourcesJar>
+
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+
<createDependencyReducedPom>true</createDependencyReducedPom>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>deploy</id>
+ <properties>
+ <createSourcesJar>true</createSourcesJar>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+
<groupId>org.apache.aries.jmx</groupId>
+
<artifactId>aries-jmx-api</artifactId>
+ <classifier>sources</classifier>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.aries.jmx</groupId>
+
<artifactId>aries-jmx-core</artifactId>
+ <classifier>sources</classifier>
+ </artifactItem>
+ </artifactItems>
+
<outputDirectory>${project.build.directory}/sources</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <minmemory>128m</minmemory>
+ <maxmemory>512m</maxmemory>
+
<sourcepath>${project.build.directory}/sources</sourcepath>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-bundle/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-bundle/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-bundle/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml?rev=893701&r1=893700&r2=893701&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml Thu Dec 24 06:52:39
2009
@@ -23,7 +23,7 @@
<version>1.0.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>aries-jmx-blueprint-core</artifactId>
+ <artifactId>org.apache.aries.jmx.blueprint.core</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JMX Blueprint Core</name>
<description>
@@ -33,7 +33,7 @@
<dependencies>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
- <artifactId>aries-jmx-blueprint-api</artifactId>
+ <artifactId>org.apache.aries.jmx.blueprint.api</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -73,7 +73,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
-
<Bundle-SymbolicName>${pom.groupId}.core</Bundle-SymbolicName>
+
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.apache.aries.jmx.blueprint.impl.Activator</Bundle-Activator>
<Export-Package>
org.apache.aries.jmx.blueprint.impl.codec*;version=${project.version}
Modified: incubator/aries/trunk/jmx/jmx-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-bundle/pom.xml?rev=893701&r1=893700&r2=893701&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-bundle/pom.xml (original)
+++ incubator/aries/trunk/jmx/jmx-bundle/pom.xml Thu Dec 24 06:52:39 2009
@@ -34,11 +34,11 @@
<dependencies>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
- <artifactId>aries-jmx-api</artifactId>
+ <artifactId>org.apache.aries.jmx.api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
- <artifactId>aries-jmx-core</artifactId>
+ <artifactId>org.apache.aries.jmx.core</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -76,11 +76,11 @@
javax.management.openmbean,
*
</Import-Package>
-
<Bundle-Activator>org.apache.aries.jmx.Activator</Bundle-Activator>
- <!-- Not currently exporting from the standalone -->
<Export-Package>
- !*
+ org.osgi.jmx*,
+ org.apache.aries.jmx.codec;version="${pom.version}"
</Export-Package>
+
<Bundle-Activator>org.apache.aries.jmx.Activator</Bundle-Activator>
<!-- include the right NOTICE with attribution to the
OSGi alliance -->
<Include-Resource>{maven-resources},META-INF/NOTICE=../NOTICE</Include-Resource>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
@@ -107,8 +107,8 @@
<configuration>
<artifactSet>
<includes>
-
<include>org.apache.aries.jmx:aries-jmx-api</include>
-
<include>org.apache.aries.jmx:aries-jmx-core</include>
+
<include>org.apache.aries.jmx:org.apache.aries.jmx.api</include>
+
<include>org.apache.aries.jmx:org.apache.aries.jmx.core</include>
</includes>
</artifactSet>
<createSourcesJar>${createSourcesJar}</createSourcesJar>
Modified: incubator/aries/trunk/jmx/jmx-core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-core/pom.xml?rev=893701&r1=893700&r2=893701&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-core/pom.xml (original)
+++ incubator/aries/trunk/jmx/jmx-core/pom.xml Thu Dec 24 06:52:39 2009
@@ -23,7 +23,7 @@
<version>1.0.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>aries-jmx-core</artifactId>
+ <artifactId>org.apache.aries.jmx.core</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JMX Core</name>
<description>
@@ -34,7 +34,7 @@
<dependencies>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
- <artifactId>aries-jmx-api</artifactId>
+ <artifactId>org.apache.aries.jmx.api</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -62,7 +62,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
-
<Bundle-SymbolicName>${pom.groupId}.core</Bundle-SymbolicName>
+
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.apache.aries.jmx.Activator</Bundle-Activator>
<Import-Package>
!org.apache.aries.jmx*,
Modified: incubator/aries/trunk/jmx/jmx-itests/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/pom.xml?rev=893701&r1=893700&r2=893701&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-itests/pom.xml (original)
+++ incubator/aries/trunk/jmx/jmx-itests/pom.xml Thu Dec 24 06:52:39 2009
@@ -41,22 +41,12 @@
<dependencies>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
- <artifactId>aries-jmx-api</artifactId>
+ <artifactId>aries-jmx</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
- <artifactId>aries-jmx-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>aries-jmx-blueprint-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>aries-jmx-blueprint-core</artifactId>
+ <artifactId>aries-jmx-blueprint</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -146,6 +136,7 @@
<target>1.5</target>
</configuration>
</plugin>
+
<plugin>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>maven-paxexam-plugin</artifactId>
@@ -164,6 +155,7 @@
</settings>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Modified:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java?rev=893701&r1=893700&r2=893701&view=diff
==============================================================================
---
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java
(original)
+++
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java
Thu Dec 24 06:52:39 2009
@@ -41,8 +41,7 @@
@Configuration
public static Option[] configuration() {
return CoreOptions.options(CoreOptions.equinox(),
-
CoreOptions.mavenBundle().groupId("org.apache.aries.jmx").artifactId("aries-jmx-api").versionAsInProject(),
-
CoreOptions.mavenBundle().groupId("org.apache.aries.jmx").artifactId("aries-jmx-core").versionAsInProject()
+
CoreOptions.mavenBundle().groupId("org.apache.aries.jmx").artifactId("aries-jmx").versionAsInProject()
);
}
Modified:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java?rev=893701&r1=893700&r2=893701&view=diff
==============================================================================
---
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
(original)
+++
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
Thu Dec 24 06:52:39 2009
@@ -78,8 +78,7 @@
CoreOptions.mavenBundle().groupId("org.ops4j.pax.logging").artifactId("pax-logging-service").versionAsInProject(),
CoreOptions.mavenBundle().groupId("org.apache.aries.blueprint").artifactId("aries-blueprint").versionAsInProject(),
CoreOptions.mavenBundle().groupId("org.apache.aries.blueprint").artifactId("org.apache.aries.blueprint.sample").versionAsInProject(),
-
CoreOptions.mavenBundle().groupId("org.apache.aries.jmx").artifactId("aries-jmx-blueprint-api").versionAsInProject(),
-
CoreOptions.mavenBundle().groupId("org.apache.aries.jmx").artifactId("aries-jmx-blueprint-core").versionAsInProject()
+
CoreOptions.mavenBundle().groupId("org.apache.aries.jmx").artifactId("aries-jmx-blueprint").versionAsInProject()
);
}
Modified: incubator/aries/trunk/jmx/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/pom.xml?rev=893701&r1=893700&r2=893701&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/pom.xml (original)
+++ incubator/aries/trunk/jmx/pom.xml Thu Dec 24 06:52:39 2009
@@ -43,22 +43,22 @@
<dependencies>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
- <artifactId>aries-jmx-api</artifactId>
+ <artifactId>org.apache.aries.jmx.api</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
- <artifactId>aries-jmx-core</artifactId>
+ <artifactId>org.apache.aries.jmx.core</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
- <artifactId>aries-jmx-blueprint-api</artifactId>
+ <artifactId>org.apache.aries.jmx.blueprint.api</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
- <artifactId>aries-jmx-blueprint-core</artifactId>
+ <artifactId>org.apache.aries.jmx.blueprint.core</artifactId>
<version>${version}</version>
</dependency>
<dependency>
@@ -67,6 +67,11 @@
<version>${version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>aries-jmx-blueprint</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>4.2.0</version>
@@ -169,6 +174,7 @@
<module>jmx-core</module>
<module>jmx-blueprint-core</module>
<module>jmx-bundle</module>
+ <module>jmx-blueprint-bundle</module>
<module>jmx-itests</module>
</modules>
