1.1 --- a/java/rozsirene-atributy/nbproject/build-impl.xml	Fri Dec 30 12:37:30 2011 +0100
     1.2 +++ b/java/rozsirene-atributy/nbproject/build-impl.xml	Sat Aug 18 13:22:45 2012 +0200
     1.3 @@ -20,10 +20,10 @@
     1.4  
     1.5          -->
     1.6  <project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="rozsirene-atributy-impl">
     1.7 -    <fail message="Please build using Ant 1.7.1 or higher.">
     1.8 +    <fail message="Please build using Ant 1.8.0 or higher.">
     1.9          <condition>
    1.10              <not>
    1.11 -                <antversion atleast="1.7.1"/>
    1.12 +                <antversion atleast="1.8.0"/>
    1.13              </not>
    1.14          </condition>
    1.15      </fail>
    1.16 @@ -198,6 +198,7 @@
    1.17          <property name="javac.fork" value="${jdkBug6558476}"/>
    1.18          <property name="jar.index" value="false"/>
    1.19          <property name="jar.index.metainf" value="${jar.index}"/>
    1.20 +        <property name="copylibs.rebase" value="true"/>
    1.21          <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
    1.22      </target>
    1.23      <target name="-post-init">
    1.24 @@ -384,6 +385,7 @@
    1.25                  <property environment="env"/>
    1.26                  <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
    1.27                  <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
    1.28 +                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
    1.29                      <jvmarg value="${profiler.info.jvmargs.agent}"/>
    1.30                      <jvmarg line="${profiler.info.jvmargs}"/>
    1.31                      <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
    1.32 @@ -514,7 +516,7 @@
    1.33                      </chainedmapper>
    1.34                  </pathconvert>
    1.35                  <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
    1.36 -                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
    1.37 +                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
    1.38                      <fileset dir="${build.classes.dir}"/>
    1.39                      <manifest>
    1.40                          <attribute name="Class-Path" value="${jar.classpath}"/>
    1.41 @@ -839,6 +841,14 @@
    1.42              -->
    1.43      <target depends="init" if="have.sources" name="-javadoc-build">
    1.44          <mkdir dir="${dist.javadoc.dir}"/>
    1.45 +        <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">
    1.46 +            <and>
    1.47 +                <isset property="endorsed.classpath.cmd.line.arg"/>
    1.48 +                <not>
    1.49 +                    <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>
    1.50 +                </not>
    1.51 +            </and>
    1.52 +        </condition>
    1.53          <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
    1.54              <classpath>
    1.55                  <path path="${javac.classpath}"/>
    1.56 @@ -850,6 +860,7 @@
    1.57                  <include name="**/*.java"/>
    1.58                  <exclude name="*.java"/>
    1.59              </fileset>
    1.60 +            <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
    1.61          </javadoc>
    1.62          <copy todir="${dist.javadoc.dir}">
    1.63              <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">