Kdy	SQL příkaz
2008-05-24 16:00:08	SELECT * FROM tabulka WHERE id = 123;
2008-05-24 15:55:10	SELECT * FROM tabulka WHERE id = 123 ORDER BY datum DESC;
2008-05-24 15:51:28	SELECT * FROM tabulka JOIN druha_tabulka USING (email) WHERE id = 8;

Výsledek

lorem ipsum, nějaký text, něco jako latina, ale jiné… @@ -103,2 +78,4 @@ + + Index: tml/licence.txt =================================================================== --- html/licence.txt (revision 5:71c6de7f0a38) +++ (revision ) @@ -1,5 +1,0 @@ -Tento HTML návrh aplikace „SQL Výuka“ není šířen pod žádnou zvláštní licencí. -Nejste tedy oprávněni ho volně použít. -Až výsledná aplikace bude svobodný software s jasně určenou licencí. - -František Kučera Index: html/styl.css =================================================================== --- html/styl.css (revision 34:8a75d9b4f88a) +++ html/styl.css (revision 0:30215344de7d) @@ -1,29 +1,17 @@ -/** Obrázky s odkazem bez rámečku */ a img { border: none; } -/** Pozadí stránky a text */ html { background: #42afdc; color:black; } - -/** Bezpatkové písmo */ body { font-family: sans-serif; - font-size: 12px; } -/** Prostor pro logo a název programu */ #zahlavi { height: 48px; - background-image: url('grafika/logo.png'); - background-repeat: no-repeat; - margin-left: 5px; -} -#zahlavi h1 { - display: none; } @@ -47,41 +35,10 @@ #vstup .vnitrekBloku { height: 150px; - text-align: right; } #vstup textarea { width: 640px; - height: 108px; + height: 110px; padding: 8px; - border: 1px solid silver; -} - -fieldset { - display: inline; - border: none; - padding: 0px; - margin: 0px; -} - -#vstup button { - height: 20px; - border: none; - margin-right: 0px; - margin-top: 5px; - padding: 0px; - cursor: pointer; - background-repeat: no-repeat; -} - -#vstup button.zobrazitHistorii { - background-image: url('grafika/historie.png'); - background-color: transparent; - background-position: center; - width: 20px; -} - -#vstup button.vykonatSQL { - background-image: url('grafika/tlacitko-sql.png'); - width: 146px; } @@ -95,13 +52,10 @@ } -/** Nadpisy bloků */ .blok h2 { - font-size: 12px; + font-size: medium; padding: 2px; - padding-top: 4px; padding-left: 32px; margin: 0px; color: gray; - height: 20px; } @@ -110,140 +64,22 @@ } -#navigace { - background-image: url('grafika/navigace-pozadi.png'); - height: 21px; - width: 300px; - position: relative; - bottom: 32px; - left: 10px; - text-align: center; +#io h2 { + background-image: url('grafika/blok-nadpis-680.png'); } -#navigace button { - height: 20px; - border: none; - margin-right: 0px; - margin-top: 5px; - padding: 0px; - cursor: pointer; - background-repeat: no-repeat; - background-color: transparent; - background-position: center; - width: 20px; - position: relative; - top: -4px; -} - -#navigace button.zpet { - background-image: url('grafika/navigace-zpet.png'); - margin-right: 32px; -} - -#navigace button.vpred { - background-image: url('grafika/navigace-vpred.png'); - margin-left: 32px; -} - -#navigace button.nasledujici { - background-image: url('grafika/navigace-nasledujici.png'); - margin-left: 42px; -} - -#navigace button.predchozi { - background-image: url('grafika/navigace-predchozi.png'); - margin-right: 42px; -} - -#navigace button.model { - background-image: url('grafika/navigace-model.png'); -} - -#navigace button.pruvodce { - background-image: url('grafika/navigace-pruvodce.png'); -} - -/** Vstupně-výstupní část */ #io { float: left; } -#io h2 { - background-image: url('grafika/blok-nadpis-680.png'); -} - -/** Blok vstupu */ #vstup { width: 680px; } -/** Blok výstupu */ #vystup { width: 680px; } -/** Blok nápovědy */ #napoveda { float: right; width: 320px; } - -/** Formátování (výstupní) tabulky */ -table { - border: 1px solid green; - border-collapse:collapse; - background-color: white; - margin: 3px; -} - -td { - border: 1px solid black; - padding: 4px; - padding-left: 8px; - padding-right: 8px; - vertical-align: top; -} - -td.cislo { - text-align: right; -} - -thead { - background: gray; - font-weight:bold; - background-image: url('grafika/tabulka-zahlavi.png'); - background-repeat: repeat-x; - height: 28px; -} - -thead td a { - color: black; - text-decoration: none; -} - -thead td { - vertical-align: middle; -} - -/** Ikonky pro zprávu k výsledku */ -#vystupniPole p { - background-repeat: no-repeat; - padding-left: 22px; -} - -#vystupniPole p.vysledekOK { - background-image: url('grafika/vysledek-ok.png'); -} - -#vystupniPole p.vysledekVarovani { - background-image: url('grafika/vysledek-varovani.png'); -} - -#vystupniPole p.vysledekChyba { - background-image: url('grafika/vysledek-chyba.png'); -} - -#vystupniPole p.vysledekTip { - background-image: url('grafika/vysledek-tip.png'); - color: gray; - font-style: italic; -} Index: tml/vysledek.html =================================================================== --- html/vysledek.html (revision 5:71c6de7f0a38) +++ (revision ) @@ -1,90 +1,0 @@ -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Sloupeček 1	Sloupeček 2	Sloupeček 3	Sloupeček 4
Hodnota 1	Hodnota 2	Hodnota 3	1234,56
Hodnota 1	Hodnota 2	Hodnota 3	1234,56
Hodnota 1	Hodnota 2	Hodnota 3	1234,56
Hodnota 1	Hodnota 2	Hodnota 3	1234,56
Hodnota 1	Hodnota 2	Hodnota 3	1234,56
Hodnota 1	Hodnota 2	Hodnota 3	1234,56
Hodnota 1	Hodnota 2	Hodnota 3	1234,56
Hodnota 1	Hodnota 2	Hodnota 3	1234,56
Hodnota 1	Hodnota 2	Hodnota 3	1234,56
Hodnota 1	Hodnota 2	Hodnota 3	1234,56
Hodnota 1	Hodnota 2	Hodnota 3	1234,56
Hodnota 1	Hodnota 2	Hodnota 3	1234,56

Ahoj. Právě jsi zmáčknul tlačítko „Vykonat SQL“ :-)

Tohle se zobrazí při varování.

A tohle, když se něco nepovede.

„Nějaký pěkný tip, citát, nebo odkaz na stránku.“

Index: tml/web/index.html =================================================================== --- html/web/index.html (revision 69:7f6193e5fef3) +++ (revision ) @@ -1,51 +1,0 @@ - - - - - - - - - SQL Výuka: tenhle jazyk tě bude bavit! - - -

SQL Výuka: tenhle jazyk tě bude bavit!

- - -

Ahoj

Nějaký text.y

- -

- xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj - - -

- - xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj - xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj xkuxj gfcjh fcj -

- - - - -

