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 20:55:43 UTC

svn commit: r1629042 - in /directory/studio/branches/studio-tycho/plugins/apacheds.configuration: META-INF/ META-INF/MANIFEST.MF build.properties pom.xml

Author: elecharny
Date: Thu Oct  2 18:55:42 2014
New Revision: 1629042

URL: http://svn.apache.org/r1629042
Log:
Added the apacheds.configuration plugin to tycho

Added:
    directory/studio/branches/studio-tycho/plugins/apacheds.configuration/META-INF/
    directory/studio/branches/studio-tycho/plugins/apacheds.configuration/META-INF/MANIFEST.MF
    directory/studio/branches/studio-tycho/plugins/apacheds.configuration/build.properties
Modified:
    directory/studio/branches/studio-tycho/plugins/apacheds.configuration/pom.xml

Added: directory/studio/branches/studio-tycho/plugins/apacheds.configuration/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/apacheds.configuration/META-INF/MANIFEST.MF?rev=1629042&view=auto
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/apacheds.configuration/META-INF/MANIFEST.MF (added)
+++ directory/studio/branches/studio-tycho/plugins/apacheds.configuration/META-INF/MANIFEST.MF Thu Oct  2 18:55:42 2014
@@ -0,0 +1,23 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Apache Directory Studio ApacheDS Configuration
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 2.0.0.qualifier
+Bundle-SymbolicName: org.apache.directory.studio.apacheds.configuration;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.apacheds.configuration
+Import-Package: org.apache.commons.lang,
+ org.dom4j,
+ org.dom4j.io
+Require-Bundle: org.eclipse.core.runtime,
+ org.apache.directory.api.ldap.model;bundle-version="1.0.0.M24",
+ org.apache.directory.api.util;bundle-version="1.0.0.M24",
+ org.apache.directory.studio.common.ui,
+ org.eclipse.core.resources,
+ org.eclipse.jface.text,
+ org.eclipse.ui,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.forms,
+ org.eclipse.ui.ide

Added: directory/studio/branches/studio-tycho/plugins/apacheds.configuration/build.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/apacheds.configuration/build.properties?rev=1629042&view=auto
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/apacheds.configuration/build.properties (added)
+++ directory/studio/branches/studio-tycho/plugins/apacheds.configuration/build.properties Thu Oct  2 18:55:42 2014
@@ -0,0 +1,3 @@
+source.. = src/main/java/
+bin.includes = META-INF/,\
+               .

Modified: directory/studio/branches/studio-tycho/plugins/apacheds.configuration/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/apacheds.configuration/pom.xml?rev=1629042&r1=1629041&r2=1629042&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/apacheds.configuration/pom.xml (original)
+++ directory/studio/branches/studio-tycho/plugins/apacheds.configuration/pom.xml Thu Oct  2 18:55:42 2014
@@ -24,262 +24,263 @@
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>parent-plugins</artifactId>
     <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../</relativePath>
   </parent>
   
-  <artifactId>apacheds.configuration</artifactId>
+  <artifactId>org.apache.directory.studio.apacheds.configuration</artifactId>
   <name>Apache Directory Studio ApacheDS Configuration</name>
-  <packaging>jar</packaging>
+  <packaging>eclipse-plugin</packaging>
 
   <description />
   
