You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2011/02/08 12:18:32 UTC
svn commit: r1068333 - in /directory/studio/branches/m1:
libraries/org.apache.felix.framework/
libraries/org.apache.felix.framework/pom.xml libraries/pom.xml pom.xml
Author: pamarcelot
Date: Tue Feb 8 11:18:32 2011
New Revision: 1068333
URL: http://svn.apache.org/viewvc?rev=1068333&view=rev
Log:
Added a 'org.apache.felix.framework' library plugin.
It is used only to satisfy the dependencies hierarchy within Eclipse and be able to launch Studio within another Eclipse instance.
This rebranded jar is not meant to be distributed in the application, the original Felix jar will be.
Added:
directory/studio/branches/m1/libraries/org.apache.felix.framework/ (with props)
directory/studio/branches/m1/libraries/org.apache.felix.framework/pom.xml
Modified:
directory/studio/branches/m1/libraries/pom.xml
directory/studio/branches/m1/pom.xml
Propchange: directory/studio/branches/m1/libraries/org.apache.felix.framework/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Feb 8 11:18:32 2011
@@ -0,0 +1,6 @@
+.classpath
+.project
+.settings
+lib
+META-INF
+target
Added: directory/studio/branches/m1/libraries/org.apache.felix.framework/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/libraries/org.apache.felix.framework/pom.xml?rev=1068333&view=auto
==============================================================================
--- directory/studio/branches/m1/libraries/org.apache.felix.framework/pom.xml (added)
+++ directory/studio/branches/m1/libraries/org.apache.felix.framework/pom.xml Tue Feb 8 11:18:32 2011
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<!--
+ @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+-->
+<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.directory.studio</groupId>
+ <artifactId>parent-libraries</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>${org.apache.felix.version}</version>
+
+ <name>Apache Felix Framework (for Apache Directory Studio)</name>
+ <packaging>jar</packaging>
+
+ <description />
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ <pde>true</pde>
+ <additionalProjectnatures>
+ <projectnature>org.eclipse.pde.PluginNature</projectnature>
+ <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+ </additionalProjectnatures>
+ <classpathContainers>
+ <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+ <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+ </classpathContainers>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>studio-maven-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ <createManifest>true</createManifest>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>prepare-jar-package</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ </plugin>
+ <!-- MANIFEST.MF Generation -->
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <Bundle-SymbolicName>org.apache.felix.framework</Bundle-SymbolicName>
+ <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+ <Embed-Directory>lib</Embed-Directory>
+ <Embed-StripGroup>true</Embed-StripGroup>
+ <Export-Package>*</Export-Package>
+ <Import-Package>!</Import-Package>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generate-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- No tests to run -->
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
Modified: directory/studio/branches/m1/libraries/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/libraries/pom.xml?rev=1068333&r1=1068332&r2=1068333&view=diff
==============================================================================
--- directory/studio/branches/m1/libraries/pom.xml (original)
+++ directory/studio/branches/m1/libraries/pom.xml Tue Feb 8 11:18:32 2011
@@ -47,6 +47,7 @@
<module>org.apache.directory.server.i18n</module>
<module>org.apache.directory.server.ldif.partition</module>
<module>org.apache.directory.server.xdbm.partition</module>
+ <module>org.apache.felix.framework</module>
<module>org.apache.httpcomponents.httpclient</module>
<module>org.apache.httpcomponents.httpcore</module>
<module>org.apache.logging.log4j</module>
Modified: directory/studio/branches/m1/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/pom.xml?rev=1068333&r1=1068332&r2=1068333&view=diff
==============================================================================
--- directory/studio/branches/m1/pom.xml (original)
+++ directory/studio/branches/m1/pom.xml Tue Feb 8 11:18:32 2011
@@ -81,6 +81,7 @@
<org.apache.directory.shared.validversion>0.9.20.SNAPSHOT</org.apache.directory.shared.validversion>
<org.apache.directory.server.version>1.5.8-SNAPSHOT</org.apache.directory.server.version>
<org.apache.directory.server.validversion>1.5.8.SNAPSHOT</org.apache.directory.server.validversion>
+ <org.apache.felix.version>3.0.0</org.apache.felix.version>
<org.apache.mina.core.version>2.0.2</org.apache.mina.core.version>
<org.bouncycastle.bcprov.jdk15.version>140</org.bouncycastle.bcprov.jdk15.version>
<org.dom4j.version>1.6.1</org.dom4j.version>
@@ -1473,6 +1474,11 @@
<version>${org.apache.mina.core.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>${org.apache.felix.version}</version>
+ </dependency>
+ <dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.9.1</version>