Changeset 61

Show
Ignore:
Timestamp:
01/24/07 20:27:39 (2 years ago)
Author:
paulhethmon
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • AcmeIdp/trunk/nbproject/build-impl.xml

    r56 r61  
    386386    <target name="do-dist" depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest"/> 
    387387    <target name="library-inclusion-in-manifest" depends="init" if="dist.ear.dir"> 
     388        <basename property="included.lib.libs.ApacheCommons.classpath.5" file="${libs.ApacheCommons.classpath.libfile.5}"/> 
     389        <basename property="included.lib.libs.ApacheCommons.classpath.4" file="${libs.ApacheCommons.classpath.libfile.4}"/> 
     390        <basename property="included.lib.libs.ApacheCommons.classpath.3" file="${libs.ApacheCommons.classpath.libfile.3}"/> 
     391        <basename property="included.lib.libs.ApacheCommons.classpath.2" file="${libs.ApacheCommons.classpath.libfile.2}"/> 
     392        <basename property="included.lib.libs.ApacheCommons.classpath.1" file="${libs.ApacheCommons.classpath.libfile.1}"/> 
     393        <copy-ear-war file="${libs.ApacheCommons.classpath.libfile.5}" propname="included.lib.libs.ApacheCommons.classpath.5.X"/> 
     394        <copy-ear-war file="${libs.ApacheCommons.classpath.libfile.4}" propname="included.lib.libs.ApacheCommons.classpath.4.X"/> 
     395        <copy-ear-war file="${libs.ApacheCommons.classpath.libfile.3}" propname="included.lib.libs.ApacheCommons.classpath.3.X"/> 
     396        <copy-ear-war file="${libs.ApacheCommons.classpath.libfile.2}" propname="included.lib.libs.ApacheCommons.classpath.2.X"/> 
     397        <copy-ear-war file="${libs.ApacheCommons.classpath.libfile.1}" propname="included.lib.libs.ApacheCommons.classpath.1.X"/> 
     398        <basename property="included.lib.libs.Javolution.classpath" file="${libs.Javolution.classpath}"/> 
     399        <copy-ear-war file="${libs.Javolution.classpath}" propname="included.lib.libs.Javolution.classpath.X"/> 
     400        <basename property="included.lib.libs.OpenSAML.classpath.8" file="${libs.OpenSAML.classpath.libfile.8}"/> 
     401        <basename property="included.lib.libs.OpenSAML.classpath.7" file="${libs.OpenSAML.classpath.libfile.7}"/> 
     402        <basename property="included.lib.libs.OpenSAML.classpath.6" file="${libs.OpenSAML.classpath.libfile.6}"/> 
     403        <basename property="included.lib.libs.OpenSAML.classpath.5" file="${libs.OpenSAML.classpath.libfile.5}"/> 
     404        <basename property="included.lib.libs.OpenSAML.classpath.4" file="${libs.OpenSAML.classpath.libfile.4}"/> 
     405        <basename property="included.lib.libs.OpenSAML.classpath.3" file="${libs.OpenSAML.classpath.libfile.3}"/> 
     406        <basename property="included.lib.libs.OpenSAML.classpath.2" file="${libs.OpenSAML.classpath.libfile.2}"/> 
     407        <basename property="included.lib.libs.OpenSAML.classpath.1" file="${libs.OpenSAML.classpath.libfile.1}"/> 
     408        <copy-ear-war file="${libs.OpenSAML.classpath.libfile.8}" propname="included.lib.libs.OpenSAML.classpath.8.X"/> 
     409        <copy-ear-war file="${libs.OpenSAML.classpath.libfile.7}" propname="included.lib.libs.OpenSAML.classpath.7.X"/> 
     410        <copy-ear-war file="${libs.OpenSAML.classpath.libfile.6}" propname="included.lib.libs.OpenSAML.classpath.6.X"/> 
     411        <copy-ear-war file="${libs.OpenSAML.classpath.libfile.5}" propname="included.lib.libs.OpenSAML.classpath.5.X"/> 
     412        <copy-ear-war file="${libs.OpenSAML.classpath.libfile.4}" propname="included.lib.libs.OpenSAML.classpath.4.X"/> 
     413        <copy-ear-war file="${libs.OpenSAML.classpath.libfile.3}" propname="included.lib.libs.OpenSAML.classpath.3.X"/> 
     414        <copy-ear-war file="${libs.OpenSAML.classpath.libfile.2}" propname="included.lib.libs.OpenSAML.classpath.2.X"/> 
     415        <copy-ear-war file="${libs.OpenSAML.classpath.libfile.1}" propname="included.lib.libs.OpenSAML.classpath.1.X"/> 
     416        <basename property="included.lib.libs.Xalan.classpath.5" file="${libs.Xalan.classpath.libfile.5}"/> 
     417        <basename property="included.lib.libs.Xalan.classpath.4" file="${libs.Xalan.classpath.libfile.4}"/> 
     418        <basename property="included.lib.libs.Xalan.classpath.3" file="${libs.Xalan.classpath.libfile.3}"/> 
     419        <basename property="included.lib.libs.Xalan.classpath.2" file="${libs.Xalan.classpath.libfile.2}"/> 
     420        <basename property="included.lib.libs.Xalan.classpath.1" file="${libs.Xalan.classpath.libfile.1}"/> 
     421        <copy-ear-war file="${libs.Xalan.classpath.libfile.5}" propname="included.lib.libs.Xalan.classpath.5.X"/> 
     422        <copy-ear-war file="${libs.Xalan.classpath.libfile.4}" propname="included.lib.libs.Xalan.classpath.4.X"/> 
     423        <copy-ear-war file="${libs.Xalan.classpath.libfile.3}" propname="included.lib.libs.Xalan.classpath.3.X"/> 
     424        <copy-ear-war file="${libs.Xalan.classpath.libfile.2}" propname="included.lib.libs.Xalan.classpath.2.X"/> 
     425        <copy-ear-war file="${libs.Xalan.classpath.libfile.1}" propname="included.lib.libs.Xalan.classpath.1.X"/> 
    388426        <mkdir dir="${build.web.dir.real}/META-INF"/> 
    389         <manifest file="${build.web.dir.real}/META-INF/MANIFEST.MF" mode="update"/> 
     427        <manifest file="${build.web.dir.real}/META-INF/MANIFEST.MF" mode="update"> 
     428            <attribute name="Class-Path" value="${included.lib.libs.ApacheCommons.classpath.1.X} ${included.lib.libs.ApacheCommons.classpath.2.X} ${included.lib.libs.ApacheCommons.classpath.3.X} ${included.lib.libs.ApacheCommons.classpath.4.X} ${included.lib.libs.ApacheCommons.classpath.5.X} ${included.lib.libs.Javolution.classpath} ${included.lib.libs.OpenSAML.classpath.1.X} ${included.lib.libs.OpenSAML.classpath.2.X} ${included.lib.libs.OpenSAML.classpath.3.X} ${included.lib.libs.OpenSAML.classpath.4.X} ${included.lib.libs.OpenSAML.classpath.5.X} ${included.lib.libs.OpenSAML.classpath.6.X} ${included.lib.libs.OpenSAML.classpath.7.X} ${included.lib.libs.OpenSAML.classpath.8.X} ${included.lib.libs.Xalan.classpath.1.X} ${included.lib.libs.Xalan.classpath.2.X} ${included.lib.libs.Xalan.classpath.3.X} ${included.lib.libs.Xalan.classpath.4.X} ${included.lib.libs.Xalan.classpath.5.X} "/> 
     429        </manifest> 
    390430        <delete dir="${dist.ear.dir}/temp"/> 
    391431    </target> 
    392     <target name="library-inclusion-in-archive" depends="init" unless="dist.ear.dir"/> 
     432    <target name="library-inclusion-in-archive" depends="init" unless="dist.ear.dir"> 
     433        <copy file="${libs.ApacheCommons.classpath.libfile.5}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
     434        <copy file="${libs.ApacheCommons.classpath.libfile.4}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
     435        <copy file="${libs.ApacheCommons.classpath.libfile.3}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
     436        <copy file="${libs.ApacheCommons.classpath.libfile.2}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
     437        <copy file="${libs.ApacheCommons.classpath.libfile.1}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
     438        <copy file="${libs.Javolution.classpath}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
     439        <copy file="${libs.OpenSAML.classpath.libfile.8}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
     440        <copy file="${libs.OpenSAML.classpath.libfile.7}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
     441        <copy file="${libs.OpenSAML.classpath.libfile.6}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
     442        <copy file="${libs.OpenSAML.classpath.libfile.5}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
     443        <copy file="${libs.OpenSAML.classpath.libfile.4}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
     444        <copy file="${libs.OpenSAML.classpath.libfile.3}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
     445        <copy file="${libs.OpenSAML.classpath.libfile.2}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
     446        <copy file="${libs.OpenSAML.classpath.libfile.1}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
     447        <copy file="${libs.Xalan.classpath.libfile.5}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
     448        <copy file="${libs.Xalan.classpath.libfile.4}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
     449        <copy file="${libs.Xalan.classpath.libfile.3}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
     450        <copy file="${libs.Xalan.classpath.libfile.2}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
     451        <copy file="${libs.Xalan.classpath.libfile.1}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
     452    </target> 
    393453    <target name="do-ear-dist" depends="init,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest"> 
    394454        <dirname property="dist.jar.dir" file="${dist.ear.war}"/> 
  • AcmeIdp/trunk/nbproject/genfiles.properties

    r56 r61  
    1 build.xml.data.CRC32=6b98d886 
     1build.xml.data.CRC32=d756e565 
    22build.xml.script.CRC32=ff870e9f 
    33build.xml.stylesheet.CRC32=b4cea8bf 
    44# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. 
    55# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. 
    6 nbproject/build-impl.xml.data.CRC32=6b98d886 
    7 nbproject/build-impl.xml.script.CRC32=254ec015 
     6nbproject/build-impl.xml.data.CRC32=d756e565 
     7nbproject/build-impl.xml.script.CRC32=74742c9c 
    88nbproject/build-impl.xml.stylesheet.CRC32=8b52d23f 
  • AcmeIdp/trunk/nbproject/project.properties

    r56 r61  
    2323j2ee.server.type=Tomcat55 
    2424jar.compress=false 
    25 javac.classpath= 
     25javac.classpath=\ 
     26    ${libs.ApacheCommons.classpath}:\ 
     27    ${libs.Javolution.classpath}:\ 
     28    ${libs.OpenSAML.classpath}:\ 
     29    ${libs.Xalan.classpath} 
    2630# Space-separated list of extra javac options 
    2731javac.compilerargs= 
  • AcmeIdp/trunk/nbproject/project.xml

    r56 r61  
    66            <name>AcmeIdp</name> 
    77            <minimum-ant-version>1.6</minimum-ant-version> 
    8             <web-module-libraries/> 
     8            <web-module-libraries> 
     9                <library files="5"> 
     10                    <file>${libs.ApacheCommons.classpath}</file> 
     11                    <path-in-war>WEB-INF/lib</path-in-war> 
     12                </library> 
     13                <library files="1"> 
     14                    <file>${libs.Javolution.classpath}</file> 
     15                    <path-in-war>WEB-INF/lib</path-in-war> 
     16                </library> 
     17                <library files="8"> 
     18                    <file>${libs.OpenSAML.classpath}</file> 
     19                    <path-in-war>WEB-INF/lib</path-in-war> 
     20                </library> 
     21                <library files="5"> 
     22                    <file>${libs.Xalan.classpath}</file> 
     23                    <path-in-war>WEB-INF/lib</path-in-war> 
     24                </library> 
     25            </web-module-libraries> 
    926            <web-module-additional-libraries/> 
    1027            <source-roots>