You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by fe...@apache.org on 2007/11/08 16:05:34 UTC
svn commit: r593184 - in /directory/sandbox/felixk: ./ studio-aciitemeditor/
studio-apacheds-configuration-feature/ studio-apacheds-configuration-help/
studio-apacheds-configuration/ studio-connection-core/
studio-connection-ui/ studio-dsml-parser/ stu...
Author: felixk
Date: Thu Nov 8 07:05:33 2007
New Revision: 593184
URL: http://svn.apache.org/viewvc?rev=593184&view=rev
Log:
Take some work home ...
Modified:
directory/sandbox/felixk/pom.xml
directory/sandbox/felixk/studio-aciitemeditor/pom.xml
directory/sandbox/felixk/studio-apacheds-configuration-feature/pom.xml
directory/sandbox/felixk/studio-apacheds-configuration-help/pom.xml
directory/sandbox/felixk/studio-apacheds-configuration/pom.xml
directory/sandbox/felixk/studio-connection-core/pom.xml
directory/sandbox/felixk/studio-connection-ui/pom.xml
directory/sandbox/felixk/studio-dsml-parser/pom.xml
directory/sandbox/felixk/studio-jars/pom.xml
directory/sandbox/felixk/studio-ldapbrowser-common/pom.xml
directory/sandbox/felixk/studio-ldapbrowser-core/pom.xml
Modified: directory/sandbox/felixk/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/pom.xml?rev=593184&r1=593183&r2=593184&view=diff
==============================================================================
--- directory/sandbox/felixk/pom.xml (original)
+++ directory/sandbox/felixk/pom.xml Thu Nov 8 07:05:33 2007
@@ -116,6 +116,9 @@
<!-- Linux i386 GTK-->
<profile>
<id>linux-i386</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<!--
<activation>
<os>
@@ -777,11 +780,10 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <!-- Needed to get the ant taskdef name="fop" -->
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: directory/sandbox/felixk/studio-aciitemeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-aciitemeditor/pom.xml?rev=593184&r1=593183&r2=593184&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-aciitemeditor/pom.xml (original)
+++ directory/sandbox/felixk/studio-aciitemeditor/pom.xml Thu Nov 8 07:05:33 2007
@@ -58,7 +58,6 @@
<artifactId>maven-eclipse-plugin</artifactId>
<configuration>
<pde>true</pde>
- <manifest>${basedir}/src/main/resources/META-INF/MANIFEST.MF</manifest>
<additionalProjectnatures>
<projectnature>org.eclipse.jem.workbench.JavaEMFNature</projectnature>
<projectnature>org.eclipse.pde.PluginNature</projectnature>
@@ -76,6 +75,7 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
+ <manifestFile>META-INF/MANIFEST.MF</manifestFile>
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
</configuration>
Modified: directory/sandbox/felixk/studio-apacheds-configuration-feature/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-apacheds-configuration-feature/pom.xml?rev=593184&r1=593183&r2=593184&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-apacheds-configuration-feature/pom.xml (original)
+++ directory/sandbox/felixk/studio-apacheds-configuration-feature/pom.xml Thu Nov 8 07:05:33 2007
@@ -56,7 +56,6 @@
<artifactId>maven-eclipse-plugin</artifactId>
<configuration>
<pde>true</pde>
- <manifest>${basedir}/src/main/resources/META-INF/MANIFEST.MF</manifest>
<additionalProjectnatures>
<projectnature>org.eclipse.pde.FeatureNature</projectnature>
<projectnature>org.eclipse.jdt.core.javanature</projectnature>
@@ -72,6 +71,7 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
+ <manifestFile>META-INF/MANIFEST.MF</manifestFile>
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
</configuration>
Modified: directory/sandbox/felixk/studio-apacheds-configuration-help/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-apacheds-configuration-help/pom.xml?rev=593184&r1=593183&r2=593184&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-apacheds-configuration-help/pom.xml (original)
+++ directory/sandbox/felixk/studio-apacheds-configuration-help/pom.xml Thu Nov 8 07:05:33 2007
@@ -185,7 +185,6 @@
<artifactId>maven-eclipse-plugin</artifactId>
<configuration>
<pde>true</pde>
- <manifest>${basedir}/src/main/resources/META-INF/MANIFEST.MF</manifest>
<additionalProjectnatures>
<projectnature>org.eclipse.pde.PluginNature</projectnature>
<projectnature>org.eclipse.jdt.core.javanature</projectnature>
@@ -197,6 +196,7 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
+ <manifestFile>META-INF/MANIFEST.MF</manifestFile>
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
</configuration>
Modified: directory/sandbox/felixk/studio-apacheds-configuration/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-apacheds-configuration/pom.xml?rev=593184&r1=593183&r2=593184&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-apacheds-configuration/pom.xml (original)
+++ directory/sandbox/felixk/studio-apacheds-configuration/pom.xml Thu Nov 8 07:05:33 2007
@@ -59,7 +59,6 @@
<artifactId>maven-eclipse-plugin</artifactId>
<configuration>
<pde>true</pde>
- <manifest>${basedir}/src/main/resources/META-INF/MANIFEST.MF</manifest>
<additionalProjectnatures>
<projectnature>org.eclipse.pde.PluginNature</projectnature>
<projectnature>org.eclipse.jdt.core.javanature</projectnature>
@@ -75,6 +74,7 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
+ <manifestFile>META-INF/MANIFEST.MF</manifestFile>
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
</configuration>
Modified: directory/sandbox/felixk/studio-connection-core/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-connection-core/pom.xml?rev=593184&r1=593183&r2=593184&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-connection-core/pom.xml (original)
+++ directory/sandbox/felixk/studio-connection-core/pom.xml Thu Nov 8 07:05:33 2007
@@ -39,40 +39,6 @@
<local-repo>${project.basedir}/../local-repository</local-repo>
</properties>
- <profiles>
- <profile>
- <id>prepare-for-eclipse</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>prepare-for-eclipse</id>
- <phase>install</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <overWrite>true</overWrite>
- <outputDirectory>lib</outputDirectory>
- <artifactItems>
- <artifactItem>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <type>jar</type>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<build>
<resources>
<resource>
@@ -82,6 +48,21 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <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.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
@@ -122,14 +103,17 @@
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.osgi</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.core.jobs</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -138,10 +122,12 @@
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.core.runtime</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
Modified: directory/sandbox/felixk/studio-connection-ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-connection-ui/pom.xml?rev=593184&r1=593183&r2=593184&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-connection-ui/pom.xml (original)
+++ directory/sandbox/felixk/studio-connection-ui/pom.xml Thu Nov 8 07:05:33 2007
@@ -54,6 +54,20 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <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>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
@@ -69,38 +83,47 @@
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>${swt.platformrelated.artifactId}</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.ui.workbench</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.core.commands</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.registry</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.jface</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.ui</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.ui.editors</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>${pom.groupId}.connection.core</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
Modified: directory/sandbox/felixk/studio-dsml-parser/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-dsml-parser/pom.xml?rev=593184&r1=593183&r2=593184&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-dsml-parser/pom.xml (original)
+++ directory/sandbox/felixk/studio-dsml-parser/pom.xml Thu Nov 8 07:05:33 2007
@@ -43,6 +43,16 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <pde>true</pde>
+ <additionalProjectnatures>
+ <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+ </additionalProjectnatures>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
@@ -58,23 +68,27 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-asn1</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>nlog4j</artifactId>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
Modified: directory/sandbox/felixk/studio-jars/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-jars/pom.xml?rev=593184&r1=593183&r2=593184&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-jars/pom.xml (original)
+++ directory/sandbox/felixk/studio-jars/pom.xml Thu Nov 8 07:05:33 2007
@@ -39,69 +39,19 @@
<local-repo>${project.basedir}/../local-repository</local-repo>
</properties>
- <profiles>
- <profile>
- <id>prepare-for-eclipse</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>prepare-for-eclipse</id>
- <phase>install</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <overWrite>true</overWrite>
- <outputDirectory>lib</outputDirectory>
- <artifactItems>
- <artifactItem>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.directory.studio.dsml.parser</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>org.slf4j</groupId>
- <artifactId>nlog4j</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-asn1</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap</artifactId>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <pde>true</pde>
+ <additionalProjectnatures>
+ <projectnature>org.eclipse.pde.PluginNature</projectnature>
+ <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+ </additionalProjectnatures>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
Modified: directory/sandbox/felixk/studio-ldapbrowser-common/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldapbrowser-common/pom.xml?rev=593184&r1=593183&r2=593184&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldapbrowser-common/pom.xml (original)
+++ directory/sandbox/felixk/studio-ldapbrowser-common/pom.xml Thu Nov 8 07:05:33 2007
@@ -54,6 +54,17 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <pde>true</pde>
+ <additionalProjectnatures>
+ <projectnature>org.eclipse.pde.PluginNature</projectnature>
+ <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+ </additionalProjectnatures>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
@@ -69,22 +80,27 @@
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.jface</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.jface.text</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.text</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>${pom.groupId}.ldapbrowser.core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>${pom.groupId}.connection.ui</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
Modified: directory/sandbox/felixk/studio-ldapbrowser-core/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldapbrowser-core/pom.xml?rev=593184&r1=593183&r2=593184&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldapbrowser-core/pom.xml (original)
+++ directory/sandbox/felixk/studio-ldapbrowser-core/pom.xml Thu Nov 8 07:05:33 2007
@@ -39,47 +39,6 @@
<local-repo>${project.basedir}/../local-repository</local-repo>
</properties>
- <profiles>
- <profile>
- <id>prepare-for-eclipse</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>prepare-for-eclipse</id>
- <phase>install</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <overWrite>true</overWrite>
- <outputDirectory>lib</outputDirectory>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<build>
<resources>
<resource>
@@ -95,6 +54,17 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <pde>true</pde>
+ <additionalProjectnatures>
+ <projectnature>org.eclipse.pde.PluginNature</projectnature>
+ <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+ </additionalProjectnatures>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
@@ -146,30 +116,40 @@
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.preferences</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.core.runtime</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>${pom.groupId}.connection.core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>${pom.groupId}.dsml.parser</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.search</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.search</artifactId>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>