You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2015/04/14 23:37:08 UTC
svn commit: r1673558 - in /directory/studio/trunk/features:
apacheds.feature/feature.xml ldapbrowser.feature/feature.xml
ldifeditor.feature/feature.xml openldap.feature/feature.xml
rcp.feature/feature.xml schemaeditor.feature/feature.xml
Author: seelmann
Date: Tue Apr 14 21:37:08 2015
New Revision: 1673558
URL: http://svn.apache.org/r1673558
Log:
Cleanup features: Only add direct Studio plugins required by a feature. Also remove the <required> dependencies. Transitive dependencies are included in plugins. Add all non-eclipse dependencies to RCP feature, this is required by the product configuration, but now they are on one place. Applied formatting/escaping done by Eclipse editor.
Modified:
directory/studio/trunk/features/apacheds.feature/feature.xml
directory/studio/trunk/features/ldapbrowser.feature/feature.xml
directory/studio/trunk/features/ldifeditor.feature/feature.xml
directory/studio/trunk/features/openldap.feature/feature.xml
directory/studio/trunk/features/rcp.feature/feature.xml
directory/studio/trunk/features/schemaeditor.feature/feature.xml
Modified: directory/studio/trunk/features/apacheds.feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/features/apacheds.feature/feature.xml?rev=1673558&r1=1673557&r2=1673558&view=diff
==============================================================================
--- directory/studio/trunk/features/apacheds.feature/feature.xml (original)
+++ directory/studio/trunk/features/apacheds.feature/feature.xml Tue Apr 14 21:37:08 2015
@@ -19,7 +19,7 @@ Some icons from FAMFAMFAM http://www.fam
</copyright>
<license url="http://www.apache.org/licenses/LICENSE-2.0.html">
-Apache License
+ Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -27,38 +27,38 @@ http://www.apache.org/licenses/
1. Definitions.
- "License" shall mean the terms and conditions for use, reproduction,
+ "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
+ "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
+ "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
+ "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
+ "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,
+ "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
+ "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
+ "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
+ "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
@@ -66,21 +66,21 @@ http://www.apache.org/licenses/
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
+ "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"
+ 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."
+ designated in writing by the copyright owner as "Not a Contribution."
- "Contributor" shall mean Licensor and any individual or Legal Entity
+ "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.
@@ -124,7 +124,7 @@ http://www.apache.org/licenses/
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
+ (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
@@ -163,7 +163,7 @@ http://www.apache.org/licenses/
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,
+ 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
@@ -235,10 +235,45 @@ http://www.apache.org/licenses/
unpack="false"/>
<plugin
+ id="org.apache.directory.studio.common.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
id="org.apache.directory.studio.common.ui"
download-size="0"
install-size="0"
version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.connection.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.ldapbrowser.common"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.ldapbrowser.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.connection.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
unpack="false"/>
</feature>
Modified: directory/studio/trunk/features/ldapbrowser.feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/features/ldapbrowser.feature/feature.xml?rev=1673558&r1=1673557&r2=1673558&view=diff
==============================================================================
--- directory/studio/trunk/features/ldapbrowser.feature/feature.xml (original)
+++ directory/studio/trunk/features/ldapbrowser.feature/feature.xml Tue Apr 14 21:37:08 2015
@@ -18,7 +18,7 @@ Apache Software Foundation http://www.ap
</copyright>
<license url="http://www.apache.org/licenses/LICENSE-2.0.html">
-Apache License
+ Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -26,38 +26,38 @@ http://www.apache.org/licenses/
1. Definitions.
- "License" shall mean the terms and conditions for use, reproduction,
+ "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
+ "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
+ "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
+ "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
+ "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,
+ "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
+ "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
+ "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
+ "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
@@ -65,21 +65,21 @@ http://www.apache.org/licenses/
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
+ "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"
+ 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."
+ designated in writing by the copyright owner as "Not a Contribution."
- "Contributor" shall mean Licensor and any individual or Legal Entity
+ "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.
@@ -123,7 +123,7 @@ http://www.apache.org/licenses/
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
+ (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
@@ -162,7 +162,7 @@ http://www.apache.org/licenses/
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,
+ 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
@@ -198,146 +198,6 @@ http://www.apache.org/licenses/
<update label="Apache Directory Studio" url="http://directory.apache.org/studio/update/2.x"/>
</url>
- <requires>
- <import plugin="org.eclipse.core.expressions"/>
- <import plugin="org.eclipse.core.filesystem"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.jface.text"/>
- <import plugin="org.eclipse.search"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.ui.editors"/>
- <import plugin="org.eclipse.ui.forms"/>
- <import plugin="org.eclipse.ui.views"/>
- <import plugin="org.eclipse.ui.workbench.texteditor"/>
- </requires>
-
- <plugin
- id="org.apache.servicemix.bundles.antlr"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.codec"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.collections"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.io"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.lang"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.logging"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.pool"
- 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.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="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.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.util"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
<plugin
id="org.apache.directory.studio.aciitemeditor"
download-size="0"
@@ -346,20 +206,6 @@ http://www.apache.org/licenses/
unpack="false"/>
<plugin
- id="org.apache.directory.studio.common.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.directory.studio.common.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.apache.directory.studio.connection.core"
download-size="0"
install-size="0"
@@ -409,13 +255,6 @@ http://www.apache.org/licenses/
unpack="false"/>
<plugin
- id="org.apache.directory.studio.ldifparser"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.apache.directory.studio.valueeditors"
download-size="0"
install-size="0"
@@ -423,56 +262,21 @@ http://www.apache.org/licenses/
unpack="false"/>
<plugin
- id="org.apache.httpcomponents.httpclient"
+ id="org.apache.directory.studio.ldifparser"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.httpcomponents.httpcore"
+ id="org.apache.directory.studio.common.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="log4j"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.mina.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="bcprov"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.servicemix.bundles.dom4j"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="slf4j.api"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.servicemix.bundles.xpp3"
+ id="org.apache.directory.studio.common.ui"
download-size="0"
install-size="0"
version="0.0.0"
Modified: directory/studio/trunk/features/ldifeditor.feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/features/ldifeditor.feature/feature.xml?rev=1673558&r1=1673557&r2=1673558&view=diff
==============================================================================
--- directory/studio/trunk/features/ldifeditor.feature/feature.xml (original)
+++ directory/studio/trunk/features/ldifeditor.feature/feature.xml Tue Apr 14 21:37:08 2015
@@ -18,7 +18,7 @@ Apache Software Foundation http://www.ap
</copyright>
<license url="http://www.apache.org/licenses/LICENSE-2.0.html">
-Apache License
+ Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -26,38 +26,38 @@ http://www.apache.org/licenses/
1. Definitions.
- "License" shall mean the terms and conditions for use, reproduction,
+ "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
+ "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
+ "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
+ "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
+ "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,
+ "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
+ "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
+ "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
+ "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
@@ -65,21 +65,21 @@ http://www.apache.org/licenses/
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
+ "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"
+ 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."
+ designated in writing by the copyright owner as "Not a Contribution."
- "Contributor" shall mean Licensor and any individual or Legal Entity
+ "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.
@@ -123,7 +123,7 @@ http://www.apache.org/licenses/
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
+ (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
@@ -162,7 +162,7 @@ http://www.apache.org/licenses/
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,
+ 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
@@ -198,146 +198,6 @@ http://www.apache.org/licenses/
<update label="Apache Directory Studio" url="http://directory.apache.org/studio/update/2.x"/>
</url>
- <requires>
- <import plugin="org.eclipse.core.expressions"/>
- <import plugin="org.eclipse.core.filesystem"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.jface.text"/>
- <import plugin="org.eclipse.search"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.ui.editors"/>
- <import plugin="org.eclipse.ui.forms"/>
- <import plugin="org.eclipse.ui.views"/>
- <import plugin="org.eclipse.ui.workbench.texteditor"/>
- </requires>
-
- <plugin
- id="org.apache.servicemix.bundles.antlr"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.codec"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.collections"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.io"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.lang"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.logging"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.pool"
- 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.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="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.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.util"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
<plugin
id="org.apache.directory.studio.aciitemeditor"
download-size="0"
@@ -346,20 +206,6 @@ http://www.apache.org/licenses/
unpack="false"/>
<plugin
- id="org.apache.directory.studio.common.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.directory.studio.common.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.apache.directory.studio.connection.core"
download-size="0"
install-size="0"
@@ -401,13 +247,6 @@ http://www.apache.org/licenses/
version="0.0.0"/>
<plugin
- id="org.apache.directory.studio.ldifparser"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.apache.directory.studio.valueeditors"
download-size="0"
install-size="0"
@@ -415,56 +254,21 @@ http://www.apache.org/licenses/
unpack="false"/>
<plugin
- id="org.apache.httpcomponents.httpclient"
+ id="org.apache.directory.studio.common.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.httpcomponents.httpcore"
+ id="org.apache.directory.studio.common.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="log4j"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.mina.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="bcprov"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.servicemix.bundles.dom4j"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="slf4j.api"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.servicemix.bundles.xpp3"
+ id="org.apache.directory.studio.ldifparser"
download-size="0"
install-size="0"
version="0.0.0"
Modified: directory/studio/trunk/features/openldap.feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/features/openldap.feature/feature.xml?rev=1673558&r1=1673557&r2=1673558&view=diff
==============================================================================
--- directory/studio/trunk/features/openldap.feature/feature.xml (original)
+++ directory/studio/trunk/features/openldap.feature/feature.xml Tue Apr 14 21:37:08 2015
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.apache.directory.studio.openldap.feature"
- label="Apache Directory Studio ApacheDS"
+ label="Apache Directory Studio OpenLDAP"
version="2.0.0.qualifier"
provider-name="Apache Software Foundation"
plugin="org.apache.directory.studio.openldap.config.editor"
@@ -19,7 +19,7 @@ Some icons from FAMFAMFAM http://www.fam
</copyright>
<license url="http://www.apache.org/licenses/LICENSE-2.0.html">
-Apache License
+ Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -27,38 +27,38 @@ http://www.apache.org/licenses/
1. Definitions.
- "License" shall mean the terms and conditions for use, reproduction,
+ "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
+ "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
+ "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
+ "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
+ "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,
+ "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
+ "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
+ "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
+ "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
@@ -66,21 +66,21 @@ http://www.apache.org/licenses/
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
+ "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"
+ 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."
+ designated in writing by the copyright owner as "Not a Contribution."
- "Contributor" shall mean Licensor and any individual or Legal Entity
+ "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.
@@ -124,7 +124,7 @@ http://www.apache.org/licenses/
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
+ (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
@@ -163,7 +163,7 @@ http://www.apache.org/licenses/
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,
+ 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
@@ -225,6 +225,55 @@ http://www.apache.org/licenses/
download-size="0"
install-size="0"
version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.common.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.common.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.connection.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.connection.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.ldapbrowser.common"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.ldapbrowser.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.valueeditors"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
unpack="false"/>
</feature>
Modified: directory/studio/trunk/features/rcp.feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/features/rcp.feature/feature.xml?rev=1673558&r1=1673557&r2=1673558&view=diff
==============================================================================
--- directory/studio/trunk/features/rcp.feature/feature.xml (original)
+++ directory/studio/trunk/features/rcp.feature/feature.xml Tue Apr 14 21:37:08 2015
@@ -19,7 +19,7 @@ Some icons from FAMFAMFAM http://www.fam
</copyright>
<license url="http://www.apache.org/licenses/LICENSE-2.0.html">
-Apache License
+ Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -27,38 +27,38 @@ http://www.apache.org/licenses/
1. Definitions.
- "License" shall mean the terms and conditions for use, reproduction,
+ "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
+ "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
+ "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
+ "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
+ "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,
+ "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
+ "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
+ "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
+ "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
@@ -66,21 +66,21 @@ http://www.apache.org/licenses/
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
+ "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"
+ 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."
+ designated in writing by the copyright owner as "Not a Contribution."
- "Contributor" shall mean Licensor and any individual or Legal Entity
+ "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.
@@ -124,7 +124,7 @@ http://www.apache.org/licenses/
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
+ (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
@@ -163,7 +163,7 @@ http://www.apache.org/licenses/
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,
+ 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
@@ -214,120 +214,125 @@ http://www.apache.org/licenses/
unpack="false"/>
<plugin
- id="slf4j.api"
+ id="org.apache.commons.codec"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="slf4j.log4j12"
+ id="org.apache.commons.collections"
download-size="0"
install-size="0"
version="0.0.0"
- fragment="true"
unpack="false"/>
<plugin
- id="javax.xml.stream"
+ id="org.apache.commons.io"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.directory.api.asn1.api"
+ id="org.apache.commons.lang"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.directory.api.asn1.ber"
+ id="slf4j.api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.directory.api.dsmlv2.engine"
+ id="org.apache.servicemix.bundles.dom4j"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.directory.api.dsmlv2.parser"
+ id="org.apache.servicemix.bundles.antlr"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.directory.api.i18n"
+ id="org.apache.servicemix.bundles.xpp3"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.directory.api.ldap.client.api"
+ id="org.apache.commons.pool"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.directory.api.ldap.codec.core"
+ id="net.sf.ehcache"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.directory.api.ldap.extras.aci"
+ id="bcprov"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.directory.api.ldap.extras.codec"
+ id="org.apache.commons.logging"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.directory.api.ldap.extras.codec.api"
+ id="javax.xml"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.directory.api.ldap.extras.sp"
+ id="javax.xml.stream"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.directory.api.ldap.extras.trigger"
+ id="org.eclipse.jdt.launching"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.directory.api.ldap.extras.util"
+ id="org.eclipse.jdt.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.directory.api.ldap.model"
+ id="org.eclipse.jdt.debug"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.apache.directory.api.ldap.client.api"
download-size="0"
install-size="0"
version="0.0.0"
@@ -341,112 +346,127 @@ http://www.apache.org/licenses/
unpack="false"/>
<plugin
- id="org.apache.directory.api.ldap.schema"
+ id="org.apache.mina.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.directory.api.ldap.schema.converter"
+ 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.util"
+ id="org.apache.directory.api.asn1.api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.directory.server.core.api"
+ id="org.apache.directory.api.asn1.ber"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.directory.server.config"
+ id="org.apache.directory.api.i18n"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="net.sf.ehcache"
+ id="org.apache.directory.api.util"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.directory.server.i18n"
+ id="log4j"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.directory.server.core"
+ id="org.apache.directory.api.ldap.schema"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.directory.server.core.avl"
+ 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.server.core.constants"
+ id="org.apache.directory.api.ldap.extras.util"
+ 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="org.apache.directory.server.core.shared"
+ id="org.apache.directory.api.dsmlv2.engine"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.directory.jdbm.jdbm"
+ id="org.apache.directory.api.dsmlv2.parser"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.directory.server.jdbm.partition"
+ id="org.apache.directory.api.ldap.codec.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.directory.server.xdbm.partition"
+ 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.mavibot.mavibot"
+ 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.server.mavibot.partition"
+ 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.server.config"
download-size="0"
install-size="0"
version="0.0.0"
@@ -460,30 +480,45 @@ http://www.apache.org/licenses/
unpack="false"/>
<plugin
- id="org.apache.directory.server.kerberos.codec"
+ id="org.apache.directory.server.xdbm.partition"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.jdt.launching"
+ id="org.apache.directory.server.core.api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.jdt.core"
+ id="org.apache.directory.server.i18n"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.jdt.debug"
+ id="org.apache.directory.server.core.avl"
download-size="0"
install-size="0"
- version="0.0.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.apache.directory.server.core.constants"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
</feature>
Modified: directory/studio/trunk/features/schemaeditor.feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/features/schemaeditor.feature/feature.xml?rev=1673558&r1=1673557&r2=1673558&view=diff
==============================================================================
--- directory/studio/trunk/features/schemaeditor.feature/feature.xml (original)
+++ directory/studio/trunk/features/schemaeditor.feature/feature.xml Tue Apr 14 21:37:08 2015
@@ -19,7 +19,7 @@ Some icons from FAMFAMFAM http://www.fam
</copyright>
<license url="http://www.apache.org/licenses/LICENSE-2.0.html">
-Apache License
+ Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -27,38 +27,38 @@ http://www.apache.org/licenses/
1. Definitions.
- "License" shall mean the terms and conditions for use, reproduction,
+ "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
+ "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
+ "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
+ "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
+ "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,
+ "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
+ "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
+ "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
+ "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
@@ -66,21 +66,21 @@ http://www.apache.org/licenses/
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
+ "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"
+ 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."
+ designated in writing by the copyright owner as "Not a Contribution."
- "Contributor" shall mean Licensor and any individual or Legal Entity
+ "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.
@@ -124,7 +124,7 @@ http://www.apache.org/licenses/
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
+ (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
@@ -163,7 +163,7 @@ http://www.apache.org/licenses/
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,
+ 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
@@ -199,157 +199,6 @@ http://www.apache.org/licenses/
<update label="Apache Directory Studio" url="http://directory.apache.org/studio/update/2.x"/>
</url>
- <requires>
- <import plugin="org.eclipse.core.expressions"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.jface.text"/>
- <import plugin="org.eclipse.search"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.ui.editors"/>
- <import plugin="org.eclipse.ui.forms"/>
- <import plugin="org.eclipse.ui.workbench.texteditor"/>
- </requires>
-
- <plugin
- id="org.apache.servicemix.bundles.antlr"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.collections"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.io"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.lang"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.logging"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.pool"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="log4j"
- 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.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="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.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.studio.common.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.directory.studio.common.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
<plugin
id="org.apache.directory.studio.connection.core"
download-size="0"
@@ -386,49 +235,14 @@ http://www.apache.org/licenses/
unpack="false"/>
<plugin
- id="org.apache.httpcomponents.httpclient"
+ id="org.apache.directory.studio.common.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.httpcomponents.httpcore"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.mina.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="bcprov"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.servicemix.bundles.dom4j"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="slf4j.api"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.servicemix.bundles.xpp3"
+ id="org.apache.directory.studio.common.ui"
download-size="0"
install-size="0"
version="0.0.0"