- - - - Index: tml/web/styl.css =================================================================== --- html/web/styl.css (revision 69:7f6193e5fef3) +++ (revision ) @@ -1,105 +1,0 @@ -body { - background-color:#2C2C29; - font-size: 11px; -} - -#logo { - background: url('grafika/logo-web.png') no-repeat; - width: 600px; - height: 56px; - position: absolute; - top: -8px; - left: 240px; -} - -#logo span { - display: none; -} - -#prostredniPruh { - color:#2C2C29; - margin:0 auto; - text-align:left; - width:811px; -} - -#zahlavi { - background:transparent url('grafika/zahlavi.png') no-repeat scroll 0 0; - height:113px; - padding:0; -} - -#obalObsahu { - background:#FFFFFF url('grafika/obsah.png') repeat-y scroll 0 0; - margin-left:7px; - padding:0 10px 0 15px; - width:769px; -} - -#obsah { - width:547px; -} - -#pravyPruh { - float:right; - width:209px; -} - -.pravyPruh-vnitrek { - margin-left: 15px; -} -.pravyPruh-vnitrek h3 { - background: white url('grafika/bocniPanel.png'); - display:block; - font-size:11px; - font-weight:700; - height:22px; - padding:9px 0 0 10px; - width:181px; -} - -#zapati { - background:transparent url('grafika/zapati.png') no-repeat scroll 0 0; - height:60px; -} - -#nabidka { - float:left; - left:0px; - overflow:hidden; - position:relative; - text-transform:uppercase; - top:65px; - width:548px; -} - -#nabidka li { - float:left; - list-style-image:none; - list-style-position:outside; - list-style-type:none; - margin-right:4px; -} - -#nabidka li a { - background:transparent url('grafika/nabidka.png') no-repeat scroll left top; - color:#2C2C29; - cursor:pointer; - display:block; - -x-system-font:none; - font-family:Arial,Helvetica,sans-serif; - font-size:0.88em; - font-style:normal; - font-variant:normal; - font-weight:700; - line-height:26px; - padding-left:15px; - text-decoration:none; -} - -#nabidka li a span { - background:transparent url('grafika/nabidka.png') no-repeat scroll right top; - display:block; - line-height:24px; - padding-right:15px; -} Index: ava/sql-vyuka/build.xml =================================================================== --- java/sql-vyuka/build.xml (revision 83:6569976087aa) +++ (revision ) @@ -1,93 +1,0 @@ - - - - - - - - - - - Builds, tests, and runs the project sql-vyuka. - - - - - - - - - - - - - -

- - - - - - -

- - - - Index: ava/sql-vyuka/licence.txt =================================================================== --- java/sql-vyuka/licence.txt (revision 23:6bbbd371e813) +++ (revision ) @@ -1,1 +1,0 @@ -../../licence/agpl-3.0.txt Index: ava/sql-vyuka/nbproject/ant-deploy.xml =================================================================== --- java/sql-vyuka/nbproject/ant-deploy.xml (revision 87:5fff85c7f980) +++ (revision ) @@ -1,150 +1,0 @@ - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: ava/sql-vyuka/nbproject/build-impl.xml =================================================================== --- java/sql-vyuka/nbproject/build-impl.xml (revision 87:5fff85c7f980) +++ (revision ) @@ -1,1454 +1,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set build.web.dir - Must set build.generated.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.war - - - - - - - - - -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> - - -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) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No tests executed. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -The libs.CopyLibs.classpath property is not set up. -This property must point to -org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part -of NetBeans IDE installation and is usually located at -<netbeans_installation>/java<version>/ant/extra folder. -Either open the project in the IDE and make sure CopyLibs library -exists or setup the property manually. For example like this: - ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set JVM to use for profiling in profiler.info.jvm - Must set profiler agent JVM arguments in profiler.info.jvmargs.agent - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.jsp.includes - - - - - - - - - - - - - - - - - - - - - - - - - - Must select a file in the IDE or set jsp.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable. - - - Launching ${browse.url} - - - - - - Must select one file in the IDE or set run.class - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - This target only works when run from inside the NetBeans IDE. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - Must select some files in the IDE or set test.class - Must select some method in the IDE or set test.method - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - Must select one file in the IDE or set test.class - Must select some method in the IDE or set test.method - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: ava/sql-vyuka/nbproject/genfiles.properties =================================================================== --- java/sql-vyuka/nbproject/genfiles.properties (revision 87:5fff85c7f980) +++ (revision ) @@ -1,8 +1,0 @@ -build.xml.data.CRC32=eb6453d4 -build.xml.script.CRC32=0f264e43 -build.xml.stylesheet.CRC32=c0ebde35 -# 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=3f9299bb -nbproject/build-impl.xml.script.CRC32=55a3d669 -nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.68.1.1 Index: ava/sql-vyuka/nbproject/project.properties =================================================================== --- java/sql-vyuka/nbproject/project.properties (revision 87:5fff85c7f980) +++ (revision ) @@ -1,89 +1,0 @@ -annotation.processing.enabled=true -annotation.processing.enabled.in.editor=true -annotation.processing.processors.list= -annotation.processing.run.all.processors=true -annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -build.classes.dir=${build.web.dir}/WEB-INF/classes -build.classes.excludes=**/*.java,**/*.form -build.dir=build -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -build.web.dir=${build.dir}/web -build.web.excludes=${build.classes.excludes} -client.urlPart= -compile.jsps=false -conf.dir=${source.root}/conf -debug.classpath=${build.classes.dir}:${javac.classpath} -debug.test.classpath=\ - ${run.test.classpath} -display.browser=false -dist.dir=dist -dist.ear.war=${dist.dir}/${war.ear.name} -dist.javadoc.dir=${dist.dir}/javadoc -dist.war=${dist.dir}/${war.name} -endorsed.classpath= -excludes= -includes=** -j2ee.compile.on.save=false -j2ee.copy.static.files.on.save=false -j2ee.deploy.on.save=false -j2ee.platform=1.5 -j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar -j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar -j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar -j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar -j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar -j2ee.platform.wsit.classpath= -j2ee.server.type=gfv3ee6 -jar.compress=false -javac.classpath=\ - ${reference.SuperDAO.jar} -# Space-separated list of extra javac options -javac.compilerargs= -javac.debug=true -javac.deprecation=false -javac.processorpath=\ - ${javac.classpath} -javac.source=1.5 -javac.target=1.5 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -javac.test.processorpath=${javac.test.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.preview=true -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api" -jspcompilation.classpath=${jspc.classpath}:${javac.classpath} -lib.dir=${web.docbase.dir}/WEB-INF/lib -persistence.xml.dir=${conf.dir} -platform.active=default_platform -project.SuperDAO=../../../SuperDAO/java/SuperDAO -reference.SuperDAO.jar=${project.SuperDAO}/dist/SuperDAO.jar -resource.dir=setup -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -# Space-separated list of JVM arguments used when running a class with a main method or a unit test -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value): -runmain.jvmargs= -source.encoding=UTF-8 -source.root=src -src.dir=${source.root}/java -test.src.dir=test -war.content.additional= -war.ear.name=sql-vyuka.war -war.name=sql-vyuka.war -web.docbase.dir=web -webinf.dir=web/WEB-INF Index: ava/sql-vyuka/nbproject/project.xml =================================================================== --- java/sql-vyuka/nbproject/project.xml (revision 74:48066e753dd6) +++ (revision ) @@ -1,33 +1,0 @@ - - - org.netbeans.modules.web.project - - - sql-vyuka - 1.6.5 - - - ${reference.SuperDAO.jar} - WEB-INF/lib - - - - - - - - - - - - - SuperDAO - jar - - jar - clean - jar - - - - Index: ava/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dao/HistorieDAO.java =================================================================== --- java/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dao/HistorieDAO.java (revision 26:5844d64930de) +++ (revision ) @@ -1,101 +1,0 @@ -package cz.frantovo.sql.vyuka.dao; - -import cz.frantovo.sql.vyuka.dto.Hlaska; -import cz.frantovo.sql.vyuka.dto.Hlaska.Typ; -import cz.frantovo.sql.vyuka.dto.Tabulka; -import cz.frantovo.sql.vyuka.dto.Uzivatel; -import cz.frantovo.sql.vyuka.dto.VysledekSQL; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.Timestamp; -import java.util.logging.Level; - -/** - * Ukládání a načítání uživatelské historie. - * @author fiki - */ -public class HistorieDAO extends VyukaSuperDAO { - - TipyDAO tipy = new TipyDAO(); - - private enum SQL { - - NACTI, - ULOZ - } - - /** - * @param sql uživatelský SQL příkaz k uložení - * @param uzivatel idSezení a IP adresa uživatele - * @return zda se podařilo historii uložit - */ - public boolean ulozPrikaz(String sql, Uzivatel uzivatel) { - Connection db = getSpojeni(DATABAZE.APLIKACE); - if (db == null) { - return false; - } else { - PreparedStatement ps = null; - ResultSet rs = null; - try { - ps = db.prepareStatement(getSQL(SQL.ULOZ)); - ps.setString(1, sql); - ps.setString(2, uzivatel.getIdSezeni()); - ps.setString(3, uzivatel.getIpAdresa()); - ps.executeUpdate(); - return true; - } catch (Exception e) { - log.log(Level.SEVERE, "Chyba při ukládání historie.", e); - return false; - } finally { - zavri(db, ps, rs); - } - } - } - - public VysledekSQL nactiHistorii(Uzivatel uzivatel) { - VysledekSQL v = new VysledekSQL(); - - - Tabulka t = new Tabulka(); - String[] zahlavi = {"historie.kdy", "historie.prikaz"}; - t.setZahlavi(zahlavi); - t.setZahlaviTip("historie.zahlaviTip"); - t.setLokalizovat(true); - - Connection db = getSpojeni(DATABAZE.APLIKACE); - if (db == null) { - v.getHlasky().add(new Hlaska("Došlo k chybě spojení.", Typ.Chyba)); - } else { - PreparedStatement ps = null; - ResultSet rs = null; - try { - ps = db.prepareStatement(getSQL(SQL.NACTI)); - ps.setString(1, uzivatel.getIdSezeni()); - rs = ps.executeQuery(); - - while (rs.next()) { - Timestamp datum = rs.getTimestamp("datum"); - String sql = rs.getString("sql"); - Object[] hodnoty = {datum, sql}; - t.getHodnoty().add(hodnoty); - } - - if (t.getHodnoty().size() < 1) { - v.getHlasky().add(new Hlaska("Historie SQL příkazů nenalezena.", Typ.Varovani)); - } else { - v.getTabulky().add(t); - } - - } catch (Exception e) { - log.log(Level.SEVERE, "Chyba při ukládání historie.", e); - v.getHlasky().add(new Hlaska("Došlo k chybě dotazu.", Typ.Chyba)); - } finally { - zavri(db, ps, rs); - } - } - - v.getHlasky().add(new Hlaska(tipy.getTip(), Typ.Tip, false)); - return v; - } -} Index: ava/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dao/HistorieDAO.sql.xml =================================================================== --- java/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dao/HistorieDAO.sql.xml (revision 18:e7a5763c789c) +++ (revision ) @@ -1,20 +1,0 @@ - - - - - '' - ORDER BY id DESC - LIMIT 20 - ]]> - - - - - Index: ava/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dao/PiskovisteDAO.java =================================================================== --- java/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dao/PiskovisteDAO.java (revision 78:3b4abb1ec5a3) +++ (revision ) @@ -1,162 +1,0 @@ -package cz.frantovo.sql.vyuka.dao; - -import cz.frantovo.sql.vyuka.dao.VyukaSuperDAO.DATABAZE; -import cz.frantovo.sql.vyuka.dto.Hlaska; -import cz.frantovo.sql.vyuka.dto.Hlaska.Typ; -import cz.frantovo.sql.vyuka.dto.Tabulka; -import cz.frantovo.sql.vyuka.dto.Uzivatel; -import cz.frantovo.sql.vyuka.dto.VysledekSQL; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.logging.Level; - -/** - * Pro spouštění uživatelových příkazů. - * - * @author fiki - */ -public class PiskovisteDAO extends VyukaSuperDAO { - - /** maximální doba trvání SQL dotazu – vteřiny */ - private static final int LIMIT_ČASU = 3; - /** maximální počet řádků */ - private static final int LIMIT_POČTU = 10000; - - private enum VLASTNOSTI { - - VYCHOZI_CESTA, - LIMIT_ČASU - } - TipyDAO tipy = new TipyDAO(); - HistorieDAO historie = new HistorieDAO(); - - public VysledekSQL vykonejSQL(String sql, Uzivatel uzivatel) { - VysledekSQL v = new VysledekSQL(); - if (historie.ulozPrikaz(sql, uzivatel)) { - - Connection db = getSpojeni(DATABAZE.PISKOVISTE); - if (db == null) { - v.getHlasky().add(new Hlaska("Došlo k chybě spojení.", Typ.Chyba)); - } else { - PreparedStatement ps = null; - ResultSet rs = null; - try { - /** - * Uživatelskému SQL příkazu předřadíme výchozí cestu (search_path). - * Protože uživatelé si ji mohou měnit a kvůli recyklaci databázových zdrojů - * by jeden uživatel mohl ovlivnit jiného. - */ - if (getVlastnost(VLASTNOSTI.VYCHOZI_CESTA) != null) { - sql = orizni(getVlastnost(VLASTNOSTI.VYCHOZI_CESTA)) + sql; - } - - /** - * TODO: - * použít ps.setQueryTimeout(LIMIT_ČASU); - * až ho bude podporovat JDBC ovladač, - * viz níže. - * Uživatel ale stejně může zadat: - * SET statement_timeout 0; - * do svého SQL dotazu. - */ - if (getVlastnost(VLASTNOSTI.LIMIT_ČASU) != null) { - sql = orizni(getVlastnost(VLASTNOSTI.LIMIT_ČASU)) + sql; - } - - long casPred = System.currentTimeMillis(); - ps = db.prepareStatement(sql); - /** - * Limit času bohužel není podporován JDBC ovladačem. - * Alespoň ne v postgresql-9.1-901.jdbc4.jar - * http://jdbc.postgresql.org/todo.html - * - * TODO: - * ps.setQueryTimeout(LIMIT_ČASU); - */ - ps.setMaxRows(LIMIT_POČTU); - boolean isRS = ps.execute(); - - if (isRS) { - rs = ps.getResultSet(); - v.getTabulky().add(zpracujVysledek(rs)); - } - - /** - * Ošetříme případ, kdy uživatel zadá SQL příkaz, který nevrací výsledkovou - * sadu. - * Typicky nastavení výchozího schématu: SET search_path = '…'; - * Poznámka: jeden „SET search_path TO "…"“ se obvykle předřazuje uživatelskému - * SQL (viz PiskovisteDAO.xml). - */ - while (ps.getMoreResults() || ps.getUpdateCount() > -1) { - rs = ps.getResultSet(); - if (rs == null) { - /** Jedná se o „update count“. */ - } else { - v.getTabulky().add(zpracujVysledek(rs)); - } - } - long dobaProvadeni = System.currentTimeMillis() - casPred; - - /** Varování */ - if (v.getHlasky().size() < 1 && v.getTabulky().size() < 1) { - v.getHlasky().add(new Hlaska("SQL příkaz proběhl, ale nevrátil žádná data.", Typ.Varovani)); - } - - /** Varování */ - int pocitadloTabulek = 1; - for (Tabulka t : v.getTabulky()) { - if (t.getHodnoty().size() < 1) { - v.getHlasky().add(new Hlaska("Tabulka " + pocitadloTabulek + " je prázdná.", Typ.Varovani)); - } - pocitadloTabulek++; - } - - v.getHlasky().add(new Hlaska("SQL příkaz byl proveden úspěšně, během " + dobaProvadeni + " ms.", Typ.OK)); - - } catch (SQLException e) { - log.log(Level.SEVERE, "SQL chyba při vykonávání uživatelského dotazu.", e); - v.getHlasky().add(new Hlaska("Chybné SQL: " + e.getMessage(), Typ.Chyba)); - } catch (Exception e) { - log.log(Level.SEVERE, "Chyba při vykonávání uživatelského dotazu.", e); - v.getHlasky().add(new Hlaska("Došlo k chybě dotazu.", Typ.Chyba)); - } finally { - zavri(db, ps, rs); - } - } - - /** Tip pro uživatele */ - String tip = tipy.getTip(); - if (tip != null) { - v.getHlasky().add(new Hlaska(tip, Typ.Tip, false)); - } - - } else { - v.getHlasky().add(new Hlaska("Došlo k chybě historie.", Typ.Chyba)); - } - return v; - } - - private Tabulka zpracujVysledek(ResultSet rs) throws SQLException { - Tabulka t = new Tabulka(); - - int pocetSloupecku = rs.getMetaData().getColumnCount(); - String[] zahlavi = new String[pocetSloupecku]; - t.setZahlavi(zahlavi); - for (int i = 0; i < pocetSloupecku; i++) { - zahlavi[i] = rs.getMetaData().getColumnName(i + 1); - } - - while (rs.next()) { - Object[] hodnoty = new Object[pocetSloupecku]; - for (int i = 0; i < pocetSloupecku; i++) { - hodnoty[i] = rs.getObject(i + 1); - } - t.getHodnoty().add(hodnoty); - } - - return t; - } -} Index: ava/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dao/PiskovisteDAO.xml =================================================================== --- java/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dao/PiskovisteDAO.xml (revision 78:3b4abb1ec5a3) +++ (revision ) @@ -1,24 +1,0 @@ - - - - - - - - - - - - Index: ava/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dao/PruvodceDAO.java =================================================================== --- java/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dao/PruvodceDAO.java (revision 37:e32867db5487) +++ (revision ) @@ -1,71 +1,0 @@ -package cz.frantovo.sql.vyuka.dao; - -import cz.frantovo.sql.vyuka.dto.Pruvodce; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.util.logging.Level; - -/** - * Načítá průvodce (nápovědu) z databáze. - * @author fiki - */ -public class PruvodceDAO extends VyukaSuperDAO { - - private enum SQL { - - PODLE_KODU, - PODLE_ID, - PODLE_ID_PREDCHOZI, - PODLE_ID_NASLEDUJICI - } - - public Pruvodce getPruvodce(long id) { - return getPruvodce(getSQL(SQL.PODLE_ID), id); - } - - public Pruvodce getPruvodce(String kod) { - return getPruvodce(getSQL(SQL.PODLE_KODU), kod); - } - - public Pruvodce getPruvodcePredchozi(long id) { - return getPruvodce(getSQL(SQL.PODLE_ID_PREDCHOZI), id); - } - - public Pruvodce getPruvodceNasledujici(long id) { - return getPruvodce(getSQL(SQL.PODLE_ID_NASLEDUJICI), id); - } - - private Pruvodce getPruvodce(String selekt, Object... parametry) { - Connection db = getSpojeni(DATABAZE.APLIKACE); - if (db == null) { - log.log(Level.SEVERE, "Databáze je null."); - return null; - } else { - PreparedStatement ps = null; - ResultSet rs = null; - try { - ps = db.prepareStatement(selekt); - for (int i = 0; i < parametry.length; i++) { - ps.setObject(i + 1, parametry[i]); - } - rs = ps.executeQuery(); - if (rs.next()) { - Pruvodce p = new Pruvodce(); - p.setId(rs.getLong("id")); - p.setKod(rs.getString("kod")); - p.setNadpis(rs.getString("nadpis")); - p.setObsah(rs.getString("obsah")); - return p; - } else { - return null; - } - } catch (Exception e) { - log.log(Level.SEVERE, "Chyba při hledání průvodce.", e); - return null; - } finally { - zavri(db, ps, rs); - } - } - } -} Index: ava/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dao/PruvodceDAO.sql.xml =================================================================== --- java/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dao/PruvodceDAO.sql.xml (revision 56:a26e7b7a86d9) +++ (revision ) @@ -1,36 +1,0 @@ - - - - - - - - - - - - - - ? - ORDER BY id - LIMIT 1; - ]]> - - Index: ava/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dao/TipyDAO.java =================================================================== --- java/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dao/TipyDAO.java (revision 29:4b6ab4ba1a95) +++ (revision ) @@ -1,43 +1,0 @@ -package cz.frantovo.sql.vyuka.dao; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.util.logging.Level; - -/** - * Rady, tipy, odkazy, citáty… pro zobrazování uživatelům. - * @author fiki - */ -public class TipyDAO extends VyukaSuperDAO { - - private enum SQL { - - NAHODNY_TIP - } - - /** - * @return Náhodný tip načtený z databáze - */ - public String getTip() { - Connection db = getSpojeni(DATABAZE.APLIKACE); - if (db == null) { - log.log(Level.SEVERE, "Databáze je null."); - return null; - } else { - PreparedStatement ps = null; - ResultSet rs = null; - try { - ps = db.prepareStatement(getSQL(SQL.NAHODNY_TIP)); - rs = ps.executeQuery(); - rs.next(); - return rs.getString("text"); - } catch (Exception e) { - log.log(Level.SEVERE, "Chyba při hledání náhodného tipu.", e); - return null; - } finally { - zavri(db, ps, rs); - } - } - } -} Index: ava/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dao/TipyDAO.sql.xml =================================================================== --- java/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dao/TipyDAO.sql.xml (revision 29:4b6ab4ba1a95) +++ (revision ) @@ -1,12 +1,0 @@ - - - - - - - Index: ava/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dao/VyukaSuperDAO.java =================================================================== --- java/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dao/VyukaSuperDAO.java (revision 86:a51bbc91a4cb) +++ (revision ) @@ -1,62 +1,0 @@ -package cz.frantovo.sql.vyuka.dao; - -import cz.frantovo.superDAO.SuperDAO; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.logging.Level; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.sql.DataSource; - -/** - * - * @author fiki - */ -public class VyukaSuperDAO extends SuperDAO { - - protected Context kontext = null; - - protected enum DATABAZE { - - /** Databáze aplikace – historie, nastavení. */ - APLIKACE, - /** Databáze, na které se spouštějí příkazy uživatelů. */ - PISKOVISTE - } - - public VyukaSuperDAO() { - try { - // v GlassFishi stačil InitialContext - // v Tomcatu / TomEE nešlo v InitialContextu DB spojení najít: - // javax.naming.NameNotFoundException: Name [jdbc/sqlVyuka/aplikace] is not bound in this Context. Unable to find [jdbc].) - // Po přidání lookup("java:comp/env") funguje v TomEE. - kontext = new InitialContext(); - kontext = (Context) kontext.lookup("java:comp/env"); - } catch (NamingException ex) { - log.log(Level.SEVERE, "Chyba při inicializaci kontextu", ex); - } - } - - /** - * @param databaze Která databáze (aplikace = historie a nastavení | pískoviště = příkazy uživatele) - * @return Databázové spojení - */ - protected Connection getSpojeni(DATABAZE databaze) { - if (databaze == null) { - databaze = DATABAZE.PISKOVISTE; - } - String jndi = orizni(getVlastnost(databaze, VyukaSuperDAO.class)); - DataSource zdroj = null; - try { - zdroj = (DataSource) kontext.lookup(jndi); - return zdroj.getConnection(); - } catch (NamingException ex) { - log.log(Level.SEVERE, "getSpojeni: lookup", ex); - return null; - } catch (SQLException ex) { - log.log(Level.SEVERE, "getSpojeni: sql", ex); - return null; - } - } -} Index: ava/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dao/VyukaSuperDAO.xml =================================================================== --- java/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dao/VyukaSuperDAO.xml (revision 16:9acb74ac7346) +++ (revision ) @@ -1,6 +1,0 @@ - - - - jdbc/sqlVyuka/aplikace - jdbc/sqlVyuka/piskoviste - Index: ava/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dto/Hlaska.java =================================================================== --- java/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dto/Hlaska.java (revision 25:97bb16063d9e) +++ (revision ) @@ -1,66 +1,0 @@ -package cz.frantovo.sql.vyuka.dto; - -/** - * Hláška úspěšného provedení. - * @author fiki - */ -public class Hlaska { - - public enum Typ { - - OK, - Tip, - Varovani, - Chyba - } - private String text; - private Typ typ; - private boolean escapovat = true; - - /** - * SQL hláška - * @param text text hlášky - * @param typ ovlivňuje ikonku - * @param escapovat zda máme escapovat text kvůli HTML značkám - */ - public Hlaska(String text, Typ typ, boolean escapovat) { - this.text = text; - this.typ = typ; - this.escapovat = escapovat; - } - - /** - * SQL hláška - * @param text text hlášky - * @param typ ovlivňuje ikonku - */ - public Hlaska(String text, Typ typ) { - this.text = text; - this.typ = typ; - this.escapovat = true; - } - - public String getText() { - return text; - } - - public void setText(String hodnota) { - this.text = hodnota; - } - - public Typ getTyp() { - return typ; - } - - public void setTyp(Typ typ) { - this.typ = typ; - } - - public boolean isEscapovat() { - return escapovat; - } - - public void setEscapovat(boolean escapovat) { - this.escapovat = escapovat; - } -} Index: ava/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dto/Pruvodce.java =================================================================== --- java/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dto/Pruvodce.java (revision 37:e32867db5487) +++ (revision ) @@ -1,60 +1,0 @@ -package cz.frantovo.sql.vyuka.dto; - -/** - * Jedna stránka průvodce: kapitola (lekce) - * @author fiki - */ -public class Pruvodce { - - private long id; - private String kod; - private String nadpis; - private String obsah; - private boolean lokalizovat = false; - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public String getKod() { - return kod; - } - - public void setKod(String kod) { - this.kod = kod; - } - - public String getNadpis() { - return nadpis; - } - - public void setNadpis(String nadpis) { - this.nadpis = nadpis; - } - - public String getObsah() { - return obsah; - } - - public void setObsah(String obsah) { - this.obsah = obsah; - } - - /** - * @return the lokalizovat - */ - public boolean isLokalizovat() { - return lokalizovat; - } - - /** - * @param lokalizovat the lokalizovat to set - */ - public void setLokalizovat(boolean lokalizovat) { - this.lokalizovat = lokalizovat; - } -} Index: ava/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dto/Tabulka.java =================================================================== --- java/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dto/Tabulka.java (revision 26:5844d64930de) +++ (revision ) @@ -1,53 +1,0 @@ -package cz.frantovo.sql.vyuka.dto; - -import java.util.ArrayList; -import java.util.Collection; - -/** - * Tabulka, která je výsledkem SQL dotazu. - * @author fiki - */ -public class Tabulka { - - private String[] zahlavi; - private String zahlaviTip; - private Collection hodnoty = new ArrayList(); - /** Zda se má lokalizovat záhlaví tabulky a její tip. */ - private boolean lokalizovat = false; - - public String[] getZahlavi() { - return zahlavi; - } - - public void setZahlavi(String[] zahlavi) { - this.zahlavi = zahlavi; - } - - public String getZahlaviTip() { - return zahlaviTip; - } - - public void setZahlaviTip(String zahlaviTip) { - this.zahlaviTip = zahlaviTip; - } - - public Collection getHodnoty() { - return hodnoty; - } - - /** - * Zda se má lokalizovat záhlaví tabulky a její tip. - * @return the lokalizovat - */ - public boolean isLokalizovat() { - return lokalizovat; - } - - /** - * Zda se má lokalizovat záhlaví tabulky a její tip. - * @param lokalizovat the lokalizovat to set - */ - public void setLokalizovat(boolean lokalizovat) { - this.lokalizovat = lokalizovat; - } -} Index: ava/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dto/Uzivatel.java =================================================================== --- java/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dto/Uzivatel.java (revision 24:dceaaefb1946) +++ (revision ) @@ -1,35 +1,0 @@ -package cz.frantovo.sql.vyuka.dto; - -/** - * Uživatel u webu. - * @author fiki - */ -public class Uzivatel { - - private String idSezeni; - private String ipAdresa; - - public Uzivatel(String idSezeni, String ipAdresa) { - this.idSezeni = idSezeni; - this.ipAdresa = ipAdresa; - } - - public Uzivatel() { - } - - public String getIdSezeni() { - return idSezeni; - } - - public void setIdSezeni(String idSezeni) { - this.idSezeni = idSezeni; - } - - public String getIpAdresa() { - return ipAdresa; - } - - public void setIpAdresa(String ipAdresa) { - this.ipAdresa = ipAdresa; - } -} Index: ava/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dto/VysledekSQL.java =================================================================== --- java/sql-vyuka/src/java/cz/frantovo/sql/vyuka/dto/VysledekSQL.java (revision 25:97bb16063d9e) +++ (revision ) @@ -1,23 +1,0 @@ -package cz.frantovo.sql.vyuka.dto; - -import java.util.ArrayList; -import java.util.Collection; - -/** - * Výsledek SQL dotazu. - * Obsahuje tabulky a hlášky. - * @author fiki - */ -public class VysledekSQL { - - private Collection tabulky = new ArrayList(); - private Collection hlasky = new ArrayList(); - - public Collection getTabulky() { - return tabulky; - } - - public Collection getHlasky() { - return hlasky; - } -} Index: ava/sql-vyuka/src/java/cz/frantovo/sql/vyuka/preklady.properties =================================================================== --- java/sql-vyuka/src/java/cz/frantovo/sql/vyuka/preklady.properties (revision 9:5f523042baae) +++ (revision ) @@ -1,1 +1,0 @@ -preklady_cs.properties Index: ava/sql-vyuka/src/java/cz/frantovo/sql/vyuka/preklady_cs.properties =================================================================== --- java/sql-vyuka/src/java/cz/frantovo/sql/vyuka/preklady_cs.properties (revision 65:bd516f2d7ded) +++ (revision ) @@ -1,43 +1,0 @@ -jazyk=\u010De\u0161tina - -nazev=SQL: tenhle jazyk t\u011B bude bavit! - -blok.zadavani=Zad\u00E1v\u00E1n\u00ED SQL p\u0159\u00EDkaz\u016F -blok.vysledek=V\u00FDsledek -blok.napoveda=N\u00E1pov\u011Bda - -tlacitko.historie.tip=Vyp\u00ED\u0161e historii SQL p\u0159\u00EDkaz\u016F (Ctrl+H). -tlacitko.vykonat.tip=Vykon\u00E1 zadan\u00FD SQL p\u0159\u00EDkaz (Ctrl+Enter). - -vychozi.sql=SELECT * FROM tabulka; -vychozi.napoveda=Tady bude n\u00E1pov\u011Bda - -js.nepodporovany=V\u00E1\u0161 prohl\u00ED\u017Ee\u010D nepodporuje AJAX. Po\u0159i\u010Fte si m\u00E9n\u011B zastaral\u00FD prohl\u00ED\u017Ee\u010D, nejl\u00E9pe Firefox. -js.probihaSQL=Prob\u00EDh\u00E1 zpracov\u00E1n\u00ED SQL p\u0159\u00EDkazu\u2026 -js.probihaHistorie=Na\u010D\u00EDt\u00E1 se historie\u2026 -js.klikniProNacteniPrikladu=Klikn\u011Bte pro na\u010Dten\u00ED p\u0159\u00EDkaldu. -js.klikniProNacteniHistorie=Klikn\u011Bte pro na\u010Dten\u00ED p\u0159\u00EDkazu z historie. - -licence.program=Program je vyd\u00E1n pod licenc\u00ED: -licence.agpl=GNU Affero GPL -licence.zdrojaky=Zdrojov\u00E9 k\u00F3dy ke sta\u017Een\u00ED: - -vysledek.razeniTip=Chcete set\u0159\u00EDdit v\u00FDsledek podle n\u011Bjak\u00E9ho sloupce? Pou\u017Eijte ORDER BY sloupec. -historie.kdy=Kdy -historie.prikaz=SQL p\u0159\u00EDkaz -historie.zahlaviTip=Posledn\u00ED proveden\u00E9 SQL p\u0159\u00EDkazy. - -boolean.pravda=true -boolean.nepravda=false -boolean.pravda.tip=pravda (ano) -boolean.nepravda.tip=nepravda (ne) - -navigace.predchozi=P\u0159edchoz\u00ED str\u00E1nka (kapitola) -navigace.zpet=Zp\u011Bt v historii -navigace.pruvodce=Pr\u016Fvodce SQL -navigace.model=Model datab\u00E1ze -navigace.vpred=Vp\u0159ed v historii -navigace.nasledujici=N\u00E1sleduj\u00EDc\u00ED str\u00E1nka (kapitola) - -pruvodce.chyba.nadpis=Nenalezeno -pruvodce.chyba.obsah=