-  <build>
-    <resources>
-      <resource>
-        <directory>.</directory>
-        <includes>
-          <include>plugin.xml</include>
-          <include>plugin*.properties</include>
-          <include>about.ini</include>
-          <include>studio.png</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>resources</directory>
-        <targetPath>resources</targetPath>
-      </resource>
-      <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>
-          <classpathContainers>
-            <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.xml</include> -->
+<!--          <include>plugin*.properties</include> -->
+<!--          <include>about.ini</include> -->
+<!--          <include>studio.png</include> -->
+<!--        </includes> -->
+<!--      </resource> -->
+<!--      <resource> -->
+<!--        <directory>resources</directory> -->
+<!--        <targetPath>resources</targetPath> -->
+<!--      </resource> -->
+<!--      <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> -->
+<!--          <classpathContainers> -->
+<!--            <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.apacheds.configuration.ApacheDSConfigurationPlugin</Bundle-Activator>
-            <Require-Bundle>org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.validversion}",
- org.apache.directory.api.util;bundle-version="${org.apache.directory.api.validversion}",
- org.apache.directory.studio.common.ui,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jface.text,
- org.eclipse.ui,
- org.eclipse.ui.editors,
- org.eclipse.ui.forms,
- org.eclipse.ui.ide,
- org.dom4j.dom4j;bundle-version="${org.dom4j.version}"</Require-Bundle>
-            <Export-Package>org.apache.directory.studio.apacheds.configuration.*</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.apacheds.configuration.ApacheDSConfigurationPlugin</Bundle-Activator> -->
+<!--            <Require-Bundle>org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.validversion}", -->
+<!-- org.apache.directory.api.util;bundle-version="${org.apache.directory.api.validversion}", -->
+<!-- org.apache.directory.studio.common.ui, -->
+<!-- org.eclipse.core.resources, -->
+<!-- org.eclipse.core.runtime, -->
+<!-- org.eclipse.jface.text, -->
+<!-- org.eclipse.ui, -->
+<!-- org.eclipse.ui.editors, -->
+<!-- org.eclipse.ui.forms, -->
+<!-- org.eclipse.ui.ide, -->
+<!-- org.dom4j.dom4j;bundle-version="${org.dom4j.version}"</Require-Bundle> -->
+<!--            <Export-Package>org.apache.directory.studio.apacheds.configuration.*</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>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <configuration>
-            <excludeSubProjects>false</excludeSubProjects>
-            <excludes>
+<!--      <plugin> -->
+<!--        <groupId>org.apache.maven.plugins</groupId> -->
+<!--        <artifactId>maven-surefire-plugin</artifactId> -->
+<!--        <configuration> -->
+<!--          <skip>true</skip> -->
+<!--        </configuration> -->
+<!--      </plugin> -->
+<!--    </plugins> -->
+<!--    <pluginManagement> -->
+<!--      <plugins> -->
+<!--        <plugin> -->
+<!--          <groupId>org.apache.rat</groupId> -->
+<!--          <artifactId>apache-rat-plugin</artifactId> -->
+<!--          <configuration> -->
+<!--            <excludeSubProjects>false</excludeSubProjects> -->
+<!--            <excludes> -->
               <!-- MAVEN_DEFAULT_EXCLUDES -->
-              <exclude>**/target/**/*</exclude>
-              <exclude>**/cobertura.ser</exclude>
+<!--              <exclude>**/target/**/*</exclude> -->
+<!--              <exclude>**/cobertura.ser</exclude> -->
               <!-- ECLIPSE_DEFAULT_EXCLUDES -->
-              <exclude>**/.classpath</exclude>
-              <exclude>**/.project</exclude>
-              <exclude>**/.settings/**/*</exclude>
+<!--              <exclude>**/.classpath</exclude> -->
+<!--              <exclude>**/.project</exclude> -->
+<!--              <exclude>**/.settings/**/*</exclude> -->
               <!-- IDEA_DEFAULT_EXCLUDES -->
-              <exclude>**/*.iml</exclude>
-              <exclude>**/*.ipr</exclude>
-              <exclude>**/*.iws</exclude>
+<!--              <exclude>**/*.iml</exclude> -->
+<!--              <exclude>**/*.ipr</exclude> -->
+<!--              <exclude>**/*.iws</exclude> -->
               <!-- MANIFEST_MF_EXCLUDES -->
-              <exclude>**/MANIFEST.MF</exclude>
+<!--              <exclude>**/MANIFEST.MF</exclude> -->
               <!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48 -->
-              <exclude>**/dependency-reduced-pom.xml</exclude>
+<!--              <exclude>**/dependency-reduced-pom.xml</exclude> -->
               <!-- GITIGNORE_EXCLUDES -->
-              <exclude>**/.gitignore</exclude>
+<!--              <exclude>**/.gitignore</exclude> -->
               <!-- ABOUT_EXCLUDES -->
