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/09 16:00:57 UTC
svn commit: r983651 - in /directory/studio/trunk: org.dom4j.dom4j/pom.xml
org.xpp3.xpp3/ org.xpp3.xpp3/.classpath org.xpp3.xpp3/.project
org.xpp3.xpp3/pom.xml pom.xml
Author: pamarcelot
Date: Mon Aug 9 14:00:57 2010
New Revision: 983651
URL: http://svn.apache.org/viewvc?rev=983651&view=rev
Log:
Added the plugin for 'org.xpp3.xpp3'. Updated the name of property for the version of dom4j.
Added:
directory/studio/trunk/org.xpp3.xpp3/
directory/studio/trunk/org.xpp3.xpp3/.classpath
directory/studio/trunk/org.xpp3.xpp3/.project
directory/studio/trunk/org.xpp3.xpp3/pom.xml
Modified:
directory/studio/trunk/org.dom4j.dom4j/pom.xml
directory/studio/trunk/pom.xml
Modified: directory/studio/trunk/org.dom4j.dom4j/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.dom4j.dom4j/pom.xml?rev=983651&r1=983650&r2=983651&view=diff
==============================================================================
--- directory/studio/trunk/org.dom4j.dom4j/pom.xml (original)
+++ directory/studio/trunk/org.dom4j.dom4j/pom.xml Mon Aug 9 14:00:57 2010
@@ -27,7 +27,7 @@
</parent>
<artifactId>org.dom4j.dom4j</artifactId>
- <version>${org.dom4j.dom4j.version}</version>
+ <version>${org.dom4j.version}</version>
<name>dom4j (for Apache Directory Studio)</name>
<packaging>jar</packaging>
Added: directory/studio/trunk/org.xpp3.xpp3/.classpath
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.xpp3.xpp3/.classpath?rev=983651&view=auto
==============================================================================
--- directory/studio/trunk/org.xpp3.xpp3/.classpath (added)
+++ directory/studio/trunk/org.xpp3.xpp3/.classpath Mon Aug 9 14:00:57 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.xpp3.xpp3/.project
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.xpp3.xpp3/.project?rev=983651&view=auto
==============================================================================
--- directory/studio/trunk/org.xpp3.xpp3/.project (added)
+++ directory/studio/trunk/org.xpp3.xpp3/.project Mon Aug 9 14:00:57 2010
@@ -0,0 +1,19 @@
+<projectDescription>
+ <name>org.xpp3.xpp3</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.xpp3.xpp3/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.xpp3.xpp3/pom.xml?rev=983651&view=auto
==============================================================================
--- directory/studio/trunk/org.xpp3.xpp3/pom.xml (added)
+++ directory/studio/trunk/org.xpp3.xpp3/pom.xml Mon Aug 9 14:00:57 2010
@@ -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</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.xpp3.xpp3</artifactId>
+ <version>${org.xpp3.version}</version>
+
+ <name>XPP3 (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>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>studio-maven-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </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>xpp3</groupId>
+ <artifactId>xpp3</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=983651&r1=983650&r2=983651&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Mon Aug 9 14:00:57 2010
@@ -77,7 +77,8 @@
<org.apache.directory.shared.version>0.9.17</org.apache.directory.shared.version>
<org.apache.mina.core.version>2.0.0-M6</org.apache.mina.core.version>
<org.bouncycastle.bcprovjdk15.version>140</org.bouncycastle.bcprovjdk15.version>
- <org.dom4j.dom4j.version>1.6.1</org.dom4j.dom4j.version>
+ <org.dom4j.version>1.6.1</org.dom4j.version>
+ <org.xpp3.version>1.1.3.4.O</org.xpp3.version>
<skin.version>1.0.1</skin.version>
</properties>
@@ -96,6 +97,7 @@
<module>org.apache.mina.core</module>
<module>org.bouncycastle.bcprovjdk15</module>
<module>org.dom4j.dom4j</module>
+ <module>org.xpp3.xpp3</module>
<module>aciitemeditor</module>
<module>apacheds</module>
<module>apacheds-launcher</module>
@@ -1174,7 +1176,7 @@
<dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
- <version>1.1.3.4.O</version>
+ <version>${org.xpp3.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>