Takov\u00E1 kapitola tu nen\u00ED.

Index: ava/sql-vyuka/src/java/cz/frantovo/sql/vyuka/web/Ajax.java =================================================================== --- java/sql-vyuka/src/java/cz/frantovo/sql/vyuka/web/Ajax.java (revision 77:fdeb54809e23) +++ (revision ) @@ -1,129 +1,0 @@ -package cz.frantovo.sql.vyuka.web; - -import cz.frantovo.sql.vyuka.dao.HistorieDAO; -import cz.frantovo.sql.vyuka.dao.PiskovisteDAO; -import cz.frantovo.sql.vyuka.dao.PruvodceDAO; -import cz.frantovo.sql.vyuka.dto.Pruvodce; -import cz.frantovo.sql.vyuka.dto.Uzivatel; -import cz.frantovo.sql.vyuka.dto.VysledekSQL; - -/** - * Webová beana, která poskytuje data Ajaxovému JSPčku. - * - * @author fiki - */ -public class Ajax { - - private final Uzivatel uzivatel = new Uzivatel(); - private String sqlPrikaz; - private long idPruvodce; - private String kodPruvodce; - - /** - * Nastaví informace o klientovi (uživateli). - * - * @param ipAdresa IP adresa, ze které přišel HTTP požadavek - * @param ipPresmerovano HTTP hlavička x-forwarded-for (přidává proxy). - * @param idSezeni javovská HTTP relace - */ - public void setKlient(String ipAdresa, String ipPresmerovano, String idSezeni) { - if (("127.0.0.1".equals(ipAdresa) || "10.0.0.31".equals(ipAdresa)) && ipPresmerovano != null) { - uzivatel.setIpAdresa(ipPresmerovano); - } else { - uzivatel.setIpAdresa(ipAdresa); - } - uzivatel.setIdSezeni(idSezeni); - } - - public void setSqlPrikaz(String sqlPrikaz) { - this.sqlPrikaz = sqlPrikaz; - } - - public void setIdPruvodce(long idPruvodce) { - this.idPruvodce = idPruvodce; - } - - public void setKodPruvodce(String kodPruvodce) { - this.kodPruvodce = kodPruvodce; - } - - /** - * @return Historie SQL příkazů daného uživatele. - */ - public VysledekSQL getHistorie() { - HistorieDAO h = new HistorieDAO(); - return h.nactiHistorii(uzivatel); - } - - /** - * Vykoná zadaný SQL příkaz v databázi. - * - * @return Výsledek dotazu – tabulka, hláška nebo chyba. - */ - public VysledekSQL getSQLVysledek() { - PiskovisteDAO p = new PiskovisteDAO(); - return p.vykonejSQL(sqlPrikaz, uzivatel); - } - - /** - * Načte stránku průvodce – podle ID. - * - * @return průvodce nebo chybová hláška. - */ - public Pruvodce getPruvodcePodleId() { - PruvodceDAO dao = new PruvodceDAO(); - Pruvodce p = dao.getPruvodce(idPruvodce); - return osetriChybuPruvodce(p); - } - - /** - * Načte stránku průvodce – podle kódu. - * - * @param kod kód průvodce, kterého hledáme. - * @return průvodce nebo chybová hláška. - */ - public Pruvodce getPruvodcePodleKodu() { - PruvodceDAO dao = new PruvodceDAO(); - Pruvodce p = dao.getPruvodce(kodPruvodce); - return osetriChybuPruvodce(p); - } - - /** - * Načte stránku průvodce. - * idPruvodce = id, ke kterému hledáme předchozí stránku (záznam před). - * - * @return průvodce nebo chybová hláška. - */ - public Pruvodce getPruvodcePredchozi() { - PruvodceDAO dao = new PruvodceDAO(); - Pruvodce p = dao.getPruvodcePredchozi(idPruvodce); - return osetriChybuPruvodce(p); - } - - /** - * Načte stránku průvodce. - * idPruvodce = id, ke kterému hledáme následující stránku (záznam po). - * - * @return průvodce nebo chybová hláška. - */ - public Pruvodce getPruvodceNasledujici() { - PruvodceDAO dao = new PruvodceDAO(); - Pruvodce p = dao.getPruvodceNasledujici(idPruvodce); - return osetriChybuPruvodce(p); - } - - /** - * @param p Stránka průvodce načtená z databáze. - * @return zadaná stránka, nebo chybová hláška, pokud bylo načteno „null“ - */ - private static Pruvodce osetriChybuPruvodce(Pruvodce p) { - if (p == null) { - p = new Pruvodce(); - p.setKod("chyba"); - p.setNadpis("pruvodce.chyba.nadpis"); - p.setObsah("pruvodce.chyba.obsah"); - p.setLokalizovat(true); - } - return p; - } -} Index: ava/sql-vyuka/web/WEB-INF/casti/aplikace.jspx =================================================================== --- java/sql-vyuka/web/WEB-INF/casti/aplikace.jspx (revision 79:aa8c8f51b0cc) +++ (revision ) @@ -1,114 +1,0 @@ - - - - - - -

