You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2008/06/02 14:09:22 UTC

svn commit: r662409 - in /directory/studio/branches/apacheds-plugin-branch: ./ apacheds-feature/ apacheds-feature/META-INF/ apacheds-feature/src/ apacheds-feature/src/site/ studio/

Author: pamarcelot
Date: Mon Jun  2 05:09:22 2008
New Revision: 662409

URL: http://svn.apache.org/viewvc?rev=662409&view=rev
Log:
Added a feature  for the Apache DS + help plugins.

Added:
    directory/studio/branches/apacheds-plugin-branch/apacheds-feature/
    directory/studio/branches/apacheds-plugin-branch/apacheds-feature/META-INF/
    directory/studio/branches/apacheds-plugin-branch/apacheds-feature/META-INF/LICENSE.txt   (with props)
    directory/studio/branches/apacheds-plugin-branch/apacheds-feature/META-INF/MANIFEST.MF
    directory/studio/branches/apacheds-plugin-branch/apacheds-feature/META-INF/NOTICE.txt
    directory/studio/branches/apacheds-plugin-branch/apacheds-feature/feature.xml
    directory/studio/branches/apacheds-plugin-branch/apacheds-feature/pom.xml
    directory/studio/branches/apacheds-plugin-branch/apacheds-feature/src/
    directory/studio/branches/apacheds-plugin-branch/apacheds-feature/src/site/
    directory/studio/branches/apacheds-plugin-branch/apacheds-feature/src/site/site.xml
    directory/studio/branches/apacheds-plugin-branch/apacheds-feature/studio.png   (with props)
Modified:
    directory/studio/branches/apacheds-plugin-branch/pom.xml
    directory/studio/branches/apacheds-plugin-branch/studio/pom.xml

Added: directory/studio/branches/apacheds-plugin-branch/apacheds-feature/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds-feature/META-INF/LICENSE.txt?rev=662409&view=auto
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds-feature/META-INF/LICENSE.txt (added)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds-feature/META-INF/LICENSE.txt Mon Jun  2 05:09:22 2008
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Propchange: directory/studio/branches/apacheds-plugin-branch/apacheds-feature/META-INF/LICENSE.txt
------------------------------------------------------------------------------
    svn:executable = *

Added: directory/studio/branches/apacheds-plugin-branch/apacheds-feature/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds-feature/META-INF/MANIFEST.MF?rev=662409&view=auto
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds-feature/META-INF/MANIFEST.MF (added)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds-feature/META-INF/MANIFEST.MF Mon Jun  2 05:09:22 2008
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Apache Directory Studio Apache DS Configuration Feature
+Bundle-SymbolicName: org.apache.directory.studio.apacheds.feature;singleton:=true
+Bundle-Version: 1.2.0.SNAPSHOT
+Bundle-Localization: plugin
+Eclipse-LazyStart: true
+Bundle-Vendor: Apache Software Foundation

Added: directory/studio/branches/apacheds-plugin-branch/apacheds-feature/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds-feature/META-INF/NOTICE.txt?rev=662409&view=auto
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds-feature/META-INF/NOTICE.txt (added)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds-feature/META-INF/NOTICE.txt Mon Jun  2 05:09:22 2008
@@ -0,0 +1 @@
+// ------------------------------------------------------------------
// NOTICE file corresponding to the section 4d of The Apache License,
// Version 2.0, in this case for Apache Directory Studio Apache DS Configuration Feature
// ------------------------------------------------------------------

Apache Directory Studio Apache DS Configuration Feature
Copyright 2003-2008 Apache Software Foundation

