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 2010/08/05 16:16:07 UTC
svn commit: r982631 - in /directory/studio/trunk: ./ ldapservers/
org.apache.mina.core/ org.apache.mina.core/src/
org.apache.mina.core/src/main/ org.apache.mina.core/src/main/resources/
Author: pamarcelot
Date: Thu Aug 5 14:16:07 2010
New Revision: 982631
URL: http://svn.apache.org/viewvc?rev=982631&view=rev
Log:
Added a plugin for the Apache MINA Core jar library and using it in the ldapservers plugin.
Added:
directory/studio/trunk/org.apache.mina.core/
directory/studio/trunk/org.apache.mina.core/.classpath
directory/studio/trunk/org.apache.mina.core/.project
directory/studio/trunk/org.apache.mina.core/pom.xml
directory/studio/trunk/org.apache.mina.core/src/
directory/studio/trunk/org.apache.mina.core/src/main/
directory/studio/trunk/org.apache.mina.core/src/main/resources/
Modified:
directory/studio/trunk/ldapservers/pom.xml
directory/studio/trunk/pom.xml
Modified: directory/studio/trunk/ldapservers/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapservers/pom.xml?rev=982631&r1=982630&r2=982631&view=diff
==============================================================================
--- directory/studio/trunk/ldapservers/pom.xml (original)
+++ directory/studio/trunk/ldapservers/pom.xml Thu Aug 5 14:16:07 2010
@@ -122,6 +122,7 @@
org.eclipse.jface.text,
org.eclipse.ui,
org.eclipse.ui.ide,
+ org.apache.mina.core,
org.apache.directory.studio.common.core,
org.apache.directory.studio.common.ui,
org.apache.directory.studio.jars
@@ -157,12 +158,6 @@
</build>
<dependencies>
- <!-- Libraries dependencies -->
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- </dependency>
-
<!-- Apache Directory Studio plugins dependencies -->
<dependency>
<groupId>org.apache.directory.studio</groupId>
@@ -171,6 +166,11 @@
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.mina.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
<artifactId>common.ui</artifactId>
<scope>provided</scope>
</dependency>
Added: directory/studio/trunk/org.apache.mina.core/.classpath
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.mina.core/.classpath?rev=982631&view=auto
==============================================================================
--- directory/studio/trunk/org.apache.mina.core/.classpath (added)
+++ directory/studio/trunk/org.apache.mina.core/.classpath Thu Aug 5 14:16:07 2010
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry excluding="**/*.java" kind="src" path="target/maven-shared-archive-resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="lib" path="src/main/resources" exported="true"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: directory/studio/trunk/org.apache.mina.core/.project
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.mina.core/.project?rev=982631&view=auto
==============================================================================
--- directory/studio/trunk/org.apache.mina.core/.project (added)
+++ directory/studio/trunk/org.apache.mina.core/.project Thu Aug 5 14:16:07 2010
@@ -0,0 +1,19 @@
+<projectDescription>
+ <name>org.apache.mina.core</name>
+ <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Added: directory/studio/trunk/org.apache.mina.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.mina.core/pom.xml?rev=982631&view=auto
==============================================================================
--- directory/studio/trunk/org.apache.mina.core/pom.xml (added)
+++ directory/studio/trunk/org.apache.mina.core/pom.xml Thu Aug 5 14:16:07 2010
@@ -0,0 +1,140 @@
+<?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</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.mina.core</artifactId>
+ <version>2.0.0-M6</version>
+
+ <name>Apache MINA Core</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>${artifactId};singleton:=true</Bundle-SymbolicName>
+ <Bundle-Localization>plugin</Bundle-Localization>
+ <Export-Package>*</Export-Package>
+ <Import-Package>!</Import-Package>
+ <Private-Package>!</Private-Package>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generate-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Unpack the jar -->
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-apache-directory-studio-plugin</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <overWrite>true</overWrite>
+ <outputDirectory>src/main/resources</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ <excludes>META-INF/**</excludes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- No tests to run -->
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=982631&r1=982630&r2=982631&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Thu Aug 5 14:16:07 2010
@@ -189,6 +189,11 @@
<!-- Apache Directory Studio -->
<dependency>
<groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.mina.core</artifactId>
+ <version>2.0.0-M6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
<artifactId>aciitemeditor</artifactId>
<version>${pom.version}</version>
</dependency>