- -

- - - - Index: ava/sql-vyuka/web/WEB-INF/chyby/404.jsp =================================================================== --- java/sql-vyuka/web/WEB-INF/chyby/404.jsp (revision 74:48066e753dd6) +++ (revision ) @@ -1,20 +1,0 @@ - - - - - - - - 404 Stránka nenalezena - - -

404 Stránka nenalezena

Takovou stránku tu bohužel nemáme.

- - - - Index: ava/sql-vyuka/web/WEB-INF/chyby/500.jsp =================================================================== --- java/sql-vyuka/web/WEB-INF/chyby/500.jsp (revision 74:48066e753dd6) +++ (revision ) @@ -1,20 +1,0 @@ - - - - - - - - 500 Interní chyba serveru - - -

500 Interní chyba serveru

Něco se nám nepovedlo.

- - - - Index: ava/sql-vyuka/web/WEB-INF/glassfish-web.xml =================================================================== --- java/sql-vyuka/web/WEB-INF/glassfish-web.xml (revision 79:aa8c8f51b0cc) +++ (revision ) @@ -1,10 +1,0 @@ - - - - - - - Keep a copy of the generated servlet class' java code. - - - Index: ava/sql-vyuka/web/WEB-INF/sun-web.xml =================================================================== --- java/sql-vyuka/web/WEB-INF/sun-web.xml (revision 8:4795d9bf6827) +++ (revision ) @@ -1,11 +1,0 @@ - - - - /sql-vyuka - - - - Keep a copy of the generated servlet class' java code. - - - Index: ava/sql-vyuka/web/WEB-INF/web.xml =================================================================== --- java/sql-vyuka/web/WEB-INF/web.xml (revision 86:a51bbc91a4cb) +++ (revision ) @@ -1,31 +1,0 @@ - - - - - 60 - - - - index.jsp - - - 404 - /WEB-INF/chyby/404.jsp - - - 500 - /WEB-INF/chyby/500.jsp - - - DB spojení: aplikace - jdbc/sqlVyuka/aplikace - javax.sql.DataSource - Container - - - DB spojení: pískoviště - jdbc/sqlVyuka/piskoviste - javax.sql.DataSource - Container - - Index: ava/sql-vyuka/web/ajax.jspx =================================================================== --- java/sql-vyuka/web/ajax.jspx (revision 73:7252f80b39de) +++ (revision ) @@ -1,172 +1,0 @@ - - - - - - - - request.setCharacterEncoding("UTF-8"); - ajax.setKlient(request.getRemoteAddr(), request.getHeader("x-forwarded-for"), request.getRequestedSessionId()); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - -
- - -	- -	- -	- - - - - - - - - - -	- -