This product includes software developed at
Apache Software Foundation (http://www.apache.org).
\ No newline at end of file

Added: directory/studio/branches/apacheds-plugin-branch/apacheds-feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds-feature/feature.xml?rev=662409&view=auto
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds-feature/feature.xml (added)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds-feature/feature.xml Mon Jun  2 05:09:22 2008
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.apache.directory.studio.apacheds.feature"
+      label="Apache Directory Studio Apache DS"
+      version="${pom.version}"
+      provider-name="Apache Software Foundation"
+      plugin="org.apache.directory.studio.apacheds"
+      image="studio.png">
+
+   <description>
+      The Apache Directory Studio Apache DS Feature contains all plugins related to Apache DS.
+   </description>
+
+   <copyright>
+      © 2006-2007 Apache Software Foundation - All right reserved.
+This product includes software developed by the
+Apache Software Foundation http://www.apache.org/
+Some icons from FAMFAMFAM http://www.famfamfam.com/lab/icons/silk/
+   </copyright>
+
+   <license url="http://www.apache.org/licenses/LICENSE-2.0.html">
+      Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+1. Definitions.
+&quot;License&quot; shall mean the terms and conditions for use, reproduction,
+and distribution as defined by Sections 1 through 9 of this document.
+&quot;Licensor&quot; shall mean the copyright owner or entity authorized
+by
+the copyright owner that is granting the License.
+&quot;Legal Entity&quot; shall mean the union of the acting entity and
+all
+other entities that control, are controlled by, or are under
+common
+control with that entity. For the purposes of this definition,
+&quot;control&quot; means (i) the power, direct or indirect, to cause the
+direction or management of such entity, whether by contract or
+otherwise, or (ii) ownership of fifty percent (50%) or more of
+the
+outstanding shares, or (iii) beneficial ownership of such entity.
+&quot;You&quot; (or &quot;Your&quot;) shall mean an individual or Legal Entity
+exercising permissions granted by this License.
+&quot;Source&quot; form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation
+source, and configuration files.
+&quot;Object&quot; form shall mean any form resulting from mechanical
+transformation or translation of a Source form, including but
+not limited to compiled object code, generated documentation,
+and conversions to other media types.
+&quot;Work&quot; shall mean the work of authorship, whether in Source or
+Object form, made available under the License, as indicated by
+a
+copyright notice that is included in or attached to the work
+(an example is provided in the Appendix below).
+&quot;Derivative Works&quot; shall mean any work, whether in Source or
+Object
+form, that is based on (or derived from) the Work and for which
+the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship. For the
+purposes
+of this License, Derivative Works shall not include works that
+remain
+separable from, or merely link (or bind by name) to the interfaces
+of,
+the Work and Derivative Works thereof.
+&quot;Contribution&quot; shall mean any work of authorship, including
+the original version of the Work and any modifications or additions
+to that Work or Derivative Works thereof, that is intentionally
+submitted to Licensor for inclusion in the Work by the copyright
+owner
+or by an individual or Legal Entity authorized to submit on behalf
+of
+the copyright owner. For the purposes of this definition, &quot;submitted&quot;
+means any form of electronic, verbal, or written communication
+sent
+to the Licensor or its representatives, including but not limited
+to
+communication on electronic mailing lists, source code control
+systems,
+and issue tracking systems that are managed by, or on behalf
+of, the
+Licensor for the purpose of discussing and improving the Work,
+but
+excluding communication that is conspicuously marked or otherwise
+designated in writing by the copyright owner as &quot;Not a Contribution.&quot;
+&quot;Contributor&quot; shall mean Licensor and any individual or Legal
+Entity
+on behalf of whom a Contribution has been received by Licensor
+and
+subsequently incorporated within the Work.
+2. Grant of Copyright License. Subject to the terms and conditions
+of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute
+the
+Work and such Derivative Works in Source or Object form.
+3. Grant of Patent License. Subject to the terms and conditions
+of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+(except as stated in this section) patent license to make, have
+made,
+use, offer to sell, sell, import, and otherwise transfer the
+Work,
+where such license applies only to those patent claims licensable
+by such Contributor that are necessarily infringed by their
+Contribution(s) alone or by combination of their Contribution(s)
+with the Work to which such Contribution(s) was submitted. If
+You
+institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work
+or a Contribution incorporated within the Work constitutes direct
+or contributory patent infringement, then any patent licenses
+granted to You under this License for that Work shall terminate
+as of the date such litigation is filed.
+4. Redistribution. You may reproduce and distribute copies of
+the
+Work or Derivative Works thereof in any medium, with or without
+modifications, and in Source or Object form, provided that You
+meet the following conditions:
+(a) You must give any other recipients of the Work or
+Derivative Works a copy of this License; and
+(b) You must cause any modified files to carry prominent notices
+stating that You changed the files; and
+(c) You must retain, in the Source form of any Derivative Works
+that You distribute, all copyright, patent, trademark, and
+attribution notices from the Source form of the Work,
+excluding those notices that do not pertain to any part of
+the Derivative Works; and
+(d) If the Work includes a &quot;NOTICE&quot; text file as part of its
+distribution, then any Derivative Works that You distribute must
+include a readable copy of the attribution notices contained
+within such NOTICE file, excluding those notices that do not
+pertain to any part of the Derivative Works, in at least one
+of the following places: within a NOTICE text file distributed
+as part of the Derivative Works; within the Source form or
+documentation, if provided along with the Derivative Works; or,
+within a display generated by the Derivative Works, if and
+wherever such third-party notices normally appear. The contents
+of the NOTICE file are for informational purposes only and
+do not modify the License. You may add Your own attribution
+notices within Derivative Works that You distribute, alongside
+or as an addendum to the NOTICE text from the Work, provided
+that such additional attribution notices cannot be construed
+as modifying the License.
+You may add Your own copyright statement to Your modifications
+and
+may provide additional or different license terms and conditions
+for use, reproduction, or distribution of Your modifications,
+or
+for any such Derivative Works as a whole, provided Your use,
+reproduction, and distribution of the Work otherwise complies
+with
+the conditions stated in this License.
+5. Submission of Contributions. Unless You explicitly state otherwise,
+any Contribution intentionally submitted for inclusion in the
+Work
+by You to the Licensor shall be under the terms and conditions
+of
+this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or
+modify
+the terms of any separate license agreement you may have executed
+with Licensor regarding such Contributions.
+6. Trademarks. This License does not grant permission to use
+the trade
+names, trademarks, service marks, or product names of the Licensor,
+except as required for reasonable and customary use in describing
+the
+origin of the Work and reproducing the content of the NOTICE
+file.
+7. Disclaimer of Warranty. Unless required by applicable law
+or
+agreed to in writing, Licensor provides the Work (and each
+Contributor provides its Contributions) on an &quot;AS IS&quot; BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+or
+implied, including, without limitation, any warranties or conditions
+of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+PARTICULAR PURPOSE. You are solely responsible for determining
+the
+appropriateness of using or redistributing the Work and assume
+any
+risks associated with Your exercise of permissions under this
+License.
+8. Limitation of Liability. In no event and under no legal theory,
+whether in tort (including negligence), contract, or otherwise,
+unless required by applicable law (such as deliberate and grossly
+negligent acts) or agreed to in writing, shall any Contributor
+be
+liable to You for damages, including any direct, indirect, special,
+incidental, or consequential damages of any character arising
+as a
+result of this License or out of the use or inability to use
+the
+Work (including but not limited to damages for loss of goodwill,
+work stoppage, computer failure or malfunction, or any and all
+other commercial damages or losses), even if such Contributor
+has been advised of the possibility of such damages.
+9. Accepting Warranty or Additional Liability. While redistributing
+the Work or Derivative Works thereof, You may choose to offer,
+and charge a fee for, acceptance of support, warranty, indemnity,
+or other liability obligations and/or rights consistent with
+this
+License. However, in accepting such obligations, You may act
+only
+on Your own behalf and on Your sole responsibility, not on behalf
+of any other Contributor, and only if You agree to indemnify,
+defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by
+reason
+of your accepting any such warranty or additional liability.
+   </license>
+
+   <url>
+      <update label="Apache Directory Studio" url="http://directory.apache.org/studio/update/1.x"/>
+   </url>
+
+   <plugin
+         id="org.apache.directory.studio.apacheds.configuration"
+         download-size="0"
+         install-size="0"
+         version="${apacheds.configuration.version}"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.studio.apacheds"
+         download-size="0"
+         install-size="0"
+         version="${apacheds.version}"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.studio.jars"
+         download-size="0"
+         install-size="0"
+         version="${jars.version}"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.studio.apacheds.help"
+         download-size="0"
+         install-size="0"
+         version="${apacheds.help.version}"
+         unpack="false"/>
+
+</feature>

Added: directory/studio/branches/apacheds-plugin-branch/apacheds-feature/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds-feature/pom.xml?rev=662409&view=auto
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds-feature/pom.xml (added)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds-feature/pom.xml Mon Jun  2 05:09:22 2008
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.directory.studio</groupId>
+    <artifactId>parent</artifactId>
+    <version>1.2.0.SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>apacheds.feature</artifactId>
+  <version>${apacheds.feature.version}</version>
+  <name>Apache Directory Studio Apache DS Feature</name>
+  <packaging>jar</packaging>
+
+  <description></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>
+          <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>
+      <!-- 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>

Added: directory/studio/branches/apacheds-plugin-branch/apacheds-feature/src/site/site.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds-feature/src/site/site.xml?rev=662409&view=auto
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds-feature/src/site/site.xml (added)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds-feature/src/site/site.xml Mon Jun  2 05:09:22 2008
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!--
+  @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+-->
+<project name="${project.name}">
+    <bannerLeft>
+        <name>${project.name}</name>
+    </bannerLeft>
+    <publishDate position="navigation-bottom" format="dd-MM-yyyy HH:mm" />
+    <body>
+        <menu name="Parent">
+            <item name="Apache Directory Studio" href="../index.html" />
+        </menu>
+        <menu ref="reports" />
+    </body>
+</project>

Added: directory/studio/branches/apacheds-plugin-branch/apacheds-feature/studio.png
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds-feature/studio.png?rev=662409&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/studio/branches/apacheds-plugin-branch/apacheds-feature/studio.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: directory/studio/branches/apacheds-plugin-branch/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/pom.xml?rev=662409&r1=662408&r2=662409&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/pom.xml (original)
+++ directory/studio/branches/apacheds-plugin-branch/pom.xml Mon Jun  2 05:09:22 2008
@@ -62,9 +62,10 @@
   <properties>
     <!-- Set versions for subprojects -->
     <aciitemeditor.version>1.2.0.SNAPSHOT</aciitemeditor.version>
+    <apacheds.launcher.version>1.2.0</apacheds.launcher.version>
     <apacheds.version>1.2.0.SNAPSHOT</apacheds.version>
     <apacheds.help.version>1.2.0.SNAPSHOT</apacheds.help.version>
-    <apacheds.launcher.version>1.2.0</apacheds.launcher.version>
+    <apacheds.feature.version>1.2.0.SNAPSHOT</apacheds.feature.version>
     <apacheds.configuration.version>1.2.0.SNAPSHOT</apacheds.configuration.version>
     <apacheds.configuration.feature.version>1.2.0.SNAPSHOT</apacheds.configuration.feature.version>
     <apacheds.configuration.help.version>1.2.0.SNAPSHOT</apacheds.configuration.help.version>
@@ -1562,6 +1563,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
+        <artifactId>apacheds.feature</artifactId>
+        <version>${apacheds.feature.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
         <artifactId>schemaeditor.help</artifactId>
         <version>${schemaeditor.help.version}</version>
       </dependency>
@@ -1918,6 +1924,7 @@
     <module>apacheds-launcher</module>
     <module>apacheds</module>
     <module>apacheds-help</module>
+    <module>apacheds-feature</module>
     <module>jars</module>
     <module>updatesite</module>
     <module>studio</module>

Modified: directory/studio/branches/apacheds-plugin-branch/studio/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/studio/pom.xml?rev=662409&r1=662408&r2=662409&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/studio/pom.xml (original)
+++ directory/studio/branches/apacheds-plugin-branch/studio/pom.xml Mon Jun  2 05:09:22 2008
@@ -1276,6 +1276,10 @@
                   <groupId>org.apache.directory.studio</groupId>
                   <artifactId>apacheds.configuration.feature</artifactId>
                 </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>apacheds.feature</artifactId>
+                </artifactItem>
               </artifactItems>
             </configuration>
           </execution>