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 2007/01/17 14:50:12 UTC

svn commit: r497018 - in /directory/trunks/ldapstudio: ./ ldapstudio-browser-core/ ldapstudio-browser-core/META-INF/ ldapstudio-browser-feature/ ldapstudio-browser-ui/ ldapstudio-browser-ui/META-INF/ ldapstudio-dsml-command/ ldapstudio-dsml-parser/ lda...

Author: pamarcelot
Date: Wed Jan 17 05:50:09 2007
New Revision: 497018

URL: http://svn.apache.org/viewvc?view=rev&rev=497018
Log:
Adding ldapstudio-browser-feature and ldapstudio-schemas-feature projects. Updating ldapstudio-rcp-features project. Adding ldapstudio-updatesite project. All projects that will be part of the LDAP Studio initial release have their version number passed to '0.6.0'. Modifying several build script for buildfing the initial release.

Added:
    directory/trunks/ldapstudio/ldapstudio-browser-feature/
    directory/trunks/ldapstudio/ldapstudio-browser-feature/.project
    directory/trunks/ldapstudio/ldapstudio-browser-feature/build.properties
    directory/trunks/ldapstudio/ldapstudio-browser-feature/build.xml
    directory/trunks/ldapstudio/ldapstudio-browser-feature/feature.xml
    directory/trunks/ldapstudio/ldapstudio-rcp-feature/build.xml
    directory/trunks/ldapstudio/ldapstudio-schemas-feature/
    directory/trunks/ldapstudio/ldapstudio-schemas-feature/.project
    directory/trunks/ldapstudio/ldapstudio-schemas-feature/build.properties
    directory/trunks/ldapstudio/ldapstudio-schemas-feature/build.xml
    directory/trunks/ldapstudio/ldapstudio-schemas-feature/feature.xml
    directory/trunks/ldapstudio/ldapstudio-updatesite/
    directory/trunks/ldapstudio/ldapstudio-updatesite/.project
    directory/trunks/ldapstudio/ldapstudio-updatesite/features/
    directory/trunks/ldapstudio/ldapstudio-updatesite/index.html
    directory/trunks/ldapstudio/ldapstudio-updatesite/plugins/
    directory/trunks/ldapstudio/ldapstudio-updatesite/site.xml
    directory/trunks/ldapstudio/ldapstudio-updatesite/web/
    directory/trunks/ldapstudio/ldapstudio-updatesite/web/site.css
    directory/trunks/ldapstudio/ldapstudio-updatesite/web/site.xsl
Removed:
    directory/trunks/ldapstudio/ldapstudio-browser-core/plugin.properties
    directory/trunks/ldapstudio/ldapstudio-jars/plugin.properties
Modified:
    directory/trunks/ldapstudio/build.xml
    directory/trunks/ldapstudio/ldapstudio-browser-core/META-INF/MANIFEST.MF
    directory/trunks/ldapstudio/ldapstudio-browser-core/build.xml
    directory/trunks/ldapstudio/ldapstudio-browser-ui/META-INF/MANIFEST.MF
    directory/trunks/ldapstudio/ldapstudio-browser-ui/build.xml
    directory/trunks/ldapstudio/ldapstudio-browser-ui/plugin.properties
    directory/trunks/ldapstudio/ldapstudio-dsml-command/build.xml
    directory/trunks/ldapstudio/ldapstudio-dsml-parser/build.xml
    directory/trunks/ldapstudio/ldapstudio-importexport-plugin/build.xml
    directory/trunks/ldapstudio/ldapstudio-jars/META-INF/MANIFEST.MF
    directory/trunks/ldapstudio/ldapstudio-jars/build.xml
    directory/trunks/ldapstudio/ldapstudio-rcp-feature/feature.xml
    directory/trunks/ldapstudio/ldapstudio-rcp/META-INF/MANIFEST.MF
    directory/trunks/ldapstudio/ldapstudio-rcp/build.xml
    directory/trunks/ldapstudio/ldapstudio-rcp/src/main/resources/org/apache/directory/ldapstudio/messages.properties
    directory/trunks/ldapstudio/ldapstudio-schemas-plugin/.classpath
    directory/trunks/ldapstudio/ldapstudio-schemas-plugin/META-INF/MANIFEST.MF
    directory/trunks/ldapstudio/ldapstudio-schemas-plugin/build.properties
    directory/trunks/ldapstudio/ldapstudio-schemas-plugin/build.xml

Modified: directory/trunks/ldapstudio/build.xml
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/build.xml?view=diff&rev=497018&r1=497017&r2=497018
==============================================================================
--- directory/trunks/ldapstudio/build.xml (original)
+++ directory/trunks/ldapstudio/build.xml Wed Jan 17 05:50:09 2007
@@ -79,34 +79,52 @@
             </fileset>
         </copy>
 
-        <!-- Creation of the Schemas Plugin -->
+        <!-- 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 Plugin in the "plugins" folder of the RCP app -->
+        <!-- Copy of the Schemas Editor Plugin in the "plugins" folder of the RCP app -->
         <copy todir="${ldapstudio-complete.build}/plugins">
             <fileset dir="${basedir}/ldapstudio-schemas-plugin/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">
+        <!-- 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" />
+        <!--<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>
+        <!--<copy todir="${ldapstudio-complete.build}/plugins">-->
+            <!--<fileset dir="${basedir}/ldapstudio-dsml-plugin/target">-->
+         <!--       <include name="*.jar" />-->
+         <!--   </fileset>-->
+       <!-- </copy>-->
 
-	<!-- Creation of the Browser Core Plugin -->
+        <!-- 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 -->
         <copy todir="${ldapstudio-complete.build}/plugins">
