Return-Path: 
 <commits-return-40475-apmail-directory-commits-archive=directory.apache.org@directory.apache.org>
X-Original-To: apmail-directory-commits-archive@www.apache.org
Delivered-To: apmail-directory-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id BA1E2C05B
	for <apmail-directory-commits-archive@www.apache.org>;
 Sun, 18 Jan 2015 15:52:35 +0000 (UTC)
Received: (qmail 27625 invoked by uid 500); 18 Jan 2015 15:52:36 -0000
Delivered-To: apmail-directory-commits-archive@directory.apache.org
Received: (qmail 27517 invoked by uid 500); 18 Jan 2015 15:52:36 -0000
Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@directory.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@directory.apache.org>
List-Post: <mailto:commits@directory.apache.org>
List-Id: <commits.directory.apache.org>
Reply-To: dev@directory.apache.org
Delivered-To: mailing list commits@directory.apache.org
Received: (qmail 27435 invoked by uid 99); 18 Jan 2015 15:52:36 -0000
Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 18 Jan 2015 15:52:36 +0000
Received: from hades.apache.org (localhost [127.0.0.1])
	by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id
 191D6AC0059;
	Sun, 18 Jan 2015 15:52:35 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1652785 - in
 /directory/studio/branches/studio-tycho/features:
 pom.xml rcp.feature/build.properties rcp.feature/feature.xml
 rcp.feature/pom.xml
Date: Sun, 18 Jan 2015 15:52:35 -0000
To: commits@directory.apache.org
From: seelmann@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20150118155236.191D6AC0059@hades.apache.org>

Author: seelmann
Date: Sun Jan 18 15:52:34 2015
New Revision: 1652785

URL: http://svn.apache.org/r1652785
Log:
Migrate RCP feature to tycho, needed to add lot of plugins to get it work

Added:
    directory/studio/branches/studio-tycho/features/rcp.feature/build.properties
Modified:
    directory/studio/branches/studio-tycho/features/pom.xml
    directory/studio/branches/studio-tycho/features/rcp.feature/feature.xml
    directory/studio/branches/studio-tycho/features/rcp.feature/pom.xml

Modified: directory/studio/branches/studio-tycho/features/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/features/pom.xml?rev=1652785&r1=1652784&r2=1652785&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/features/pom.xml (original)
+++ directory/studio/branches/studio-tycho/features/pom.xml Sun Jan 18 15:52:34 2015
@@ -37,7 +37,7 @@
     <module>ldapbrowser.feature</module>
 <!--     <module>ldapservers.feature</module> -->
     <module>ldifeditor.feature</module>
-<!--     <module>rcp.feature</module> -->
+    <module>rcp.feature</module>
     <module>schemaeditor.feature</module>
   </modules>
   

Added: directory/studio/branches/studio-tycho/features/rcp.feature/build.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/features/rcp.feature/build.properties?rev=1652785&view=auto
==============================================================================
--- directory/studio/branches/studio-tycho/features/rcp.feature/build.properties (added)
+++ directory/studio/branches/studio-tycho/features/rcp.feature/build.properties Sun Jan 18 15:52:34 2015
@@ -0,0 +1,3 @@
+bin.includes = feature.xml,\
+               studio.png,\
+               META-INF/*

Modified: directory/studio/branches/studio-tycho/features/rcp.feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/features/rcp.feature/feature.xml?rev=1652785&r1=1652784&r2=1652785&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/features/rcp.feature/feature.xml (original)
+++ directory/studio/branches/studio-tycho/features/rcp.feature/feature.xml Sun Jan 18 15:52:34 2015
@@ -2,17 +2,13 @@
 <feature
       id="org.apache.directory.studio.rcp.feature"
       label="Apache Directory Studio RCP"
-      version="${pom.version}"
+      version="2.0.0.qualifier"
       provider-name="Apache Software Foundation"
       plugin="org.apache.directory.studio.rcp"
-      os="linux,macosx,win32"
-      ws="carbon,gtk,win32"
-      arch="x86,x86_64"
       image="studio.png">
 
    <description>
-      The Apache Directory Studio RCP Feature contains all plugins related to the
-Apache Directory Studio RCP Tooling Platform.
+      The Apache Directory Studio RCP Feature contains all plugins related to the Apache Directory Studio RCP Tooling Platform.
    </description>
 
    <copyright>
@@ -204,24 +200,290 @@ http://www.apache.org/licenses/
    </url>
 
    <plugin
-         id="org.apache.directory.studio.common.ui"
+         id="org.apache.directory.studio.rcp"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.apache.directory.studio.rcp"
+         id="org.apache.directory.studio.rcp.help"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.apache.directory.studio.rcp.help"
+         id="slf4j.api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="slf4j.log4j12"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="javax.xml.stream"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.api.asn1.api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.api.asn1.ber"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.api.dsmlv2.engine"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.api.dsmlv2.parser"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.api.i18n"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.api.ldap.client.api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.api.ldap.codec.core"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.apache.directory.api.ldap.extras.aci"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.api.ldap.extras.codec"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.api.ldap.extras.codec.api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.api.ldap.extras.sp"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.api.ldap.extras.trigger"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.api.ldap.extras.util"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.api.ldap.model"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.api.ldap.net.mina"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.api.ldap.schema"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.api.ldap.schema.converter"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.api.util"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.server.core.api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.server.config"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="net.sf.ehcache"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.server.i18n"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.server.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.server.core.avl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.server.core.constants"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.server.core.shared"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.jdbm.jdbm"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.server.jdbm.partition"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.server.xdbm.partition"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.mavibot.mavibot"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.server.mavibot.partition"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.server.ldif.partition"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.server.kerberos.codec"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jdt.launching"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jdt.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jdt.debug"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
 </feature>

Modified: directory/studio/branches/studio-tycho/features/rcp.feature/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/features/rcp.feature/pom.xml?rev=1652785&r1=1652784&r2=1652785&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/features/rcp.feature/pom.xml (original)
+++ directory/studio/branches/studio-tycho/features/rcp.feature/pom.xml Sun Jan 18 15:52:34 2015
@@ -24,103 +24,13 @@
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>parent-features</artifactId>
     <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../</relativePath>
   </parent>
   
-  <artifactId>rcp.feature</artifactId>
+  <artifactId>org.apache.directory.studio.rcp.feature</artifactId>
   <name>Apache Directory Studio RCP Feature</name>
-  <packaging>jar</packaging>
+  <packaging>eclipse-feature</packaging>
 
   <description />
-  
-  <build>
-    <resources>
-      <resource>
-        <directory>.</directory>
-        <includes>
-          <include>feature.xml</include>
-          <include>studio.png</include>
-        </includes>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-    
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>resources</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <configuration>
-          <skip>false</skip>
-          <projectnatures>
-            <projectnature>org.eclipse.pde.FeatureNature</projectnature>
-          </projectnatures>
-          <buildcommands>
-            <buildcommand>org.eclipse.pde.FeatureBuilder</buildcommand>
-          </buildcommands>
-        </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>
-      <plugin>
-        <groupId>org.apache.directory.studio</groupId>
-        <artifactId>studio-maven-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-          <createManifest>true</createManifest>
-        </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>
-            <Export-Package>!</Export-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>
 
 </project>
\ No newline at end of file