-              <exclude>**/about.ini</exclude>
-              <exclude>**/about_files/*</exclude>
+<!--              <exclude>**/about.ini</exclude> -->
+<!--              <exclude>**/about_files/*</exclude> -->
               <!-- LOG_FILES_EXCLUDES -->
-              <exclude>**/*.log</exclude>
-              <exclude>**/*.vm</exclude>
+<!--              <exclude>**/*.log</exclude> -->
+<!--              <exclude>**/*.vm</exclude> -->
               <!-- OTHER_EXCLUDES -->
-              <exclude>src/main/resources/org/apache/directory/studio/apacheds/configuration/spring-beans.dtd</exclude>
-            </excludes>
-          </configuration>
-         </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-  <dependencies>
+<!--              <exclude>src/main/resources/org/apache/directory/studio/apacheds/configuration/spring-beans.dtd</exclude> -->
+<!--            </excludes> -->
+<!--          </configuration> -->
+<!--         </plugin> -->
+<!--      </plugins> -->
+<!--    </pluginManagement> -->
+<!--  </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-util</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.dom4j.dom4j</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-util</artifactId> -->
+<!--      <scope>provided</scope> -->
+<!--    </dependency> -->
+<!--    <dependency> -->
+<!--      <groupId>org.apache.directory.studio</groupId> -->
+<!--      <artifactId>org.dom4j.dom4j</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>common.ui</artifactId> -->
+<!--      <scope>provided</scope> -->
+<!--    </dependency> -->
+<!--     -->
 	<!-- Eclipse plugins dependencies -->
-    <dependency>
-      <groupId>org.eclipse.swt.gtk.linux</groupId>
-      <artifactId>x86</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>contenttype</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>resources</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>jobs</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse</groupId>
-      <artifactId>jface</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>forms</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.ui</groupId>
-      <artifactId>ide</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.ui</groupId>
-      <artifactId>workbench</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>runtime</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.equinox</groupId>
-      <artifactId>common</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.equinox</groupId>
-      <artifactId>registry</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>commands</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse</groupId>
-      <artifactId>osgi</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-</project>
+<!--    <dependency> -->
+<!--      <groupId>org.eclipse.swt.gtk.linux</groupId> -->
+<!--      <artifactId>x86</artifactId> -->
+<!--      <scope>provided</scope> -->
+<!--    </dependency> -->
+<!--    <dependency> -->
+<!--      <groupId>org.eclipse.core</groupId> -->
+<!--      <artifactId>contenttype</artifactId> -->
+<!--      <scope>provided</scope> -->
+<!--    </dependency> -->
+<!--    <dependency> -->
+<!--      <groupId>org.eclipse.core</groupId> -->
+<!--      <artifactId>resources</artifactId> -->
+<!--      <scope>provided</scope> -->
+<!--    </dependency> -->
+<!--    <dependency> -->
+<!--      <groupId>org.eclipse.core</groupId> -->
+<!--      <artifactId>jobs</artifactId> -->
+<!--      <scope>provided</scope> -->
+<!--    </dependency> -->
+<!--    <dependency> -->
+<!--      <groupId>org.eclipse</groupId> -->
+<!--      <artifactId>jface</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>forms</artifactId> -->
+<!--      <scope>provided</scope> -->
+<!--    </dependency> -->
+<!--    <dependency> -->
+<!--      <groupId>org.eclipse.ui</groupId> -->
+<!--      <artifactId>ide</artifactId> -->
+<!--      <scope>provided</scope> -->
+<!--    </dependency> -->
+<!--    <dependency> -->
+<!--      <groupId>org.eclipse.ui</groupId> -->
+<!--      <artifactId>workbench</artifactId> -->
+<!--      <scope>provided</scope> -->
+<!--    </dependency> -->
+<!--    <dependency> -->
+<!--      <groupId>org.eclipse.core</groupId> -->
+<!--      <artifactId>runtime</artifactId> -->
+<!--      <scope>provided</scope> -->
+<!--    </dependency> -->
+<!--    <dependency> -->
+<!--      <groupId>org.eclipse.equinox</groupId> -->
+<!--      <artifactId>common</artifactId> -->
+<!--      <scope>provided</scope> -->
+<!--    </dependency> -->
+<!--    <dependency> -->
+<!--      <groupId>org.eclipse.equinox</groupId> -->
+<!--      <artifactId>registry</artifactId> -->
+<!--      <scope>provided</scope> -->
+<!--    </dependency> -->
+<!--    <dependency> -->
+<!--      <groupId>org.eclipse.core</groupId> -->
+<!--      <artifactId>commands</artifactId> -->
+<!--      <scope>provided</scope> -->
+<!--    </dependency> -->
+<!--    <dependency> -->
+<!--      <groupId>org.eclipse</groupId> -->
+<!--      <artifactId>osgi</artifactId> -->
+<!--      <scope>provided</scope> -->
+<!--    </dependency> -->
+<!--  </dependencies> -->
+<!-- -->
+</project> -->