@@ -115,7 +133,7 @@
             </fileset>
         </copy>
 
-	<!-- Creation of the Browser UI Plugin -->
+        <!-- Creation of the Browser UI Plugin -->
         <ant dir="ldapstudio-browser-ui" inheritAll="no" />
         <!-- Copy of the Browser UI Plugin in the "plugins" folder of the RCP app -->
         <copy todir="${ldapstudio-complete.build}/plugins">
@@ -124,15 +142,24 @@
             </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">
+        <!-- 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 -->
         <ant dir="ldapstudio-jars" inheritAll="no" />
         <!-- Copy of the Jars Plugin in the "plugins" folder of the RCP app -->
@@ -197,14 +224,12 @@
     <!-- ================================== -->
     <target name="clean" description="Deletes any generated file (javadoc, classes, jars, distribution)">
         <ant dir="ldapstudio-rcp" inheritAll="no" target="clean"/>
+        <ant dir="ldapstudio-rcp-feature" inheritAll="no" target="clean"/>
         <ant dir="ldapstudio-schemas-plugin" inheritAll="no" target="clean"/>
-        <ant dir="ldapstudio-importexport-plugin" inheritAll="no" target="clean"/>
-        <ant dir="ldapstudio-dsml-plugin" inheritAll="no" target="clean" />
-        <ant dir="ldapstudio-dsml-parser" inheritAll="no" target="clean" />
-        <ant dir="ldapstudio-dsml-command" inheritAll="no" target="clean" />
+        <ant dir="ldapstudio-schemas-feature" inheritAll="no" target="clean"/>
         <ant dir="ldapstudio-browser-core" inheritAll="no" target="clean" />
         <ant dir="ldapstudio-browser-ui" inheritAll="no" target="clean" />
