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/07/21 16:05:22 UTC
svn commit: r966227 - in /directory/studio/trunk:
application/application-plugins/pom.xml common-core/ common-core/pom.xml
pom.xml
Author: pamarcelot
Date: Wed Jul 21 14:05:21 2010
New Revision: 966227
URL: http://svn.apache.org/viewvc?rev=966227&view=rev
Log:
Added the new 'common.core' plugin.
Added:
directory/studio/trunk/common-core/
directory/studio/trunk/common-core/pom.xml
Modified:
directory/studio/trunk/application/application-plugins/pom.xml
directory/studio/trunk/pom.xml
Modified: directory/studio/trunk/application/application-plugins/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/application-plugins/pom.xml?rev=966227&r1=966226&r2=966227&view=diff
==============================================================================
--- directory/studio/trunk/application/application-plugins/pom.xml (original)
+++ directory/studio/trunk/application/application-plugins/pom.xml Wed Jul 21 14:05:21 2010
@@ -71,6 +71,10 @@
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
+ <artifactId>common.core</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.directory.studio</groupId>
<artifactId>common.ui</artifactId>
</artifactItem>
<artifactItem>
Added: directory/studio/trunk/common-core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/common-core/pom.xml?rev=966227&view=auto
==============================================================================
--- directory/studio/trunk/common-core/pom.xml (added)
+++ directory/studio/trunk/common-core/pom.xml Wed Jul 21 14:05:21 2010
@@ -0,0 +1,145 @@
+<?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>common.core</artifactId>
+ <name>Apache Directory Studio Common Core</name>
+ <packaging>jar</packaging>
+
+ <description />
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ <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>
+ <additionalProjects>
+ <project>org.apache.directory.studio.connection.core</project>
+ </additionalProjects>
+ <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>${groupId}.${artifactId};singleton:=true</Bundle-SymbolicName>
+ <Bundle-Localization>plugin</Bundle-Localization>
+ <Eclipse-LazyStart>true</Eclipse-LazyStart>
+ <Require-Bundle>org.eclipse.core.runtime
+ </Require-Bundle>
+ <Export-Package>org.apache.directory.studio.*</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>
+ <!-- No tests to run -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <!-- Eclipse plugins dependencies -->
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>osgi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=966227&r1=966226&r2=966227&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Wed Jul 21 14:05:21 2010
@@ -71,6 +71,30 @@
<skin.version>1.0.1</skin.version>
</properties>
+ <modules>
+ <!-- The 'repository' module must be the first one -->
+ <module>repository</module>
+ <!-- Other modules are sorted in alphabetical order -->
+ <module>aciitemeditor</module>
+ <module>apacheds</module>
+ <module>apacheds-configuration</module>
+ <module>apacheds-launcher</module>
+ <module>apacheds-feature</module>
+ <module>common-core</module>
+ <module>common-ui</module>
+ <module>connection-core</module>
+ <module>connection-ui</module>
+ <module>jars</module>
+ <module>ldapbrowser-core</module>
+ <module>ldapbrowser-common</module>
+ <module>ldapbrowser-ui</module>
+ <module>ldifeditor</module>
+ <module>ldif-parser</module>
+ <module>rcp</module>
+ <module>schemaeditor</module>
+ <module>valueeditors</module>
+ </modules>
+
<profiles>
<!-- Skip tests -->
<profile>
@@ -208,6 +232,11 @@
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
+ <artifactId>common.core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
<artifactId>connection.core</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -1128,34 +1157,6 @@
</dependencies>
</dependencyManagement>
- <modules>
- <!-- The 'repository' module must be the first one -->
- <module>repository</module>
- <!-- Other modules are sorted in alphabetical order -->
- <module>aciitemeditor</module>
- <module>apacheds</module>
- <module>apacheds-configuration</module>
- <module>apacheds-configuration-feature</module>
- <module>apacheds-launcher</module>
- <module>apacheds-feature</module>
- <module>connection-core</module>
- <module>connection-ui</module>
- <module>common-ui</module>
- <module>jars</module>
- <module>ldapbrowser-core</module>
- <module>ldapbrowser-common</module>
- <module>ldapbrowser-feature</module>
- <module>ldapbrowser-ui</module>
- <module>ldifeditor</module>
- <module>ldifeditor-feature</module>
- <module>ldif-parser</module>
- <module>rcp</module>
- <module>rcp-feature</module>
- <module>schemaeditor</module>
- <module>schemaeditor-feature</module>
- <module>valueeditors</module>
- </modules>
-
<build>
<plugins>
<plugin>