- - - - - - - - -

- -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - -

- - - - - - - - - Index: ava/sql-vyuka/web/hlavni.js =================================================================== --- java/sql-vyuka/web/hlavni.js (revision 84:ee75bd007626) +++ (revision ) @@ -1,281 +1,0 @@ -/** ID html prvků */ -var vstupniPole = 'vstupniPole'; -var vystupniPole = 'vystupniPole'; -var napovedniPole = 'napovedniPole'; -var stavovePole = 'stavovePole'; - - -/** - * Aby to fungovalo i v MSIE 6. - * @return AJAXový objekt. - */ -function getXmlHttpRequestObject() { - if (window.XMLHttpRequest) { - return new XMLHttpRequest(); - } else if(window.ActiveXObject) { - return new ActiveXObject("Microsoft.XMLHTTP"); - } else { - alert(document.getElementById('lokalizace').nepodporovany.value); - return null; - } -} - - -/** Náš AJAXový objekt. */ -var ajax = getXmlHttpRequestObject(); - - -/** - * Vrací vstup od uživatele. - * @return SQL příkaz zadaný uživatelem. - **/ -function getSQL() { - return document.getElementById('aplikace').vstupniPole.value; -} - - -/** - * Zobrazí text na požadovaném místě. - * @param text text k zobrazení. V případě formulářů prostý text, v ostatních případech HTML text. - * @param kde id prvku, do kterého se má text vypsat. - **/ -function zobraz(text, kde) { - if (kde == vstupniPole) { - document.getElementById('aplikace').vstupniPole.value = vratEntity(text); - } else if (kde == stavovePole) { - document.getElementById('aplikace').stavovePole.value = vratEntity(text); - } else { - document.getElementById(kde).innerHTML = text + '

'; - } -} - - -/** Jednoduchá AJAXová funkce, načte obsah souboru a zobrazí ho ve výstupním okně. */ -function ajaxVykonatSQL() { - if (ajax.readyState == 4 || ajax.readyState == 0) { - zobraz(document.getElementById('lokalizace').probihaSQL.value, stavovePole); - ajax.open("POST", 'ajax.jspx?akce=vykonat&sql=' + encodeURIComponent(getSQL()), true); - ajax.onreadystatechange = function() { - if (ajax.readyState == 4) { - zobraz(ajax.responseText, vystupniPole); - zobraz('', stavovePole); - } - }; - ajax.send(null); - } - ulozURL(); -} - - -/** Jednoduchá AJAXová funkce, načte obsah souboru a zobrazí ho ve výstupním okně. */ -function ajaxZobrazitHistorii() { - if (ajax.readyState == 4 || ajax.readyState == 0) { - zobraz(document.getElementById('lokalizace').probihaHistorie.value, stavovePole); - ajax.open("POST", 'ajax.jspx?akce=historie', true); - ajax.onreadystatechange = function() { - if (ajax.readyState == 4) { - zobraz(ajax.responseText, vystupniPole); - zobraz('', stavovePole); - aktivujHistorii(); - } - }; - ajax.send(null); - } -} - -var pruvodceAktualniId = 0; -var urlOdkaz = new Array(); -urlOdkaz['pruvodce'] = null; - -function ajaxPruvodcePredchozi() { - ajaxPruvodceNaviguj('predchozi', pruvodceAktualniId, null); -} - -function ajaxPruvodceZpet() { - try { - history.back(); - //window.back(); - nactiURL(); - } catch (e) { - alert(e); - // není historie - } -} - -function ajaxPruvodceVpred() { - try { - history.forward(); - //window.forward(); - nactiURL(); - } catch (e) { - alert(e); - // není historie - } -} - -function ajaxPruvodceNasledujici() { - ajaxPruvodceNaviguj('nasledujici', pruvodceAktualniId, null); -} - -function ajaxPruvodceKod(kod) { - ajaxPruvodceNaviguj('podleKodu', 0, kod); -} - -function ajaxPruvodceId(id) { - ajaxPruvodceNaviguj('podleId', id, null); - -} - -function ajaxPruvodceNaviguj(akcePruvodce, id, kod) { - if (ajax.readyState == 4 || ajax.readyState == 0) { - ajax.open("POST", 'ajax.jspx?akce=napoveda&pruvodce=' + encodeURIComponent(akcePruvodce) + '&idPruvodce=' + encodeURIComponent(id) + '&kodPruvodce=' + encodeURIComponent(kod), true); - ajax.onreadystatechange = function() { - if (ajax.readyState == 4) { - zobraz(ajax.responseText, napovedniPole); - /** Uložíme si do paměti ID aktuální stránky */ - if (document.getElementById('pruvodceData')) { - pruvodceAktualniId = document.getElementById('pruvodceData').id.value; - } else { - pruvodceAktualniId = 0; - } - /** Změníme URL v prohlížeči */ - urlOdkaz['pruvodce'] = 'pruvodce=' + encodeURIComponent(pruvodceAktualniId); - ulozURL(); - sestavStromy(); - aktivujPruvodce(); - } - }; - ajax.send(null); - } -} - -/** - * Parametry si ukládáme za # do URL (window.location.hash) - * Můžeme měnit URL, aniž by prohlížeč obnovoval stránku. - * Uživatel si může URL zkopírovat a obnovit si příště stav aplikace. - * @param parametr jméno parametru, který hledáme - * @return hodnota parametr - */ -function getParametr(parametr) { - parametr = parametr.replace(/[\[]/,"\\\[").replace(/[\]]/,"\\\]"); - //var regexS = "[\\?&]"+parametr+"=([^&#]*)"; - var regexS = "[\\#&]"+parametr+"=([^&]*)"; - var regex = new RegExp( regexS ); - var results = regex.exec(window.location.hash); - if ( results == null ) { - return ""; - } else { - return decodeURIComponent(results[1]); - } -} - -/** - * Uloží parametry (jako je SQL příkaz a stránka průvodce) do URL (za #), - * aby si uživatel mohl URL zkopírovat a příště si obnovit stav aplikace. - */ -function ulozURL() { - if (urlOdkaz['pruvodce']) { - window.location.hash = urlOdkaz['pruvodce'] + '&sql=' + encodeURIComponent(getSQL()); - } else { - window.location.hash = 'sql=' + encodeURIComponent(getSQL()); - } -} -/** - * Načte uložený stav aplikace z URL (SQL příkaz, průvodce). - */ -function nactiURL() { - /** Načteme uživatelův SQL příkaz z URL do vstupního pole */ - if (getParametr('sql')) { - zobraz(getParametr('sql'), vstupniPole); - } - - /** Načteme pozici v nápovědě */ - if (getParametr('pruvodce')) { - ajaxPruvodceId(getParametr('pruvodce')); - } else { - ajaxPruvodceKod('vitejte'); - } -} - -window.onload = function() { - nactiURL(); - document.getElementById("zahlavi").addEventListener('click', function () { - ajaxPruvodceKod('vitejte'); - }, false); -} - -/** - * Přidá

 elementům v průvodci akci onclick,
- * která se postará o načtení obsahu daného elementu do vstupního pole,
- * aby uživatel tento kód nemusel opisovat.
- *
- * Zpracuje odkazy na průvodce:
- * převede href="@klíč" na správný javascriptový odkaz.
- */
-function aktivujPruvodce() {
-	/** Ukázky SQL kódu */
-	elementy = document.getElementsByTagName("pre");
-	for (var i = 0; i < elementy.length; i++) {
-		if (elementy[i].parentNode.id == napovedniPole) {
-			elementy[i].title = document.getElementById('lokalizace').klikniProNacteniPrikladu.value;
-			elementy[i].onclick = function() {
-				zobraz(this.innerHTML, 'vstupniPole');
-				return true;
-			};
-		}
-	}
-
-	/** Aktivace interních odkazů na průvodce */
-	elementy = document.getElementsByTagName("a");
-	for (var j = 0; j < elementy.length; j++) {
-		var odkaz = elementy[j].getAttribute("href");
-		if (odkaz.substring(0, 1) == '@') {
-			elementy[j].href = "javascript:ajaxPruvodceKod('" + odkaz.substring(1, odkaz.length) + "');";
-		}
-	}
-}
-
-/**
- * Přidá  elementům v historii akci onclick,
- * která se postará o načtení obsahu daného elementu do vstupního pole,
- * aby uživatel tento kód nemusel opisovat.
- */
-function aktivujHistorii() {
-	radky = document.getElementsByTagName("tr");
-	for (var i = 1; i < radky.length; i++) {
-		if (radky[i].parentNode.parentNode.parentNode.id == vystupniPole) {
-			radky[i].childNodes[1].title = document.getElementById('lokalizace').klikniProNacteniHistorie.value;
-			radky[i].childNodes[1].style.cursor = 'pointer';
-			radky[i].childNodes[1].onclick = function() {
-				zobraz(this.innerHTML, 'vstupniPole');
-				return true;
-			};
-		}
-	}
-}
-
-/**
- * Převede HTML entity zpět na znaky,
- * aby se správně zobrazily ve vstupním nebo stavovém poli.
- */
-function vratEntity (text) {
-	var vysledek = text;
-	vysledek = vysledek.replace(new RegExp('<', 'g'), '<');
-	vysledek = vysledek.replace(new RegExp('>', 'g'), '>');
-	vysledek = vysledek.replace(new RegExp('&', 'g'), '&');
-	vysledek = vysledek.replace(new RegExp(' ', 'g'), ' ');
-	vysledek = vysledek.replace(new RegExp(' ', 'g'), ' ');
-	return vysledek;
-}
-
-/**
- * Načte dynamicky soubor se skriptem.
- * url = název souboru.js
- */
-function nactiJavaScript (url) {
-	var element = document.createElement("script");
-	element.src = url;
-	element.type = "text/javascript";
-	document.getElementsByTagName("head")[0].appendChild(element);
-}
-
Index: ava/sql-vyuka/web/index.jsp
===================================================================
--- java/sql-vyuka/web/index.jsp	(revision 79:aa8c8f51b0cc)
+++ 	(revision )
@@ -1,26 +1,0 @@
-
-<%@page contentType="text/html" pageEncoding="UTF-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-
-
-
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<fmt:message key="nazev"/>
-    
-    
-
-	
-
-    
-
Index: ava/sql-vyuka/web/klavesoveZkratky.js
===================================================================
--- java/sql-vyuka/web/klavesoveZkratky.js	(revision 80:d900e5a112cc)
+++ 	(revision )
@@ -1,38 +1,0 @@
-/** Klávesové zkratky pro celou stránku */
-
-var isCtrl = false;
-
-document.onkeyup = function(e) {
-	if(e.which == 17) {
-		isCtrl = false;
-	}
-}
-
-document.onkeydown = function(e) {
-	if(e.which == 17) {
-		isCtrl = true;
-	}
-
-	if (isCtrl) {
-		if (e.which == 13) {
-			/** ctrl+enter → vykonáme SQL */
-			ajaxVykonatSQL();
-			return false;
-		} else if (e.which == 72) {
-			/** ctrl+h → uobrazíme historii */
-			ajaxZobrazitHistorii();
-			return false;
-		} else if (e.which == 39) {
-			/** doprava → následující kapitola */
-			ajaxPruvodceNasledujici();
-			return false;
-		} else if (e.which == 37) {
-			/** doleva → předchozí kapitola */
-			ajaxPruvodcePredchozi();
-			return false;
-		}
-		return true;
-	} else {
-		return true;
-	}
-}
Index: ava/sql-vyuka/web/licence.txt
===================================================================
--- java/sql-vyuka/web/licence.txt	(revision 23:6bbbd371e813)
+++ 	(revision )
@@ -1,1 +1,0 @@
-../../../licence/agpl-3.0.txt
Index: ava/sql-vyuka/web/strom.css
===================================================================
--- java/sql-vyuka/web/strom.css	(revision 68:261fa1211b78)
+++ 	(revision )
@@ -1,57 +1,0 @@
-ul.strom {
-    display: none;
-}
-
-ul.strom  li {
-    list-style: none;
-    margin: 3px;
-}
-
-ul.strom, ul.strom ul , ul.strom li {
-    margin-left: 10px;
-    padding: 0px;
-}
-
-ul.strom li .bullet {
-    padding-left: 16px;
-}
-
-ul.strom li.liOpen .bullet {
-    cursor: pointer;
-    background: url('grafika/strom-minus.gif') center left no-repeat;
-}
-
-ul.strom li.liClosed .bullet {
-    cursor: pointer;
-    background: url('grafika/strom-plus.gif') center left no-repeat;
-}
-
-ul.strom li.liBullet .bullet {
-    cursor: default;
-    background: url('grafika/strom-konec.png') center left no-repeat;
-}
-
-ul.strom li.liOpen ul {
-    display: block;
-}
-
-ul.strom li.liClosed ul {
-    display: none;
-}
-
-ul.strom .schema {
-    padding-left: 22px;
-    background: url('grafika/strom-schema.png') center left no-repeat;
-}
-
-ul.strom .tabulka {
-    padding-left: 22px;
-    background: url('grafika/strom-tabulka.png') center left no-repeat;
-    cursor: pointer;
-}
-
-ul.strom .pohled {
-    padding-left: 22px;
-    background: url('grafika/strom-pohled.png') center left no-repeat;
-    cursor: pointer;
-}
Index: ava/sql-vyuka/web/strom.js
===================================================================
--- java/sql-vyuka/web/strom.js	(revision 80:d900e5a112cc)
+++ 	(revision )
@@ -1,146 +1,0 @@
-/** Strom je načítaný AJAXem až po načtení stránky, takže je potřeba funkci zavolat ručně */
-//pridejUdalost(window,"load",sestavStromy);
-
-function pridejUdalost(o, e, f) {
-	if (o.addEventListener) {
-		o.addEventListener(e,f,true);
-		return true;
-	} else if (o.attachEvent) {
-		return o.attachEvent("on" + e, f);
-	} else {
-		return false;
-	}
-}
-
-function nastavKonstantu(name, val) {
-	if (typeof(window[name]) == "undefined" || window[name] == null) {
-		window[name] = val;
-	}
-}
-
-function rozbalStrom(treeId) {
-	var ul = document.getElementById(treeId);
-	if (ul == null) {
-		return false;
-	}
-	rozbalSbalSeznam(ul, nodeOpenClass);
-}
-
-function sbalStrom(treeId) {
-	var ul = document.getElementById(treeId);
-	if (ul == null) {
-		return false;
-	}
-	rozbalSbalSeznam(ul, nodeClosedClass);
-}
-
-function rozbalAzNaPolozku(treeId, itemId) {
-	var ul = document.getElementById(treeId);
-	if (ul == null) {
-		return false;
-	}
-	var ret = rozbalSbalSeznam(ul, nodeOpenClass, itemId);
-	if (ret) {
-		var o = document.getElementById(itemId);
-		if (o.scrollIntoView) {
-			o.scrollIntoView(false);
-		}
-	}
-}
-
-function rozbalSbalSeznam(ul, cName, itemId) {
-	if(!ul.childNodes || ul.childNodes.length==0) {
-		return false;
-	}
-	for (var itemi = 0; itemi < ul.childNodes.length; itemi++) {
-		var item = ul.childNodes[itemi];
-
-		if (itemId != null && item.id == itemId) {
-			return true;
-		}
-
-		if (item.nodeName == "LI") {
-			var subLists = false;
-			for (var sitemi = 0; sitemi
-
-
-	
-	/
-	
-		/webapps/sql-vyuka.war
-	
-	
-		jdbc/sqlVyuka/aplikace
-		
-			
-				sqlvyukaaplikace
-				
-				sqlvyukaaplikace
-				localhost
-				5432
-			
-		
-	
-	
-	
-		jdbc/sqlVyuka/piskoviste
-		
-			
-				sqlvyukapiskoviste
-				
-				piskoviste
-				localhost
-				5432
-			
-		
-	
-	
-
-
Index: icence/agpl-3.0.tex
===================================================================
--- licence/agpl-3.0.tex	(revision 23:6bbbd371e813)
+++ 	(revision )
@@ -1,705 +1,0 @@
-\documentclass[11pt]{article}
-
-\title{GNU AFFERO GENERAL PUBLIC LICENSE}
-\date{Version 3, 19 November 2007}
-
-\begin{document}
-\maketitle
-
-\begin{center}
-{\parindent 0in
-
-Copyright \copyright\  2007 Free Software Foundation, Inc. \texttt{http://fsf.org/}
-
-\bigskip
-Everyone is permitted to copy and distribute verbatim copies of this
-
-license document, but changing it is not allowed.}
-
-\end{center}
-
-\renewcommand{\abstractname}{Preamble}
-\begin{abstract}
-The GNU Affero General Public License is a free, copyleft license
-for software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-The licenses for most software and other practical works are
-designed to take away your freedom to share and change the works.  By
-contrast, our General Public Licenses are intended to guarantee your
-freedom to share and change all versions of a program--to make sure it
-remains free software for all its users.
-
-When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-The precise terms and conditions for copying, distribution and
-modification follow.
-\end{abstract}
-
-\begin{center}
-{\Large \sc Terms and Conditions}
-\end{center}
-
-
-\begin{enumerate}
-
-\addtocounter{enumi}{-1}
-
-\item Definitions.
-
-``This License'' refers to version 3 of the GNU Affero General Public License.
-
-``Copyright'' also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-``The Program'' refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as ``you''.  ``Licensees'' and
-``recipients'' may be individuals or organizations.
-
-To ``modify'' a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a ``modified version'' of the
-earlier work or a work ``based on'' the earlier work.
-
-A ``covered work'' means either the unmodified Program or a work based
-on the Program.
-
-To ``propagate'' a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-To ``convey'' a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-An interactive user interface displays ``Appropriate Legal Notices''
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-\item Source Code.
-
-The ``source code'' for a work means the preferred form of the work
-for making modifications to it.  ``Object code'' means any non-source
-form of a work.
-
-A ``Standard Interface'' means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-The ``System Libraries'' of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-``Major Component'', in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-The ``Corresponding Source'' for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-The Corresponding Source for a work in source code form is that
-same work.
-
-\item Basic Permissions.
-
-All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-\item Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-\item Conveying Verbatim Copies.
-
-You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-\item Conveying Modified Source Versions.
-
-You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-  \begin{enumerate}
-  \item The work must carry prominent notices stating that you modified
-  it, and giving a relevant date.
-
-  \item The work must carry prominent notices stating that it is
-  released under this License and any conditions added under section
-  7.  This requirement modifies the requirement in section 4 to
-  ``keep intact all notices''.
-
-  \item You must license the entire work, as a whole, under this
-  License to anyone who comes into possession of a copy.  This
-  License will therefore apply, along with any applicable section 7
-  additional terms, to the whole of the work, and all its parts,
-  regardless of how they are packaged.  This License gives no
-  permission to license the work in any other way, but it does not
-  invalidate such permission if you have separately received it.
-
-  \item If the work has interactive user interfaces, each must display
-  Appropriate Legal Notices; however, if the Program has interactive
-  interfaces that do not display Appropriate Legal Notices, your
-  work need not make them do so.
-\end{enumerate}
-A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-``aggregate'' if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-\item Conveying Non-Source Forms.
-
-You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-  \begin{enumerate}
-  \item Convey the object code in, or embodied in, a physical product
-  (including a physical distribution medium), accompanied by the
-  Corresponding Source fixed on a durable physical medium
-  customarily used for software interchange.
-
-  \item Convey the object code in, or embodied in, a physical product
-  (including a physical distribution medium), accompanied by a
-  written offer, valid for at least three years and valid for as
-  long as you offer spare parts or customer support for that product
-  model, to give anyone who possesses the object code either (1) a
-  copy of the Corresponding Source for all the software in the
-  product that is covered by this License, on a durable physical
-  medium customarily used for software interchange, for a price no
-  more than your reasonable cost of physically performing this
-  conveying of source, or (2) access to copy the
-  Corresponding Source from a network server at no charge.
-
-  \item Convey individual copies of the object code with a copy of the
-  written offer to provide the Corresponding Source.  This
-  alternative is allowed only occasionally and noncommercially, and
-  only if you received the object code with such an offer, in accord
-  with subsection 6b.
-
-  \item Convey the object code by offering access from a designated
-  place (gratis or for a charge), and offer equivalent access to the
-  Corresponding Source in the same way through the same place at no
-  further charge.  You need not require recipients to copy the
-  Corresponding Source along with the object code.  If the place to
-  copy the object code is a network server, the Corresponding Source
-  may be on a different server (operated by you or a third party)
-  that supports equivalent copying facilities, provided you maintain
-  clear directions next to the object code saying where to find the
-  Corresponding Source.  Regardless of what server hosts the
-  Corresponding Source, you remain obligated to ensure that it is
-  available for as long as needed to satisfy these requirements.
-
-  \item Convey the object code using peer-to-peer transmission, provided
-  you inform other peers where the object code and Corresponding
-  Source of the work are being offered to the general public at no
-  charge under subsection 6d.
-  \end{enumerate}
-
-A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-A ``User Product'' is either (1) a ``consumer product'', which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, ``normally used'' refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-``Installation Information'' for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-\item Additional Terms.
-
-``Additional permissions'' are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-  \begin{enumerate}
-  \item Disclaiming warranty or limiting liability differently from the
-  terms of sections 15 and 16 of this License; or
-
-  \item Requiring preservation of specified reasonable legal notices or
-  author attributions in that material or in the Appropriate Legal
-  Notices displayed by works containing it; or
-
-  \item Prohibiting misrepresentation of the origin of that material, or
-  requiring that modified versions of such material be marked in
-  reasonable ways as different from the original version; or
-
-  \item Limiting the use for publicity purposes of names of licensors or
-  authors of the material; or
-
-  \item Declining to grant rights under trademark law for use of some
-  trade names, trademarks, or service marks; or
-
-  \item Requiring indemnification of licensors and authors of that
-  material by anyone who conveys the material (or modified versions of
-  it) with contractual assumptions of liability to the recipient, for
-  any liability that these contractual assumptions directly impose on
-  those licensors and authors.
-  \end{enumerate}
-
-All other non-permissive additional terms are considered ``further
-restrictions'' within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-\item Termination.
-
-You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-\item Acceptance Not Required for Having Copies.
-
-You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-\item Automatic Licensing of Downstream Recipients.
-
-Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-An ``entity transaction'' is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-\item Patents.
-
-A ``contributor'' is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's ``contributor version''.
-
-A contributor's ``essential patent claims'' are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, ``control'' includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-In the following three paragraphs, a ``patent license'' is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To ``grant'' such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  ``Knowingly relying'' means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-A patent license is ``discriminatory'' if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-\item No Surrender of Others' Freedom.
-
-If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-\item Remote Network Interaction; Use with the GNU General Public License.
-
-Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users interacting
-with it remotely through a computer network (if your version supports such
-interaction) an opportunity to receive the Corresponding Source of your
-version by providing access to the Corresponding Source from a network
-server at no charge, through some standard or customary means of
-facilitating copying of software.  This Corresponding Source shall include
-the Corresponding Source for any work covered by version 3 of the GNU
-General Public License that is incorporated pursuant to the following
-paragraph.
-
-Notwithstanding any other provision of this License, you have permission to
-link or combine any covered work with a work licensed under version 3 of
-the GNU General Public License into a single combined work, and to convey
-the resulting work.  The terms of this License will continue to apply to
-the part which is the covered work, but the work with which it is combined
-will remain governed by version 3 of the GNU General Public License.
-
-\item Revised Versions of this License.
-
-The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License ``or any later version'' applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-\item Disclaimer of Warranty.
-
-\begin{sloppypar}
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
- APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE
- COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM ``AS IS''
- WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE
- RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.
- SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
- NECESSARY SERVICING, REPAIR OR CORRECTION.
-\end{sloppypar}
-
-\item Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
- WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES
- AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
- DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
- DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM
- (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
- INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE
- OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH
- HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- DAMAGES.
-
-\item Interpretation of Sections 15 and 16.
-
-If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-\begin{center}
-{\Large\sc End of Terms and Conditions}
-
-\bigskip
-How to Apply These Terms to Your New Programs
-\end{center}
-
-If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the ``copyright'' line and a pointer to where the full notice is found.
-
-{\footnotesize
-\begin{verbatim}
-
-
-Copyright (C)   
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see .
-\end{verbatim}
-}
-
-Also add information on how to contact you by electronic and paper mail.
-
-If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a ``Source'' link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-You should also get your employer (if you work as a programmer) or
-school, if any, to sign a ``copyright disclaimer'' for the program, if
-necessary.  For more information on this, and how to apply and follow
-the GNU AGPL, see \texttt{http://www.gnu.org/licenses/}.
-
-\end{enumerate}
-
-\end{document}
-
-%%% Local Variables:
-%%% mode: latex
-%%% TeX-master: t
-%%% End:
-
Index: icence/agpl-3.0.txt
===================================================================
--- licence/agpl-3.0.txt	(revision 23:6bbbd371e813)
+++ 	(revision )
@@ -1,661 +1,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. 
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    
-    Copyright (C)   
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see .
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-.
Index: icence/licence.txt
===================================================================
--- licence/licence.txt	(revision 75:e0c23170f359)
+++ 	(revision )
@@ -1,12 +1,0 @@
-Program sql-vyuka (SQL Výuka) vydávám pod licencí:
-GNU Affero General Public License, verze 3
-
-  viz agpl-3.0.txt
-  viz http://www.fsf.org/licensing/licenses/agpl-3.0.html
-
-
-František Kučera
-
-  http://frantovo.cz/blog
-  http://frantovo.cz/
-  franta-hg@frantovo.cz
Index: ql/schéma.sql
===================================================================
--- sql/schéma.sql	(revision 43:8d1a92f64110)
+++ 	(revision )
@@ -1,225 +1,0 @@
---
--- PostgreSQL database dump
---
-
--- Started on 2009-06-06 23:39:14 CEST
-
-SET client_encoding = 'UTF8';
-SET standard_conforming_strings = off;
-SET check_function_bodies = false;
-SET client_min_messages = warning;
-SET escape_string_warning = off;
-
---
--- TOC entry 10 (class 2615 OID 16788)
--- Name: sqlvyukaaplikace; Type: SCHEMA; Schema: -; Owner: -
---
-
-CREATE SCHEMA sqlvyukaaplikace;
-
-
-SET search_path = sqlvyukaaplikace, pg_catalog;
-
---
--- TOC entry 1583 (class 1259 OID 16797)
--- Dependencies: 10
--- Name: historie_seq; Type: SEQUENCE; Schema: sqlvyukaaplikace; Owner: -
---
-
-CREATE SEQUENCE historie_seq
-    INCREMENT BY 1
-    NO MAXVALUE
-    NO MINVALUE
-    CACHE 1;
-
-
-SET default_tablespace = '';
-
-SET default_with_oids = false;
-
---
--- TOC entry 1582 (class 1259 OID 16789)
--- Dependencies: 1854 1855 10
--- Name: historie; Type: TABLE; Schema: sqlvyukaaplikace; Owner: -; Tablespace: 
---
-
-CREATE TABLE historie (
-    id numeric DEFAULT nextval('historie_seq'::regclass) NOT NULL,
-    datum timestamp with time zone DEFAULT now(),
-    sql text,
-    id_sezeni character varying(255),
-    ip_adresa character varying(255)
-);
-
-
---
--- TOC entry 1586 (class 1259 OID 16826)
--- Dependencies: 10
--- Name: pruvodce_seq; Type: SEQUENCE; Schema: sqlvyukaaplikace; Owner: -
---
-
-CREATE SEQUENCE pruvodce_seq
-    INCREMENT BY 10
-    NO MAXVALUE
-    NO MINVALUE
-    CACHE 1;
-
-
---
--- TOC entry 1587 (class 1259 OID 16828)
--- Dependencies: 1857 10
--- Name: pruvodce; Type: TABLE; Schema: sqlvyukaaplikace; Owner: -; Tablespace: 
---
-
-CREATE TABLE pruvodce (
-    id numeric DEFAULT nextval('pruvodce_seq'::regclass) NOT NULL,
-    kod character varying(32),
-    nadpis character varying(255) NOT NULL,
-    obsah text NOT NULL
-);
-
-
---
--- TOC entry 1870 (class 0 OID 0)
--- Dependencies: 1587
--- Name: TABLE pruvodce; Type: COMMENT; Schema: sqlvyukaaplikace; Owner: -
---
-
-COMMENT ON TABLE pruvodce IS 'Nápověda, průvodce';
-
-
---
--- TOC entry 1871 (class 0 OID 0)
--- Dependencies: 1587
--- Name: COLUMN pruvodce.id; Type: COMMENT; Schema: sqlvyukaaplikace; Owner: -
---
-
-COMMENT ON COLUMN pruvodce.id IS 'Pořadí kapitoly/lekce';
-
-
---
--- TOC entry 1872 (class 0 OID 0)
--- Dependencies: 1587
--- Name: COLUMN pruvodce.kod; Type: COMMENT; Schema: sqlvyukaaplikace; Owner: -
---
-
-COMMENT ON COLUMN pruvodce.kod IS 'kód, na který se můžeme odkazovat';
-
-
---
--- TOC entry 1873 (class 0 OID 0)
--- Dependencies: 1587
--- Name: COLUMN pruvodce.nadpis; Type: COMMENT; Schema: sqlvyukaaplikace; Owner: -
---
-
-COMMENT ON COLUMN pruvodce.nadpis IS 'Název kapitoly';
-
-
---
--- TOC entry 1874 (class 0 OID 0)
--- Dependencies: 1587
--- Name: COLUMN pruvodce.obsah; Type: COMMENT; Schema: sqlvyukaaplikace; Owner: -
---
-
-COMMENT ON COLUMN pruvodce.obsah IS 'Vlastní text kapitoly';
-
-
---
--- TOC entry 1584 (class 1259 OID 16813)
--- Dependencies: 10
--- Name: tip_seq; Type: SEQUENCE; Schema: sqlvyukaaplikace; Owner: -
---
-
-CREATE SEQUENCE tip_seq
-    INCREMENT BY 1
-    NO MAXVALUE
-    NO MINVALUE
-    CACHE 1;
-
-
---
--- TOC entry 1585 (class 1259 OID 16815)
--- Dependencies: 1856 10
--- Name: tip; Type: TABLE; Schema: sqlvyukaaplikace; Owner: -; Tablespace: 
---
-
-CREATE TABLE tip (
-    id numeric DEFAULT nextval('tip_seq'::regclass) NOT NULL,
-    text character varying(512) NOT NULL
-);
-
-
---
--- TOC entry 1875 (class 0 OID 0)
--- Dependencies: 1585
--- Name: TABLE tip; Type: COMMENT; Schema: sqlvyukaaplikace; Owner: -
---
-
-COMMENT ON TABLE tip IS 'Rady, tipy, odkazy a citáty… které budeme zobrazovat uživateli v náhodném pořadí.';
-
-
---
--- TOC entry 1876 (class 0 OID 0)
--- Dependencies: 1585
--- Name: COLUMN tip.text; Type: COMMENT; Schema: sqlvyukaaplikace; Owner: -
---
-
-COMMENT ON COLUMN tip.text IS 'HTML text. Bude vložen do odstavce. → Pozor na validitu.';
-
-
---
--- TOC entry 1859 (class 2606 OID 16796)
--- Dependencies: 1582 1582
--- Name: historie_pk; Type: CONSTRAINT; Schema: sqlvyukaaplikace; Owner: -; Tablespace: 
---
-
-ALTER TABLE ONLY historie
-    ADD CONSTRAINT historie_pk PRIMARY KEY (id);
-
-
---
--- TOC entry 1865 (class 2606 OID 16838)
--- Dependencies: 1587 1587
--- Name: pruvodce_kod_uq; Type: CONSTRAINT; Schema: sqlvyukaaplikace; Owner: -; Tablespace: 
---
-
-ALTER TABLE ONLY pruvodce
-    ADD CONSTRAINT pruvodce_kod_uq UNIQUE (kod);
-
-
---
--- TOC entry 1867 (class 2606 OID 16836)
--- Dependencies: 1587 1587
--- Name: pruvodce_pk; Type: CONSTRAINT; Schema: sqlvyukaaplikace; Owner: -; Tablespace: 
---
-
-ALTER TABLE ONLY pruvodce
-    ADD CONSTRAINT pruvodce_pk PRIMARY KEY (id);
-
-
---
--- TOC entry 1861 (class 2606 OID 16823)
--- Dependencies: 1585 1585
--- Name: tip_pk; Type: CONSTRAINT; Schema: sqlvyukaaplikace; Owner: -; Tablespace: 
---
-
-ALTER TABLE ONLY tip
-    ADD CONSTRAINT tip_pk PRIMARY KEY (id);
-
-
---
--- TOC entry 1863 (class 2606 OID 16825)
--- Dependencies: 1585 1585
--- Name: tip_uq; Type: CONSTRAINT; Schema: sqlvyukaaplikace; Owner: -; Tablespace: 
---
-
-ALTER TABLE ONLY tip
-    ADD CONSTRAINT tip_uq UNIQUE (text);
-
-
--- Completed on 2009-06-06 23:39:14 CEST
-
---
--- PostgreSQL database dump complete
---
-

Objednávka

SQL: tenhle jazyk tě bude bavit!

Nápověda

Zadávání SQL příkazů

Výsledek

SQL Výuka: tenhle jazyk tě bude bavit!

Ahoj

404 Stránka nenalezena

500 Interní chyba serveru