-        <ant dir="ldapstudio-aciitemeditor" inheritAll="no" target="clean" />
+        <ant dir="ldapstudio-browser-feature" inheritAll="no" target="clean"/>
         <ant dir="ldapstudio-jars" inheritAll="no" target="clean" />
         <delete dir="${ldapstudio-complete.output}" />
     </target>

Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/META-INF/MANIFEST.MF?view=diff&rev=497018&r1=497017&r2=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/META-INF/MANIFEST.MF (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/META-INF/MANIFEST.MF Wed Jan 17 05:50:09 2007
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
+Bundle-Name: LDAP Studio Browser Core Plugin
 Bundle-SymbolicName: org.apache.directory.ldapstudio.browser.core; singleton:=true
-Bundle-Version: 0.0.0.Development-Version
+Bundle-Version: 0.6.0
 Bundle-Activator: org.apache.directory.ldapstudio.browser.core.BrowserCorePlugin
-Bundle-Vendor: %providerName
+Bundle-Vendor: Apache Software Foundation
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.search,

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=497018&r1=497017&r2=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/build.xml (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/build.xml Wed Jan 17 05:50:09 2007
@@ -16,9 +16,9 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<project name="ldapstudio-browser-core" default="jar" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
+<project default="jar" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
 	<property name="project.name" value="org.apache.directory.ldapstudio.browser-core" />
-	<property name="project.version" value="0.5.5" />
+	<property name="project.version" value="0.6.0" />
 
 	<property name="project.output" value="${basedir}/target" />
 	<property name="project.build" value="${project.output}/build" />

Added: directory/trunks/ldapstudio/ldapstudio-browser-feature/.project
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-feature/.project?view=auto&rev=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-feature/.project (added)
+++ directory/trunks/ldapstudio/ldapstudio-browser-feature/.project Wed Jan 17 05:50:09 2007
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ldapstudio-browser-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>

Added: directory/trunks/ldapstudio/ldapstudio-browser-feature/build.properties
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-feature/build.properties?view=auto&rev=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-feature/build.properties (added)
+++ directory/trunks/ldapstudio/ldapstudio-browser-feature/build.properties Wed Jan 17 05:50:09 2007
@@ -0,0 +1 @@
+bin.includes = feature.xml

Added: directory/trunks/ldapstudio/ldapstudio-browser-feature/build.xml
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-feature/build.xml?view=auto&rev=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-feature/build.xml (added)
+++ directory/trunks/ldapstudio/ldapstudio-browser-feature/build.xml Wed Jan 17 05:50:09 2007
@@ -0,0 +1,52 @@
+<!--
+  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 default="jar" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
+	<property name="project.name" value="org.apache.directory.ldapstudio.browser.feature" />
+	<property name="project.version" value="0.6.0" />
+
+	<property name="project.output" value="${basedir}/target" />
+		
+	<!-- ================================== -->
+	<!--               JAR                  -->
+	<!-- ================================== -->
+	<target name="jar" description="Creates jar file">
+		<mkdir dir="${project.output}" />
+		<jar destfile="${project.output}/${project.name}_${project.version}.jar">
+			<fileset dir="${basedir}">
+				<exclude name=".project"/>
+				<exclude name="build.properties"/>
+				<exclude name="build.xml"/>
+			</fileset>
+		</jar>
+	</target>
+
+	<!-- ================================== -->
+	<!--               CLEAN                -->
+	<!-- ================================== -->
+	<target name="clean" description="Deletes any generated file (javadoc, classes, jars, distribution)">
+		<delete includeemptydirs="true">
+			<fileset dir="${basedir}">
+				<exclude name=".project"/>
+				<exclude name="build.properties"/>
+				<exclude name="build.xml"/>
+				<exclude name="feature.xml"/>
+			</fileset>
+		</delete>
+	</target>
+</project>

Added: directory/trunks/ldapstudio/ldapstudio-browser-feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-feature/feature.xml?view=auto&rev=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-feature/feature.xml (added)
+++ directory/trunks/ldapstudio/ldapstudio-browser-feature/feature.xml Wed Jan 17 05:50:09 2007
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.apache.directory.ldapstudio.browser.feature"
+      label="LDAP Studio Browser Feature"
+      version="0.6.0"
+      provider-name="Apache Software Foundation"
+      os="linux,macosx,win32"
+      ws="carbon,gtk,win32"
+      arch="ppc,x86">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <url>
+      <update label="LDAP Studio Update Site" url="http://people.apache.org/~pajbam/ldapstudio/update"/>
+   </url>
+
+   <plugin
+         id="org.apache.directory.ldapstudio.browser.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.ldapstudio.browser.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.ldapstudio.jars"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+</feature>

Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/META-INF/MANIFEST.MF?view=diff&rev=497018&r1=497017&r2=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/META-INF/MANIFEST.MF (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/META-INF/MANIFEST.MF Wed Jan 17 05:50:09 2007
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
+Bundle-Name: LDAP Studio Browser UI Plugin
 Bundle-SymbolicName: org.apache.directory.ldapstudio.browser.ui;singleton:=true
-Bundle-Version: 0.0.0.Development-Version
+Bundle-Version: 0.6.0
 Bundle-Activator: org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin
-Bundle-Vendor: %providerName
+Bundle-Vendor: Apache Software Foundation
 Bundle-Localization: plugin
 Require-Bundle: org.apache.directory.ldapstudio.browser.core,
  org.eclipse.core.runtime,

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=497018&r1=497017&r2=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/build.xml (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/build.xml Wed Jan 17 05:50:09 2007
@@ -16,9 +16,9 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<project name="ldapstudio-browser-ui" default="jar" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
+<project default="jar" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
 	<property name="project.name" value="org.apache.directory.ldapstudio.browser-ui" />
-	<property name="project.version" value="0.5.5" />
+	<property name="project.version" value="0.6.0" />
 
 	<property name="project.output" value="${basedir}/target" />
 	<property name="project.build" value="${project.output}/build" />

Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/plugin.properties
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/plugin.properties?view=diff&rev=497018&r1=497017&r2=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/plugin.properties (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/plugin.properties Wed Jan 17 05:50:09 2007
@@ -1,5 +1,2 @@
-pluginName=LDAP Browser and Editor UI
-providerName=Apache Software Foundation
-
 searchMenu.label=Se&arch
 openLDAPSearchPageAction.label=&LDAP Search...

Modified: directory/trunks/ldapstudio/ldapstudio-dsml-command/build.xml
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-dsml-command/build.xml?view=diff&rev=497018&r1=497017&r2=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-dsml-command/build.xml (original)
+++ directory/trunks/ldapstudio/ldapstudio-dsml-command/build.xml Wed Jan 17 05:50:09 2007
@@ -16,7 +16,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<project name="ldapstudio-dsml-command" default="bundle" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
+<project default="bundle" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
 	<property name="project.name" value="ldapstudio-dsml-command" />
 	<property name="project.version" value="0.1" />
 

Modified: directory/trunks/ldapstudio/ldapstudio-dsml-parser/build.xml
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-dsml-parser/build.xml?view=diff&rev=497018&r1=497017&r2=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-dsml-parser/build.xml (original)
+++ directory/trunks/ldapstudio/ldapstudio-dsml-parser/build.xml Wed Jan 17 05:50:09 2007
@@ -16,7 +16,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<project name="ldapstudio-dsml-parser" default="jar" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
+<project default="jar" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
 	<property name="project.name" value="ldapstudio-dsml-parser" />
 	<property name="project.version" value="0.3" />
 

Modified: directory/trunks/ldapstudio/ldapstudio-importexport-plugin/build.xml
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-importexport-plugin/build.xml?view=diff&rev=497018&r1=497017&r2=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-importexport-plugin/build.xml (original)
+++ directory/trunks/ldapstudio/ldapstudio-importexport-plugin/build.xml Wed Jan 17 05:50:09 2007
@@ -16,7 +16,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<project name="ldapstudio-importexport-plugin" default="jar" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
+<project default="jar" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
 	<property name="project.name" value="org.apache.directory.ldapstudio.importexport" />
 	<property name="project.version" value="0.9" />
 

Modified: directory/trunks/ldapstudio/ldapstudio-jars/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-jars/META-INF/MANIFEST.MF?view=diff&rev=497018&r1=497017&r2=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-jars/META-INF/MANIFEST.MF (original)
+++ directory/trunks/ldapstudio/ldapstudio-jars/META-INF/MANIFEST.MF Wed Jan 17 05:50:09 2007
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
+Bundle-Name: LDAP Studio Jars Plugin
 Bundle-SymbolicName: org.apache.directory.ldapstudio.jars
-Bundle-Version: 0.0.0.Development-Version
+Bundle-Version: 0.6.0
 Bundle-Localization: plugin
-Bundle-Vendor: %providerName
+Bundle-Vendor: Apache Software Foundation
 Export-Package: antlr,
  antlr.ASdebug,
  antlr.actions.cpp,

Modified: directory/trunks/ldapstudio/ldapstudio-jars/build.xml
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-jars/build.xml?view=diff&rev=497018&r1=497017&r2=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-jars/build.xml (original)
+++ directory/trunks/ldapstudio/ldapstudio-jars/build.xml Wed Jan 17 05:50:09 2007
@@ -16,9 +16,9 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<project name="ldapstudio-jars" default="jar" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
+<project default="jar" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
 	<property name="project.name" value="org.apache.directory.ldapstudio.jars" />
-	<property name="project.version" value="0.1.0" />
+	<property name="project.version" value="0.6.0" />
 
 	<property name="project.output" value="${basedir}/target" />
 	<property name="project.build" value="${project.output}/build" />

Added: directory/trunks/ldapstudio/ldapstudio-rcp-feature/build.xml
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-rcp-feature/build.xml?view=auto&rev=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-rcp-feature/build.xml (added)
+++ directory/trunks/ldapstudio/ldapstudio-rcp-feature/build.xml Wed Jan 17 05:50:09 2007
@@ -0,0 +1,52 @@
+<!--
+  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 default="jar" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
+	<property name="project.name" value="org.apache.directory.ldapstudio.rcp.feature" />
+	<property name="project.version" value="0.6.0" />
+
+	<property name="project.output" value="${basedir}/target" />
+		
+	<!-- ================================== -->
+	<!--               JAR                  -->
+	<!-- ================================== -->
+	<target name="jar" description="Creates jar file">
+		<mkdir dir="${project.output}" />
+		<jar destfile="${project.output}/${project.name}_${project.version}.jar">
+			<fileset dir="${basedir}">
+				<exclude name=".project"/>
+				<exclude name="build.properties"/>
+				<exclude name="build.xml"/>
+			</fileset>
+		</jar>
+	</target>
+
+	<!-- ================================== -->
+	<!--               CLEAN                -->
+	<!-- ================================== -->
+	<target name="clean" description="Deletes any generated file (javadoc, classes, jars, distribution)">
+		<delete includeemptydirs="true">
+			<fileset dir="${basedir}">
+				<exclude name=".project"/>
+				<exclude name="build.properties"/>
+				<exclude name="build.xml"/>
+				<exclude name="feature.xml"/>
+			</fileset>
+		</delete>
+	</target>
+</project>

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=497018&r1=497017&r2=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-rcp-feature/feature.xml (original)
+++ directory/trunks/ldapstudio/ldapstudio-rcp-feature/feature.xml Wed Jan 17 05:50:09 2007
@@ -1,24 +1,224 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.apache.directory.ldapstudio.feature"
-      label="LDAP Studio"
-      version="1.0"
-      provider-name="apache.org">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
+      label="LDAP Studio RCP Feature"
+      version="0.6.0"
+      provider-name="Apache Software Foundation"
+      os="linux,macosx,win32"
+      ws="carbon,gtk,win32"
+      arch="ppc,x86">
+
+   <description>
+      The LDAP Studio RCP Feature contains all plugins related to the
+LDAP Studio RCP Tooling Platform.
    </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 RCP Application Update Site" url="http://people.apache.org/~pajbam/ldapstudio/rcp"/>
+      <update label="LDAP Studio Update Site" url="http://people.apache.org/~pajbam/ldapstudio/update"/>
    </url>
 
    <includes
@@ -40,6 +240,7 @@
       <import plugin="org.eclipse.update.core" version="3.1.0" match="compatible"/>
       <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
       <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

Modified: directory/trunks/ldapstudio/ldapstudio-rcp/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-rcp/META-INF/MANIFEST.MF?view=diff&rev=497018&r1=497017&r2=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-rcp/META-INF/MANIFEST.MF (original)
+++ directory/trunks/ldapstudio/ldapstudio-rcp/META-INF/MANIFEST.MF Wed Jan 17 05:50:09 2007
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: LDAP Studio
+Bundle-Name: LDAP Studio RCP Application
 Bundle-SymbolicName: org.apache.directory.ldapstudio;singleton:=true
-Bundle-Version: 0.1
+Bundle-Version: 0.6.0
 Bundle-Activator: org.apache.directory.ldapstudio.Activator
-Bundle-Vendor: apache.org
+Bundle-Vendor: Apache Software Foundation
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.update.core,

Modified: directory/trunks/ldapstudio/ldapstudio-rcp/build.xml
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-rcp/build.xml?view=diff&rev=497018&r1=497017&r2=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-rcp/build.xml (original)
+++ directory/trunks/ldapstudio/ldapstudio-rcp/build.xml Wed Jan 17 05:50:09 2007
@@ -16,7 +16,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<project name="ldapstudio-rcp" default="product" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
+<project default="product" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
     <property name="project.name" value="org.apache.directory.ldapstudio" />
     <property name="project.version" value="0.1" />
 
@@ -163,6 +163,7 @@
 		<copy todir="${ldapstudio-rcp.application}" failonerror="true" overwrite="true" preservelastmodified="yes">
 			<fileset dir="${ldapstudio-rcp.eclipse.dir}/${ldapstudio-rcp.eclipse.version}/${ldapstudio-rcp.os.name}/${ldapstudio-rcp.os.arch}/rcp/" />
 		</copy>
+		<mkdir dir="${ldapstudio-rcp.application}/features" />
 		<mkdir dir="${ldapstudio-rcp.application}/plugins" />
 		<copy todir="${ldapstudio-rcp.application}/plugins" failonerror="true" overwrite="true">
 			<fileset dir="${ldapstudio-rcp.eclipse.dir}/${ldapstudio-rcp.eclipse.version}/${ldapstudio-rcp.os.name}/${ldapstudio-rcp.os.arch}" excludes="rcp/" />

Modified: directory/trunks/ldapstudio/ldapstudio-rcp/src/main/resources/org/apache/directory/ldapstudio/messages.properties
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-rcp/src/main/resources/org/apache/directory/ldapstudio/messages.properties?view=diff&rev=497018&r1=497017&r2=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-rcp/src/main/resources/org/apache/directory/ldapstudio/messages.properties (original)
+++ directory/trunks/ldapstudio/ldapstudio-rcp/src/main/resources/org/apache/directory/ldapstudio/messages.properties Wed Jan 17 05:50:09 2007
@@ -29,7 +29,7 @@
 AddExtensionAction.Search_for_new_extensions=Search for new extensions for LDAP Studio
 AddExtensionAction.Searching_new_extensions=Searching new extensions
 AddExtensionAction.LDAP_Studio_Site=LDAP Studio Site
-AddExtensionAction.LDAP_Studio_Home_Base=http://people.apache.org/~pamarcelot/ldapstudio
+AddExtensionAction.LDAP_Studio_Home_Base=http://people.apache.org/~pamarcelot/ldapstudio/update
 
 # Strings used by ManageExtensionsAction Class
 ManageExtensionsAction.Manage_Extensions=Manage Extensions

Added: directory/trunks/ldapstudio/ldapstudio-schemas-feature/.project
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-schemas-feature/.project?view=auto&rev=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-schemas-feature/.project (added)
+++ directory/trunks/ldapstudio/ldapstudio-schemas-feature/.project Wed Jan 17 05:50:09 2007
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ldapstudio-schemas-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>

Added: directory/trunks/ldapstudio/ldapstudio-schemas-feature/build.properties
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-schemas-feature/build.properties?view=auto&rev=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-schemas-feature/build.properties (added)
+++ directory/trunks/ldapstudio/ldapstudio-schemas-feature/build.properties Wed Jan 17 05:50:09 2007
@@ -0,0 +1 @@
+bin.includes = feature.xml

Added: directory/trunks/ldapstudio/ldapstudio-schemas-feature/build.xml
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-schemas-feature/build.xml?view=auto&rev=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-schemas-feature/build.xml (added)
+++ directory/trunks/ldapstudio/ldapstudio-schemas-feature/build.xml Wed Jan 17 05:50:09 2007
@@ -0,0 +1,52 @@
+<!--
+  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 default="jar" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
+	<property name="project.name" value="org.apache.directory.ldapstudio.schemas.feature" />
+	<property name="project.version" value="0.6.0" />
+
+	<property name="project.output" value="${basedir}/target" />
+		
+	<!-- ================================== -->
+	<!--                                       JAR                                   -->
+	<!-- ================================== -->
+	<target name="jar" description="Creates jar file">
+		<mkdir dir="${project.output}" />
+		<jar destfile="${project.output}/${project.name}_${project.version}.jar">
+			<fileset dir="${basedir}">
+				<exclude name=".project"/>
+				<exclude name="build.properties"/>
+				<exclude name="build.xml"/>
+			</fileset>
+		</jar>
+	</target>
+
+	<!-- ================================== -->
+	<!--                                       CLEAN                              -->
+	<!-- ================================== -->
+	<target name="clean" description="Deletes any generated file (javadoc, classes, jars, distribution)">
+		<delete includeemptydirs="true">
+			<fileset dir="${basedir}">
+				<exclude name=".project"/>
+				<exclude name="build.properties"/>
+				<exclude name="build.xml"/>
+				<exclude name="feature.xml"/>
+			</fileset>
+		</delete>
+	</target>
+</project>

Added: directory/trunks/ldapstudio/ldapstudio-schemas-feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-schemas-feature/feature.xml?view=auto&rev=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-schemas-feature/feature.xml (added)
+++ directory/trunks/ldapstudio/ldapstudio-schemas-feature/feature.xml Wed Jan 17 05:50:09 2007
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.apache.directory.ldapstudio.schemas.feature"
+      label="LDAP Studio Schemas Feature"
+      version="0.6.0"
+      provider-name="Apache Software Foundation"
+      os="linux,macosx,win32"
+      ws="carbon,gtk,win32"
+      arch="ppc,x86">
+
+   <description>
+      The LDAP Studio Schemas Feature contains all plugins related to the
+Schemas Editor.
+   </description>
+
+   <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.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"/>
+   </url>
+
+   <plugin
+         id="org.apache.directory.ldapstudio.schemas"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.ldapstudio.jars"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+</feature>

Modified: directory/trunks/ldapstudio/ldapstudio-schemas-plugin/.classpath
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-schemas-plugin/.classpath?view=diff&rev=497018&r1=497017&r2=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-schemas-plugin/.classpath (original)
+++ directory/trunks/ldapstudio/ldapstudio-schemas-plugin/.classpath Wed Jan 17 05:50:09 2007
@@ -3,6 +3,7 @@
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry exported="true" kind="lib" path="lib/junit-3.8.2.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>

Modified: directory/trunks/ldapstudio/ldapstudio-schemas-plugin/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-schemas-plugin/META-INF/MANIFEST.MF?view=diff&rev=497018&r1=497017&r2=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-schemas-plugin/META-INF/MANIFEST.MF (original)
+++ directory/trunks/ldapstudio/ldapstudio-schemas-plugin/META-INF/MANIFEST.MF Wed Jan 17 05:50:09 2007
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Schemas Plug-in
+Bundle-Name: LDAP Studio Schemas Editor Plug-in
 Bundle-SymbolicName: org.apache.directory.ldapstudio.schemas;singleton:=true
-Bundle-Version: 0.8
+Bundle-Version: 0.6.0
 Bundle-Activator: org.apache.directory.ldapstudio.schemas.Activator
-Bundle-Vendor: apache.org
+Bundle-Vendor: Apache Software Foundation
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -21,4 +21,5 @@
  lib/velocity-dep-1.4.jar,
  lib/apacheds-core-plugin-1.5.0-SNAPSHOT.jar,
  lib/apacheds-core-shared-1.5.0-SNAPSHOT.jar,
- lib/shared-asn1-0.9.6-SNAPSHOT.jar
+ lib/shared-asn1-0.9.6-SNAPSHOT.jar,
+ lib/junit-3.8.2.jar

Modified: directory/trunks/ldapstudio/ldapstudio-schemas-plugin/build.properties
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-schemas-plugin/build.properties?view=diff&rev=497018&r1=497017&r2=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-schemas-plugin/build.properties (original)
+++ directory/trunks/ldapstudio/ldapstudio-schemas-plugin/build.properties Wed Jan 17 05:50:09 2007
@@ -21,4 +21,5 @@
                lib/apacheds-core-plugin-1.5.0-SNAPSHOT.jar,\
                lib/apacheds-core-shared-1.5.0-SNAPSHOT.jar,\
                lib/shared-asn1-0.9.6-SNAPSHOT.jar,\
-               lib/antlr-2.7.6.jar
+               lib/antlr-2.7.6.jar,\
+               lib/junit-3.8.2.jar

Modified: directory/trunks/ldapstudio/ldapstudio-schemas-plugin/build.xml
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-schemas-plugin/build.xml?view=diff&rev=497018&r1=497017&r2=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-schemas-plugin/build.xml (original)
+++ directory/trunks/ldapstudio/ldapstudio-schemas-plugin/build.xml Wed Jan 17 05:50:09 2007
@@ -16,7 +16,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<project name="ldapstudio-schemas-plugin" default="jar" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
+<project default="jar" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
 	<property name="project.name" value="org.apache.directory.ldapstudio.schemas" />
 	<property name="project.version" value="0.8" />
 

Added: directory/trunks/ldapstudio/ldapstudio-updatesite/.project
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-updatesite/.project?view=auto&rev=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-updatesite/.project (added)
+++ directory/trunks/ldapstudio/ldapstudio-updatesite/.project Wed Jan 17 05:50:09 2007
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ldapstudio-updatesite</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.UpdateSiteBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.UpdateSiteNature</nature>
+	</natures>
+</projectDescription>

Added: directory/trunks/ldapstudio/ldapstudio-updatesite/index.html
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-updatesite/index.html?view=auto&rev=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-updatesite/index.html (added)
+++ directory/trunks/ldapstudio/ldapstudio-updatesite/index.html Wed Jan 17 05:50:09 2007
@@ -0,0 +1,60 @@
+<html>
+<head>
+<title>ldapstudio-updatesite</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<style>@import url("web/site.css");</style>
+<script type="text/javascript">
+	var returnval = 0;
+	var stylesheet, xmlFile, cache, doc;
+	function init(){
+		// NSCP 7.1+ / Mozilla 1.4.1+ / Safari
+		// Use the standard DOM Level 2 technique, if it is supported
+		if (document.implementation && document.implementation.createDocument) {
+			xmlFile = document.implementation.createDocument("", "", null);
+			stylesheet = document.implementation.createDocument("", "", null);
+			if (xmlFile.load){
+				xmlFile.load("site.xml");
+				stylesheet.load("web/site.xsl");
+			} else {
+				alert("Document could not be loaded by browser.");
+			}
+			xmlFile.addEventListener("load", transform, false);
+			stylesheet.addEventListener("load", transform, false);
+		}
+		//IE 6.0+ solution
+		else if (window.ActiveXObject) {
+			xmlFile = new ActiveXObject("msxml2.DOMDocument.3.0");
+			xmlFile.async = false;
+			xmlFile.load("site.xml");
+			stylesheet = new ActiveXObject("msxml2.FreeThreadedDOMDocument.3.0");
+			stylesheet.async = false;
+			stylesheet.load("web/site.xsl");
+			cache = new ActiveXObject("msxml2.XSLTemplate.3.0");
+			cache.stylesheet = stylesheet;
+			transformData();
+		}
+	}
+	// separate transformation function for IE 6.0+
+	function transformData(){
+		var processor = cache.createProcessor();
+		processor.input = xmlFile;
+		processor.transform();
+		data.innerHTML = processor.output;
+	}
+	// separate transformation function for NSCP 7.1+ and Mozilla 1.4.1+ 
+	function transform(){
+		returnval+=1;
+		if (returnval==2){
+			var processor = new XSLTProcessor();
+			processor.importStylesheet(stylesheet); 
+			doc = processor.transformToDocument(xmlFile);
+			document.getElementById("data").innerHTML = doc.documentElement.innerHTML;
+		}
+	}
+</script>
+</head>
+<body onload="init();">
+<!--[insert static HTML here]-->
+<div id="data"><!-- this is where the transformed data goes --></div>
+</body>
+</html>

Added: directory/trunks/ldapstudio/ldapstudio-updatesite/site.xml
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-updatesite/site.xml?view=auto&rev=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-updatesite/site.xml (added)
+++ directory/trunks/ldapstudio/ldapstudio-updatesite/site.xml Wed Jan 17 05:50:09 2007
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature url="features/org.apache.directory.ldapstudio.browser.feature_0.6.0.jar" id="org.apache.directory.ldapstudio.browser.feature" version="0.6.0" os="linux,macosx,win32" ws="carbon,gtk,win32" arch="ppc,x86">
+      <category name="LDAP Studio Browser"/>
+   </feature>
+   <feature url="features/org.apache.directory.ldapstudio.schemas.feature_0.6.0.jar" id="org.apache.directory.ldapstudio.schemas.feature" version="0.6.0" os="linux,macosx,win32" ws="carbon,gtk,win32" arch="ppc,x86">
+      <category name="LDAP Studio Schemas Editor"/>
+   </feature>
+   <category-def name="LDAP Studio RCP" label="LDAP Studio RCP">
+      <description>
+         The LDAP Studio RCP category contains all features related to the LDAP Studio RCP Application.
+      </description>
+   </category-def>
+   <category-def name="LDAP Studio Browser" label="LDAP Studio Browser">
+      <description>
+         The LDAP Studio Browser category contains all features related to the LDAP Studio Browser.
+      </description>
+   </category-def>
+   <category-def name="LDAP Studio Schemas Editor" label="LDAP Studio Schemas Editor">
+      <description>
+         The LDAP Studio Schemas category contains all features related to the LDAP Studio Schemas Editor.
+      </description>
+   </category-def>
+</site>

Added: directory/trunks/ldapstudio/ldapstudio-updatesite/web/site.css
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-updatesite/web/site.css?view=auto&rev=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-updatesite/web/site.css (added)
+++ directory/trunks/ldapstudio/ldapstudio-updatesite/web/site.css Wed Jan 17 05:50:09 2007
@@ -0,0 +1,12 @@
+<STYLE type="text/css">
+td.spacer {padding-bottom: 10px; padding-top: 10px;}
+.title { font-family: sans-serif; color: #99AACC;}
+.bodyText { font-family: sans-serif; font-size: 9pt; color:#000000;  }
+.sub-header { font-family: sans-serif; font-style: normal; font-weight: bold; font-size: 9pt; color: white;}
+.log-text {font-family: sans-serif; font-style: normal; font-weight: lighter; font-size: 8pt; color:black;}
+.big-header { font-family: sans-serif; font-style: normal; font-weight: bold; font-size: 9pt; color: white; border-top:10px solid white;}
+.light-row {background:#FFFFFF}
+.dark-row {background:#EEEEFF}
+.header {background:#99AADD}
+#indent {word-wrap : break-word;width :300px;text-indent:10px;}
+</STYLE>

Added: directory/trunks/ldapstudio/ldapstudio-updatesite/web/site.xsl
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-updatesite/web/site.xsl?view=auto&rev=497018
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-updatesite/web/site.xsl (added)
+++ directory/trunks/ldapstudio/ldapstudio-updatesite/web/site.xsl Wed Jan 17 05:50:09 2007
@@ -0,0 +1,214 @@
+<xsl:stylesheet version = '1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform' xmlns:msxsl="urn:schemas-microsoft-com:xslt">
+<xsl:output method="html" encoding="UTF-8"/>
+<xsl:key name="cat" match="category" use="@name"/>
+<xsl:template match="/">
+<xsl:for-each select="site">
+	<html>
+	<head>
+	<title>ldapstudio-updatesite</title>
+	<style>@import url("web/site.css");</style>
+	</head>
+	<body>
+	<h1 class="title">ldapstudio-updatesite</h1>
+	<p class="bodyText"><xsl:value-of select="description"/></p>
+	<table width="100%" border="0" cellspacing="1" cellpadding="2">
+	<xsl:for-each select="category-def">
+		<xsl:sort select="@label" order="ascending" case-order="upper-first"/>
+		<xsl:sort select="@name" order="ascending" case-order="upper-first"/>
+	<xsl:if test="count(key('cat',@name)) != 0">
+			<tr class="header">
+				<td class="sub-header" width="30%">
+					<xsl:value-of select="@name"/>
+				</td>
+				<td class="sub-header" width="70%">
+					<xsl:value-of select="@label"/>
+				</td>
+			</tr>
+			<xsl:for-each select="key('cat',@name)">
+			<xsl:sort select="ancestor::feature//@version" order="ascending"/>
+			<xsl:sort select="ancestor::feature//@id" order="ascending" case-order="upper-first"/>
+			<tr>
+				<xsl:choose>
+				<xsl:when test="(position() mod 2 = 1)">
+					<xsl:attribute name="class">dark-row</xsl:attribute>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:attribute name="class">light-row</xsl:attribute>
+				</xsl:otherwise>
+				</xsl:choose>
+				<td class="log-text" id="indent">
+						<xsl:choose>
+						<xsl:when test="ancestor::feature//@label">
+							<a href="{ancestor::feature//@url}"><xsl:value-of select="ancestor::feature//@label"/></a>
+							<br/>
+							<div id="indent">
+							(<xsl:value-of select="ancestor::feature//@id"/> - <xsl:value-of select="ancestor::feature//@version"/>)
+							</div>
+						</xsl:when>
+						<xsl:otherwise>
+						<a href="{ancestor::feature//@url}"><xsl:value-of select="ancestor::feature//@id"/> - <xsl:value-of select="ancestor::feature//@version"/></a>
+						</xsl:otherwise>
+						</xsl:choose>
+						<br />
+				</td>
+				<td>
+					<table>
+						<xsl:if test="ancestor::feature//@os">
+							<tr><td class="log-text" id="indent">Operating Systems:</td>
+							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@os"/></td>
+							</tr>
+						</xsl:if>
+						<xsl:if test="ancestor::feature//@ws">
+							<tr><td class="log-text" id="indent">Windows Systems:</td>
+							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@ws"/></td>
+							</tr>
+						</xsl:if>
+						<xsl:if test="ancestor::feature//@nl">
+							<tr><td class="log-text" id="indent">Languages:</td>
+							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@nl"/></td>
+							</tr>
+						</xsl:if>
+						<xsl:if test="ancestor::feature//@arch">
+							<tr><td class="log-text" id="indent">Architecture:</td>
+							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@arch"/></td>
+							</tr>
+						</xsl:if>
+					</table>
+				</td>
+			</tr>
+			</xsl:for-each>
+			<tr><td class="spacer"><br/></td><td class="spacer"><br/></td></tr>
+		</xsl:if>
+	</xsl:for-each>
+	<xsl:if test="count(feature)  &gt; count(feature/category)">
+	<tr class="header">
+		<td class="sub-header" colspan="2">
+		Uncategorized
+		</td>
+	</tr>
+	</xsl:if>
+	<xsl:choose>
+	<xsl:when test="function-available('msxsl:node-set')">
+	   <xsl:variable name="rtf-nodes">
+		<xsl:for-each select="feature[not(category)]">
+			<xsl:sort select="@id" order="ascending" case-order="upper-first"/>
+			<xsl:sort select="@version" order="ascending" />
+			<xsl:value-of select="."/>
+			<xsl:copy-of select="." />
+		</xsl:for-each>
+	   </xsl:variable>
+	   <xsl:variable name="myNodeSet" select="msxsl:node-set($rtf-nodes)/*"/>
+	<xsl:for-each select="$myNodeSet">
+	<tr>
+		<xsl:choose>
+		<xsl:when test="position() mod 2 = 1">
+		<xsl:attribute name="class">dark-row</xsl:attribute>
+		</xsl:when>
+		<xsl:otherwise>
+		<xsl:attribute name="class">light-row</xsl:attribute>
+		</xsl:otherwise>
+		</xsl:choose>
+		<td class="log-text" id="indent">
+			<xsl:choose>
+			<xsl:when test="@label">
+				<a href="{@url}"><xsl:value-of select="@label"/></a>
+				<br />
+				<div id="indent">
+				(<xsl:value-of select="@id"/> - <xsl:value-of select="@version"/>)
+				</div>
+			</xsl:when>
+			<xsl:otherwise>
+				<a href="{@url}"><xsl:value-of select="@id"/> - <xsl:value-of select="@version"/></a>
+			</xsl:otherwise>
+			</xsl:choose>
+			<br /><br />
+		</td>
+		<td>
+			<table>
+				<xsl:if test="@os">
+					<tr><td class="log-text" id="indent">Operating Systems:</td>
+					<td class="log-text" id="indent"><xsl:value-of select="@os"/></td>
+					</tr>
+				</xsl:if>
+				<xsl:if test="@ws">
+					<tr><td class="log-text" id="indent">Windows Systems:</td>
+					<td class="log-text" id="indent"><xsl:value-of select="@ws"/></td>
+					</tr>
+				</xsl:if>
+				<xsl:if test="@nl">
+					<tr><td class="log-text" id="indent">Languages:</td>
+					<td class="log-text" id="indent"><xsl:value-of select="@nl"/></td>
+					</tr>
+				</xsl:if>
+				<xsl:if test="@arch">
+					<tr><td class="log-text" id="indent">Architecture:</td>
+					<td class="log-text" id="indent"><xsl:value-of select="@arch"/></td>
+					</tr>
+				</xsl:if>
+			</table>
+		</td>
+	</tr>
+	</xsl:for-each>
+	</xsl:when>
+	<xsl:otherwise>
+	<xsl:for-each select="feature[not(category)]">
+	<xsl:sort select="@id" order="ascending" case-order="upper-first"/>
+	<xsl:sort select="@version" order="ascending" />
+	<tr>
+		<xsl:choose>
+		<xsl:when test="count(preceding-sibling::feature[not(category)]) mod 2 = 1">
+		<xsl:attribute name="class">dark-row</xsl:attribute>
+		</xsl:when>
+		<xsl:otherwise>
+		<xsl:attribute name="class">light-row</xsl:attribute>
+		</xsl:otherwise>
+		</xsl:choose>
+		<td class="log-text" id="indent">
+			<xsl:choose>
+			<xsl:when test="@label">
+				<a href="{@url}"><xsl:value-of select="@label"/></a>
+				<br />
+				<div id="indent">
+				(<xsl:value-of select="@id"/> - <xsl:value-of select="@version"/>)
+				</div>
+			</xsl:when>
+			<xsl:otherwise>
+				<a href="{@url}"><xsl:value-of select="@id"/> - <xsl:value-of select="@version"/></a>
+			</xsl:otherwise>
+			</xsl:choose>
+			<br /><br />
+		</td>
+		<td>
+			<table>
+				<xsl:if test="@os">
+					<tr><td class="log-text" id="indent">Operating Systems:</td>
+					<td class="log-text" id="indent"><xsl:value-of select="@os"/></td>
+					</tr>
+				</xsl:if>
+				<xsl:if test="@ws">
+					<tr><td class="log-text" id="indent">Windows Systems:</td>
+					<td class="log-text" id="indent"><xsl:value-of select="@ws"/></td>
+					</tr>
+				</xsl:if>
+				<xsl:if test="@nl">
+					<tr><td class="log-text" id="indent">Languages:</td>
+					<td class="log-text" id="indent"><xsl:value-of select="@nl"/></td>
+					</tr>
+				</xsl:if>
+				<xsl:if test="@arch">
+					<tr><td class="log-text" id="indent">Architecture:</td>
+					<td class="log-text" id="indent"><xsl:value-of select="@arch"/></td>
+					</tr>
+				</xsl:if>
+			</table>
+		</td>
+	</tr>
+	</xsl:for-each>
+	</xsl:otherwise>
+	</xsl:choose>
+	</table>
+	</body>
+	</html>
+</xsl:for-each>
+</xsl:template>
+</xsl:stylesheet>