Changeset 142

Timestamp:

05/02/07 21:16:32 (2 years ago)

Author:

paulhethmon

Message:

--

Files:

• AcmeIdp/trunk/build.xml (modified) (1 diff)
• AcmeIdp/trunk/nbproject/build-impl.xml (modified) (34 diffs)
• AcmeIdp/trunk/nbproject/genfiles.properties (modified) (1 diff)
• AcmeIdp/trunk/nbproject/project.properties (modified) (2 diffs)
• AcmeIdp/trunk/nbproject/project.xml (modified) (3 diffs)
• AcmeIdp/trunk/web/login.jsp (modified) (1 diff)
• AcmeIdp/trunk/web/recv-authnrequest.jsp (modified) (1 diff)

AcmeIdp/trunk/build.xml

@@ -1 @@
-
-
-
-
-
+
-    <description>Builds, tests, and runs the project AcmeIdp.</description>
-    <import file="nbproject/build-impl.xml"/>

AcmeIdp/trunk/nbproject/build-impl.xml

@@ -1 @@
-
-
+
-        *** GENERATED FROM project.xml - DO NOT EDIT  ***
-        ***         EDIT ../build.xml INSTEAD         ***
@@ -17 +16 @@
-        - cleanup
-
-
-
+
-    <import file="ant-deploy.xml"/>
-    <target name="default" depends="dist,javadoc" description="Build whole project."/>
@@ -35 +33 @@
-        <!-- The two properties below are usually overridden -->
-        <!-- by the active platform. Just a fallback. -->
-name="default.javac.source" value="1.4
-name="default.javac.target" value="1.4
+value="1.4" name="default.javac.source
+value="1.4" name="default.javac.target
-    </target>
-    <target name="-init-project" depends="-pre-init,-init-private,-init-user">
@@ -42 +40 @@
-    </target>
-    <target name="-do-ear-init" depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir">
-value="${build.ear.web.dir}/META-INF" name="build.meta.inf.dir
-name="build.classes.dir.real" value="${build.ear.classes.dir}
-name="build.web.dir.real" value="${build.ear.web.dir}
+name="build.meta.inf.dir" value="${build.ear.web.dir}/META-INF
+value="${build.ear.classes.dir}" name="build.classes.dir.real
+value="${build.ear.web.dir}" name="build.web.dir.real
-    </target>
-    <target name="-do-init" depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property, -do-ear-init">
+        <webproject1:property value="platforms.${platform.active}.home" name="platform.home"/>
+        <webproject1:property value="platforms.${platform.active}.bootclasspath" name="platform.bootcp"/>
+        <webproject1:property value="platforms.${platform.active}.compile" name="platform.compiler"/>
+        <webproject1:property value="platforms.${platform.active}.javac" name="platform.javac.tmp"/>
+        <condition value="${platform.home}/bin/javac" property="platform.javac">
+            <equals arg2="$${platforms.${platform.active}.javac}" arg1="${platform.javac.tmp}"/>
+        </condition>
+        <property value="${platform.javac.tmp}" name="platform.javac"/>
+        <webproject1:property value="platforms.${platform.active}.java" name="platform.java.tmp"/>
+        <condition value="${platform.home}/bin/java" property="platform.java">
+            <equals arg2="$${platforms.${platform.active}.java}" arg1="${platform.java.tmp}"/>
+        </condition>
+        <property value="${platform.java.tmp}" name="platform.java"/>
+        <webproject1:property value="platforms.${platform.active}.javadoc" name="platform.javadoc.tmp"/>
+        <condition value="${platform.home}/bin/javadoc" property="platform.javadoc">
+            <equals arg2="$${platforms.${platform.active}.javadoc}" arg1="${platform.javadoc.tmp}"/>
+        </condition>
+        <property value="${platform.javadoc.tmp}" name="platform.javadoc"/>
+        <fail unless="platform.home">Must set platform.home</fail>
+        <fail unless="platform.bootcp">Must set platform.bootcp</fail>
+        <fail unless="platform.java">Must set platform.java</fail>
+        <fail unless="platform.javac">Must set platform.javac</fail>
+        <fail if="platform.invalid">Platform is not correctly set up</fail>
-        <condition property="have.tests">
-            <or>
@@ -66 +87 @@
-            <isfalse value="${javadoc.preview}"/>
-        </condition>
-name="javac.compilerargs" value="
+value="" name="javac.compilerargs
-        <condition property="no.deps">
-            <and>
@@ -77 +98 @@
-            </not>
-        </condition>
-name="build.web.excludes" value="${build.classes.excludes}
+value="${build.classes.excludes}" name="build.web.excludes
-        <condition property="do.compile.jsps">
-            <istrue value="${compile.jsps}"/>
@@ -84 +105 @@
-            <istrue value="${display.browser}"/>
-        </condition>
-file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest
-file="${conf.dir}/persistence.xml" property="has.
+property="has.custom.manifest" file="${conf.dir}/MANIFEST.MF
+property="has.persistence.xml" file="${conf.dir}/
-        <condition property="do.war.package.with.custom.manifest">
-            <and>
@@ -100 +121 @@
-            </and>
-        </condition>
-value="${build.web.dir}/META-INF" name="build.meta.inf.dir
-name="build.classes.dir.real" value="${build.classes.dir}
-name="build.web.dir.real" value="${build.web.dir}
-property="application.args.param" value="${application.args}" else="
+name="build.meta.inf.dir" value="${build.web.dir}/META-INF
+value="${build.classes.dir}" name="build.classes.dir.real
+value="${build.web.dir}" name="build.web.dir.real
+else="" value="${application.args}" property="application.args.param
-            <and>
-                <isset property="application.args"/>
-                <not>
-arg1="${application.args}" arg2="" trim="true
+trim="true" arg2="" arg1="${application.args}
-                </not>
-            </and>
@@ -135 +156 @@
-            <attribute name="value"/>
-            <sequential>
-name="@{name}" value="${@{value}
+value="${@{value}}" name="@{name
-            </sequential>
-        </macrodef>
@@ -147 +168 @@
-            <element name="customize" optional="true"/>
-            <sequential>
-
+fork="yes" executable="${platform.javac}" tempdir="${java.io.tmpdir}" 
-                    <classpath>
-                        <path path="@{classpath}"/>
@@ -161 +182 @@
-            <attribute name="includes" default="**/*Test.java"/>
-            <sequential>
-
+ jvm="${platform.java}"
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" includes="@{includes}"/>
@@ -170 +191 @@
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-ype="glob" from="test-sys-prop.*" to="*
+o="*" from="test-sys-prop.*" type="glob
-                    </syspropertyset>
-type="brief" usefile="false
+usefile="false" type="brief
-                    <formatter type="xml"/>
-                </junit>
@@ -183 +204 @@
-            <element name="customize" optional="true"/>
-            <sequential>
-fork="true" classname="@{classname
+classname="@{classname}" fork="true" jvm="${platform.java
-                    <jvmarg line="${runmain.jvmargs}"/>
-                    <classpath>
@@ -190 +211 @@
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-ype="glob" from="run-sys-prop.*" to="*
+o="*" from="run-sys-prop.*" type="glob
-                    </syspropertyset>
-                    <customize/>
@@ -202 +223 @@
-            <attribute name="classpath" default="${debug.classpath}"/>
-            <sequential>
-transport="dt_socket" addressproperty="jpda.address" name="@{name}
+name="@{name}" addressproperty="jpda.address" transport="dt_socket
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
+                    <bootclasspath>
+                        <path path="${platform.bootcp}"/>
+                    </bootclasspath>
-                </nbjpdastart>
-            </sequential>
@@ -213 +237 @@
-            <sequential>
-                <nbjpdareload>
-includes="${fix.includes}*.class" dir="@{dir}
+dir="@{dir}" includes="${fix.includes}*.class
-                </nbjpdareload>
-            </sequential>
@@ -224 +248 @@
-            <attribute name="args" default="${application.args.param}"/>
-            <sequential>
-fork="true" classname="@{classname
+classname="@{classname}" fork="true" jvm="${platform.java
-                    <jvmarg value="-Xdebug"/>
-                    <jvmarg value="-Xnoagent"/>
@@ -235 +259 @@
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-ype="glob" from="run-sys-prop.*" to="*
+o="*" from="run-sys-prop.*" type="glob
-                    </syspropertyset>
-                    <arg line="@{args}"/>
@@ -247 +271 @@
-            <attribute name="propname"/>
-            <sequential>
-property="base_@{propname}" file="@{fil
-d="tld.files_@{propname}" src="@{file}" includes="META-INF/*.tld META-INF/tlds/*.tld
-property="tld.files.path_@{propname}" refid="tld.files
-value="yes" property="hastlds_@{propname}
-string="${tld.files.path_@{propname}}" substring=".tld" casesensitive="false
+file="@{file}" property="base_@{propnam
+ncludes="META-INF/*.tld META-INF/tlds/*.tld" src="@{file}" id="tld.files_@{propname}
+refid="tld.files_@{propname}" property="tld.files.path
+property="hastlds_@{propname}" value="yes
+casesensitive="false" substring=".tld" string="${tld.files.path_@{propname}}
-                </condition>
-value="${build.web.dir.real}/WEB-INF/lib" property="copy.to.dir_@{propname}
+property="copy.to.dir_@{propname}" value="${build.web.dir.real}/WEB-INF/lib
-                    <isset property="hastlds_@{propname}"/>
-                </condition>
-value="${dist.ear.dir}" property="copy.to.dir_@{propname
+property="copy.to.dir_@{propname}" value="${dist.ear.dir
-                    <not>
-                        <isset property="hastlds_@{propname}"/>
-                    </not>
-                </condition>
-file="@{file}" todir="${copy.to.dir_@{propname}
-value="${base_@{propname}}" property="@{propname
+todir="${copy.to.dir_@{propname}}" file="@{file
+property="@{propname}" value="${base_@{propname}
-                    <not>
-                        <isset property="hastlds_@{propname}"/>
-                    </not>
-                </condition>
-value="" property="@{propname}
+property="@{propname}" value="
-                    <isset property="hastlds_@{propname}"/>
-                </condition>
@@ -289 +313 @@
-    <target name="-copy-webdir">
-        <copy todir="${build.web.dir.real}">
-excludes="${build.web.excludes}" dir="${web.docbase.dir
+dir="${web.docbase.dir}" excludes="${build.web.excludes
-        </copy>
-    </target>
@@ -298 +322 @@
-        </copy>
-    </target>
-name="-copy-manifest" if="has.custom.
+if="has.custom.manifest" name="-copy-
-        <mkdir dir="${build.meta.inf.dir}"/>
-        <copy todir="${build.meta.inf.dir}">
-dir="${conf.dir}" includes="MANIFEST.MF
+includes="MANIFEST.MF" dir="${conf.dir}
-        </copy>
-    </target>
-name="-copy-persistence-xml" if="has.persistence.
+if="has.persistence.xml" name="-copy-persistence-
-        <mkdir dir="${build.web.dir.real}/WEB-INF/classes/META-INF"/>
-        <copy todir="${build.web.dir.real}/WEB-INF/classes/META-INF">
-dir="${conf.dir}" includes="persistence.xml
+includes="persistence.xml" dir="${conf.dir}
-        </copy>
-    </target>
@@ -337 +361 @@
-    <target name="compile-jsps" depends="compile" if="do.compile.jsps" description="Test compile JSP pages to expose compilation errors.">
-        <mkdir dir="${build.generated.dir}/src"/>
-classname="org.netbeans.modules.web.project.ant.JspC" fork="true" failonerror="true
+failonerror="true" fork="true" classname="org.netbeans.modules.web.project.ant.JspC
-            <arg value="-uriroot"/>
-            <arg file="${basedir}/${build.web.dir.real}"/>
@@ -346 +370 @@
-        </java>
-        <mkdir dir="${build.generated.dir}/classes"/>
-srcdir="${build.generated.dir}/src" destdir="${build.generated.dir}/classes" classpath="${j2ee.platform.classpath}:${build.classes.dir.real}:${jspcompilation.classpath}
+classpath="${j2ee.platform.classpath}:${build.classes.dir.real}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src
-    </target>
-    <target name="-do-compile-single-jsp" depends="compile" if="jsp.includes">
-        <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
-        <mkdir dir="${build.generated.dir}/src"/>
-classname="org.netbeans.modules.web.project.ant.JspCSingle" fork="true" failonerror="tru
+failonerror="true" fork="true" classname="org.netbeans.modules.web.project.ant.JspCSingl
-            <arg value="-uriroot"/>
-            <arg file="${basedir}/${build.web.dir.real}"/>
@@ -362 +386 @@
-        </java>
-        <mkdir dir="${build.generated.dir}/classes"/>
-srcdir="${build.generated.dir}/src" destdir="${build.generated.dir}/classes" classpath="${j2ee.platform.classpath}:${build.classes.dir.real}:${jspcompilation.classpath}
+classpath="${j2ee.platform.classpath}:${build.classes.dir.real}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src
-            <customize>
-                <patternset includes="${javac.jsp.includes}"/>
@@ -379 +403 @@
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-name="-do-dist-without-manifest" if="do.war.package.without.custom.
-property="dist.jar.dir" file="${dist.war}
+if="do.war.package.without.custom.manifest" name="-do-dist-without-
+file="${dist.war}" property="dist.jar.dir
-        <mkdir dir="${dist.jar.dir}"/>
-jarfile="${dist.war}" compress="${jar.compress
+compress="${jar.compress}" jarfile="${dist.war
-            <fileset dir="${build.web.dir.real}"/>
-        </jar>
-    </target>
-name="-do-dist-with-manifest" if="do.war.package.with.custom.
-property="dist.jar.dir" file="${dist.war}
+if="do.war.package.with.custom.manifest" name="-do-dist-with-
+file="${dist.war}" property="dist.jar.dir
-        <mkdir dir="${dist.jar.dir}"/>
-manifest="${build.meta.inf.dir}/MANIFEST.MF" jarfile="${dist.war}" compress="${jar.compress}
+compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF
-            <fileset dir="${build.web.dir.real}"/>
-        </jar>
-    </target>
-    <target name="do-dist" depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        <mkdir dir="${build.web.dir.real}/META-INF"/>
-file="${build.web.dir.real}/META-INF/MANIFEST.MF" mode="update
-Javolution.classpath} ${included.lib.libs.Velocity1.4.classpath} ${included.lib.libs.OpenSAML-20070323.classpath.1.X} ${included.lib.libs.OpenSAML-20070323.classpath.2.X} ${included.lib.libs.OpenSAML-20070323.classpath.3.X} ${included.lib.libs.OpenSAML-20070323.classpath.4.X} ${included.lib.libs.OpenSAML-20070323.classpath.5.X} ${included.lib.libs.OpenSAML-20070323.classpath.6.X
+mode="update" file="${build.web.dir.real}/META-INF/MANIFEST.MF
+ApacheCommons.classpath.6.X} ${included.lib.libs.Javolution.classpath} ${included.lib.libs.OpenSAML-20070323.classpath.1.X} ${included.lib.libs.OpenSAML-20070323.classpath.2.X} ${included.lib.libs.OpenSAML-20070323.classpath.3.X} ${included.lib.libs.OpenSAML-20070323.classpath.4.X} ${included.lib.libs.OpenSAML-20070323.classpath.5.X} ${included.lib.libs.OpenSAML-20070323.classpath.6.X} ${included.lib.libs.Velocity.classpath
-        </manifest>
-        <delete dir="${dist.ear.dir}/temp"/>
-    </target>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    </target>
-    <target name="do-ear-dist" depends="init,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest">
-property="dist.jar.dir" file="${dist.ear.war}
+file="${dist.ear.war}" property="dist.jar.dir
-        <mkdir dir="${dist.jar.dir}"/>
-jarfile="${dist.ear.war}" compress="${jar.compress}" manifest="${build.web.dir.real}/META-INF/MANIFEST.MF
+manifest="${build.web.dir.real}/META-INF/MANIFEST.MF" compress="${jar.compress}" jarfile="${dist.ear.war}
-            <fileset dir="${build.web.dir.real}"/>
-        </jar>
@@ -479 +506 @@
-    </target>
-    <target name="run-deploy" depends="init,compile,compile-jsps,-do-compile-single-jsp,dist,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy"/>
-name="-run-deploy-nb" if="netbeans.home
-debugmode="false" clientUrlPart="${client.urlPart}" forceRedeploy="${forceRedeploy}
-
-name="-init-deploy-ant" unless="netbeans.home
-name="deploy.ant.archive" value="${dist.war}
-name="deploy.ant.docbase.dir" value="${web.docbase.dir}
-name="deploy.ant.resource.dir" value="${resource.dir}
-name="deploy.ant.enabled" value="true
+if="netbeans.home" name="-run-deploy-nb
+forceRedeploy="${forceRedeploy}" clientUrlPart="${client.urlPart}" debugmode="false
+
+unless="netbeans.home" name="-init-deploy-ant
+value="${dist.war}" name="deploy.ant.archive
+value="${web.docbase.dir}" name="deploy.ant.docbase.dir
+value="${resource.dir}" name="deploy.ant.resource.dir
+value="true" name="deploy.ant.enabled
-    </target>
-    <target name="run-undeploy" depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant"/>
-name="-run-undeploy-nb" if="netbeans.home
+if="netbeans.home" name="-run-undeploy-nb
-        <fail message="Undeploy is not supported from within the IDE"/>
-    </target>
@@ -496 +523 @@
-    </target>
-    <target name="run-display-browser" depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl"/>
-name="-init-display-browser" if="do.display.
+if="do.display.browser" name="-init-display-
-        <condition property="do.display.browser.nb">
-            <isset property="netbeans.home"/>
@@ -504 +531 @@
-        </condition>
-    </target>
-name="-display-browser-nb" if="do.display.browser.
+if="do.display.browser.nb" name="-display-browser-
-        <nbbrowse url="${client.url}"/>
-    </target>
-name="-get-browser" if="do.display.browser.cl" unless="
-property="browser" value="rundll32
+unless="browser" if="do.display.browser.cl" name="-get-
+value="rundll32" property="browser
-            <os family="windows"/>
-        </condition>
-property="browser.args" value="url.dll,FileProtocolHandler" else="
+else="" value="url.dll,FileProtocolHandler" property="browser.args
-            <os family="windows"/>
-        </condition>
-property="browser" value="/usr/bin/open
+value="/usr/bin/open" property="browser
-            <os family="mac"/>
-        </condition>
-        <property environment="env"/>
-property="browser" value="${env.BROWSER}
+value="${env.BROWSER}" property="browser
-            <isset property="env.BROWSER"/>
-        </condition>
-property="browser" value="/usr/bin/firefox
+value="/usr/bin/firefox" property="browser
-            <available file="/usr/bin/firefox"/>
-        </condition>
-property="browser" value="/usr/local/firefox/firefox
+value="/usr/local/firefox/firefox" property="browser
-            <available file="/usr/local/firefox/firefox"/>
-        </condition>
-property="browser" value="/usr/bin/mozilla
+value="/usr/bin/mozilla" property="browser
-            <available file="/usr/bin/mozilla"/>
-        </condition>
-property="browser" value="/usr/local/mozilla/mozilla
+value="/usr/local/mozilla/mozilla" property="browser
-            <available file="/usr/local/mozilla/mozilla"/>
-        </condition>
-property="browser" value="/usr/sfw/lib/firefox/firefox
+value="/usr/sfw/lib/firefox/firefox" property="browser
-            <available file="/usr/sfw/lib/firefox/firefox"/>
-        </condition>
-property="browser" value="/opt/csw/bin/firefox
+value="/opt/csw/bin/firefox" property="browser
-            <available file="/opt/csw/bin/firefox"/>
-        </condition>
-property="browser" value="/usr/sfw/lib/mozilla/mozilla
+value="/usr/sfw/lib/mozilla/mozilla" property="browser
-            <available file="/usr/sfw/lib/mozilla/mozilla"/>
-        </condition>
-property="browser" value="/opt/csw/bin/mozilla
+value="/opt/csw/bin/mozilla" property="browser
-            <available file="/opt/csw/bin/mozilla"/>
-        </condition>
-    </target>
-name="-display-browser-cl" depends="-get-browser" if="do.display.browser.
+if="do.display.browser.cl" depends="-get-browser" name="-display-browser-
-        <fail unless="browser">
-                    Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable.
-                </fail>
-name="browse.url" value="${deploy.ant.client.url}${client.urlPart}
+value="${deploy.ant.client.url}${client.urlPart}" name="browse.url
-        <echo>Launching ${browse.url}</echo>
-executable="${browser}" spawn="true
+spawn="true" executable="${browser}
-            <arg line="${browser.args} ${browse.url}"/>
-        </exec>
@@ -564 +591 @@
-            -->
-    <target name="debug" description="Debug project in IDE." depends="init,compile,compile-jsps,-do-compile-single-jsp,dist" if="netbeans.home">
-debugmode="true" clientUrlPart="${client.urlPart}
+clientUrlPart="${client.urlPart}" debugmode="true
-        <antcall target="connect-debugger"/>
-        <antcall target="debug-display-browser"/>
-    </target>
-name="connect-debugger" unless="is.debugged
-name="${name}" host="${jpda.host}" address="${jpda.address}" transport="${jpda.transport
+unless="is.debugged" name="connect-debugger
+transport="${jpda.transport}" address="${jpda.address}" host="${jpda.host}" name="${name
-            <classpath>
-                <path path="${debug.classpath}:${ws.debug.classpaths}"/>
@@ -576 +603 @@
-                <path path="${web.docbase.dir}:${ws.web.docbase.dirs}"/>
-            </sourcepath>
+            <bootclasspath>
+                <path path="${platform.bootcp}"/>
+            </bootclasspath>
-        </nbjpdaconnect>
-    </target>
-name="debug-display-browser" if="do.display.
+if="do.display.browser" name="debug-display-
-        <nbbrowse url="${client.url}"/>
-    </target>
@@ -592 +622 @@
-    <target name="-pre-debug-fix" depends="init">
-        <fail unless="fix.includes">Must set fix.includes</fail>
-name="javac.includes" value="${fix.includes}.java
+value="${fix.includes}.java" name="javac.includes
-    </target>
-    <target name="-do-debug-fix" if="netbeans.home" depends="init,-pre-debug-fix,compile-single">
@@ -603 +633 @@
-    <target name="javadoc-build" depends="init">
-        <mkdir dir="${dist.javadoc.dir}"/>
-
+ executable="${platform.javadoc}"
-            <classpath>
-                <path path="${javac.classpath}:${j2ee.platform.classpath}"/>
@@ -693 +723 @@
-    <target name="-debug-start-debuggee-test" if="have.tests" depends="init,compile-test">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-classname="junit.textui.TestRunner" classpath="${debug.test.classpath}" args="${test.class}
+args="${test.class}" classpath="${debug.test.classpath}" classname="junit.textui.TestRunner
-    </target>
-    <target name="-debug-start-debugger-test" if="netbeans.home+have.tests" depends="init,compile-test">
-name="${test.class}" classpath="${debug.test.classpath
+classpath="${debug.test.classpath}" name="${test.class
-    </target>
-    <target name="debug-test" depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test"/>
@@ -709 +739 @@
-    <target name="deps-clean" depends="init" if="no.dist.ear.dir" unless="no.deps"/>
-    <target name="do-clean" depends="init">
-value="${build.web.dir.real}" property="build.dir.to.clean
+property="build.dir.to.clean" value="${build.web.dir.real}
-            <isset property="dist.ear.dir"/>
-        </condition>
-value="${build.web.dir.real}" name="build.dir.to.clean
-includeEmptyDirs="true" quiet
+name="build.dir.to.clean" value="${build.web.dir.real}
+quiet="true" includeEmptyDirs
-            <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
-        </delete>
-        <delete dir="${build.dir}"/>
-file="${build.dir.to.clean}/WEB-INF/lib" type="dir" property="status.clean-failed
+property="status.clean-failed" type="dir" file="${build.dir.to.clean}/WEB-INF/lib
-        <delete dir="${dist.dir}"/>
-    </target>
-    <target name="check-clean" depends="do-clean" if="status.clean-failed">
-        <echo message="Warning: unable to delete some files in ${build.web.dir.real}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
-level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again.
+message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again." level="info
-    </target>
-    <target name="-post-clean">

AcmeIdp/trunk/nbproject/genfiles.properties

@@ -1 @@
-4d2e78ea
-6ed50798
+5d181752
+aba0f6b0
-build.xml.stylesheet.CRC32=95be3570
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-4d2e78ea
-5398a86e
+5d181752
+18cffc42
-nbproject/build-impl.xml.stylesheet.CRC32=ac43bae1

AcmeIdp/trunk/nbproject/project.properties

@@ -26 +26 @@
-    ${libs.ApacheCommons.classpath}:\
-    ${libs.Javolution.classpath}:\
-Velocity1.4
-OpenSAML-20070323
+OpenSAML-20070323
+Velocity
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.debug=true
-javac.deprecation=false
-${default.javac.source}
-${default.javac.target}
+1.5
+1.5
-javac.test.classpath=\
-    ${javac.classpath}:\
@@ -52 +52 @@
-jspcompilation.classpath=${jspc.classpath}:${javac.classpath}
-lib.dir=${web.docbase.dir}/WEB-INF/lib
-
+
+
+
+
-resource.dir=setup
-run.test.classpath=\

AcmeIdp/trunk/nbproject/project.xml

@@ -1 @@
-
-
+
-    <type>org.netbeans.modules.web.project</type>
-    <configuration>
@@ -6 +5 @@
-            <name>AcmeIdp</name>
-            <minimum-ant-version>1.6</minimum-ant-version>
+            <explicit-platform explicit-source-supported="true"/>
-            <web-module-libraries>
-5
+6
-                    <file>${libs.ApacheCommons.classpath}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
@@ -15 +15 @@
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
-1
-Velocity1.4
+6
+OpenSAML-20070323
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
-6
-OpenSAML-20070323
+1
+Velocity
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>

AcmeIdp/trunk/web/login.jsp

@@ -53 +53 @@
-      AuthnRequestImpl auth = (AuthnRequestImpl) session.getAttribute(_authnrequest);
-      // we must now build the Response object to redirect the user back to the SP with
+      // saml-core-2.0 has example of a response object, section 5.4.6, page 70
-      ResponseBuilder rspBldr = (ResponseBuilder) builderFactory.getBuilder(Response.DEFAULT_ELEMENT_NAME);
-      Response rsp = rspBldr.buildObject();

AcmeIdp/trunk/web/recv-authnrequest.jsp

@@ -64 +64 @@
-  Response rsp = rspBldr.buildObject();
-
+  ResponseBuilder respBldr = (ResponseBuilder) builderFactory.getBuilder(Response.DEFAULT_ELEMENT_NAME);
+  Response resp = respBldr.buildObject();
+  
-%>    
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"