# HG changeset patch # User František Kučera # Date 1269301839 -3600 # Node ID 18ed62105526870f02d41ceb66aa689965a92e55 # Parent aec1fb81580ea132bde9b0512638e5ff80c63723 REST: přidán nový webový modul. diff -r aec1fb81580e -r 18ed62105526 .hgignore --- a/.hgignore Thu Mar 18 14:33:35 2010 +0100 +++ b/.hgignore Tue Mar 23 00:50:39 2010 +0100 @@ -4,6 +4,7 @@ java/nekurak.net-web/web/nekurak.net-src.zip java/nekurak.net-web/web/nekurak.net-src.zip.SHA-512 java/nekurak.net-web/src/conf/MANIFEST.MF + java/nekurak.net-mvn/target/* java/nekurak.net-ear/dist/* @@ -19,3 +20,7 @@ java/nekurak.net-lib/nbproject/private java/nekurak.net-web/lib/* + +java/nekurak.net-rest/dist/* +java/nekurak.net-rest/build/* +java/nekurak.net-rest/nbproject/private diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-ear/nbproject/build-impl.xml --- a/java/nekurak.net-ear/nbproject/build-impl.xml Thu Mar 18 14:33:35 2010 +0100 +++ b/java/nekurak.net-ear/nbproject/build-impl.xml Tue Mar 23 00:50:39 2010 +0100 @@ -166,6 +166,15 @@ + + + + + + + + + @@ -184,6 +193,7 @@ + @@ -261,6 +271,7 @@ + @@ -455,6 +466,15 @@ + + + + + + + + + diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-ear/nbproject/genfiles.properties --- a/java/nekurak.net-ear/nbproject/genfiles.properties Thu Mar 18 14:33:35 2010 +0100 +++ b/java/nekurak.net-ear/nbproject/genfiles.properties Tue Mar 23 00:50:39 2010 +0100 @@ -3,6 +3,6 @@ build.xml.stylesheet.CRC32=475c2a62@1.17.2 # 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=dd0510f0 -nbproject/build-impl.xml.script.CRC32=b94a2023 +nbproject/build-impl.xml.data.CRC32=efe37659 +nbproject/build-impl.xml.script.CRC32=4bf9637a nbproject/build-impl.xml.stylesheet.CRC32=624b8ca2@1.17.2 diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-ear/nbproject/project.properties --- a/java/nekurak.net-ear/nbproject/project.properties Thu Mar 18 14:33:35 2010 +0100 +++ b/java/nekurak.net-ear/nbproject/project.properties Tue Mar 23 00:50:39 2010 +0100 @@ -16,7 +16,8 @@ jar.compress=false jar.content.additional=\ ${reference.nekurak_net-web.dist-ear}:\ - ${reference.nekurak_net-ejb.dist-ear} + ${reference.nekurak_net-ejb.dist-ear}:\ + ${reference.nekurak_net-rest.dist-ear} jar.name=nekurak.net-ear.ear javac.debug=true javac.deprecation=false @@ -26,8 +27,10 @@ no.dependencies=false platform.active=default_platform project.nekurak_net-ejb=../nekurak.net-ejb +project.nekurak_net-rest=../nekurak.net-rest project.nekurak_net-web=../nekurak.net-web reference.nekurak_net-ejb.dist-ear=${project.nekurak_net-ejb}/dist/nekurak.net-ejb.jar +reference.nekurak_net-rest.dist-ear=${project.nekurak_net-rest}/dist/nekurak.net-rest.war reference.nekurak_net-web.dist-ear=${project.nekurak_net-web}/dist/nekurak.net-web.war resource.dir=setup run.classpath= diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-ear/nbproject/project.xml --- a/java/nekurak.net-ear/nbproject/project.xml Thu Mar 18 14:33:35 2010 +0100 +++ b/java/nekurak.net-ear/nbproject/project.xml Tue Mar 23 00:50:39 2010 +0100 @@ -15,6 +15,10 @@ ${reference.nekurak_net-ejb.dist-ear} / + + ${reference.nekurak_net-rest.dist-ear} + / + @@ -27,6 +31,14 @@ dist-ear + nekurak_net-rest + j2ee_ear_archive + + dist-ear + clean-ear + dist-ear + + nekurak_net-web j2ee_ear_archive diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-ear/src/conf/application.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-ear/src/conf/application.xml Tue Mar 23 00:50:39 2010 +0100 @@ -0,0 +1,19 @@ + + + nekurak.net-ear + + + nekurak.net-web.war + /nekurak.net-web + + + + + nekurak.net-rest.war + /nekurak.net-rest + + + + nekurak.net-ejb.jar + + diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-ejb/src/conf/Clanek.hbm.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-ejb/src/conf/Clanek.hbm.xml Tue Mar 23 00:50:39 2010 +0100 @@ -0,0 +1,14 @@ + + + + + + + clanek_seq + + + + + + \ No newline at end of file diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/dao/ClanekDAO.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/dao/ClanekDAO.java Tue Mar 23 00:50:39 2010 +0100 @@ -0,0 +1,38 @@ +package cz.frantovo.nekurak.dao; + +import cz.frantovo.nekurak.dto.Clanek; +import java.util.Collection; +import javax.ejb.LocalBean; +import javax.ejb.Stateless; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; +import javax.persistence.Query; + +/** + * + * @author fiki + */ +@Stateless +@LocalBean +public class ClanekDAO { + + @PersistenceContext(unitName = DAO.PU) + private EntityManager em; + + public Clanek getClanek(int id) { + return em.find(Clanek.class, id); + } + + public Collection getClanky() { + Query dotaz = em.createQuery("FROM " + DAO.t(Clanek.class) + " c ORDER BY id"); + return dotaz.getResultList(); + } + + public void zalozClanek(Clanek clanek) { + em.persist(clanek); + } + + public void upravClanek(Clanek clanek) { + em.merge(clanek); + } +} diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/ejb/ClanekEJB.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/ejb/ClanekEJB.java Tue Mar 23 00:50:39 2010 +0100 @@ -0,0 +1,37 @@ +package cz.frantovo.nekurak.ejb; + +import cz.frantovo.nekurak.dao.ClanekDAO; +import cz.frantovo.nekurak.dto.Clanek; +import java.util.Collection; +import javax.annotation.security.RolesAllowed; +import javax.ejb.EJB; +import javax.ejb.Stateless; + +/** + * Redakční část – správa článků/stránek. + * @author fiki + */ +@Stateless +public class ClanekEJB implements ClanekRemote { + + @EJB + private ClanekDAO clanekDAO; + + public Clanek getClanek(int id) { + return clanekDAO.getClanek(id); + } + + public Collection getClanky() { + return clanekDAO.getClanky(); + } + + @RolesAllowed("redaktor") + public void zalozClanek(Clanek clanek) { + clanekDAO.zalozClanek(clanek); + } + + @RolesAllowed("redaktor") + public void upravClanek(Clanek clanek) { + clanekDAO.upravClanek(clanek); + } +} diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Clanek.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Clanek.java Tue Mar 23 00:50:39 2010 +0100 @@ -0,0 +1,32 @@ +package cz.frantovo.nekurak.dto; + +public class Clanek { + + private int id; + private String nadpis; + private String text; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getNadpis() { + return nadpis; + } + + public void setNadpis(String nadpis) { + this.nadpis = nadpis; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } +} diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-lib/src/cz/frantovo/nekurak/ejb/ClanekRemote.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/ejb/ClanekRemote.java Tue Mar 23 00:50:39 2010 +0100 @@ -0,0 +1,21 @@ +package cz.frantovo.nekurak.ejb; + +import cz.frantovo.nekurak.dto.Clanek; +import java.util.Collection; +import javax.ejb.Remote; + +/** + * + * @author fiki + */ +@Remote +public interface ClanekRemote { + + public Clanek getClanek(int id); + + public void zalozClanek(Clanek clanek); + + public void upravClanek(Clanek clanek); + + public Collection getClanky(); +} diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-lib/src/cz/frantovo/nekurak/xml/ClanekXML.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/xml/ClanekXML.java Tue Mar 23 00:50:39 2010 +0100 @@ -0,0 +1,53 @@ +package cz.frantovo.nekurak.xml; + +import cz.frantovo.nekurak.dto.Clanek; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +/** + * Převaděč do XML + * @author fiki + */ +@XmlRootElement +public class ClanekXML { + + private Clanek clanek; + + public ClanekXML() { + } + + public ClanekXML(Clanek clanek) { + this.clanek = clanek; + } + + @XmlAttribute(name = "id", required = true) + public int getId() { + return clanek.getId(); + } + + @XmlAttribute(name = "id", required = true) + public void setId(int id) { + clanek.setId(id); + } + + @XmlElement + public String getNadpis() { + return clanek.getNadpis(); + } + + @XmlElement + public void setNadpis(String nadpis) { + clanek.setNadpis(nadpis); + } + + @XmlElement + public String getText() { + return clanek.getText(); + } + + @XmlElement + public void setText(String text) { + clanek.setText(text); + } +} diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-lib/src/cz/frantovo/nekurak/xml/package-info.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/xml/package-info.java Tue Mar 23 00:50:39 2010 +0100 @@ -0,0 +1,5 @@ +/** + * Třídy pro překlad mezi objekty a XML + */ +package cz.frantovo.nekurak.xml; + diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-rest/nbproject/ant-deploy.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-rest/nbproject/ant-deploy.xml Tue Mar 23 00:50:39 2010 +0100 @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-rest/nbproject/build-impl.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-rest/nbproject/build-impl.xml Tue Mar 23 00:50:39 2010 +0100 @@ -0,0 +1,855 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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. 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) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +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 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 one file in the IDE or set test.class + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-rest/nbproject/genfiles.properties --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-rest/nbproject/genfiles.properties Tue Mar 23 00:50:39 2010 +0100 @@ -0,0 +1,8 @@ +build.xml.data.CRC32=d32e8880 +build.xml.script.CRC32=fb1b7f84 +build.xml.stylesheet.CRC32=c0ebde35@1.21.2.1 +# 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=d32e8880 +nbproject/build-impl.xml.script.CRC32=45392f70 +nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.2.1 diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-rest/nbproject/project.properties --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-rest/nbproject/project.properties Tue Mar 23 00:50:39 2010 +0100 @@ -0,0 +1,73 @@ +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=true +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=\ + ${libs.javaee-endorsed-api-6.0.classpath} +excludes= +includes=** +j2ee.deploy.on.save=false +j2ee.platform=1.6-web +j2ee.server.type=gfv3ee6 +jar.compress=false +javac.classpath= +# Space-separated list of extra javac options +javac.compilerargs= +javac.debug=true +javac.deprecation=false +javac.source=1.5 +javac.target=1.5 +javac.test.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir}:\ + ${libs.junit.classpath}:\ + ${libs.junit_4.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= +jspcompilation.classpath=${jspc.classpath}:${javac.classpath} +lib.dir=${web.docbase.dir}/WEB-INF/lib +no.dependencies=false +persistence.xml.dir=${conf.dir} +platform.active=default_platform +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=nekurak.net-rest.war +war.name=nekurak.net-rest.war +web.docbase.dir=web +webinf.dir=web/WEB-INF diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-rest/nbproject/project.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-rest/nbproject/project.xml Tue Mar 23 00:50:39 2010 +0100 @@ -0,0 +1,18 @@ + + + org.netbeans.modules.web.project + + + nekurak.net-rest + 1.6.5 + + + + + + + + + + + diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-rest/web/WEB-INF/beans.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-rest/web/WEB-INF/beans.xml Tue Mar 23 00:50:39 2010 +0100 @@ -0,0 +1,5 @@ + + + diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-rest/web/WEB-INF/sun-web.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-rest/web/WEB-INF/sun-web.xml Tue Mar 23 00:50:39 2010 +0100 @@ -0,0 +1,11 @@ + + + + /nekurak.net-rest + + + + Keep a copy of the generated servlet class' java code. + + + diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-rest/web/WEB-INF/web.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-rest/web/WEB-INF/web.xml Tue Mar 23 00:50:39 2010 +0100 @@ -0,0 +1,12 @@ + + + + + + 30 + + + diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-rest/web/index.jsp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-rest/web/index.jsp Tue Mar 23 00:50:39 2010 +0100 @@ -0,0 +1,19 @@ +<%-- + Document : index + Created on : 23.3.2010, 0:39:07 + Author : fiki +--%> + +<%@page contentType="text/html" pageEncoding="UTF-8"%> + + + + + + JSP Page + + +

