Return-Path: 
 <commits-return-14219-apmail-directory-commits-archive=directory.apache.org@directory.apache.org>
Delivered-To: apmail-directory-commits-archive@www.apache.org
Received: (qmail 37192 invoked from network); 13 Jun 2007 16:01:52 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 13 Jun 2007 16:01:52 -0000
Received: (qmail 45511 invoked by uid 500); 13 Jun 2007 16:01:56 -0000
Delivered-To: apmail-directory-commits-archive@directory.apache.org
Received: (qmail 45483 invoked by uid 500); 13 Jun 2007 16:01:56 -0000
Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@directory.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@directory.apache.org>
List-Post: <mailto:commits@directory.apache.org>
List-Id: <commits.directory.apache.org>
Reply-To: dev@directory.apache.org
Delivered-To: mailing list commits@directory.apache.org
Received: (qmail 45472 invoked by uid 99); 13 Jun 2007 16:01:55 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Jun 2007 09:01:55 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Jun 2007 09:01:51 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 809DF1A981D; Wed, 13 Jun 2007 09:01:31 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r546936 - in
 /directory/studio/trunk/studio-apacheds-configuration-help: build.xml
 plugin.properties src/main/resources/0_index.xml
Date: Wed, 13 Jun 2007 16:01:31 -0000
To: commits@directory.apache.org
From: pamarcelot@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070613160131.809DF1A981D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: pamarcelot
Date: Wed Jun 13 09:01:30 2007
New Revision: 546936

URL: http://svn.apache.org/viewvc?view=rev&rev=546936
Log:
Updated the Apache Directory Studio Apache DS Configuration Help with the new build system.

Added:
    directory/studio/trunk/studio-apacheds-configuration-help/plugin.properties
Modified:
    directory/studio/trunk/studio-apacheds-configuration-help/build.xml
    directory/studio/trunk/studio-apacheds-configuration-help/src/main/resources/0_index.xml

Modified: directory/studio/trunk/studio-apacheds-configuration-help/build.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-configuration-help/build.xml?view=diff&rev=546936&r1=546935&r2=546936
==============================================================================
--- directory/studio/trunk/studio-apacheds-configuration-help/build.xml (original)
+++ directory/studio/trunk/studio-apacheds-configuration-help/build.xml Wed Jun 13 09:01:30 2007
@@ -16,284 +16,6 @@
   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.studio.apacheds.configuration.help" />
