1.1 --- a/.hgignore Thu Feb 18 01:22:22 2010 +0100
1.2 +++ b/.hgignore Thu Feb 18 10:36:06 2010 +0100
1.3 @@ -1,7 +1,8 @@
1.4 java/nekurak.net-web/dist/*
1.5 java/nekurak.net-web/build/*
1.6 java/nekurak.net-web/nbproject/private
1.7 -java/nekurak.net-web/web/nekurak.net-web-src.zip
1.8 +java/nekurak.net-web/web/nekurak.net-src.zip
1.9 +java/nekurak.net-web/web/nekurak.net-src.zip.SHA-512
1.10 java/nekurak.net-web/src/conf/MANIFEST.MF
1.11 java/nekurak.net-mvn/target/*
1.12
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2 +++ b/java/licence.txt Thu Feb 18 10:36:06 2010 +0100
2.3 @@ -0,0 +1,1 @@
2.4 +../licence/agpl-3.0.txt
2.5 \ No newline at end of file
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/java/nekurak.net-ear/build.xml Thu Feb 18 10:36:06 2010 +0100
3.3 @@ -0,0 +1,62 @@
3.4 +<?xml version="1.0" encoding="UTF-8"?>
3.5 +<!-- You may freely edit this file. See commented blocks below for -->
3.6 +<!-- some examples of how to customize the build. -->
3.7 +<!-- (If you delete it and reopen the project it will be recreated.) -->
3.8 +<!-- By default, only the Clean and Build commands use this build script. -->
3.9 +<!-- Commands such as Run, Debug, and Test only use this build script if -->
3.10 +<!-- the Compile on Save feature is turned off for the project. -->
3.11 +<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
3.12 +<!-- in the project's Project Properties dialog box.-->
3.13 +<project name="nekurak.net-ear" default="default" basedir="." xmlns:ear="http://www.netbeans.org/ns/j2ee-earproject/2">
3.14 + <description>Builds, tests, and runs the project nekurak.net-ear.</description>
3.15 + <import file="nbproject/build-impl.xml"/>
3.16 + <!--
3.17 +
3.18 + There exist several targets which are by default empty and which can be
3.19 + used for execution of your tasks. These targets are usually executed
3.20 + before and after some main targets. They are:
3.21 +
3.22 + pre-init: called before initialization of project properties
3.23 + post-init: called after initialization of project properties
3.24 + pre-compile: called before javac compilation
3.25 + post-compile: called after javac compilation
3.26 + pre-dist: called before archive building
3.27 + post-dist: called after archive building
3.28 + post-clean: called after cleaning build products
3.29 + pre-run-deploy: called before deploying
3.30 + post-run-deploy: called after deploying
3.31 +
3.32 + Example of pluging an obfuscator after the compilation could look like
3.33 +
3.34 + <target name="post-compile">
3.35 + <obfuscate>
3.36 + <fileset dir="${build.classes.dir}"/>
3.37 + </obfuscate>
3.38 + </target>
3.39 +
3.40 + For list of available properties check the imported
3.41 + nbproject/build-impl.xml file.
3.42 +
3.43 +
3.44 + Other way how to customize the build is by overriding existing main targets.
3.45 + The target of interest are:
3.46 +
3.47 + do-dist: archive building
3.48 + run: execution of project
3.49 +
3.50 + Example of overriding the target for project execution could look like
3.51 +
3.52 + <target name="run" depends="<PROJNAME>-impl.jar">
3.53 + <exec dir="bin" executable="launcher.exe">
3.54 + <arg file="${dist.jar}"/>
3.55 + </exec>
3.56 + </target>
3.57 +
3.58 + Notice that overridden target depends on jar target and not only on
3.59 + compile target as regular run target does. Again, for list of available
3.60 + properties which you can use check the target you are overriding in
3.61 + nbproject/build-impl.xml file.
3.62 +
3.63 + -->
3.64 +
3.65 +</project>
4.1 --- a/java/nekurak.net-web/build.xml Thu Feb 18 01:22:22 2010 +0100
4.2 +++ b/java/nekurak.net-web/build.xml Thu Feb 18 10:36:06 2010 +0100
4.3 @@ -12,60 +12,106 @@
4.4 <import file="nbproject/build-impl.xml"/>
4.5 <!--
4.6
4.7 - There exist several targets which are by default empty and which can be
4.8 - used for execution of your tasks. These targets are usually executed
4.9 - before and after some main targets. They are:
4.10 + There exist several targets which are by default empty and which can be
4.11 + used for execution of your tasks. These targets are usually executed
4.12 + before and after some main targets. They are:
4.13
4.14 - -pre-init: called before initialization of project properties
4.15 - -post-init: called after initialization of project properties
4.16 - -pre-compile: called before javac compilation
4.17 - -post-compile: called after javac compilation
4.18 + -pre-init: called before initialization of project properties
4.19 + -post-init: called after initialization of project properties
4.20 + -pre-compile: called before javac compilation
4.21 + -post-compile: called after javac compilation
4.22 -pre-compile-single: called before javac compilation of single file
4.23 -post-compile-single: called after javac compilation of single file
4.24 -pre-compile-test: called before javac compilation of JUnit tests
4.25 -post-compile-test: called after javac compilation of JUnit tests
4.26 -pre-compile-test-single: called before javac compilation of single JUnit test
4.27 -post-compile-test-single: called after javac compilation of single JUunit test
4.28 - -pre-dist: called before archive building
4.29 - -post-dist: called after archive building
4.30 - -post-clean: called after cleaning build products
4.31 + -pre-dist: called before archive building
4.32 + -post-dist: called after archive building
4.33 + -post-clean: called after cleaning build products
4.34 -pre-run-deploy: called before deploying
4.35 -post-run-deploy: called after deploying
4.36
4.37 - Example of pluging an obfuscator after the compilation could look like
4.38 + Example of pluging an obfuscator after the compilation could look like
4.39
4.40 - <target name="-post-compile">
4.41 - <obfuscate>
4.42 - <fileset dir="${build.classes.dir}"/>
4.43 - </obfuscate>
4.44 - </target>
4.45 + <target name="-post-compile">
4.46 + <obfuscate>
4.47 + <fileset dir="${build.classes.dir}"/>
4.48 + </obfuscate>
4.49 + </target>
4.50
4.51 - For list of available properties check the imported
4.52 - nbproject/build-impl.xml file.
4.53 + For list of available properties check the imported
4.54 + nbproject/build-impl.xml file.
4.55
4.56
4.57 Other way how to customize the build is by overriding existing main targets.
4.58 - The target of interest are:
4.59 + The target of interest are:
4.60
4.61 init-macrodef-javac: defines macro for javac compilation
4.62 init-macrodef-junit: defines macro for junit execution
4.63 init-macrodef-debug: defines macro for class debugging
4.64 do-dist: archive building
4.65 - run: execution of project
4.66 - javadoc-build: javadoc generation
4.67 + run: execution of project
4.68 + javadoc-build: javadoc generation
4.69
4.70 - Example of overriding the target for project execution could look like
4.71 + Example of overriding the target for project execution could look like
4.72
4.73 - <target name="run" depends="<PROJNAME>-impl.jar">
4.74 - <exec dir="bin" executable="launcher.exe">
4.75 - <arg file="${dist.jar}"/>
4.76 - </exec>
4.77 - </target>
4.78 + <target name="run" depends="<PROJNAME>-impl.jar">
4.79 + <exec dir="bin" executable="launcher.exe">
4.80 + <arg file="${dist.jar}"/>
4.81 + </exec>
4.82 + </target>
4.83
4.84 - Notice that overridden target depends on jar target and not only on
4.85 - compile target as regular run target does. Again, for list of available
4.86 - properties which you can use check the target you are overriding in
4.87 - nbproject/build-impl.xml file.
4.88 + Notice that overridden target depends on jar target and not only on
4.89 + compile target as regular run target does. Again, for list of available
4.90 + properties which you can use check the target you are overriding in
4.91 + nbproject/build-impl.xml file.
4.92
4.93 -->
4.94 +
4.95 + <target name="-pre-dist">
4.96 + <property name="zdrojaky-archiv-soubor" value="web/nekurak.net-src.zip"/>
4.97 + <property name="zdrojaky-archiv-komentar" value="Kódování: UTF-8 | Autor: František Kučera | Web: http://frantovo.cz/ | Licence: GNU Affero GPL, verze 3"/>
4.98 + <property name="hashovani" value="SHA-512"/>
4.99 +
4.100 + <zip basedir="../../.." excludes="nekurak.net/html/**
4.101 + nekurak.net/.hg/**
4.102 + nekurak.net/.hgignore
4.103 + nekurak.net/.hgtags
4.104 + nekurak.net/java/nekurak.net-mvn/**
4.105 + nekurak.net/java/nekurak.net-ear/nbproject/private/**
4.106 + nekurak.net/java/nekurak.net-ear/dist/**
4.107 + nekurak.net/java/nekurak.net-ear/build/**
4.108 + nekurak.net/java/nekurak.net-web/nbproject/private/**
4.109 + nekurak.net/java/nekurak.net-web/dist/**
4.110 + nekurak.net/java/nekurak.net-web/build/**
4.111 + nekurak.net/java/nekurak.net-lib/nbproject/private/**
4.112 + nekurak.net/java/nekurak.net-lib/dist/**
4.113 + nekurak.net/java/nekurak.net-lib/build/**
4.114 + nekurak.net/java/nekurak.net-ejb/nbproject/private/**
4.115 + nekurak.net/java/nekurak.net-ejb/dist/**
4.116 + nekurak.net/java/nekurak.net-ejb/build/**
4.117 + nekurak.net/java/nekurak.net-web/${zdrojaky-archiv-soubor}
4.118 + nekurak.net/java/nekurak.net-web/${zdrojaky-archiv-soubor}.${hashovani}
4.119 + nekurak.net/licence/agpl-3.0.pdf
4.120 + nekurak.net/licence/agpl-3.0.tex"
4.121 + includes="nekurak.net/**"
4.122 + comment="${zdrojaky-archiv-komentar}"
4.123 + encoding="UTF-8"
4.124 + destfile="${zdrojaky-archiv-soubor}"/>
4.125 + <checksum file="${zdrojaky-archiv-soubor}" algorithm="${hashovani}" pattern="{0} {1}"/>
4.126 +
4.127 + <manifest file="src/conf/MANIFEST.MF" mode="replace">
4.128 + <attribute name="Manifest-Version" value="1.0"/>
4.129 + <section name="Frantovo.cz">
4.130 + <attribute name="Kompiloval" value="${user.name}"/>
4.131 + <attribute name="java-version" value="${java.version}"/>
4.132 + <attribute name="java-vm-version" value="${java.vm.version}"/>
4.133 + <attribute name="os-name" value="${os.name}"/>
4.134 + <attribute name="os-arch" value="${os.arch}"/>
4.135 + <attribute name="os-version" value="${os.version}"/>
4.136 + </section>
4.137 + </manifest>
4.138 + </target>
4.139 +
4.140 </project>
5.1 --- a/java/nekurak.net-web/web/index.jsp Thu Feb 18 01:22:22 2010 +0100
5.2 +++ b/java/nekurak.net-web/web/index.jsp Thu Feb 18 10:36:06 2010 +0100
5.3 @@ -8,6 +8,10 @@
5.4 doctype-root-element="html"
5.5 omit-xml-declaration="false"/>
5.6
5.7 + <fmt:setLocale value="cs"/>
5.8 + <c:if test="${param.jazyk == 'en'}">
5.9 + <fmt:setLocale value="en"/>
5.10 + </c:if>
5.11 <fmt:setBundle basename="cz.frantovo.nekurak.preklady" scope="application"/>
5.12
5.13 <html xmlns="http://www.w3.org/1999/xhtml">
5.14 @@ -19,6 +23,8 @@
5.15 <h1><fmt:message key="nazev"/></h1>
5.16 <p><fmt:message key="popis"/></p>
5.17
5.18 + <p><fmt:formatNumber value="1234567890" pattern="###,###.###"/></p>
5.19 +
5.20
5.21 <!-- jednoduchá podmínka -->
5.22 <c:if test="${param.akce == 'informace'}">