Menu
▾
▴
advance-project-commit
|
From: <da...@us...> - 2012-07-02 14:07:38
|
Revision: 266
http://advance-project.svn.sourceforge.net/advance-project/?rev=266&view=rev
Author: dalmaso
Date: 2012-07-02 14:07:24 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
AdvanceET 1.0
Added Paths:
-----------
advance-et/trunk/build.xml
advance-et/trunk/lib/
advance-et/trunk/lib/CopyLibs/
advance-et/trunk/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
advance-et/trunk/lib/commons-compress-1.3-bin.zip
advance-et/trunk/lib/commons-fileupload-1.2.2.jar
advance-et/trunk/lib/commons-io-2.1.jar
advance-et/trunk/lib/jdom-1.1.3.jar
advance-et/trunk/lib/jstl11/
advance-et/trunk/lib/jstl11/javaee6-doc-api.zip
advance-et/trunk/lib/jstl11/jstl.jar
advance-et/trunk/lib/jstl11/standard.jar
advance-et/trunk/lib/nblibraries.properties
advance-et/trunk/lib/xalan-2.7.1.jar
advance-et/trunk/nbproject/
advance-et/trunk/nbproject/ant-deploy.xml
advance-et/trunk/nbproject/build-impl.xml
advance-et/trunk/nbproject/genfiles.properties
advance-et/trunk/nbproject/project.properties
advance-et/trunk/nbproject/project.xml
advance-et/trunk/src/
advance-et/trunk/src/conf/
advance-et/trunk/src/conf/MANIFEST.MF
advance-et/trunk/src/java/
advance-et/trunk/src/java/com/
advance-et/trunk/src/java/com/ttsnetwork/
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/CheckFileFilter.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/CheckFileRepositoryFilter.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/CheckFileServlet.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/DeleteXmlServlet.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/DownloadXmlServlet.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/GetXmlServlet.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/LoginFilter.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/LoginServlet.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/LogoutServlet.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/PermissionFilter.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/SaveXmlServlet.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/UploadXmlServlet.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/UserBean.java
advance-et/trunk/web/
advance-et/trunk/web/META-INF/
advance-et/trunk/web/META-INF/context.xml
advance-et/trunk/web/WEB-INF/
advance-et/trunk/web/WEB-INF/web.xml
advance-et/trunk/web/css/
advance-et/trunk/web/css/editFile.css
advance-et/trunk/web/css/fileList.css
advance-et/trunk/web/css/general.css
advance-et/trunk/web/css/images/
advance-et/trunk/web/css/images/ui-bg_glass_55_fcf0ba_1x400.png
advance-et/trunk/web/css/images/ui-bg_gloss-wave_100_ece8da_500x100.png
advance-et/trunk/web/css/images/ui-bg_highlight-hard_100_f5f3e5_1x100.png
advance-et/trunk/web/css/images/ui-bg_highlight-hard_100_fafaf4_1x100.png
advance-et/trunk/web/css/images/ui-bg_highlight-hard_15_459e00_1x100.png
advance-et/trunk/web/css/images/ui-bg_highlight-hard_95_cccccc_1x100.png
advance-et/trunk/web/css/images/ui-bg_highlight-soft_25_67b021_1x100.png
advance-et/trunk/web/css/images/ui-bg_highlight-soft_95_ffedad_1x100.png
advance-et/trunk/web/css/images/ui-bg_inset-soft_15_2b2922_1x100.png
advance-et/trunk/web/css/images/ui-icons_808080_256x240.png
advance-et/trunk/web/css/images/ui-icons_847e71_256x240.png
advance-et/trunk/web/css/images/ui-icons_8dc262_256x240.png
advance-et/trunk/web/css/images/ui-icons_cd0a0a_256x240.png
advance-et/trunk/web/css/images/ui-icons_eeeeee_256x240.png
advance-et/trunk/web/css/images/ui-icons_ffffff_256x240.png
advance-et/trunk/web/css/index.css
advance-et/trunk/web/css/jquery-ui-1.8.18.custom.css
advance-et/trunk/web/css/jsxgraph.css
advance-et/trunk/web/css/viewFile.css
advance-et/trunk/web/doc/
advance-et/trunk/web/doc/AdvanceElicitationTool_QuickGuide.pdf
advance-et/trunk/web/favicon.ico
advance-et/trunk/web/filerep/
advance-et/trunk/web/filerep/ST.xml
advance-et/trunk/web/filerep/ST_1.xml
advance-et/trunk/web/filerep/ST_2.xml
advance-et/trunk/web/header.html
advance-et/trunk/web/images/
advance-et/trunk/web/images/ajax-loader.gif
advance-et/trunk/web/images/editor_bg.png
advance-et/trunk/web/images/header/
advance-et/trunk/web/images/header/advlogo_transparent_80.png
advance-et/trunk/web/images/header/logo.png
advance-et/trunk/web/images/html_bg.png
advance-et/trunk/web/images/tree_buttons.png
advance-et/trunk/web/index.jsp
advance-et/trunk/web/js/
advance-et/trunk/web/js/editFile.js
advance-et/trunk/web/js/fileList.js
advance-et/trunk/web/js/jquery.jsPlumb-1.3.8-all-min.js
advance-et/trunk/web/js/viewFile.js
advance-et/trunk/web/pages/
advance-et/trunk/web/pages/editFile.jsp
advance-et/trunk/web/pages/fileList.jsp
advance-et/trunk/web/pages/viewFile.jsp
advance-et/trunk/web/tmp/
advance-et/trunk/web/users/
advance-et/trunk/web/users/users.xml
Added: advance-et/trunk/build.xml
===================================================================
--- advance-et/trunk/build.xml (rev 0)
+++ advance-et/trunk/build.xml 2012-07-02 14:07:24 UTC (rev 266)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="ElicitationTool" default="default" basedir=".">
+ <description>Builds, tests, and runs the project ElicitationTool.</description>
+ <import file="nbproject/build-impl.xml"/>
+ <!--
+
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
+
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
+ -pre-compile-single: called before javac compilation of single file
+ -post-compile-single: called after javac compilation of single file
+ -pre-compile-test: called before javac compilation of JUnit tests
+ -post-compile-test: called after javac compilation of JUnit tests
+ -pre-compile-test-single: called before javac compilation of single JUnit test
+ -post-compile-test-single: called after javac compilation of single JUunit test
+ -pre-dist: called before archive building
+ -post-dist: called after archive building
+ -post-clean: called after cleaning build products
+ -pre-run-deploy: called before deploying
+ -post-run-deploy: called after deploying
+
+ Example of pluging an obfuscator after the compilation could look like
+
+ <target name="-post-compile">
+ <obfuscate>
+ <fileset dir="${build.classes.dir}"/>
+ </obfuscate>
+ </target>
+
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
+
+
+ Other way how to customize the build is by overriding existing main targets.
+ The target of interest are:
+
+ init-macrodef-javac: defines macro for javac compilation
+ init-macrodef-junit: defines macro for junit execution
+ init-macrodef-debug: defines macro for class debugging
+ do-dist: archive building
+ run: execution of project
+ javadoc-build: javadoc generation
+
+ Example of overriding the target for project execution could look like
+
+ <target name="run" depends="<PROJNAME>-impl.jar">
+ <exec dir="bin" executable="launcher.exe">
+ <arg file="${dist.jar}"/>
+ </exec>
+ </target>
+
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
+
+ -->
+</project>
Property changes on: advance-et/trunk/build.xml
___________________________________________________________________
Added: svn:eol-style
+ native
Added: advance-et/trunk/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
===================================================================
(Binary files differ)
Property changes on: advance-et/trunk/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: advance-et/trunk/lib/commons-compress-1.3-bin.zip
===================================================================
(Binary files differ)
Property changes on: advance-et/trunk/lib/commons-compress-1.3-bin.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: advance-et/trunk/lib/commons-fileupload-1.2.2.jar
===================================================================
(Binary files differ)
Property changes on: advance-et/trunk/lib/commons-fileupload-1.2.2.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: advance-et/trunk/lib/commons-io-2.1.jar
===================================================================
(Binary files differ)
Property changes on: advance-et/trunk/lib/commons-io-2.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: advance-et/trunk/lib/jdom-1.1.3.jar
===================================================================
(Binary files differ)
Property changes on: advance-et/trunk/lib/jdom-1.1.3.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: advance-et/trunk/lib/jstl11/javaee6-doc-api.zip
===================================================================
(Binary files differ)
Property changes on: advance-et/trunk/lib/jstl11/javaee6-doc-api.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: advance-et/trunk/lib/jstl11/jstl.jar
===================================================================
(Binary files differ)
Property changes on: advance-et/trunk/lib/jstl11/jstl.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: advance-et/trunk/lib/jstl11/standard.jar
===================================================================
(Binary files differ)
Property changes on: advance-et/trunk/lib/jstl11/standard.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: advance-et/trunk/lib/nblibraries.properties
===================================================================
--- advance-et/trunk/lib/nblibraries.properties (rev 0)
+++ advance-et/trunk/lib/nblibraries.properties 2012-07-02 14:07:24 UTC (rev 266)
@@ -0,0 +1,7 @@
+libs.CopyLibs.classpath=\
+ ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
+libs.jstl11.classpath=\
+ ${base}/jstl11/standard.jar;\
+ ${base}/jstl11/jstl.jar
+libs.jstl11.javadoc=\
+ ${base}/jstl11/javaee6-doc-api.zip
Property changes on: advance-et/trunk/lib/nblibraries.properties
___________________________________________________________________
Added: svn:eol-style
+ native
Added: advance-et/trunk/lib/xalan-2.7.1.jar
===================================================================
(Binary files differ)
Property changes on: advance-et/trunk/lib/xalan-2.7.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: advance-et/trunk/nbproject/ant-deploy.xml
===================================================================
--- advance-et/trunk/nbproject/ant-deploy.xml (rev 0)
+++ advance-et/trunk/nbproject/ant-deploy.xml 2012-07-02 14:07:24 UTC (rev 266)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="-deploy-ant" basedir=".">
+ <target name="-init" if="deploy.ant.enabled">
+ <property file="${deploy.ant.properties.file}"/>
+ <tempfile property="temp.module.folder" prefix="tomcat" destdir="${java.io.tmpdir}"/>
+ <unwar src="${deploy.ant.archive}" dest="${temp.module.folder}">
+ <patternset includes="META-INF/context.xml"/>
+ </unwar>
+ <xmlproperty file="${temp.module.folder}/META-INF/context.xml"/>
+ <delete dir="${temp.module.folder}"/>
+ </target>
+ <target name="-check-credentials" if="deploy.ant.enabled" depends="-init">
+ <fail message="Tomcat password has to be passed as tomcat.password property.">
+ <condition>
+ <not>
+ <isset property="tomcat.password"/>
+ </not>
+ </condition>
+ </fail>
+ </target>
+ <target name="-deploy-ant" if="deploy.ant.enabled" depends="-init,-check-credentials">
+ <echo message="Deploying ${deploy.ant.archive} to ${Context(path)}"/>
+ <taskdef name="deploy" classname="org.apache.catalina.ant.DeployTask">
+ <classpath>
+ <pathelement path="${tomcat.home}/lib/catalina-ant.jar"/>
+ <pathelement path="${tomcat.home}/lib/tomcat-coyote.jar"/>
+ <pathelement path="${tomcat.home}/lib/tomcat-util.jar"/>
+ <pathelement path="${tomcat.home}/bin/tomcat-juli.jar"/>
+ </classpath>
+ </taskdef>
+ <deploy url="${tomcat.url}/manager/text" username="${tomcat.username}"
+ password="${tomcat.password}" path="${Context(path)}"
+ war="${deploy.ant.archive}"/>
+ <property name="deploy.ant.client.url" value="${tomcat.url}${Context(path)}"/>
+ </target>
+ <target name="-undeploy-ant" if="deploy.ant.enabled" depends="-init,-check-credentials">
+ <echo message="Undeploying ${Context(path)}"/>
+ <taskdef name="undeploy" classname="org.apache.catalina.ant.UndeployTask">
+ <classpath>
+ <pathelement path="${tomcat.home}/lib/catalina-ant.jar"/>
+ <pathelement path="${tomcat.home}/lib/tomcat-coyote.jar"/>
+ <pathelement path="${tomcat.home}/lib/tomcat-util.jar"/>
+ <pathelement path="${tomcat.home}/bin/tomcat-juli.jar"/>
+ </classpath>
+ </taskdef>
+ <undeploy url="${tomcat.url}/manager/text" username="${tomcat.username}"
+ password="${tomcat.password}" path="${Context(path)}"/>
+ </target>
+</project>
Property changes on: advance-et/trunk/nbproject/ant-deploy.xml
___________________________________________________________________
Added: svn:eol-style
+ native
Added: advance-et/trunk/nbproject/build-impl.xml
===================================================================
--- advance-et/trunk/nbproject/build-impl.xml (rev 0)
+++ advance-et/trunk/nbproject/build-impl.xml 2012-07-02 14:07:24 UTC (rev 266)
@@ -0,0 +1,1104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ *** GENERATED FROM project.xml - DO NOT EDIT ***
+ *** EDIT ../build.xml INSTEAD ***
+
+ For the purpose of easier reading the script
+ is divided into following sections:
+ - initialization
+ - compilation
+ - dist
+ - execution
+ - debugging
+ - javadoc
+ - junit compilation
+ - junit execution
+ - junit debugging
+ - cleanup
+
+ -->
+<project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="default" name="ElicitationTool-impl">
+ <import file="ant-deploy.xml"/>
+ <fail message="Please build using Ant 1.7.1 or higher.">
+ <condition>
+ <not>
+ <antversion atleast="1.7.1"/>
+ </not>
+ </condition>
+ </fail>
+ <target depends="dist,javadoc" description="Build whole project." name="default"/>
+ <!--
+ INITIALIZATION SECTION
+ -->
+ <target name="-pre-init">
+ <!-- Empty placeholder for easier customization. -->
+ <!-- You can override this target in the ../build.xml file. -->
+ </target>
+ <target depends="-pre-init" name="-init-private">
+ <property file="nbproject/private/private.properties"/>
+ </target>
+ <target name="-pre-init-libraries">
+ <property location=".\lib\nblibraries.properties" name="libraries.path"/>
+ <dirname file="${libraries.path}" property="libraries.dir.nativedirsep"/>
+ <pathconvert dirsep="/" property="libraries.dir">
+ <path path="${libraries.dir.nativedirsep}"/>
+ </pathconvert>
+ <basename file="${libraries.path}" property="libraries.basename" suffix=".properties"/>
+ <available file="${libraries.dir}/${libraries.basename}-private.properties" property="private.properties.available"/>
+ </target>
+ <target depends="-pre-init-libraries" if="private.properties.available" name="-init-private-libraries">
+ <loadproperties encoding="ISO-8859-1" srcfile="${libraries.dir}/${libraries.basename}-private.properties">
+ <filterchain>
+ <replacestring from="$${base}" to="${libraries.dir}"/>
+ <escapeunicode/>
+ </filterchain>
+ </loadproperties>
+ </target>
+ <target depends="-pre-init,-init-private,-init-private-libraries" name="-init-libraries">
+ <loadproperties encoding="ISO-8859-1" srcfile="${libraries.path}">
+ <filterchain>
+ <replacestring from="$${base}" to="${libraries.dir}"/>
+ <escapeunicode/>
+ </filterchain>
+ </loadproperties>
+ </target>
+ <target depends="-pre-init,-init-private,-init-libraries" name="-init-user">
+ <property file="${user.properties.file}"/>
+ <!-- The two properties below are usually overridden -->
+ <!-- by the active platform. Just a fallback. -->
+ <property name="default.javac.source" value="1.4"/>
+ <property name="default.javac.target" value="1.4"/>
+ </target>
+ <target depends="-pre-init,-init-private,-init-libraries,-init-user" name="-init-project">
+ <property file="nbproject/project.properties"/>
+ </target>
+ <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir" name="-do-ear-init"/>
+ <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+ <condition property="have.tests">
+ <or>
+ <available file="${test.src.dir}"/>
+ </or>
+ </condition>
+ <condition property="have.sources">
+ <or>
+ <available file="${src.dir}"/>
+ </or>
+ </condition>
+ <condition property="netbeans.home+have.tests">
+ <and>
+ <isset property="netbeans.home"/>
+ <isset property="have.tests"/>
+ </and>
+ </condition>
+ <condition property="no.javadoc.preview">
+ <isfalse value="${javadoc.preview}"/>
+ </condition>
+ <property name="javac.compilerargs" value=""/>
+ <condition property="no.deps">
+ <and>
+ <istrue value="${no.dependencies}"/>
+ </and>
+ </condition>
+ <condition property="no.dist.ear.dir">
+ <not>
+ <isset property="dist.ear.dir"/>
+ </not>
+ </condition>
+ <property name="build.web.excludes" value="${build.classes.excludes}"/>
+ <condition property="do.compile.jsps">
+ <istrue value="${compile.jsps}"/>
+ </condition>
+ <condition property="do.debug.server">
+ <or>
+ <not>
+ <isset property="debug.server"/>
+ </not>
+ <istrue value="${debug.server}"/>
+ <and>
+ <not>
+ <istrue value="${debug.server}"/>
+ </not>
+ <not>
+ <istrue value="${debug.client}"/>
+ </not>
+ </and>
+ </or>
+ </condition>
+ <condition property="do.debug.client">
+ <istrue value="${debug.client}"/>
+ </condition>
+ <condition property="do.display.browser">
+ <istrue value="${display.browser}"/>
+ </condition>
+ <condition property="do.display.browser.debug">
+ <and>
+ <isset property="do.display.browser"/>
+ <not>
+ <isset property="do.debug.client"/>
+ </not>
+ </and>
+ </condition>
+ <available file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest"/>
+ <available file="${persistence.xml.dir}/persistence.xml" property="has.persistence.xml"/>
+ <condition property="do.war.package.with.custom.manifest">
+ <isset property="has.custom.manifest"/>
+ </condition>
+ <condition property="do.war.package.without.custom.manifest">
+ <not>
+ <isset property="has.custom.manifest"/>
+ </not>
+ </condition>
+ <condition property="do.tmp.war.package.with.custom.manifest">
+ <and>
+ <isset property="has.custom.manifest"/>
+ <or>
+ <isfalse value="${directory.deployment.supported}"/>
+ <isset property="dist.ear.dir"/>
+ </or>
+ </and>
+ </condition>
+ <condition property="do.tmp.war.package.without.custom.manifest">
+ <and>
+ <not>
+ <isset property="has.custom.manifest"/>
+ </not>
+ <or>
+ <isfalse value="${directory.deployment.supported}"/>
+ <isset property="dist.ear.dir"/>
+ </or>
+ </and>
+ </condition>
+ <condition property="do.tmp.war.package">
+ <or>
+ <isfalse value="${directory.deployment.supported}"/>
+ <isset property="dist.ear.dir"/>
+ </or>
+ </condition>
+ <property name="build.meta.inf.dir" value="${build.web.dir}/META-INF"/>
+ <condition else="" property="application.args.param" value="${application.args}">
+ <and>
+ <isset property="application.args"/>
+ <not>
+ <equals arg1="${application.args}" arg2="" trim="true"/>
+ </not>
+ </and>
+ </condition>
+ <property name="source.encoding" value="${file.encoding}"/>
+ <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
+ <and>
+ <isset property="javadoc.encoding"/>
+ <not>
+ <equals arg1="${javadoc.encoding}" arg2=""/>
+ </not>
+ </and>
+ </condition>
+ <property name="javadoc.encoding.used" value="${source.encoding}"/>
+ <property name="includes" value="**"/>
+ <property name="excludes" value=""/>
+ <property name="runmain.jvmargs" value=""/>
+ <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
+ <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
+ <and>
+ <isset property="endorsed.classpath"/>
+ <length length="0" string="${endorsed.classpath}" when="greater"/>
+ </and>
+ </condition>
+ <condition else="false" property="jdkBug6558476">
+ <and>
+ <matches pattern="1\.[56]" string="${java.specification.version}"/>
+ <not>
+ <os family="unix"/>
+ </not>
+ </and>
+ </condition>
+ <property name="javac.fork" value="${jdkBug6558476}"/>
+ </target>
+ <target depends="init" name="-init-cos" unless="deploy.on.save">
+ <condition property="deploy.on.save" value="true">
+ <or>
+ <istrue value="${j2ee.deploy.on.save}"/>
+ <istrue value="${j2ee.compile.on.save}"/>
+ </or>
+ </condition>
+ </target>
+ <target name="-post-init">
+ <!-- Empty placeholder for easier customization. -->
+ <!-- You can override this target in the ../build.xml file. -->
+ </target>
+ <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init" name="-init-check">
+ <fail unless="src.dir">Must set src.dir</fail>
+ <fail unless="test.src.dir">Must set test.src.dir</fail>
+ <fail unless="build.dir">Must set build.dir</fail>
+ <fail unless="build.web.dir">Must set build.web.dir</fail>
+ <fail unless="build.generated.dir">Must set build.generated.dir</fail>
+ <fail unless="dist.dir">Must set dist.dir</fail>
+ <fail unless="build.classes.dir">Must set build.classes.dir</fail>
+ <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
+ <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
+ <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
+ <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
+ <fail unless="dist.war">Must set dist.war</fail>
+ <condition property="missing.j2ee.server.home">
+ <and>
+ <matches pattern="j2ee.server.home" string="${j2ee.platform.classpath}"/>
+ <not>
+ <isset property="j2ee.server.home"/>
+ </not>
+ </and>
+ </condition>
+ <fail if="missing.j2ee.server.home">
+The Java EE server classpath is not correctly set up - server home directory is missing.
+Either open the project in the IDE and assign the server or setup the server classpath manually.
+For example like this:
+ ant -Dj2ee.server.home=<app_server_installation_directory>
+ </fail>
+ <fail unless="j2ee.platform.classpath">
+The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}.
+Either open the project in the IDE and assign the server or setup the server classpath manually.
+For example like this:
+ ant -Duser.properties.file=<path_to_property_file> (where you put the property "j2ee.platform.classpath" in a .properties file)
+or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties file is used)
+ </fail>
+ </target>
+ <target name="-init-macrodef-property">
+ <macrodef name="property" uri="http://www.netbeans.org/ns/web-project/1">
+ <attribute name="name"/>
+ <attribute name="value"/>
+ <sequential>
+ <property name="@{name}" value="${@{value}}"/>
+ </sequential>
+ </macrodef>
+ </target>
+ <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
+ <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
+ <attribute default="${src.dir}" name="srcdir"/>
+ <attribute default="${build.classes.dir}" name="destdir"/>
+ <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
+ <attribute default="${javac.processorpath}" name="processorpath"/>
+ <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="${javac.debug}" name="debug"/>
+ <attribute default="${empty.dir}" name="gensrcdir"/>
+ <element name="customize" optional="true"/>
+ <sequential>
+ <property location="${build.dir}/empty" name="empty.dir"/>
+ <mkdir dir="${empty.dir}"/>
+ <mkdir dir="@{apgeneratedsrcdir}"/>
+ <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
+ <src>
+ <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+ <include name="*"/>
+ </dirset>
+ </src>
+ <classpath>
+ ...
[truncated message content] |
|
From: <da...@us...> - 2012-11-05 09:15:01
|
Revision: 273
http://advance-project.svn.sourceforge.net/advance-project/?rev=273&view=rev
Author: dalmaso
Date: 2012-11-05 09:14:51 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
updated to latest deliverable specification
Modified Paths:
--------------
advance-et/trunk/nbproject/build-impl.xml
advance-et/trunk/nbproject/genfiles.properties
advance-et/trunk/nbproject/project.properties
advance-et/trunk/nbproject/project.xml
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/CheckFileFilter.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/CheckFileServlet.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/DeleteXmlServlet.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/DownloadXmlServlet.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/GetXmlServlet.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/LoginServlet.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/SaveXmlServlet.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/UploadXmlServlet.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/UserBean.java
advance-et/trunk/web/WEB-INF/web.xml
advance-et/trunk/web/css/editFile.css
advance-et/trunk/web/css/fileList.css
advance-et/trunk/web/css/viewFile.css
advance-et/trunk/web/doc/AdvanceElicitationTool_QuickGuide.pdf
advance-et/trunk/web/filerep/ST_1.xml
advance-et/trunk/web/index.jsp
advance-et/trunk/web/js/editFile.js
advance-et/trunk/web/js/fileList.js
advance-et/trunk/web/js/viewFile.js
advance-et/trunk/web/pages/editFile.jsp
advance-et/trunk/web/pages/fileList.jsp
advance-et/trunk/web/pages/viewFile.jsp
advance-et/trunk/web/users/users.xml
Added Paths:
-----------
advance-et/trunk/lib/gson-2.2.2.jar
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/FileItem.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/FileManager.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/FileViewData.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/GetFileListServlet.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/UnsetUserBeanServlet.java
advance-et/trunk/web/WEB-INF/jspf/
advance-et/trunk/web/WEB-INF/jspf/footer.jspf
advance-et/trunk/web/css/images/ui-bg_flat_0_aaaaaa_40x100.png
advance-et/trunk/web/css/images/ui-bg_flat_100_388d3c_40x100.png
advance-et/trunk/web/css/images/ui-bg_flat_55_388d3c_40x100.png
advance-et/trunk/web/css/images/ui-bg_flat_75_388d3c_40x100.png
advance-et/trunk/web/css/images/ui-bg_flat_75_ffffff_40x100.png
advance-et/trunk/web/css/images/ui-bg_glass_65_ffffff_1x400.png
advance-et/trunk/web/css/images/ui-bg_glass_95_fef1ec_1x400.png
advance-et/trunk/web/css/images/ui-icons_222222_256x240.png
advance-et/trunk/web/css/images/ui-icons_388d3c_256x240.png
advance-et/trunk/web/css/jquery-ui-1.9.0.custom.min.css
advance-et/trunk/web/images/locked.png
advance-et/trunk/web/js/d3.v2.js
Removed Paths:
-------------
advance-et/trunk/web/css/images/ui-bg_glass_55_fcf0ba_1x400.png
advance-et/trunk/web/css/images/ui-bg_gloss-wave_100_ece8da_500x100.png
advance-et/trunk/web/css/images/ui-bg_highlight-hard_100_f5f3e5_1x100.png
advance-et/trunk/web/css/images/ui-bg_highlight-hard_100_fafaf4_1x100.png
advance-et/trunk/web/css/images/ui-bg_highlight-hard_15_459e00_1x100.png
advance-et/trunk/web/css/images/ui-bg_highlight-hard_95_cccccc_1x100.png
advance-et/trunk/web/css/images/ui-bg_highlight-soft_25_67b021_1x100.png
advance-et/trunk/web/css/images/ui-bg_highlight-soft_95_ffedad_1x100.png
advance-et/trunk/web/css/images/ui-bg_inset-soft_15_2b2922_1x100.png
advance-et/trunk/web/css/images/ui-icons_808080_256x240.png
advance-et/trunk/web/css/images/ui-icons_847e71_256x240.png
advance-et/trunk/web/css/images/ui-icons_8dc262_256x240.png
advance-et/trunk/web/css/images/ui-icons_eeeeee_256x240.png
advance-et/trunk/web/css/jquery-ui-1.8.18.custom.css
advance-et/trunk/web/filerep/ST.xml
advance-et/trunk/web/js/jquery.jsPlumb-1.3.8-all-min.js
Added: advance-et/trunk/lib/gson-2.2.2.jar
===================================================================
(Binary files differ)
Property changes on: advance-et/trunk/lib/gson-2.2.2.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: advance-et/trunk/nbproject/build-impl.xml
===================================================================
--- advance-et/trunk/nbproject/build-impl.xml 2012-10-31 14:05:56 UTC (rev 272)
+++ advance-et/trunk/nbproject/build-impl.xml 2012-11-05 09:14:51 UTC (rev 273)
@@ -11,9 +11,9 @@
- execution
- debugging
- javadoc
- - junit compilation
- - junit execution
- - junit debugging
+ - test compilation
+ - test execution
+ - test debugging
- cleanup
-->
@@ -212,6 +212,27 @@
</and>
</condition>
<property name="javac.fork" value="${jdkBug6558476}"/>
+ <condition property="junit.available">
+ <or>
+ <available classname="org.junit.Test" classpath="${run.test.classpath}"/>
+ <available classname="junit.framework.Test" classpath="${run.test.classpath}"/>
+ </or>
+ </condition>
+ <condition property="testng.available">
+ <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/>
+ </condition>
+ <condition property="junit+testng.available">
+ <and>
+ <istrue value="${junit.available}"/>
+ <istrue value="${testng.available}"/>
+ </and>
+ </condition>
+ <condition else="testng" property="testng.mode" value="mixed">
+ <istrue value="${junit+testng.available}"/>
+ </condition>
+ <condition else="" property="testng.debug.mode" value="-mixed">
+ <istrue value="${junit+testng.available}"/>
+ </condition>
</target>
<target depends="init" name="-init-cos" unless="deploy.on.save">
<condition property="deploy.on.save" value="true">
@@ -370,34 +391,308 @@
</sequential>
</macrodef>
</target>
- <target name="-init-macrodef-junit">
+ <target if="${junit.available}" name="-init-macrodef-junit-init">
+ <condition else="false" property="nb.junit.batch" value="true">
+ <and>
+ <istrue value="${junit.available}"/>
+ <not>
+ <isset property="test.method"/>
+ </not>
+ </and>
+ </condition>
+ <condition else="false" property="nb.junit.single" value="true">
+ <and>
+ <istrue value="${junit.available}"/>
+ <isset property="test.method"/>
+ </and>
+ </condition>
+ </target>
+ <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
<macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
<attribute default="${includes}" name="includes"/>
<attribute default="${excludes}" name="excludes"/>
<attribute default="**" name="testincludes"/>
+ <attribute default="" name="testmethods"/>
+ <element name="customize" optional="true"/>
<sequential>
<junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}">
+ <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
+ <syspropertyset>
+ <propertyref prefix="test-sys-prop."/>
+ <mapper from="test-sys-prop.*" to="*" type="glob"/>
+ </syspropertyset>
+ <formatter type="brief" usefile="false"/>
+ <formatter type="xml"/>
+ <jvmarg value="-ea"/>
+ <customize/>
+ </junit>
+ </sequential>
+ </macrodef>
+ </target>
+ <target if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
+ <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="**" name="testincludes"/>
+ <attribute default="" name="testmethods"/>
+ <element name="customize" optional="true"/>
+ <sequential>
+ <property name="run.jvmargs.ide" value=""/>
+ <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}">
<batchtest todir="${build.test.results.dir}">
<fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
</batchtest>
- <classpath>
- <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/>
- </classpath>
<syspropertyset>
<propertyref prefix="test-sys-prop."/>
<mapper from="test-sys-prop.*" to="*" type="glob"/>
</syspropertyset>
<formatter type="brief" usefile="false"/>
<formatter type="xml"/>
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
<jvmarg value="-ea"/>
- <jvmarg line="${runmain.jvmargs}"/>
+ <jvmarg line="${run.jvmargs.ide}"/>
+ <customize/>
</junit>
</sequential>
</macrodef>
</target>
+ <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/>
+ <target if="${testng.available}" name="-init-macrodef-testng">
+ <macrodef name="testng" uri="http://www.netbeans.org/ns/web-project/2">
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="**" name="testincludes"/>
+ <attribute default="" name="testmethods"/>
+ <element name="customize" optional="true"/>
+ <sequential>
+ <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">
+ <isset property="test.method"/>
+ </condition>
+ <union id="test.set">
+ <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
+ <filename name="@{testincludes}"/>
+ </fileset>
+ </union>
+ <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
+ <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="ElicitationTool" testname="TestNG tests" workingDir="${basedir}">
+ <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
+ <propertyset>
+ <propertyref prefix="test-sys-prop."/>
+ <mapper from="test-sys-prop.*" to="*" type="glob"/>
+ </propertyset>
+ <customize/>
+ </testng>
+ </sequential>
+ </macrodef>
+ </target>
+ <target name="-init-macrodef-test-impl">
+ <macrodef name="test-impl" uri="http://www.netbeans.org/ns/web-project/2">
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="**" name="testincludes"/>
+ <attribute default="" name="testmethods"/>
+ <element implicit="true" name="customize" optional="true"/>
+ <sequential>
+ <echo>No tests executed.</echo>
+ </sequential>
+ </macrodef>
+ </target>
+ <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl">
+ <macrodef name="test-impl" uri="http://www.netbeans.org/ns/web-project/2">
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="**" name="testincludes"/>
+ <attribute default="" name="testmethods"/>
+ <element implicit="true" name="customize" optional="true"/>
+ <sequential>
+ <webproject2:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+ <customize/>
+ </webproject2:junit>
+ </sequential>
+ </macrodef>
+ </target>
+ <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl">
+ <macrodef name="test-impl" uri="http://www.netbeans.org/ns/web-project/2">
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="**" name="testincludes"/>
+ <attribute default="" name="testmethods"/>
+ <element implicit="true" name="customize" optional="true"/>
+ <sequential>
+ <webproject2:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+ <customize/>
+ </webproject2:testng>
+ </sequential>
+ </macrodef>
+ </target>
+ <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test">
+ <macrodef name="test" uri="http://www.netbeans.org/ns/web-project/2">
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="**" name="testincludes"/>
+ <attribute default="" name="testmethods"/>
+ <sequential>
+ <webproject2:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+ <customize>
+ <classpath>
+ <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/>
+ </classpath>
+ <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+ <jvmarg line="${runmain.jvmargs}"/>
+ </customize>
+ </webproject2:test-impl>
+ </sequential>
+ </macrodef>
+ </target>
+ <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">
+ <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/web-project/2">
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="**" name="testincludes"/>
+ <attribute default="" name="testmethods"/>
+ <element name="customize" optional="true"/>
+ <sequential>
+ <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}">
+ <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
+ <syspropertyset>
+ <propertyref prefix="test-sys-prop."/>
+ <mapper from="test-sys-prop.*" to="*" type="glob"/>
+ </syspropertyset>
+ <formatter type="brief" usefile="false"/>
+ <formatter type="xml"/>
+ <jvmarg value="-ea"/>
+ <jvmarg line="${debug-args-line}"/>
+ <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+ <customize/>
+ </junit>
+ </sequential>
+ </macrodef>
+ </target>
+ <target if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
+ <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/web-project/2">
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="**" name="testincludes"/>
+ <attribute default="" name="testmethods"/>
+ <element name="customize" optional="true"/>
+ <sequential>
+ <property name="run.jvmargs.ide" value=""/>
+ <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}">
+ <batchtest todir="${build.test.results.dir}">
+ <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+ <filename name="@{testincludes}"/>
+ </fileset>
+ </batchtest>
+ <syspropertyset>
+ <propertyref prefix="test-sys-prop."/>
+ <mapper from="test-sys-prop.*" to="*" type="glob"/>
+ </syspropertyset>
+ <formatter type="brief" usefile="false"/>
+ <formatter type="xml"/>
+ <jvmarg value="-ea"/>
+ <jvmarg line="${run.jvmargs.ide}"/>
+ <jvmarg line="${debug-args-line}"/>
+ <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+ <customize/>
+ </junit>
+ </sequential>
+ </macrodef>
+ </target>
+ <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
+ <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/web-project/2">
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="**" name="testincludes"/>
+ <attribute default="" name="testmethods"/>
+ <element implicit="true" name="customize" optional="true"/>
+ <sequential>
+ <webproject2:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+ <customize/>
+ </webproject2:junit-debug>
+ </sequential>
+ </macrodef>
+ </target>
+ <target if="${testng.available}" name="-init-macrodef-testng-debug">
+ <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/web-project/2">
+ <attribute default="${main.class}" name="testClass"/>
+ <attribute default="" name="testMethod"/>
+ <element name="customize2" optional="true"/>
+ <sequential>
+ <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
+ <isset property="test.method"/>
+ </condition>
+ <condition else="-suitename ElicitationTool -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
+ <matches pattern=".*\.xml" string="@{testClass}"/>
+ </condition>
+ <delete dir="${build.test.results.dir}" quiet="true"/>
+ <mkdir dir="${build.test.results.dir}"/>
+ <webproject1:debug args="${testng.cmd.args}" classname="org.testng.TestNG" classpath="${debug.test.classpath}:${j2ee.platform.embeddableejb.classpath}">
+ <customize>
+ <customize2/>
+ <jvmarg value="-ea"/>
+ <arg line="${testng.debug.mode}"/>
+ <arg line="-d ${build.test.results.dir}"/>
+ <arg line="-listener org.testng.reporters.VerboseReporter"/>
+ </customize>
+ </webproject1:debug>
+ </sequential>
+ </macrodef>
+ </target>
+ <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">
+ <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/web-project/2">
+ <attribute default="${main.class}" name="testClass"/>
+ <attribute default="" name="testMethod"/>
+ <element implicit="true" name="customize2" optional="true"/>
+ <sequential>
+ <webproject2:testng-debug testClass="@{testClass}" testMethod="@{testMethod}">
+ <customize2/>
+ </webproject2:testng-debug>
+ </sequential>
+ </macrodef>
+ </target>
+ <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">
+ <macrodef name="test-debug" uri="http://www.netbeans.org/ns/web-project/2">
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="**" name="testincludes"/>
+ <attribute default="" name="testmethods"/>
+ <attribute default="${main.class}" name="testClass"/>
+ <attribute default="" name="testMethod"/>
+ <sequential>
+ <webproject2:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+ <customize>
+ <classpath>
+ <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/>
+ </classpath>
+ <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+ <jvmarg line="${runmain.jvmargs}"/>
+ </customize>
+ </webproject2:test-debug-impl>
+ </sequential>
+ </macrodef>
+ </target>
+ <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">
+ <macrodef name="test-debug" uri="http://www.netbeans.org/ns/web-project/2">
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="**" name="testincludes"/>
+ <attribute default="" name="testmethods"/>
+ <attribute default="${main.class}" name="testClass"/>
+ <attribute default="" name="testMethod"/>
+ <sequential>
+ <webproject2:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">
+ <customize2>
+ <syspropertyset>
+ <propertyref prefix="test-sys-prop."/>
+ <mapper from="test-sys-prop.*" to="*" type="glob"/>
+ </syspropertyset>
+ </customize2>
+ </webproject2:testng-debug-impl>
+ </sequential>
+ </macrodef>
+ </target>
+ <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>
<target name="-init-macrodef-java">
<macrodef name="java" uri="http://www.netbeans.org/ns/web-project/1">
<attribute default="${main.class}" name="classname"/>
@@ -536,7 +831,10 @@
<target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
<property name="ap.cmd.line.internal" value=""/>
</target>
- <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-check" name="profile-init"/>
+ <!--
+ pre NB7.2 profiling section; consider it deprecated
+ -->
+ <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
<target name="-profile-pre-init">
<!-- Empty placeholder for easier customization. -->
<!-- You can override this target in the ../build.xml file. -->
@@ -545,12 +843,15 @@
<!-- Empty placeholder for easier customization. -->
<!-- You can override this target in the ../build.xml file. -->
</target>
- <target depends="-profile-pre-init, init, -profile-post-init" name="-profile-init-check">
+ <target depends="-profile-pre-init, init, -profile-post-init" if="profiler.info.jvmargs.agent" name="-profile-init-check">
<fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
<fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
</target>
- <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline" name="init"/>
<!--
+ end of pre NB7.2 profiling section
+ -->
+ <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline" name="init"/>
+ <!--
COMPILATION SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/>
@@ -703,6 +1004,7 @@
<copyfiles files="${file.reference.xalan-2.7.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.commons-fileupload-1.2.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.commons-io-2.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+ <copyfiles files="${file.reference.gson-2.2.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<mkdir dir="${build.web.dir}/META-INF"/>
<manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
</target>
@@ -712,6 +1014,7 @@
<copyfiles files="${file.reference.xalan-2.7.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.commons-fileupload-1.2.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.commons-io-2.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+ <copyfiles files="${file.reference.gson-2.2.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
</target>
<target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
<delete dir="${build.web.dir}/WEB-INF/lib"/>
@@ -852,7 +1155,10 @@
<antcall target="connect-client-debugger"/>
</target>
<target if="do.debug.server" name="connect-debugger" unless="is.debugged">
- <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}">
+ <condition property="listeningcp" value="sourcepath">
+ <istrue value="${j2ee.compile.on.save}"/>
+ </condition>
+ <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" listeningcp="${listeningcp}" name="${name}" transport="${jpda.transport}">
<classpath>
<path path="${debug.classpath}:${j2ee.platform.classpath}"/>
</classpath>
@@ -897,28 +1203,79 @@
PROFILING SECTION
=================
-->
- <target description="Profile a J2EE project in the IDE." name="profile">
+ <!--
+ pre NB7.2 profiling section; consider it deprecated
+ -->
+ <target description="Profile a J2EE project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
<condition else="start-profiled-server" property="profiler.startserver.target" value="start-profiled-server-extraargs">
<isset property="profiler.info.jvmargs.extra"/>
</condition>
<antcall target="${profiler.startserver.target}"/>
<antcall target="run"/>
- <antcall target="start-loadgen"/>
+ <antcall target="-profile-start-loadgen"/>
</target>
- <target name="start-profiled-server">
+ <target if="profiler.info.jvmargs.agent" name="start-profiled-server">
<nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
<jvmarg value="${profiler.info.jvmargs.agent}"/>
<jvmarg value="${profiler.j2ee.agentID}"/>
</nbstartprofiledserver>
</target>
- <target name="start-profiled-server-extraargs">
+ <target if="profiler.info.jvmargs.agent" name="start-profiled-server-extraargs">
<nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.ser...
[truncated message content] |
|
From: <da...@us...> - 2013-12-10 10:27:32
|
Revision: 347
http://sourceforge.net/p/advance-project/code/347
Author: dalmaso
Date: 2013-12-10 10:27:28 +0000 (Tue, 10 Dec 2013)
Log Message:
-----------
Sync with online version
Modified Paths:
--------------
advance-et/trunk/nbproject/build-impl.xml
advance-et/trunk/nbproject/genfiles.properties
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/LoginServlet.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/UploadXmlServlet.java
advance-et/trunk/web/WEB-INF/web.xml
advance-et/trunk/web/css/editFile.css
advance-et/trunk/web/css/fileList.css
advance-et/trunk/web/css/general.css
advance-et/trunk/web/js/editFile.js
advance-et/trunk/web/js/fileList.js
advance-et/trunk/web/pages/editFile.jsp
advance-et/trunk/web/pages/fileList.jsp
advance-et/trunk/web/pages/viewFile.jsp
Added Paths:
-----------
advance-et/trunk/ncaabracket.js
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/DestroySessionServlet.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/ServletContextListener.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/SessionServletListener.java
advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/UserNameListManager.java
Modified: advance-et/trunk/nbproject/build-impl.xml
===================================================================
--- advance-et/trunk/nbproject/build-impl.xml 2013-11-20 12:07:21 UTC (rev 346)
+++ advance-et/trunk/nbproject/build-impl.xml 2013-12-10 10:27:28 UTC (rev 347)
@@ -407,6 +407,11 @@
</and>
</condition>
</target>
+ <target name="-init-test-properties">
+ <property name="test.binaryincludes" value="<nothing>"/>
+ <property name="test.binarytestincludes" value=""/>
+ <property name="test.binaryexcludes" value=""/>
+ </target>
<target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
<macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
<attribute default="${includes}" name="includes"/>
@@ -429,7 +434,7 @@
</sequential>
</macrodef>
</target>
- <target if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
+ <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
<macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
<attribute default="${includes}" name="includes"/>
<attribute default="${excludes}" name="excludes"/>
@@ -443,6 +448,9 @@
<fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
+ <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
+ <filename name="${test.binarytestincludes}"/>
+ </fileset>
</batchtest>
<syspropertyset>
<propertyref prefix="test-sys-prop."/>
@@ -569,7 +577,7 @@
</sequential>
</macrodef>
</target>
- <target if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
+ <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
<macrodef name="junit-debug" uri="http://www.netbeans.org/ns/web-project/2">
<attribute default="${includes}" name="includes"/>
<attribute default="${excludes}" name="excludes"/>
@@ -583,6 +591,9 @@
<fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
+ <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
+ <filename name="${test.binarytestincludes}"/>
+ </fileset>
</batchtest>
<syspropertyset>
<propertyref prefix="test-sys-prop."/>
@@ -835,11 +846,11 @@
pre NB7.2 profiling section; consider it deprecated
-->
<target depends="-profile-pre-init, init, -profile-post-init, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
- <target name="-profile-pre-init">
+ <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
<!-- Empty placeholder for easier customization. -->
<!-- You can override this target in the ../build.xml file. -->
</target>
- <target name="-profile-post-init">
+ <target if="profiler.info.jvmargs.agent" name="-profile-post-init">
<!-- Empty placeholder for easier customization. -->
<!-- You can override this target in the ../build.xml file. -->
</target>
@@ -887,7 +898,7 @@
<target if="has.persistence.xml" name="-copy-persistence-xml">
<mkdir dir="${build.web.dir}/WEB-INF/classes/META-INF"/>
<copy todir="${build.web.dir}/WEB-INF/classes/META-INF">
- <fileset dir="${persistence.xml.dir}" includes="persistence.xml"/>
+ <fileset dir="${persistence.xml.dir}" includes="persistence.xml orm.xml"/>
</copy>
</target>
<target name="-post-compile">
@@ -1227,7 +1238,7 @@
<jvmarg value="${profiler.j2ee.agentID}"/>
</nbstartprofiledserver>
</target>
- <target if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
+ <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
<fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
<nbprofiledirect>
<classpath>
Modified: advance-et/trunk/nbproject/genfiles.properties
===================================================================
--- advance-et/trunk/nbproject/genfiles.properties 2013-11-20 12:07:21 UTC (rev 346)
+++ advance-et/trunk/nbproject/genfiles.properties 2013-12-10 10:27:28 UTC (rev 347)
@@ -4,5 +4,5 @@
# 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.
nbproject/build-impl.xml.data.CRC32=363c97b5
-nbproject/build-impl.xml.script.CRC32=1c824f86
-nbproject/build-impl.xml.stylesheet.CRC32=b7883b1f@1.36.1.1
+nbproject/build-impl.xml.script.CRC32=c3a39748
+nbproject/build-impl.xml.stylesheet.CRC32=5459df51@1.43.0.1
Added: advance-et/trunk/ncaabracket.js
===================================================================
--- advance-et/trunk/ncaabracket.js (rev 0)
+++ advance-et/trunk/ncaabracket.js 2013-12-10 10:27:28 UTC (rev 347)
@@ -0,0 +1,412 @@
+var r = 320;
+
+var svg = d3.select("#chart").append("svg")
+ .attr("width", r*4)
+ .attr("height", r*3.2)
+ .style("background","#fff")
+ .append("g")
+ .attr("transform", "translate(" + r*2 + "," + (r*1.6) + ")")
+
+svg.append("text").attr("class","region")
+ .text("MIDWEST")
+ .attr("x", r*1.5)
+ .attr("y", r*1)
+ .attr("text-anchor","middle");
+
+svg.append("text").attr("class","region")
+ .text("SOUTH")
+ .attr("x", -r*1.5)
+ .attr("y", -r*1)
+ .attr("text-anchor","middle");
+
+svg.append("text").attr("class","region")
+ .text("EAST")
+ .attr("x", r*1.5)
+ .attr("y", -r*1)
+ .attr("text-anchor","middle");
+
+svg.append("text")
+ .text("WEST").attr("class","region")
+ .attr("x", -r*1.5)
+ .attr("y", r*1)
+ .attr("text-anchor","middle");
+
+function Team(name) {
+ this.name = name;
+ this.seed = 0;
+ this.region = 0;
+ this.probs = []; // prob of making it to each game
+ this.stillin = 1; // is team still in tournament?
+}
+
+function Game(num, flag) {
+ this.name = num;
+ this.region = 0;
+ this.teams = []; // possible teams playing in this game
+ this.prevGames = []; // parent games
+ this.played = flag; // has the game been played?
+}
+
+function isDefined(element, index, array) {
+ return (element != undefined);
+}
+
+function hasValue(element, index, array) {
+ if (element > 0) {
+ return 1;
+ } else {
+ return 0;
+ }
+}
+
+// recursively create the tree structure so D3 can display it correctly
+function travelTree(onegame) {
+ //document.write(onegame.name);
+ var returnArray = [];
+ var h;
+ // figure out all the child games first
+ if (onegame.prevGames.length > 0) {
+ onegame.prevGames.forEach(function (g) {
+ //document.write("-->");
+ h = new Object();
+ h.name = g.name;
+ h.children = travelTree(g);
+ h.teams = g.teams;
+ h.region = g.region;
+ h.played = g.played;
+ returnArray.push(h);
+ });
+ }
+ // in the first round, some games are not symmetric, so need to allow
+ // for specifying a team as a child
+ if (onegame.prevGames.length < 2) {
+ onegame.teams.forEach(function (t){
+ if (t.probs[onegame.name] >0) {
+ var skipThis = false;
+ if (onegame.prevGames.length == 1) {
+ onegame.prevGames[0].teams.forEach(function (t2) {
+ if (t2.name == t.name) {
+ skipThis = true;
+ }
+ });
+ }
+ if (!skipThis) {
+ h = new Object();
+ h.name = t.name;
+ h.children = [];
+ h.stillin = t.stillin;
+ h.probs = t.probs;
+ h.seed = t.seed;
+ h.region = t.region;
+ returnArray.push(h);
+ }
+ }
+ })
+ }
+ return returnArray;
+
+}
+
+
+function parseCSV(onerow, rowindex) {
+ if (rowindex == 0){
+ // first row has all the teams
+ onerow.forEach(function(oneteam, teamindex){
+ if (teamindex > 0) { // ignore entry one
+ allTeams.push(new Team(oneteam));
+ }
+ });
+ } else if (rowindex == 1) {
+ // second row is each team's seed
+ onerow.forEach(function (oneseed, teamindex) {
+ if (teamindex > 0) { // ignore entry one
+ allTeams[teamindex-1].seed = oneseed;
+ }
+ });
+ } else if (rowindex == 2) {
+ // second row is each team's regions
+ onerow.forEach(function (oneregion, teamindex) {
+ if (teamindex > 0) { // ignore entry one
+ allTeams[teamindex-1].region = oneregion;
+ }
+ });
+ } else if (rowindex == 3) {
+ // third row indicates if a team is still in the tournament
+ onerow.forEach(function (oneflag, teamindex) {
+ if (teamindex > 0) { // ignore entry one
+ allTeams[teamindex-1].stillin = oneflag;
+ }
+ });
+ } else {
+ realrowindex = rowindex-4;
+ // all other rows are games
+ onerow.forEach(function(oneprob, teamindex) {
+
+ if (teamindex == 0) { // first entry is the played flag
+ allGames.push(new Game(realrowindex, oneprob));
+ } else {
+ var thisTeam = allTeams[teamindex-1];
+ var thisGame = allGames[allGames.length-1];
+ if (oneprob > 0) {
+ thisGame.teams.push(thisTeam);
+ // find this game's ancestors
+ var lastGame = thisTeam.probs.map(hasValue).lastIndexOf(1);
+ if (lastGame > -1) {
+ if (thisGame.prevGames.length == 0) {
+ thisGame.prevGames.push(allGames[lastGame]);
+ } else {
+ var addThis = true;
+ thisGame.prevGames.forEach(function (g) {
+ if (allGames[lastGame] == g) {
+ addThis = false;
+ }
+ });
+ if (addThis) {
+ thisGame.prevGames.push(allGames[lastGame]);
+ }
+
+ }
+ }
+ }
+ thisTeam.probs[realrowindex] = oneprob;
+ }
+ });
+ }
+}
+
+function padWithSpace(num) {
+ if (num < 10) {
+ return " " + num.toString();
+ } else {
+ return num.toString();
+ }
+}
+
+// for debugging purposes
+function printTree(node) {
+ if (node.children.length > 0) {
+ document.writeln(" { name = " + node.name + ",");
+ document.write(" childen (" + node.children.length + ") = [<br> ");
+ node.children.forEach(function (c) {
+ printTree(c);
+ document.write(",");
+ });
+ document.write("] } <br>");
+ } else {
+ document.writeln("{ name = " + node.name + "}");
+ }
+
+}
+
+function teamover(t) {
+ d3.select(this).selectAll("text")
+ .transition().duration(100).attr("fill","#000");
+
+ svg.selectAll("g.futuregame").select("circle")
+ .transition().duration(100)
+ .attr("r",5) // this is in case you roll from one team to next w/o activating teamout
+ .style("fill","#ccc").style("stroke","#ccc");
+
+ t.probs.forEach(function (p, gameindex) {
+ if (p>0) {
+ if (allGames[gameindex].played==0) {
+ svg.selectAll("g.g"+gameindex).select("circle")
+ .transition().duration(100)
+ .attr("r",10)
+ .style("fill","#99c").style("stroke","#000");
+ svg.selectAll("g.g"+gameindex).append("text")
+ .text((Math.round(p*1000)/10)+"%")
+ .attr("class", "prob")
+ .attr("x", 0)
+ .attr("y", -15)
+ .attr("text-anchor", "middle")
+ .attr("transform", function(z) {return "rotate(" + (90-z.x) + ")"; })
+ .attr("fill","#11f")
+ .attr("font-size","0.9em");
+ }
+ }
+ })
+
+}
+function teamout(t,i){
+ d3.select(this).selectAll("text")
+ .transition().duration(100).attr("fill","#aaa");
+
+ svg.selectAll("g.futuregame").select("circle")
+ .transition().duration(100)
+ .attr("r",5)
+ .style("fill","#99c").style("stroke","#99c");
+
+ t.probs.forEach(function (p, gameindex) {
+ if (p>0) {
+ svg.selectAll("g.g"+gameindex).select("text.prob").remove();
+
+ }
+ });
+
+}
+
+function gameover(d, i) {
+ svg.selectAll("g.futuregame").select("circle")
+ .transition().duration(100)
+ .attr("r",5) // this is in case you roll from one team to next w/o activating teamout
+ .style("fill","#ccc").style("stroke","#ccc");
+
+ d3.select(this)
+ .transition().duration(100)
+ .attr("r",10)
+ .style("stroke", "black").style("stroke-width", "2px");
+
+ d.teams.forEach(function (t) {
+ if (t.stillin==1) {
+ var nameText = svg.selectAll("g."+t.name.toLowerCase().replace(/\W/g,"_"))
+ .selectAll("text")
+ .transition().duration(100).attr("fill", "#000");
+ svg.selectAll("g."+t.name.toLowerCase().replace(/\W/g,"_"))
+ .append("text")
+ .attr("class", "prob")
+ .text((Math.round(t.probs[d.name]*1000)/10)+"%")
+ .attr("x", function(d) { return d.x < 180 ? 10 : -10; })
+ .attr("y",10)
+ .attr("text-anchor", function(z) { return z.x < 180 ? "end" : "start"; })
+ .attr("transform", function(z) { return z.x < 180 ? null : "rotate(180)"; })
+ .attr("fill","#11f")
+ .attr("font-size","0.9em");
+ }
+ });
+}
+
+function gameout(d, i) {
+ svg.selectAll("g.futuregame").select("circle")
+ .transition().duration(100)
+ .attr("r",5)
+ .style("fill","#99c").style("stroke","#99c");
+
+ d3.select(this)
+ .transition().duration(100)
+ .attr("r",5)
+ .style("stroke", "#99c").style("stroke-width", "2px");
+
+ d.teams.forEach(function (t) {
+ if (t.stillin ==1) {
+ svg.selectAll("g."+t.name.toLowerCase().replace(/\W/g,"_"))
+ .selectAll("text")
+ .transition().duration(100).attr("fill", "#aaa");
+ svg.selectAll("g."+t.name.toLowerCase().replace(/\W/g,"_"))
+ .select("text.prob").remove();
+ }
+ });
+}
+
+
+// START MAIN JS STUFF
+//
+// these will hold the teams/games as they are being parsed from CSV
+var allTeams = [];
+var allGames = [];
+
+// read in CSV file and parse each row
+d3.text("bracket.csv", function(data) {
+
+ // save the CSV data as objects in allTeams and allGames
+ var rows = d3.csv.parseRows(data);
+ rows.forEach(parseCSV);
+
+ // generate tree structure from the data that was read in
+ var finalgame = allGames[allGames.length-1];
+ var gameTree = new Object();
+ gameTree.name = finalgame.name;
+ gameTree.children = travelTree(finalgame);
+ gameTree.teams = allTeams;
+ gameTree.played = finalgame.played;
+
+ // time to visualize!
+ var tree = d3.layout.tree()
+ .size([360, r])
+ .separation(function(a, b) {
+ if (a.region != b.region) {
+ return 1;
+ } else {
+ return (a.parent == b.parent ? 3 : 3) / a.depth;
+ }
+ });
+
+ var diagonal = d3.svg.diagonal.radial()
+ .projection(function(d) { return [d.y+5, d.x / 180 * Math.PI]; });
+
+ var nodes = tree.nodes(gameTree);
+ var links = tree.links(nodes);
+
+ var drawlink = svg.selectAll("path.link")
+ .data(links)
+ .enter()
+ .append("path")
+ .attr("class", "link")
+ .attr("d", diagonal);
+
+ var drawnode = svg.selectAll("g.node")
+ .data(nodes)
+ .enter().append("g")
+ .attr("class","node")
+ .attr("transform", function(d) { return "rotate(" + (d.x-90) + ")translate(" + d.y + ")"; })
+
+ var playedGameNodes = drawnode.filter(function (d) {
+ return ((typeof(d.name) == "number") && (d.played==1));
+ });
+
+ var futureGameNodes = drawnode.filter(function (d) {
+ return ((typeof(d.name) == "number") && (d.played==0));
+ });
+
+ var teamInNodes = drawnode.filter(function (d) {
+ return ((typeof(d.name) == "string") && (d.stillin==1));
+ });
+
+ var teamOutNodes = drawnode.filter(function (d) {
+ return ((typeof(d.name) == "string") && (d.stillin==0));
+ });
+
+ var teamNodes = drawnode.filter(function (d) {
+ return (typeof(d.name) == "string");
+ });
+
+ playedGameNodes.attr("class", function(d) {return "node playedgame g" + d.name;})
+ .append("circle").attr("r",3)
+ .style("stroke", "#ccc").style("stroke-width", "2px")
+ .style("fill", "#fff");
+
+ futureGameNodes.attr("class", function(d) {return "node futuregame g" + d.name;})
+ .append("circle").attr("r",5)
+ .style("stroke", "#99c").style("stroke-width", "2px")
+ .style("fill", "#99c")
+ .on("mouseover", gameover)
+ .on("mouseout", gameout);
+
+ teamNodes
+ .attr("class", function (d) { return "node team " + d.name.toLowerCase().replace(/\W/g,"_"); })
+ .append("text")
+ .attr("x", function(d) { return d.x < 180 ? 40 : -40; })
+ .attr("y", 10)
+ .attr("text-anchor", function(d) { return d.x < 180 ? "start" : "end"; })
+ .attr("transform", function(d) { return d.x < 180 ? null : "rotate(180)"; })
+ .text(function(d) { return d.name; });
+
+ teamNodes
+ .append("text")
+ .attr("x", function(d) { return d.x < 180 ? 25 : -25; })
+ .attr("y", 10)
+ .attr("text-anchor", "middle")
+ .attr("transform", function(d) { return d.x < 180 ? null : "rotate(180)"; })
+ .text(function(d) { return d.seed; });
+
+ teamInNodes.selectAll("text")
+ .attr("fill", "#aaa");
+
+ teamOutNodes.selectAll("text")
+ .attr("fill", "#ddd").style("text-decoration","none");
+
+ teamInNodes
+ .on("mouseover", teamover)
+ .on("mouseout", teamout);
+
+});
Property changes on: advance-et/trunk/ncaabracket.js
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/DestroySessionServlet.java
===================================================================
--- advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/DestroySessionServlet.java (rev 0)
+++ advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/DestroySessionServlet.java 2013-12-10 10:27:28 UTC (rev 347)
@@ -0,0 +1,76 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ttsnetwork.elicitationtool;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ *
+ * @author farago
+ */
+public class DestroySessionServlet extends HttpServlet {
+
+ /**
+ * Processes requests for both HTTP
+ * <code>GET</code> and
+ * <code>POST</code> methods.
+ *
+ * @param request servlet request
+ * @param response servlet response
+ * @throws ServletException if a servlet-specific error occurs
+ * @throws IOException if an I/O error occurs
+ */
+ protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ response.setContentType("text/html;charset=UTF-8");
+ request.getSession().invalidate();
+ }
+
+ // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+ /**
+ * Handles the HTTP
+ * <code>GET</code> method.
+ *
+ * @param request servlet request
+ * @param response servlet response
+ * @throws ServletException if a servlet-specific error occurs
+ * @throws IOException if an I/O error occurs
+ */
+ @Override
+ protected void doGet(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ processRequest(request, response);
+ }
+
+ /**
+ * Handles the HTTP
+ * <code>POST</code> method.
+ *
+ * @param request servlet request
+ * @param response servlet response
+ * @throws ServletException if a servlet-specific error occurs
+ * @throws IOException if an I/O error occurs
+ */
+ @Override
+ protected void doPost(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ processRequest(request, response);
+ }
+
+ /**
+ * Returns a short description of the servlet.
+ *
+ * @return a String containing servlet description
+ */
+ @Override
+ public String getServletInfo() {
+ return "Short description";
+ }// </editor-fold>
+}
Property changes on: advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/DestroySessionServlet.java
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/LoginServlet.java
===================================================================
--- advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/LoginServlet.java 2013-11-20 12:07:21 UTC (rev 346)
+++ advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/LoginServlet.java 2013-12-10 10:27:28 UTC (rev 347)
@@ -85,7 +85,14 @@
}
if (userBean != null) {
+
+ UserNameListManager userNameListManager = ((UserNameListManager) getServletContext().getAttribute("userNameListManager"));
+
+ if (!userNameListManager.userNameExists(userBean.getName())) {
+ userNameListManager.addUserName(userBean.getName());
request.getSession().setAttribute("userBean", userBean);
+ }
+
}
} catch (JDOMException ex) {
Added: advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/ServletContextListener.java
===================================================================
--- advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/ServletContextListener.java (rev 0)
+++ advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/ServletContextListener.java 2013-12-10 10:27:28 UTC (rev 347)
@@ -0,0 +1,23 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ttsnetwork.elicitationtool;
+
+import javax.servlet.ServletContextEvent;
+
+/**
+ * Web application lifecycle listener.
+ *
+ * @author farago
+ */
+public class ServletContextListener implements javax.servlet.ServletContextListener {
+
+ public void contextInitialized(ServletContextEvent sce) {
+ sce.getServletContext().setAttribute("userNameListManager", new UserNameListManager());
+ }
+
+ public void contextDestroyed(ServletContextEvent sce) {
+ sce.getServletContext().removeAttribute("userNameListManager");
+ }
+}
Property changes on: advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/ServletContextListener.java
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/SessionServletListener.java
===================================================================
--- advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/SessionServletListener.java (rev 0)
+++ advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/SessionServletListener.java 2013-12-10 10:27:28 UTC (rev 347)
@@ -0,0 +1,32 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ttsnetwork.elicitationtool;
+
+import java.util.Collection;
+import javax.servlet.http.HttpSessionEvent;
+import javax.servlet.http.HttpSessionListener;
+
+/**
+ * Web application lifecycle listener.
+ *
+ * @author farago
+ */
+public class SessionServletListener implements HttpSessionListener {
+
+ public void sessionCreated(HttpSessionEvent se) {
+
+ }
+
+ public void sessionDestroyed(HttpSessionEvent se) {
+ String userName = ((UserBean) se.getSession().getAttribute("userBean")).getName();
+ Collection<FileItem> files = FileManager.getInstance().getFiles();
+ for (FileItem fileItem : files) {
+ if(fileItem.getUser()!= null && fileItem.getUser().equals(userName)) {
+ fileItem.setUser(null);
+ }
+ }
+ ((UserNameListManager)se.getSession().getServletContext().getAttribute("userNameListManager")).removeUserName(userName);
+ }
+}
Property changes on: advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/SessionServletListener.java
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/UploadXmlServlet.java
===================================================================
--- advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/UploadXmlServlet.java 2013-11-20 12:07:21 UTC (rev 346)
+++ advance-et/trunk/src/java/com/ttsnetwork/elicitationtool/UploadXmlServlet.java 2013-12-10 10:27:28 UTC (rev 347)
@@ -84,7 +84,7 @@
validateXml(doc, validationErrorMessages);
// System.out.println("Error messages: " + validationErrorMessages);
- if (validationErrorMessages.isEmpty()) {
+// if (validationErrorMessages.isEmpty()) {
FileWriter writer = new FileWriter(xml);
new XMLOutputter(Format.getPrettyFormat()).output(doc, writer);
writer.close();
@@ -95,17 +95,17 @@
+ "id=\"success-message\">"
+ item.getName() + "</p>");
FileManager.getInstance().add(xml);
- } else {
+// } else {
+//
+// StringBuilder sb = new StringBuilder();
+// for (String s : validationErrorMessages) {
+// sb.append(s).append("\n");
+// }
+// errorMessage = sb.toString();
+//
+// }
- StringBuilder sb = new StringBuilder();
- for (String s : validationErrorMessages) {
- sb.append(s).append("\n");
- }
- ...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X