directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r497053 - in /directory/trunks/ldapstudio: build.xml ldapstudio-browser-core/build.xml ldapstudio-browser-feature/feature.xml ldapstudio-browser-ui/build.xml ldapstudio-rcp-feature/feature.xml ldapstudio-schemas-feature/feature.xml
Date Wed, 17 Jan 2007 15:58:50 GMT
Author: pamarcelot
Date: Wed Jan 17 07:58:48 2007
New Revision: 497053

URL: http://svn.apache.org/viewvc?view=rev&rev=497053
Log:
Updating UpdateSite URL on all features. Adding missing informations on features. Correcting
the build to activate correctly the features in LDAP Studio.

Modified:
    directory/trunks/ldapstudio/build.xml
    directory/trunks/ldapstudio/ldapstudio-browser-core/build.xml
    directory/trunks/ldapstudio/ldapstudio-browser-feature/feature.xml
    directory/trunks/ldapstudio/ldapstudio-browser-ui/build.xml
    directory/trunks/ldapstudio/ldapstudio-rcp-feature/feature.xml
    directory/trunks/ldapstudio/ldapstudio-schemas-feature/feature.xml

Modified: directory/trunks/ldapstudio/build.xml
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/build.xml?view=diff&rev=497053&r1=497052&r2=497053
==============================================================================
--- directory/trunks/ldapstudio/build.xml (original)
+++ directory/trunks/ldapstudio/build.xml Wed Jan 17 07:58:48 2007
@@ -79,15 +79,6 @@
             </fileset>
         </copy>
 
-        <!-- Creation of the LDAP Studio RCP Feature -->
-        <ant dir="ldapstudio-rcp-feature" inheritAll="no" />
-        <!-- Copy of the LDAP Studio RCP Feature in the "features" folder of the RCP app
-->
-        <copy todir="${ldapstudio-complete.build}/features">
-            <fileset dir="${basedir}/ldapstudio-rcp-feature/target">
-                <include name="*.jar" />
-            </fileset>
-        </copy>
-
         <!-- Creation of the Schemas Editor Plugin -->
         <ant dir="ldapstudio-schemas-plugin" inheritAll="no" />
         <!-- Copy of the Schemas Editor Plugin in the "plugins" folder of the RCP app
-->
@@ -97,33 +88,6 @@
             </fileset>
         </copy>
 
-        <!-- Creation of the Schemas Editor Feature -->
-        <ant dir="ldapstudio-schemas-feature" inheritAll="no" />
-        <!-- Copy of the Schemas Editor Feature in the "features" folder of the RCP app
-->
-        <copy todir="${ldapstudio-complete.build}/features">
-            <fileset dir="${basedir}/ldapstudio-schemas-feature/target">
-                <include name="*.jar" />
-            </fileset>
-        </copy>
-
-        <!-- Creation of the Import/Export Plugin -->
-        <!--<ant dir="ldapstudio-importexport-plugin" inheritAll="no" />-->
-        <!-- Copy of the Import/Export Plugin in the "plugins" folder of the RCP app -->
-        <!--<copy todir="${ldapstudio-complete.build}/plugins">-->
-        <!--    <fileset dir="${basedir}/ldapstudio-importexport-plugin/target">-->
-        <!--        <include name="*.jar" />-->
-        <!--    </fileset>-->
-        <!--</copy>-->
-
-	<!-- Creation of the DSML Plugin -->
-        <!--<ant dir="ldapstudio-dsml-plugin" inheritAll="no" />-->
-        <!-- Copy of the DSML Plugin in the "plugins" folder of the RCP app -->
-        <!--<copy todir="${ldapstudio-complete.build}/plugins">-->
-            <!--<fileset dir="${basedir}/ldapstudio-dsml-plugin/target">-->
-         <!--       <include name="*.jar" />-->
-         <!--   </fileset>-->
-       <!-- </copy>-->
-
         <!-- Creation of the Browser Core Plugin -->
         <ant dir="ldapstudio-browser-core" inheritAll="no" />
         <!-- Copy of the Browser Core Plugin in the "plugins" folder of the RCP app -->
@@ -142,25 +106,7 @@
             </fileset>
         </copy>
 