-	<property name="project.version" value="0.8.0" />
-
-	<property name="project.output" value="${basedir}/target" />
-	<property name="project.build" value="${project.output}/build" />
-	<property name="project.html" value="${project.output}/html" />
-	<property name="project.pdf" value="${project.output}/pdf" />
-	<property name="project.src" value="${basedir}/src/main/resources" />
-
-	<property name="lib.dir" value="lib" />
-
-	<property name="repository.dir" location="../dependencies/externals/"/>
-
-	<!-- Configuring Ivy (Needs to be AFTER the $repository.dir declaration) -->
-	<ivy:configure file="../tools/ivyconf.xml"/>
-
-	<!-- ================================== -->
-	<!--               RESOLVE              -->
-	<!-- ================================== -->
-	<target name="resolve" description="--> retreive dependencies with ivy">
-		<ivy:retrieve/>
-
-		<mkdir dir="${basedir}/docbook-xml" />
-		<unzip dest="${basedir}/docbook-xml">
-			<fileset dir="${basedir}/lib">
-				<include name="**/docbook-xml*.zip"/>
-			</fileset>
-		</unzip>
-
-		<unzip dest="${basedir}">
-			<fileset dir="${basedir}/lib">
-				<include name="**/docbook-xsl*.zip"/>
-			</fileset>
-		</unzip>
-		<property name="fromregexp" value="^(docbook-xsl-[^/]+)/(.*)" />
-		<property name="toregexp" value="docbook-xsl/\2" />
-		<move todir="${basedir}">
-			<fileset dir="${basedir}">
-				<include name="docbook-xsl-*/**"/>
-			</fileset>
-			<!--<mapper type="regexp" from="${fromregexp}" to="${toregexp}" />-->
-			<regexpmapper from="${fromregexp}" to="${toregexp}" handledirsep="true" />
-		</move>
-		<delete includeemptydirs="true">
-			<fileset dir="${basedir}">
-				<include name="docbook-xsl-*"/>
-			</fileset>
-		</delete>
-
-
-	</target>
-
-	<!-- ================================== -->
-	<!--           ECLIPSE HELP             -->
-	<!-- ================================== -->
-	<target name="eclipse-help" depends="resolve" description="Generates the eclipse help">
-		<mkdir dir="${project.build}" />
-		
-		<xslt in="${project.src}/0_index.xml" out="${project.build}/index.html" style="${basedir}/docbook-xsl/eclipse/eclipse.xsl">
-
-			<classpath location="lib/xalan-2.7.0.jar" />
-			
-			<param name="ignore.image.scaling" expression="1" />
-
-			<param name="manifest.in.base.dir" expression="0" />
-			<param name="base.dir" expression="html/" />
-
-			<param name="html.stylesheet" expression="css/book.css" />
-			<param name="table.cell.borders.thickness" expression="1" />
-			<!-- <param name="table.borders.with.css" expression="1" /> -->
-
-			<param name="generate.section.toc.level" expression="5" />
-			<param name="toc.max.depth" expression="1" />
-
-			<param name="chunk.first.sections" expression="1" />
-			<param name="chunk.section.depth" expression="5" />
-
-			<param name="chunk.fast" expression="1" />
-			<param name="chunk.separate.lots" expression="1" />
-			<!--<param name="chunk.tocs.and.lots" expression="1" />-->
-
-			<param name="ulink.target" expression="_self" />
-			<param name="suppress.navigation" expression="1" />
-			<param name="html.cleanup" expression="1" />
-			<param name="html.cellpadding" expression="3" />
-			<param name="use.id.as.filename" expression="1" />
-			<param name="chapter.autolabel" expression="0" />
-			<param name="section.autolabel" expression="0" />
-
-			<outputproperty name="method" value="xml" />
-			<outputproperty name="standalone" value="yes" />
-			<outputproperty name="encoding" value="iso8859_1" />
-			<outputproperty name="indent" value="es" />
-		</xslt>
-
-		<replaceregexp file="${project.build}/toc.xml"
-		                         match="&lt;toc [^>]*>"
-		                         replace="&lt;toc topic=&#34;html/index.html&#34; label=&#34;Apache Directory Studio Apache DS Configuration User's Guide\&#34;>"
-		                         byline="true"/>
-		
-		<copy todir="${project.build}" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="plugin.xml" />
-				<include name="plugin.properties" />
-				<include name="about.html" />
-			</fileset>
-		</copy>
-		<mkdir dir="${project.build}/META-INF" />
-		<copy todir="${project.build}/META-INF">
-			<fileset dir="${basedir}/META-INF">
-				<include name="**" />
-			</fileset>
-		</copy>
-		<mkdir dir="${project.build}/about_files" />
-		<copy todir="${project.build}/about_files">
-			<fileset dir="${basedir}/about_files">
-				<include name="**" />
-			</fileset>
-		</copy>
-
-		<mkdir dir="${project.build}/html" />
-		<copy todir="${project.build}/html">
-			<fileset dir="${basedir}/resources">
-				<include name="**" />
-			</fileset>
-		</copy>
-
-		<tstamp>
-			<format pattern="yyyy-MMM-dd, HH:mm 'GMT'Z" property="timestamp" locale="en" />
-		</tstamp>
-		<echo message="${project.name}-${project.version} compiled ${timestamp} by ${user.name}" file="${project.build}/compile.timestamp" />
-	</target>
-
-	<!-- ================================== -->
-	<!--           STATIC HTML              -->
-	<!-- ================================== -->
-	<target name="static-html" depends="resolve" description="Generates the static html">
-		<mkdir dir="${project.html}" />
-		<copy todir="${project.html}">
-			<fileset dir="${basedir}/resources">
-				<include name="**" />
-			</fileset>
-		</copy>
-
-		<xslt in="${project.src}/0_index.xml" out="${project.html}/index.html" style="${basedir}/docbook-xsl/html/chunk.xsl">
-
-			<classpath location="lib/xalan-2.7.0.jar" />
-			
-			<param name="ignore.image.scaling" expression="1" />
-
-			<param name="manifest.in.base.dir" expression="0" />
-			<!-- <param name="base.dir" expression="html/" /> -->
-
-			<param name="html.stylesheet" expression="css/book.css" />
-			<param name="table.cell.borders.thickness" expression="1" />
-			<!-- <param name="table.borders.with.css" expression="1" /> -->
-
-			<param name="generate.section.toc.level" expression="5" />
-			<param name="toc.max.depth" expression="3" />
-
-			<param name="chunk.first.sections" expression="1" />
-			<param name="chunk.section.depth" expression="5" />
-
-			<param name="chunk.fast" expression="1" />
-			<param name="chunk.separate.lots" expression="1" />
-			<!--<param name="chunk.tocs.and.lots" expression="1" />-->
-
-			<param name="ulink.target" expression="_self" />
-			<param name="suppress.navigation" expression="0" />
-			<param name="html.cleanup" expression="1" />
-			<param name="html.cellpadding" expression="3" />
-			<param name="use.id.as.filename" expression="1" />
-			<param name="chapter.autolabel" expression="0" />
-			<param name="section.autolabel" expression="0" />
-
-			<outputproperty name="method" value="xml" />
-			<outputproperty name="standalone" value="yes" />
-			<outputproperty name="encoding" value="iso8859_1" />
-			<outputproperty name="indent" value="es" />
-		</xslt>
-
-
-		<tstamp>
-			<format pattern="yyyy-MMM-dd, HH:mm 'GMT'Z" property="timestamp" locale="en" />
-		</tstamp>
-		<echo message="${project.name}-${project.version} compiled ${timestamp} by ${user.name}" file="${project.html}/compile.timestamp" />
-	</target>
-
-	<!-- ================================== -->
-	<!--           STATIC PDF               -->
-	<!-- ================================== -->
-	<target name="static-pdf" depends="resolve" description="Generates the static pdf">
-				
-		<property name="fop.dir" value="${basedir}/lib"/>
-		<taskdef name="fop"
-		         classname="org.apache.fop.tools.anttasks.Fop">
-		         <classpath>
-		            <pathelement location="${fop.dir}/avalon-framework-api-4.2.0.jar"/>
-		            <pathelement location="${fop.dir}/avalon-framework-impl-4.2.0.jar"/>
-		            <pathelement location="${fop.dir}/commons-logging-1.1.jar"/>
-		            <pathelement location="${fop.dir}/commons-io-1.3.1.jar"/>
-		            <pathelement location="${fop.dir}/fop-0.9.3.jar"/>
-		            <pathelement location="${fop.dir}/batik-all-1.6.jar"/>
-		            <pathelement location="${fop.dir}/xmlgraphics-commons-1.1.jar"/>
-		         </classpath>
-		</taskdef>
-		
-		<mkdir dir="${project.pdf}" />
-		<copy todir="${project.pdf}">
-			<fileset dir="${basedir}/resources">
-				<include name="**" />
-			</fileset>
-		</copy>
-
-		<xslt in="${project.src}/0_index.xml" out="${project.pdf}/Apache_Directory_LDAP_Studio_Schemas_Editor.fo" style="${basedir}/docbook-xsl/fo/docbook.xsl">
-	
-			<classpath location="lib/xalan-2.7.0.jar" />
-			
-			<param name="manifest.in.base.dir" expression="0" />
-	
-			<param name="generate.section.toc.level" expression="5" />
-			<param name="toc.max.depth" expression="3" />
-	
-			<param name="ulink.target" expression="_self" />
-			<param name="suppress.navigation" expression="0" />
-			<param name="use.id.as.filename" expression="1" />
-			<param name="chapter.autolabel" expression="I" />
-			<param name="section.autolabel" expression="1" />
-
-			<outputproperty name="method" value="xml" />
-			<outputproperty name="standalone" value="yes" />
-			<outputproperty name="encoding" value="iso8859_1" />
-			<outputproperty name="indent" value="es" />
-		</xslt>
-
-		<fop format="application/pdf" basedir="${project.pdf}" 
-	        fofile="${project.pdf}/Apache_Directory_LDAP_Studio_Schemas_Editor.fo"
-	        outfile="${project.pdf}/Apache_Directory_LDAP_Studio_Schemas_Editor.pdf" />
-
-		<tstamp>
-			<format pattern="yyyy-MMM-dd, HH:mm 'GMT'Z" property="timestamp" locale="en" />
-		</tstamp>
-		<echo message="${project.name}-${project.version} compiled ${timestamp} by ${user.name}" file="${project.pdf}/compile.timestamp" />
-	</target>
-
-	<!-- ================================== -->
-	<!--              JAR                   -->
-	<!-- ================================== -->
-	<target name="jar" description="Creates jar file" depends="eclipse-help">
-		<jar destfile="${project.output}/${project.name}_${project.version}.jar" manifest="${project.build}/META-INF/MANIFEST.MF">
-			<fileset dir="${project.build}" excludes="compile.timestamp" />
-			<include name="META-INF/**"/>
-		</jar>
-	</target>
-
-	<!-- ================================== -->
-	<!--               CLEAN                -->
-	<!-- ================================== -->
-	<target name="clean" description="Deletes any generated file (javadoc, classes, jars, distribution)">
-		<delete includeemptydirs="true">
-			<fileset dir="${basedir}">
-				<exclude name=".classpath"/>
-				<exclude name=".project"/>
-				<exclude name="about.html"/>
-				<exclude name="about_files**"/>
-				<exclude name="build.properties"/>
-				<exclude name="build-eclipse.xml"/>
-				<exclude name="build-html.xml"/>
-				<exclude name="build.xml"/>
-				<exclude name="ivy.xml"/>
-				<exclude name="plugin.properties"/>
-				<exclude name="plugin.xml"/>
-				<exclude name="docbook/**"/>
-				<exclude name="src/**" />
-				<exclude name="resources/**" />
-				<exclude name="META-INF/**"/>
-			</fileset>
-		</delete>
-	</target>
+<project default="help-eclipse">
+	<import file="../studio-build/build.xml"/>
 </project>

