Add apacheds help and feature.

git-svn-id: https://svn.apache.org/repos/asf/directory/studio/branches/studio-tycho@1650893 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 23 insertions, 103 deletions

diff --git a/features/apacheds.feature/build.properties b/features/apacheds.feature/build.properties
new file mode 100644
index 000000000..423f4ae65
--- /dev/null
+++ b/features/apacheds.feature/build.properties
@@ -0,0 +1,3 @@
+bin.includes = feature.xml,\
+               studio.png,\
+               META-INF/*
\ No newline at end of file
diff --git a/features/apacheds.feature/feature.xml b/features/apacheds.feature/feature.xml
index b2813f6fb..68d6db721 100644
--- a/features/apacheds.feature/feature.xml
+++ b/features/apacheds.feature/feature.xml
@@ -2,9 +2,9 @@
 <feature
       id="org.apache.directory.studio.apacheds.feature"
       label="Apache Directory Studio ApacheDS"
-      version="${pom.version}"
+      version="2.0.0.qualifier"
       provider-name="Apache Software Foundation"
-      plugin="org.apache.directory.studio.apacheds"
+      plugin="org.apache.directory.studio.apacheds.configuration.v2"
       image="studio.png">
 
    <description>
@@ -200,38 +200,45 @@ http://www.apache.org/licenses/
    </url>
 
    <plugin
-         id="org.apache.directory.studio.apacheds"
+         id="org.apache.directory.studio.ldapservers"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.apache.directory.studio.apacheds.configuration"
+         id="org.apache.directory.studio.ldapservers.apacheds.v200"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.studio.apacheds.configuration.v2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.apacheds.configuration.help"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.apacheds.help"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.common.ui"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
 </feature>
diff --git a/features/apacheds.feature/pom.xml b/features/apacheds.feature/pom.xml
index 8b97577cf..60bb9a33d 100644
--- a/features/apacheds.feature/pom.xml
+++ b/features/apacheds.feature/pom.xml
@@ -24,103 +24,13 @@
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>parent-features</artifactId>
     <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../</relativePath>
   </parent>
   
-  <artifactId>apacheds.feature</artifactId>
+  <artifactId>org.apache.directory.studio.apacheds.feature</artifactId>
   <name>Apache Directory Studio ApacheDS 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
diff --git a/features/pom.xml b/features/pom.xml
index 65c3edc09..ca55fc804 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -33,7 +33,7 @@
   <modules>
 <!--     <module>apacheds.configuration.feature</module> -->
 <!--     <module>apacheds.configuration.v2.feature</module> -->
-<!--     <module>apacheds.feature</module> -->
+    <module>apacheds.feature</module>
     <module>ldapbrowser.feature</module>
 <!--     <module>ldapservers.feature</module> -->
     <module>ldifeditor.feature</module>