Hello World!

+ + diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-web/nbproject/build-impl.xml --- a/java/nekurak.net-web/nbproject/build-impl.xml Thu Mar 18 14:33:35 2010 +0100 +++ b/java/nekurak.net-web/nbproject/build-impl.xml Tue Mar 23 00:50:39 2010 +0100 @@ -18,6 +18,7 @@ --> + @@ -401,7 +402,7 @@
- + @@ -536,11 +537,13 @@ + + diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-web/nbproject/genfiles.properties --- a/java/nekurak.net-web/nbproject/genfiles.properties Thu Mar 18 14:33:35 2010 +0100 +++ b/java/nekurak.net-web/nbproject/genfiles.properties Tue Mar 23 00:50:39 2010 +0100 @@ -3,6 +3,9 @@ build.xml.stylesheet.CRC32=c0ebde35@1.21.2.1 # 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=84da1c7b -nbproject/build-impl.xml.script.CRC32=6cc41288 +nbproject/build-impl.xml.data.CRC32=44af31d0 +nbproject/build-impl.xml.script.CRC32=aefcc545 nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.2.1 +nbproject/rest-build.xml.data.CRC32=84da1c7b +nbproject/rest-build.xml.script.CRC32=3db088b3 +nbproject/rest-build.xml.stylesheet.CRC32=ddd64843@1.4.1 diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-web/nbproject/project.properties --- a/java/nekurak.net-web/nbproject/project.properties Thu Mar 18 14:33:35 2010 +0100 +++ b/java/nekurak.net-web/nbproject/project.properties Tue Mar 23 00:50:39 2010 +0100 @@ -26,7 +26,8 @@ j2ee.server.type=gfv3ee6 jar.compress=false javac.classpath=\ - ${reference.nekurak_net-lib.jar} + ${reference.nekurak_net-lib.jar}:\ + ${libs.restlib_gfv3ee6.classpath} # Space-separated list of extra javac options javac.compilerargs= javac.debug=true @@ -58,6 +59,8 @@ project.nekurak_net-lib=../nekurak.net-lib reference.nekurak_net-lib.jar=${project.nekurak_net-lib}/dist/nekurak.net-lib.jar resource.dir=setup +rest.config.type=dd +rest.support.on=true run.test.classpath=\ ${javac.test.classpath}:\ ${build.test.classes.dir} diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-web/nbproject/project.xml --- a/java/nekurak.net-web/nbproject/project.xml Thu Mar 18 14:33:35 2010 +0100 +++ b/java/nekurak.net-web/nbproject/project.xml Tue Mar 23 00:50:39 2010 +0100 @@ -2,6 +2,11 @@ org.netbeans.modules.web.project + + + + + nekurak.net-web 1.6.5 @@ -10,6 +15,10 @@ ${reference.nekurak_net-lib.jar} WEB-INF/lib + + ${libs.restlib_gfv3ee6.classpath} + WEB-INF/lib + diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-web/nbproject/rest-build.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-web/nbproject/rest-build.xml Tue Mar 23 00:50:39 2010 +0100 @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.netbeans.rest.application.config; +/** + * This class is generated by the Netbeans IDE, + * and registers all REST root resources created in the project. + * Please, DO NOT EDIT this class ! + */ +@javax.ws.rs.ApplicationPath("${rest.resources.path}") +public class ApplicationConfig extends javax.ws.rs.core.Application { +} + + diff -r aec1fb81580e -r 18ed62105526 java/nekurak.net-web/web/WEB-INF/web.xml --- a/java/nekurak.net-web/web/WEB-INF/web.xml Thu Mar 18 14:33:35 2010 +0100 +++ b/java/nekurak.net-web/web/WEB-INF/web.xml Tue Mar 23 00:50:39 2010 +0100 @@ -38,7 +38,7 @@ adresar /var/www/nekurak.net/fotky - 1 + 1