1.1 --- a/java/HrisniciSpameri/nbproject/build-impl.xml Mon Feb 23 15:44:05 2009 +0100
1.2 +++ b/java/HrisniciSpameri/nbproject/build-impl.xml Sat Feb 28 21:50:25 2009 +0100
1.3 @@ -503,13 +503,15 @@
1.4 <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
1.5 <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
1.6 <copyfiles files="${reference.SuperDAO.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.reference.SuperDAO.jar" todir="${dist.ear.dir}"/>
1.7 + <copyfiles files="${libs.cewolf.classpath}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.libs.cewolf.classpath" todir="${dist.ear.dir}"/>
1.8 <mkdir dir="${build.web.dir}/META-INF"/>
1.9 <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update">
1.10 - <attribute name="Class-Path" value="${manifest.reference.SuperDAO.jar} "/>
1.11 + <attribute name="Class-Path" value="${manifest.reference.SuperDAO.jar} ${manifest.libs.cewolf.classpath} "/>
1.12 </manifest>
1.13 </target>
1.14 <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
1.15 <copyfiles files="${reference.SuperDAO.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
1.16 + <copyfiles files="${libs.cewolf.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
1.17 </target>
1.18 <target depends="init,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" name="do-ear-dist">
1.19 <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
2.1 --- a/java/HrisniciSpameri/nbproject/genfiles.properties Mon Feb 23 15:44:05 2009 +0100
2.2 +++ b/java/HrisniciSpameri/nbproject/genfiles.properties Sat Feb 28 21:50:25 2009 +0100
2.3 @@ -3,6 +3,6 @@
2.4 build.xml.stylesheet.CRC32=c0ebde35
2.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
2.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
2.7 -nbproject/build-impl.xml.data.CRC32=c00e70e9
2.8 -nbproject/build-impl.xml.script.CRC32=81a189fc
2.9 +nbproject/build-impl.xml.data.CRC32=01ed39bb
2.10 +nbproject/build-impl.xml.script.CRC32=c430b928
2.11 nbproject/build-impl.xml.stylesheet.CRC32=174458fc
3.1 --- a/java/HrisniciSpameri/nbproject/project.properties Mon Feb 23 15:44:05 2009 +0100
3.2 +++ b/java/HrisniciSpameri/nbproject/project.properties Sat Feb 28 21:50:25 2009 +0100
3.3 @@ -24,7 +24,8 @@
3.4 j2ee.server.type=J2EE
3.5 jar.compress=false
3.6 javac.classpath=\
3.7 - ${reference.SuperDAO.jar}
3.8 + ${reference.SuperDAO.jar}:\
3.9 + ${libs.cewolf.classpath}
3.10 # Space-separated list of extra javac options
3.11 javac.compilerargs=
3.12 javac.debug=true
4.1 --- a/java/HrisniciSpameri/nbproject/project.xml Mon Feb 23 15:44:05 2009 +0100
4.2 +++ b/java/HrisniciSpameri/nbproject/project.xml Sat Feb 28 21:50:25 2009 +0100
4.3 @@ -10,6 +10,10 @@
4.4 <file>${reference.SuperDAO.jar}</file>
4.5 <path-in-war>WEB-INF/lib</path-in-war>
4.6 </library>
4.7 + <library>
4.8 + <file>${libs.cewolf.classpath}</file>
4.9 + <path-in-war>WEB-INF/lib</path-in-war>
4.10 + </library>
4.11 </web-module-libraries>
4.12 <web-module-additional-libraries/>
4.13 <source-roots>
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
5.2 +++ b/java/HrisniciSpameri/web/graf.jspx Sat Feb 28 21:50:25 2009 +0100
5.3 @@ -0,0 +1,14 @@
5.4 +<?xml version="1.0" encoding="UTF-8"?>
5.5 +<!--
5.6 + Document : souhrn
5.7 + Created on : 11.2.2009, 18:54:42
5.8 + Author : fiki
5.9 +-->
5.10 +<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
5.11 + xmlns:c="http://java.sun.com/jsp/jstl/core"
5.12 + xmlns:f="http://java.sun.com/jsp/jstl/functions"
5.13 + version="2.0">
5.14 +
5.15 + <h2>Graf</h2>
5.16 +
5.17 +</jsp:root>
6.1 --- a/java/HrisniciSpameri/web/index.jsp Mon Feb 23 15:44:05 2009 +0100
6.2 +++ b/java/HrisniciSpameri/web/index.jsp Sat Feb 28 21:50:25 2009 +0100
6.3 @@ -16,12 +16,9 @@
6.4
6.5
6.6 <c:choose>
6.7 - <c:when test="${param.s == 'ucitele'}">
6.8 - <jsp:include page="souhrn.jspx"/>
6.9 - </c:when>
6.10 - <c:when test="${param.s == 'komise'}">
6.11 - <jsp:include page="souhrn.jspx"/>
6.12 - </c:when>
6.13 + <c:when test="${param.graf == 'ano'}">
6.14 + <jsp:include page="graf.jspx"/>
6.15 + </c:when>
6.16 <c:otherwise>
6.17 <jsp:include page="souhrn.jspx"/>
6.18 </c:otherwise>