You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2014/10/02 13:02:15 UTC
svn commit: r1628931 - in /directory/studio/branches/studio-tycho/plugins:
aciitemeditor/META-INF/ aciitemeditor/META-INF/MANIFEST.MF
aciitemeditor/build.properties aciitemeditor/pom.xml pom.xml
valueeditors/META-INF/MANIFEST.MF
Author: elecharny
Date: Thu Oct 2 11:02:14 2014
New Revision: 1628931
URL: http://svn.apache.org/r1628931
Log:
Added the aciitemeditor plugin to the Tycho build
Added:
directory/studio/branches/studio-tycho/plugins/aciitemeditor/META-INF/
directory/studio/branches/studio-tycho/plugins/aciitemeditor/META-INF/MANIFEST.MF
directory/studio/branches/studio-tycho/plugins/aciitemeditor/build.properties
Modified:
directory/studio/branches/studio-tycho/plugins/aciitemeditor/pom.xml
directory/studio/branches/studio-tycho/plugins/pom.xml
directory/studio/branches/studio-tycho/plugins/valueeditors/META-INF/MANIFEST.MF
Added: directory/studio/branches/studio-tycho/plugins/aciitemeditor/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/aciitemeditor/META-INF/MANIFEST.MF?rev=1628931&view=auto
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/aciitemeditor/META-INF/MANIFEST.MF (added)
+++ directory/studio/branches/studio-tycho/plugins/aciitemeditor/META-INF/MANIFEST.MF Thu Oct 2 11:02:14 2014
@@ -0,0 +1,26 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Apache Directory Studio ACI Item Editor
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 2.0.0.qualifier
+Bundle-SymbolicName: org.apache.directory.studio.aciitemeditor;singleton:=true
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Eclipse-LazyStart: true
+Export-Package: org.apache.directory.studio.aciitemeditor
+Require-Bundle: org.eclipse.core.runtime,
+ org.apache.directory.api.ldap.extras.aci;bundle-version="1.0.0.M24",
+ org.apache.directory.api.ldap.model;bundle-version="1.0.0.M24",
+ org.apache.directory.studio.common.ui,
+ org.apache.directory.studio.connection.core,
+ org.apache.directory.studio.connection.ui,
+ org.apache.directory.studio.ldapbrowser.common,
+ org.apache.directory.studio.ldapbrowser.core,
+ org.apache.directory.studio.valueeditors,
+ org.eclipse.core.expressions,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.jface.text,
+ org.eclipse.ui,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.workbench.texteditor
Added: directory/studio/branches/studio-tycho/plugins/aciitemeditor/build.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/aciitemeditor/build.properties?rev=1628931&view=auto
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/aciitemeditor/build.properties (added)
+++ directory/studio/branches/studio-tycho/plugins/aciitemeditor/build.properties Thu Oct 2 11:02:14 2014
@@ -0,0 +1,3 @@
+source.. = src/main/java/
+bin.includes = META-INF/,\
+ .
Modified: directory/studio/branches/studio-tycho/plugins/aciitemeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/aciitemeditor/pom.xml?rev=1628931&r1=1628930&r2=1628931&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/aciitemeditor/pom.xml (original)
+++ directory/studio/branches/studio-tycho/plugins/aciitemeditor/pom.xml Thu Oct 2 11:02:14 2014
@@ -24,232 +24,233 @@
<groupId>org.apache.directory.studio</groupId>
<artifactId>parent-plugins</artifactId>
<version>2.0.0-SNAPSHOT</version>
+ <relativePath>../</relativePath>
</parent>
- <artifactId>aciitemeditor</artifactId>
+ <artifactId>org.apache.directory.studio.aciitemeditor</artifactId>
<name>Apache Directory Studio ACI Item Editor</name>
- <packaging>jar</packaging>
+ <packaging>eclipse-plugin</packaging>
<description />
- <build>
- <resources>
- <resource>
- <directory>.</directory>
- <includes>
- <include>plugin*.properties</include>
- <include>plugin.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>resources</directory>
- <targetPath>resources</targetPath>
- </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>
- <projectnatures>
- <projectnature>org.eclipse.jem.workbench.JavaEMFNature</projectnature>
- <projectnature>org.eclipse.pde.PluginNature</projectnature>
- <projectnature>org.eclipse.jdt.core.javanature</projectnature>
- <projectnature>org.eclipse.jem.beaninfo.BeanInfoNature</projectnature>
- </projectnatures>
- <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>
+<!-- <build> -->
+<!-- <resources> -->
+<!-- <resource> -->
+<!-- <directory>.</directory> -->
+<!-- <includes> -->
+<!-- <include>plugin*.properties</include> -->
+<!-- <include>plugin.xml</include> -->
+<!-- </includes> -->
+<!-- </resource> -->
+<!-- <resource> -->
+<!-- <directory>resources</directory> -->
+<!-- <targetPath>resources</targetPath> -->
+<!-- </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> -->
+<!-- <projectnatures> -->
+<!-- <projectnature>org.eclipse.jem.workbench.JavaEMFNature</projectnature> -->
+<!-- <projectnature>org.eclipse.pde.PluginNature</projectnature> -->
+<!-- <projectnature>org.eclipse.jdt.core.javanature</projectnature> -->
+<!-- <projectnature>org.eclipse.jem.beaninfo.BeanInfoNature</projectnature> -->
+<!-- </projectnatures> -->
+<!-- <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>${project.groupId}.${project.artifactId};singleton:=true</Bundle-SymbolicName>
- <Bundle-Localization>plugin</Bundle-Localization>
- <Eclipse-LazyStart>true</Eclipse-LazyStart>
- <Bundle-Activator>org.apache.directory.studio.aciitemeditor.Activator</Bundle-Activator>
- <Require-Bundle>org.apache.directory.api.ldap.extras.aci;bundle-version="${org.apache.directory.api.validversion}",
- org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.validversion}",
- org.apache.directory.studio.common.ui,
- org.apache.directory.studio.connection.core,
- org.apache.directory.studio.connection.ui,
- org.apache.directory.studio.ldapbrowser.common,
- org.apache.directory.studio.ldapbrowser.core,
- org.apache.directory.studio.valueeditors,
- org.eclipse.core.expressions,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jface.text,
- org.eclipse.ui,
- org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor</Require-Bundle>
- <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>
+<!-- <plugin> -->
+<!-- <groupId>org.apache.felix</groupId> -->
+<!-- <artifactId>maven-bundle-plugin</artifactId> -->
+<!-- <extensions>true</extensions> -->
+<!-- <configuration> -->
+<!-- <manifestLocation>META-INF</manifestLocation> -->
+<!-- <instructions> -->
+<!-- <Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton:=true</Bundle-SymbolicName> -->
+<!-- <Bundle-Localization>plugin</Bundle-Localization> -->
+<!-- <Eclipse-LazyStart>true</Eclipse-LazyStart> -->
+<!-- <Bundle-Activator>org.apache.directory.studio.aciitemeditor.Activator</Bundle-Activator> -->
+<!-- <Require-Bundle>org.apache.directory.api.ldap.extras.aci;bundle-version="${org.apache.directory.api.validversion}", -->
+<!-- org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.validversion}", -->
+<!-- org.apache.directory.studio.common.ui, -->
+<!-- org.apache.directory.studio.connection.core, -->
+<!-- org.apache.directory.studio.connection.ui, -->
+<!-- org.apache.directory.studio.ldapbrowser.common, -->
+<!-- org.apache.directory.studio.ldapbrowser.core, -->
+<!-- org.apache.directory.studio.valueeditors, -->
+<!-- org.eclipse.core.expressions, -->
+<!-- org.eclipse.core.resources, -->
+<!-- org.eclipse.core.runtime, -->
+<!-- org.eclipse.jface.text, -->
+<!-- org.eclipse.ui, -->
+<!-- org.eclipse.ui.editors, -->
+<!-- org.eclipse.ui.workbench.texteditor</Require-Bundle> -->
+<!-- <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>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
+<!-- <plugin> -->
+<!-- <groupId>org.apache.maven.plugins</groupId> -->
+<!-- <artifactId>maven-surefire-plugin</artifactId> -->
+<!-- <configuration> -->
+<!-- <skip>true</skip> -->
+<!-- </configuration> -->
+<!-- </plugin> -->
+<!-- </plugins> -->
+<!-- </build> -->
+<!-- -->
+<!-- <dependencies> -->
<!-- Apache Directory Studio library plugins dependencies -->
- <dependency>
- <groupId>org.apache.directory.api</groupId>
- <artifactId>api-ldap-model</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.api</groupId>
- <artifactId>api-ldap-extras-aci</artifactId>
- <scope>provided</scope>
- </dependency>
-
+<!-- <dependency> -->
+<!-- <groupId>org.apache.directory.api</groupId> -->
+<!-- <artifactId>api-ldap-model</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.apache.directory.api</groupId> -->
+<!-- <artifactId>api-ldap-extras-aci</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- -->
<!-- Apache Directory Studio plugins dependencies -->
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>common.ui</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>connection.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>connection.ui</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>ldapbrowser.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>ldapbrowser.common</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>valueeditors</artifactId>
- <scope>provided</scope>
- </dependency>
-
+<!-- <dependency> -->
+<!-- <groupId>org.apache.directory.studio</groupId> -->
+<!-- <artifactId>common.ui</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.apache.directory.studio</groupId> -->
+<!-- <artifactId>connection.core</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.apache.directory.studio</groupId> -->
+<!-- <artifactId>connection.ui</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.apache.directory.studio</groupId> -->
+<!-- <artifactId>ldapbrowser.core</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.apache.directory.studio</groupId> -->
+<!-- <artifactId>ldapbrowser.common</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.apache.directory.studio</groupId> -->
+<!-- <artifactId>valueeditors</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- -->
<!-- Eclipse plugins dependencies -->
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>commands</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>jface</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jface</groupId>
- <artifactId>text</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.swt.gtk.linux</groupId>
- <artifactId>x86</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>common</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>runtime</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>text</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>editors</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>workbench</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui.workbench</groupId>
- <artifactId>texteditor</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
+<!-- <dependency> -->
+<!-- <groupId>org.eclipse.core</groupId> -->
+<!-- <artifactId>commands</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.eclipse</groupId> -->
+<!-- <artifactId>jface</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.eclipse.jface</groupId> -->
+<!-- <artifactId>text</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.eclipse.swt.gtk.linux</groupId> -->
+<!-- <artifactId>x86</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.eclipse</groupId> -->
+<!-- <artifactId>osgi</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.eclipse.equinox</groupId> -->
+<!-- <artifactId>common</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.eclipse.core</groupId> -->
+<!-- <artifactId>runtime</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.eclipse</groupId> -->
+<!-- <artifactId>text</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.eclipse.ui</groupId> -->
+<!-- <artifactId>editors</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.eclipse.ui</groupId> -->
+<!-- <artifactId>workbench</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.eclipse.ui.workbench</groupId> -->
+<!-- <artifactId>texteditor</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- </dependencies> -->
+<!-- -->
</project>
Modified: directory/studio/branches/studio-tycho/plugins/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/pom.xml?rev=1628931&r1=1628930&r2=1628931&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/pom.xml (original)
+++ directory/studio/branches/studio-tycho/plugins/pom.xml Thu Oct 2 11:02:14 2014
@@ -32,7 +32,7 @@
<packaging>pom</packaging>
<modules>
-<!-- <module>aciitemeditor</module> -->
+ <module>aciitemeditor</module>
<!-- <module>apacheds-launcher</module> -->
<!-- <module>apacheds.configuration</module> -->
<!-- <module>apacheds.configuration.v2</module> -->
Modified: directory/studio/branches/studio-tycho/plugins/valueeditors/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/valueeditors/META-INF/MANIFEST.MF?rev=1628931&r1=1628930&r2=1628931&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/valueeditors/META-INF/MANIFEST.MF (original)
+++ directory/studio/branches/studio-tycho/plugins/valueeditors/META-INF/MANIFEST.MF Thu Oct 2 11:02:14 2014
@@ -7,7 +7,9 @@ Bundle-SymbolicName: org.apache.director
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Eclipse-LazyStart: true
-Export-Package: org.apache.directory.studio.valueeditors
+Export-Package: org.apache.directory.studio.valueeditors,
+ org.apache.directory.studio.valueeditors.dn,
+ org.apache.directory.studio.valueeditors.integer
Import-Package: org.apache.commons.lang,
org.apache.commons.codec;bundle-version="1.8",
org.apache.commons.codec.binary;bundle-version="1.8",