-        <!-- Creation of the Browser Feature -->
-        <ant dir="ldapstudio-browser-feature" inheritAll="no" />
-        <!-- Copy of the Browser Feature in the "features" folder of the RCP app -->
-        <copy todir="${ldapstudio-complete.build}/features">
-            <fileset dir="${basedir}/ldapstudio-browser-feature/target">
-                <include name="*.jar" />
-            </fileset>
-        </copy>
-
-	<!-- Creation of the ACIItem Editor Plugin -->
-        <!--<ant dir="ldapstudio-aciitemeditor" inheritAll="no" />-->
-        <!-- Copy of the ACI Item Editor Plugin in the "plugins" folder of the RCP app
-->
-        <!--<copy todir="${ldapstudio-complete.build}/plugins">-->
-        <!--    <fileset dir="${basedir}/ldapstudio-aciitemeditor/target">-->
-         <!--       <include name="*.jar" />-->
-         <!--   </fileset>-->
-       <!--   </copy>-->
-
-	<!-- Creation of the Jars Plugin -->
+	    <!-- Creation of the Jars Plugin -->
         <ant dir="ldapstudio-jars" inheritAll="no" />
         <!-- Copy of the Jars Plugin in the "plugins" folder of the RCP app -->
         <copy todir="${ldapstudio-complete.build}/plugins">
@@ -168,6 +114,42 @@
                 <include name="*.jar" />
             </fileset>
         </copy>
