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/11/07 14:55:18 UTC
svn commit: r1406636 - in /karaf/eik/trunk: ./
features/org.apache.karaf.eik.feature/
features/org.apache.karaf.eik.repository/ plugins/
plugins/org.apache.commons.lang/ plugins/org.apache.commons.lang/META-INF/
plugins/org.apache.karaf.eik.core/META-INF/
Author: jbonofre
Date: Wed Nov 7 13:55:18 2012
New Revision: 1406636
URL: http://svn.apache.org/viewvc?rev=1406636&view=rev
Log:
[KARAF-1988] Add commons-lang plugin EIK wrapper
Added:
karaf/eik/trunk/plugins/org.apache.commons.lang/
karaf/eik/trunk/plugins/org.apache.commons.lang/META-INF/
karaf/eik/trunk/plugins/org.apache.commons.lang/META-INF/MANIFEST.MF
karaf/eik/trunk/plugins/org.apache.commons.lang/NOTICE
karaf/eik/trunk/plugins/org.apache.commons.lang/build.properties
karaf/eik/trunk/plugins/org.apache.commons.lang/pom.xml
Modified:
karaf/eik/trunk/features/org.apache.karaf.eik.feature/feature.xml
karaf/eik/trunk/features/org.apache.karaf.eik.repository/pom.xml
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/META-INF/MANIFEST.MF
karaf/eik/trunk/plugins/pom.xml
karaf/eik/trunk/pom.xml
Modified: karaf/eik/trunk/features/org.apache.karaf.eik.feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/features/org.apache.karaf.eik.feature/feature.xml?rev=1406636&r1=1406635&r2=1406636&view=diff
==============================================================================
--- karaf/eik/trunk/features/org.apache.karaf.eik.feature/feature.xml (original)
+++ karaf/eik/trunk/features/org.apache.karaf.eik.feature/feature.xml Wed Nov 7 13:55:18 2012
@@ -29,6 +29,7 @@
<import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.jdt.launching" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.pde.ui" version="3.6.0" match="compatible"/>
+ <import plugin="org.apache.commons.lang" version="2.6.0" match="greaterOrEqual"/>
<import plugin="org.ops4j.pax.url.mvn" version="1.2.8" match="greaterOrEqual"/>
<import plugin="org.apache.mina.core" version="2.0.0" match="greaterOrEqual"/>
<import plugin="org.fusesource.jansi" version="1.5.0" match="greaterOrEqual"/>
@@ -92,4 +93,10 @@
install-size="0"
version="3.2.1"/>
+ <plugin
+ id="org.apache.commons.lang"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
</feature>
Modified: karaf/eik/trunk/features/org.apache.karaf.eik.repository/pom.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/features/org.apache.karaf.eik.repository/pom.xml?rev=1406636&r1=1406635&r2=1406636&view=diff
==============================================================================
--- karaf/eik/trunk/features/org.apache.karaf.eik.repository/pom.xml (original)
+++ karaf/eik/trunk/features/org.apache.karaf.eik.repository/pom.xml Wed Nov 7 13:55:18 2012
@@ -84,6 +84,12 @@
<outputDirectory>plugins</outputDirectory>
</artifactItem>
<artifactItem>
+ <groupId>org.apache.karaf.eik.plugins</groupId>
+ <artifactId>org.apache.commons.lang</artifactId>
+ <version>${commons-lang.version}</version>
+ <outputDirectory>plugins</outputDirectory>
+ </artifactItem>
+ <artifactItem>
<groupId>org.apache.karaf.eik.features</groupId>
<artifactId>org.apache.karaf.eik.feature</artifactId>
<version>${project.version}</version>
Added: karaf/eik/trunk/plugins/org.apache.commons.lang/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.commons.lang/META-INF/MANIFEST.MF?rev=1406636&view=auto
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.commons.lang/META-INF/MANIFEST.MF (added)
+++ karaf/eik/trunk/plugins/org.apache.commons.lang/META-INF/MANIFEST.MF Wed Nov 7 13:55:18 2012
@@ -0,0 +1,27 @@
+Manifest-Version: 1.0
+Bundle-Description: Types that extend and augment the Java Lang.
+Bundle-DocURL: http://www.apache.org/
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-ManifestVersion: 2
+Bundle-Name: commons-lang
+Bundle-SymbolicName: org.apache.commons.lang
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 2.6
+Export-Package: org.apache.commons.lang;version="2.6.0",
+ org.apache.commons.lang.builder;version="2.6.0",
+ org.apache.commons.lang.enums;version="2.6.0",
+ org.apache.commons.lang.exception;version="2.6.0",
+ org.apache.commons.lang.math;version="2.6.0",
+ org.apache.commons.lang.mutable;version="2.6.0",
+ org.apache.commons.lang.text;version="2.6.0",
+ org.apache.commons.lang.time;version="2.6.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ClassPath: lib/commons-lang-2.6.jar
+Import-Package: org.apache.commons.lang;version="2.6.0",
+ org.apache.commons.lang.builder;version="2.6.0",
+ org.apache.commons.lang.enums;version="2.6.0",
+ org.apache.commons.lang.exception;version="2.6.0",
+ org.apache.commons.lang.math;version="2.6.0",
+ org.apache.commons.lang.mutable;version="2.6.0",
+ org.apache.commons.lang.text;version="2.6.0",
+ org.apache.commons.lang.time;version="2.6.0"
Added: karaf/eik/trunk/plugins/org.apache.commons.lang/NOTICE
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.commons.lang/NOTICE?rev=1406636&view=auto
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.commons.lang/NOTICE (added)
+++ karaf/eik/trunk/plugins/org.apache.commons.lang/NOTICE Wed Nov 7 13:55:18 2012
@@ -0,0 +1,30 @@
+Apache Karaf EIK
+Copyright 2010-2011 The Apache Software Foundation
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+III. License Summary
+- Apache License 2.0
Added: karaf/eik/trunk/plugins/org.apache.commons.lang/build.properties
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.commons.lang/build.properties?rev=1406636&view=auto
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.commons.lang/build.properties (added)
+++ karaf/eik/trunk/plugins/org.apache.commons.lang/build.properties Wed Nov 7 13:55:18 2012
@@ -0,0 +1,6 @@
+bin.includes = META-INF/,\
+ .,\
+ lib/,\
+ lib/commons-lang-2.6.jar
+bin.excludes = lib/commons-lang-2.6-javadoc.jar
+src.includes = lib/commons-lang-2.6-sources.jar
\ No newline at end of file
Added: karaf/eik/trunk/plugins/org.apache.commons.lang/pom.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.commons.lang/pom.xml?rev=1406636&view=auto
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.commons.lang/pom.xml (added)
+++ karaf/eik/trunk/plugins/org.apache.commons.lang/pom.xml Wed Nov 7 13:55:18 2012
@@ -0,0 +1,129 @@
+<?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.commons.lang</artifactId>
+ <version>2.6</version>
+ <packaging>eclipse-plugin</packaging>
+ <name>Apache Karaf :: EIK :: Plugins :: Apache Commons Lang wrapper</name>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>lib</directory>
+ <includes>
+ <include>**/*.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>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons-lang.version}</version>
+ <outputDirectory>lib</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons-lang.version}</version>
+ <classifier>sources</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>
+ <pluginManagement>
+ <plugins>
+ <!-- this plugin configuration is used to store Eclipse m2e settings only. It doesn't affect the core Maven build -->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <versionRange>[2.1,)</versionRange>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+</project>
\ No newline at end of file
Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/META-INF/MANIFEST.MF?rev=1406636&r1=1406635&r2=1406636&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.core/META-INF/MANIFEST.MF (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/META-INF/MANIFEST.MF Wed Nov 7 13:55:18 2012
@@ -13,7 +13,8 @@ Require-Bundle: org.eclipse.core.runtime
org.apache.mina.core;bundle-version="2.0.0",
org.fusesource.jansi;bundle-version="1.5.0",
sshd-core;bundle-version="0.5.0",
- org.apache.commons.collections;bundle-version="3.2.1"
+ org.apache.commons.collections;bundle-version="3.2.1",
+ org.apache.commons.lang;bundle-version="[2.6.0,3.0.0)"
Export-Package: org.apache.karaf.eik.core,
org.apache.karaf.eik.core.configuration,
org.apache.karaf.eik.core.configuration.internal,
Modified: karaf/eik/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/pom.xml?rev=1406636&r1=1406635&r2=1406636&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/pom.xml (original)
+++ karaf/eik/trunk/plugins/pom.xml Wed Nov 7 13:55:18 2012
@@ -39,6 +39,7 @@
<module>org.apache.mina.core</module>
<module>org.ops4j.pax.url.mvn</module>
<module>org.apache.commons.collections</module>
+ <module>org.apache.commons.lang</module>
<module>org.apache.aries.jmx.api</module>
<module>org.apache.aries.jmx.core</module>
<module>org.apache.karaf.eik.core</module>
Modified: karaf/eik/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/pom.xml?rev=1406636&r1=1406635&r2=1406636&view=diff
==============================================================================
--- karaf/eik/trunk/pom.xml (original)
+++ karaf/eik/trunk/pom.xml Wed Nov 7 13:55:18 2012
@@ -43,6 +43,7 @@
<tycho-version>0.13.0</tycho-version>
<aries.jmx.version>0.3</aries.jmx.version>
<commons-collections.version>3.2.1</commons-collections.version>
+ <commons-lang.version>2.6</commons-lang.version>
<jansi.version>1.7</jansi.version>
<mina.version>2.0.1</mina.version>
<pax.url.version>1.2.8</pax.url.version>