Added: directory/studio/trunk/studio-apacheds-configuration-help/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-configuration-help/plugin.properties?view=auto&rev=546936
==============================================================================
--- directory/studio/trunk/studio-apacheds-configuration-help/plugin.properties (added)
+++ directory/studio/trunk/studio-apacheds-configuration-help/plugin.properties Wed Jun 13 09:01:30 2007
@@ -0,0 +1,19 @@
+#  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.name=Apache Directory Studio Apache DS Configuration Help Plugin
+project.version=0.8.0
+project.id=org.apache.directory.studio.apacheds.configuration.help

Modified: directory/studio/trunk/studio-apacheds-configuration-help/src/main/resources/0_index.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-configuration-help/src/main/resources/0_index.xml?view=diff&rev=546936&r1=546935&r2=546936
==============================================================================
--- directory/studio/trunk/studio-apacheds-configuration-help/src/main/resources/0_index.xml (original)
+++ directory/studio/trunk/studio-apacheds-configuration-help/src/main/resources/0_index.xml Wed Jun 13 09:01:30 2007
@@ -285,7 +285,7 @@
 					and <emphasis role="strong">Delete</emphasis> buttons to set your Binary Attributes.</para>
 				</simplesect>
 					
-				<simplesect id="general_binary_attributes">
+				<simplesect id="general_limits">
 					<title>Limits</title>
 					<para>This section allows you to specify the Limits of the server.</para>
 					 <screenshot>