+
+        <!-- Property for the features -->
+		<property name="project.features" value="${ldapstudio-complete.build}/features" />
+
+        <!-- Copy of the LDAP Studio RCP Feature in the "features" folder -->
+		<property name="ldapstudio-rcp-feature.project" value="${basedir}/ldapstudio-rcp-feature"
/>
+		<property name="ldapstudio-rcp-feature.name" value="org.apache.directory.ldapstudio.rcp"
/>
+		<property name="ldapstudio-rcp-feature.version" value="0.6.0" />
+        <mkdir dir="${project.features}/${ldapstudio-rcp-feature.name}_${ldapstudio-rcp-feature.version}"
/>
+		<copy todir="${project.features}/${ldapstudio-rcp-feature.name}_${ldapstudio-rcp-feature.version}">
+			<fileset dir="${ldapstudio-rcp-feature.project}">
+				<include name="feature.xml" />
+			</fileset>
+		</copy>
+		
+        <!-- Copy of the Schemas Editor Feature in the "features" folder -->
+		<property name="ldapstudio-schemas-feature.project" value="${basedir}/ldapstudio-schemas-feature"
/>
+		<property name="ldapstudio-schemas-feature.name" value="org.apache.directory.ldapstudio.schemas.feature"
/>
+		<property name="ldapstudio-schemas-feature.version" value="0.6.0" />
+		<mkdir dir="${project.features}/${ldapstudio-schemas-feature.name}_${ldapstudio-schemas-feature.version}"
/>
+		<copy todir="${project.features}/${ldapstudio-schemas-feature.name}_${ldapstudio-schemas-feature.version}">
+			<fileset dir="${ldapstudio-schemas-feature.project}">
+				<include name="feature.xml" />
+			</fileset>
+		</copy>
+		
+	    <!-- Copy of the Browser Feature in the "features" folder -->
+		<property name="ldapstudio-browser-feature.project" value="${basedir}/ldapstudio-browser-feature"
/>
+		<property name="ldapstudio-browser-feature.name" value="org.apache.directory.ldapstudio.browser.feature"
/>
+		<property name="ldapstudio-browser-feature.version" value="0.6.0" />
+		<mkdir dir="${project.features}/${ldapstudio-browser-feature.name}_${ldapstudio-browser-feature.version}"
/>
+		<copy todir="${project.features}/${ldapstudio-browser-feature.name}_${ldapstudio-browser-feature.version}">
+			<fileset dir="${ldapstudio-browser-feature.project}">
+				<include name="feature.xml" />
+			</fileset>
+		</copy>
 
         <!-- Setting Permissions -->
         <antcall target="setPermission_${ldapstudio-rcp.os.name}" />

Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/build.xml
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/build.xml?view=diff&rev=497053&r1=497052&r2=497053
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/build.xml (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/build.xml Wed Jan 17 07:58:48 2007
@@ -17,7 +17,7 @@
   under the License.
 -->
 <project default="jar" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
-	<property name="project.name" value="org.apache.directory.ldapstudio.browser-core" />
+	<property name="project.name" value="org.apache.directory.ldapstudio.browser.core" />
 	<property name="project.version" value="0.6.0" />
 
 	<property name="project.output" value="${basedir}/target" />

Modified: directory/trunks/ldapstudio/ldapstudio-browser-feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-feature/feature.xml?view=diff&rev=497053&r1=497052&r2=497053
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-feature/feature.xml (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-feature/feature.xml Wed Jan 17 07:58:48
2007
@@ -9,39 +9,235 @@
       arch="ppc,x86">
 
    <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
+      The LDAP Studio Browser Feature contains all plugins related to the LDAP Browser.
    </description>
 
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
+   <copyright>
+      © 2006-2007 Apache Software Foundation - All right reserved.
+This product includes software developed by the
+Apache Software Foundation http://www.apache.org/
    </copyright>
 
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
+   <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="LDAP Studio Update Site" url="http://people.apache.org/~pajbam/ldapstudio/update"/>
+      <update label="LDAP Studio Update Site" url="http://people.apache.org/~pamarcelot/ldapstudio/update"/>
    </url>
 
    <plugin
          id="org.apache.directory.ldapstudio.browser.core"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="0.6.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.ldapstudio.browser.ui"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="0.6.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.ldapstudio.jars"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="0.6.0"/>
 
 </feature>

Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/build.xml
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/build.xml?view=diff&rev=497053&r1=497052&r2=497053
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/build.xml (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/build.xml Wed Jan 17 07:58:48 2007
@@ -17,7 +17,7 @@
   under the License.
 -->
 <project default="jar" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
-	<property name="project.name" value="org.apache.directory.ldapstudio.browser-ui" />
+	<property name="project.name" value="org.apache.directory.ldapstudio.browser.ui" />
 	<property name="project.version" value="0.6.0" />
 
 	<property name="project.output" value="${basedir}/target" />

Modified: directory/trunks/ldapstudio/ldapstudio-rcp-feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-rcp-feature/feature.xml?view=diff&rev=497053&r1=497052&r2=497053
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-rcp-feature/feature.xml (original)
+++ directory/trunks/ldapstudio/ldapstudio-rcp-feature/feature.xml Wed Jan 17 07:58:48 2007
@@ -218,13 +218,9 @@
    </license>
 
    <url>
-      <update label="LDAP Studio Update Site" url="http://people.apache.org/~pajbam/ldapstudio/update"/>
+      <update label="LDAP Studio Update Site" url="http://people.apache.org/~pamarcelot/ldapstudio/update"/>
    </url>
 
-   <includes
-         id="org.eclipse.rcp"
-         version="0.0.0"/>
-
    <requires>
       <import plugin="org.eclipse.core.runtime" version="3.1.0" match="compatible"/>
       <import plugin="com.ibm.icu"/>
@@ -242,93 +238,5 @@
       <import plugin="org.eclipse.help" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.equinox.common" version="3.2.0" match="compatible"/>
    </requires>
-
-   <plugin
-         id="org.apache.lucene"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.help"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.help.appserver"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.help.base"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.help.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.help.webapp"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.tomcat"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ui.forms"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.directory.ldapstudio"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.update.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.update.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.views"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.jobs"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
 
 </feature>

Modified: directory/trunks/ldapstudio/ldapstudio-schemas-feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-schemas-feature/feature.xml?view=diff&rev=497053&r1=497052&r2=497053
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-schemas-feature/feature.xml (original)
+++ directory/trunks/ldapstudio/ldapstudio-schemas-feature/feature.xml Wed Jan 17 07:58:48
2007
@@ -218,20 +218,20 @@
    </license>
 
    <url>
-      <update label="LDAP Studio Update Site" url="http://people.apache.org/~pajbam/ldapstudio/update"/>
+      <update label="LDAP Studio Update Site" url="http://people.apache.org/~pamarcelot/ldapstudio/update"/>
    </url>
 
    <plugin
          id="org.apache.directory.ldapstudio.schemas"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="0.6.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.ldapstudio.jars"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="0.6.0"/>
 
 </feature>



Mime
View raw message