Add ldapbrowser help and feature. Add legal files to feature jars.

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

4 files changed, 77 insertions, 140 deletions

diff --git a/features/ldapbrowser.feature/build.properties b/features/ldapbrowser.feature/build.properties
new file mode 100644
index 000000000..423f4ae65
--- /dev/null
+++ b/features/ldapbrowser.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/ldapbrowser.feature/feature.xml b/features/ldapbrowser.feature/feature.xml
index f8632d8a2..9565caef1 100644
--- a/features/ldapbrowser.feature/feature.xml
+++ b/features/ldapbrowser.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.apache.directory.studio.ldapbrowser.feature"
       label="Apache Directory Studio LDAP Browser"
-      version="${pom.version}"
+      version="2.0.0.qualifier"
       provider-name="Apache Software Foundation"
       plugin="org.apache.directory.studio.ldapbrowser.ui"
       image="studio.png">
@@ -213,269 +213,269 @@ http://www.apache.org/licenses/
    </requires>
 
    <plugin
-         id="org.antlr.antlr"
+         id="org.apache.servicemix.bundles.antlr"
          download-size="0"
          install-size="0"
-         version="${org.antlr.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.commons.codec"
          download-size="0"
          install-size="0"
-         version="${org.apache.commons.codec.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.commons.collections"
          download-size="0"
          install-size="0"
-         version="${org.apache.commons.collections.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.commons.io"
          download-size="0"
          install-size="0"
-         version="${org.apache.commons.io.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.commons.lang"
          download-size="0"
          install-size="0"
-         version="${org.apache.commons.lang.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.commons.logging"
          download-size="0"
          install-size="0"
-         version="${org.apache.commons.logging.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.commons.pool"
          download-size="0"
          install-size="0"
-         version="${org.apache.commons.pool.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.api.asn1.api"
          download-size="0"
          install-size="0"
-         version="${org.apache.directory.api.validversion}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.api.asn1.ber"
          download-size="0"
          install-size="0"
-         version="${org.apache.directory.api.validversion}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.api.dsmlv2.parser"
          download-size="0"
          install-size="0"
-         version="${org.apache.directory.api.validversion}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.api.i18n"
          download-size="0"
          install-size="0"
-         version="${org.apache.directory.api.validversion}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.api.ldap.client.api"
          download-size="0"
          install-size="0"
-         version="${org.apache.directory.api.validversion}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.api.ldap.codec.core"
          download-size="0"
          install-size="0"
-         version="${org.apache.directory.api.validversion}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.api.ldap.extras.aci"
          download-size="0"
          install-size="0"
-         version="${org.apache.directory.api.validversion}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.api.ldap.model"
          download-size="0"
          install-size="0"
-         version="${org.apache.directory.api.validversion}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.api.ldap.net.mina"
          download-size="0"
          install-size="0"
-         version="${org.apache.directory.api.validversion}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.api.ldap.schema"
          download-size="0"
          install-size="0"
-         version="${org.apache.directory.api.validversion}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.api.util"
          download-size="0"
          install-size="0"
-         version="${org.apache.directory.api.validversion}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.aciitemeditor"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.common.core"
          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"/>
 
    <plugin
          id="org.apache.directory.studio.connection.core"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.connection.ui"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.ldapbrowser.common"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.ldapbrowser.core"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.ldapbrowser.help"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.ldapbrowser.ui"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.ldifeditor"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.ldifparser"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.valueeditors"
          download-size="0"
          install-size="0"
-         version="${pom.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.httpcomponents.httpclient"
          download-size="0"
          install-size="0"
-         version="${org.apache.httpcomponents.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.httpcomponents.httpcore"
          download-size="0"
          install-size="0"
-         version="${org.apache.httpcomponents.version}"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.apache.logging.log4j"
+         id="log4j"
          download-size="0"
          install-size="0"
-         version="${org.apache.logging.log4j.version}"
+         version="0.0.0"
          unpack="false"/>
          
    <plugin
          id="org.apache.mina.core"
          download-size="0"
          install-size="0"
-         version="${org.apache.mina.version}"
+         version="0.0.0"
          unpack="false"/>
          
    <plugin
-         id="org.bouncycastle.bcprov.jdk15"
+         id="bcprov"
          download-size="0"
          install-size="0"
-         version="${org.bouncycastle.bcprov.jdk15.version}"
+         version="0.0.0"
          unpack="false"/>
          
    <plugin
-         id="org.dom4j.dom4j"
+         id="org.apache.servicemix.bundles.dom4j"
          download-size="0"
          install-size="0"
-         version="${org.dom4j.version}"
+         version="0.0.0"
          unpack="false"/>
          
    <plugin
-         id="org.slf4j.api"
+         id="slf4j.api"
          download-size="0"
          install-size="0"
-         version="${org.slf4j.version}"
+         version="0.0.0"
          unpack="false"/>
          
    <plugin
-         id="org.xpp3.xpp3"
+         id="org.apache.servicemix.bundles.xpp3"
          download-size="0"
          install-size="0"
-         version="${org.xpp3.validversion}"
+         version="0.0.0"
          unpack="false"/>
 
 </feature>
diff --git a/features/ldapbrowser.feature/pom.xml b/features/ldapbrowser.feature/pom.xml
index 11fddebf3..548117d00 100644
--- a/features/ldapbrowser.feature/pom.xml
+++ b/features/ldapbrowser.feature/pom.xml
@@ -24,103 +24,12 @@
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>parent-features</artifactId>
     <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../</relativePath>
   </parent>
   
-  <artifactId>ldapbrowser.feature</artifactId>
+  <artifactId>org.apache.directory.studio.ldapbrowser.feature</artifactId>
   <name>Apache Directory Studio LDAP Browser 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 5a51cf0f1..5a6a8372c 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -34,11 +34,36 @@
 <!--     <module>apacheds.configuration.feature</module> -->
 <!--     <module>apacheds.configuration.v2.feature</module> -->
 <!--     <module>apacheds.feature</module> -->
-<!--     <module>ldapbrowser.feature</module> -->
+    <module>ldapbrowser.feature</module>
 <!--     <module>ldapservers.feature</module> -->
     <module>ldifeditor.feature</module>
 <!--     <module>rcp.feature</module> -->
 <!--     <module>schemaeditor.feature</module> -->
   </modules>
   
+  <build>
+    <plugins>
+      <!-- Clean META-INF directory with legal files -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-clean-plugin</artifactId>
+        <configuration>
+          <filesets>
+            <fileset>
+              <directory>${basedir}/META-INF</directory>
+            </fileset>
+          </filesets>
+        </configuration>
+      </plugin>
+      <!-- Add legal files to META-INF directory -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <configuration>
+          <outputDirectory>${basedir}</outputDirectory>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  
 </project>