# HG changeset patch # User František Kučera <franta-hg@frantovo.cz> # Date 1270487332 -7200 # Node ID a5339bcce9a2b1f07ef85d6ef22ae837d32f8b81 # Parent 27ddd36919979114035572fcc5823b250bd5bfb8 Zjednodušení URL a vyřazení nadbytečné závislosti na knihovně. diff -r 27ddd3691997 -r a5339bcce9a2 java/nekurak.net-rest/nbproject/genfiles.properties --- a/java/nekurak.net-rest/nbproject/genfiles.properties Mon Apr 05 18:44:10 2010 +0200 +++ b/java/nekurak.net-rest/nbproject/genfiles.properties Mon Apr 05 19:08:52 2010 +0200 @@ -1,9 +1,9 @@ -build.xml.data.CRC32=8f44a4ef +build.xml.data.CRC32=27a024ad 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=8f44a4ef +nbproject/build-impl.xml.data.CRC32=27a024ad nbproject/build-impl.xml.script.CRC32=f658df40 nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.2.1 nbproject/rest-build.xml.data.CRC32=d32e8880 diff -r 27ddd3691997 -r a5339bcce9a2 java/nekurak.net-rest/nbproject/project.properties --- a/java/nekurak.net-rest/nbproject/project.properties Mon Apr 05 18:44:10 2010 +0200 +++ b/java/nekurak.net-rest/nbproject/project.properties Mon Apr 05 19:08:52 2010 +0200 @@ -26,8 +26,7 @@ j2ee.platform=1.6-web j2ee.server.type=gfv3ee6 jar.compress=false -javac.classpath=\ - ${libs.restlib_gfv3ee6.classpath} +javac.classpath= # Space-separated list of extra javac options javac.compilerargs= javac.debug=true diff -r 27ddd3691997 -r a5339bcce9a2 java/nekurak.net-rest/nbproject/project.xml --- a/java/nekurak.net-rest/nbproject/project.xml Mon Apr 05 18:44:10 2010 +0200 +++ b/java/nekurak.net-rest/nbproject/project.xml Mon Apr 05 19:08:52 2010 +0200 @@ -10,11 +10,7 @@ <data xmlns="http://www.netbeans.org/ns/web-project/3"> <name>nekurak.net-rest</name> <minimum-ant-version>1.6.5</minimum-ant-version> - <web-module-libraries> - <library dirs="200"> - <file>${libs.restlib_gfv3ee6.classpath}</file> - </library> - </web-module-libraries> + <web-module-libraries/> <web-module-additional-libraries/> <source-roots> <root id="src.dir"/> diff -r 27ddd3691997 -r a5339bcce9a2 java/nekurak.net-rest/src/java/cz/frantovo/nekurak/rest/ClankyREST.java --- a/java/nekurak.net-rest/src/java/cz/frantovo/nekurak/rest/ClankyREST.java Mon Apr 05 18:44:10 2010 +0200 +++ b/java/nekurak.net-rest/src/java/cz/frantovo/nekurak/rest/ClankyREST.java Mon Apr 05 19:08:52 2010 +0200 @@ -4,6 +4,7 @@ import javax.ws.rs.GET; import javax.ws.rs.PUT; import javax.ws.rs.Path; +import javax.ws.rs.PathParam; import javax.ws.rs.Produces; @Path("clanek") @@ -18,9 +19,10 @@ private static String data; @GET + @Path("/{id}") @Produces("text/plain") - public String getText() { - return "Naposledy sem někdo poslal:\n" + data + "\n"; + public String getText(@PathParam("id") int id) { + return "Naposledy sem někdo poslal:\n" + data + "\n" + id + "\n" ; } @PUT diff -r 27ddd3691997 -r a5339bcce9a2 java/nekurak.net-rest/web/WEB-INF/web.xml --- a/java/nekurak.net-rest/web/WEB-INF/web.xml Mon Apr 05 18:44:10 2010 +0200 +++ b/java/nekurak.net-rest/web/WEB-INF/web.xml Mon Apr 05 19:08:52 2010 +0200 @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> <servlet> - <servlet-name>ServletAdaptor</servlet-name> + <servlet-name>REST</servlet-name> <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class> <load-on-startup>1</load-on-startup> </servlet> <servlet-mapping> - <servlet-name>ServletAdaptor</servlet-name> - <url-pattern>/zdroje/*</url-pattern> + <servlet-name>REST</servlet-name> + <url-pattern>/*</url-pattern> </servlet-mapping> <session-config> <session-timeout>