You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/01/13 08:22:51 UTC
svn commit: r1230909 - in /karaf/eik/trunk/plugins: ./
org.apache.aries.jmx.api/ org.apache.aries.jmx.api/META-INF/ org.osgi.jmx/
org.osgi.jmx/META-INF/ org.osgi.jmx/lib/
Author: jbonofre
Date: Fri Jan 13 07:22:50 2012
New Revision: 1230909
URL: http://svn.apache.org/viewvc?rev=1230909&view=rev
Log:
Refactoring of the Aries JMX API Eclipse plugin wrapper
Added:
karaf/eik/trunk/plugins/org.apache.aries.jmx.api/
karaf/eik/trunk/plugins/org.apache.aries.jmx.api/META-INF/
karaf/eik/trunk/plugins/org.apache.aries.jmx.api/META-INF/MANIFEST.MF
karaf/eik/trunk/plugins/org.apache.aries.jmx.api/NOTICE
- copied, changed from r1230779, karaf/eik/trunk/plugins/org.osgi.jmx/NOTICE
karaf/eik/trunk/plugins/org.apache.aries.jmx.api/build.properties
karaf/eik/trunk/plugins/org.apache.aries.jmx.api/pom.xml
Removed:
karaf/eik/trunk/plugins/org.osgi.jmx/META-INF/MANIFEST.MF
karaf/eik/trunk/plugins/org.osgi.jmx/NOTICE
karaf/eik/trunk/plugins/org.osgi.jmx/build.properties
karaf/eik/trunk/plugins/org.osgi.jmx/lib/org.apache.aries.jmx.api-0.2-incubating-javadoc.jar
karaf/eik/trunk/plugins/org.osgi.jmx/lib/org.apache.aries.jmx.api-0.2-incubating-sources.jar
karaf/eik/trunk/plugins/org.osgi.jmx/lib/org.apache.aries.jmx.api-0.2-incubating.jar
karaf/eik/trunk/plugins/org.osgi.jmx/pom.xml
Modified:
karaf/eik/trunk/plugins/pom.xml
Added: karaf/eik/trunk/plugins/org.apache.aries.jmx.api/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.aries.jmx.api/META-INF/MANIFEST.MF?rev=1230909&view=auto
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.aries.jmx.api/META-INF/MANIFEST.MF (added)
+++ karaf/eik/trunk/plugins/org.apache.aries.jmx.api/META-INF/MANIFEST.MF Fri Jan 13 07:22:50 2012
@@ -0,0 +1,28 @@
+Manifest-Version: 1.0
+Export-Package: org.osgi.jmx;uses:="javax.management.openmbean";versio
+ n="1.0.0",org.osgi.jmx.framework;uses:="org.osgi.jmx,javax.management
+ .openmbean";version="1.5.0",org.osgi.jmx.service.cm;uses:="javax.mana
+ gement.openmbean";version="1.3.0",org.osgi.jmx.service.permissionadmi
+ n;uses:="org.osgi.jmx";version="1.2.0",org.osgi.jmx.service.provision
+ ing;uses:="javax.management.openmbean";version="1.2.0",org.osgi.jmx.s
+ ervice.useradmin;uses:="org.osgi.jmx,javax.management.openmbean";vers
+ ion="1.1.0"
+Implementation-Title: Apache Aries
+Implementation-Version: 0.3
+Built-By: zoe
+Tool: Bnd-1.15.0
+Bundle-Name: Apache Aries JMX API
+Created-By: Apache Maven Bundle Plugin
+Bundle-Vendor: The Apache Software Foundation
+Build-Jdk: 1.6.0_22
+Bundle-Version: 0.3
+Bnd-LastModified: 1295786529768
+Bundle-ManifestVersion: 2
+Bundle-Description: This bundle contains the JMX 1.0.0 API
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-DocURL: http://www.apache.org
+Bundle-SymbolicName: org.apache.aries.jmx.api
+Import-Package: javax.management.openmbean
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ClassPath: lib/org.apache.aries.jmx.api-0.3.jar,
+ .
\ No newline at end of file
Copied: karaf/eik/trunk/plugins/org.apache.aries.jmx.api/NOTICE (from r1230779, karaf/eik/trunk/plugins/org.osgi.jmx/NOTICE)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.aries.jmx.api/NOTICE?p2=karaf/eik/trunk/plugins/org.apache.aries.jmx.api/NOTICE&p1=karaf/eik/trunk/plugins/org.osgi.jmx/NOTICE&r1=1230779&r2=1230909&rev=1230909&view=diff
==============================================================================
(empty)
Added: karaf/eik/trunk/plugins/org.apache.aries.jmx.api/build.properties
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.aries.jmx.api/build.properties?rev=1230909&view=auto
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.aries.jmx.api/build.properties (added)
+++ karaf/eik/trunk/plugins/org.apache.aries.jmx.api/build.properties Fri Jan 13 07:22:50 2012
@@ -0,0 +1,6 @@
+bin.includes = META-INF/,\
+ .,\
+ lib/,\
+ lib/org.apache.aries.jmx.api-0.3.jar
+bin.excludes = lib/org.apache.aries.jmx.api-0.3-javadoc.jar
+src.includes = lib/org.apache.aries.jmx.api-0.3-sources.jar
Added: karaf/eik/trunk/plugins/org.apache.aries.jmx.api/pom.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.aries.jmx.api/pom.xml?rev=1230909&view=auto
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.aries.jmx.api/pom.xml (added)
+++ karaf/eik/trunk/plugins/org.apache.aries.jmx.api/pom.xml Fri Jan 13 07:22:50 2012
@@ -0,0 +1,128 @@
+<?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/xsd/maven-4.0.0.xsd">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.karaf.eik</groupId>
+ <artifactId>plugins</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.karaf.eik.plugins</groupId>
+ <artifactId>org.apache.aries.jmx.api</artifactId>
+ <version>0.3</version>
+ <packaging>eclipse-plugin</packaging>
+ <name>Apache Karaf :: EIK :: Plugins :: OSGi JMX RFC Wrapper</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.api</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.api</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}</directory>
+ <includes>
+ <include>lib/**/*.jar</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.api</artifactId>
+ <version>${project.version}</version>
+ <outputDirectory>lib</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.api</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ <outputDirectory>lib</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.api</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ <outputDirectory>lib</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.basedir}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>lib</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Modified: karaf/eik/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/pom.xml?rev=1230909&r1=1230908&r2=1230909&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/pom.xml (original)
+++ karaf/eik/trunk/plugins/pom.xml Fri Jan 13 07:22:50 2012
@@ -37,8 +37,8 @@
<module>org.apache.sshd.core</module>
<module>org.fusesource.jansi</module>
<module>org.apache.mina.core</module>
- <module>org.osgi.jmx</module>
<module>org.ops4j.pax.url.mvn</module>
+ <module>org.apache.aries.jmx.api</module>
<module>org.apache.aries.jmx.core</module>
<module>org.apache.karaf.eik.core</module>
<module>org.apache.karaf.eik.jmx</module>