# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1270499408 -7200
# Node ID 0967d5e3b4704036d642ba3e550d758219eef737
# Parent  59ba044de1643f4fad185921eebd68f1a1388109
generování XML vycpávkového článku

diff -r 59ba044de164 -r 0967d5e3b470 java/nekurak.net-rest/nbproject/build-impl.xml
--- a/java/nekurak.net-rest/nbproject/build-impl.xml	Mon Apr 05 22:21:01 2010 +0200
+++ b/java/nekurak.net-rest/nbproject/build-impl.xml	Mon Apr 05 22:30:08 2010 +0200
@@ -391,8 +391,16 @@
     <!--
                 COMPILATION SECTION
             -->
-    <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/>
-    <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"/>
+    <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps">
+        <ant antfile="${project.nekurak_net-lib}/build.xml" inheritall="false" target="jar">
+            <property name="deploy.on.save" value="false"/>
+        </ant>
+    </target>
+    <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps">
+        <ant antfile="${project.nekurak_net-lib}/build.xml" inheritall="false" target="jar">
+            <property name="deploy.on.save" value="false"/>
+        </ant>
+    </target>
     <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
     <target depends="init,deps-jar,generate-rest-config" name="-pre-pre-compile">
         <mkdir dir="${build.classes.dir}"/>
@@ -528,10 +536,13 @@
     </target>
     <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
     <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
+        <copyfiles files="${reference.nekurak_net-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <mkdir dir="${build.web.dir}/META-INF"/>
         <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>
-    <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
+    <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
+        <copyfiles files="${reference.nekurak_net-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+    </target>
     <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
         <delete dir="${build.web.dir}/WEB-INF/lib"/>
     </target>
@@ -827,7 +838,9 @@
                 
                 CLEANUP SECTION
             -->
-    <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
+    <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps">
+        <ant antfile="${project.nekurak_net-lib}/build.xml" inheritall="false" target="clean"/>
+    </target>
     <target depends="init" name="do-clean">
         <condition property="build.dir.to.clean" value="${build.web.dir}">
             <isset property="dist.ear.dir"/>
diff -r 59ba044de164 -r 0967d5e3b470 java/nekurak.net-rest/nbproject/genfiles.properties
--- a/java/nekurak.net-rest/nbproject/genfiles.properties	Mon Apr 05 22:21:01 2010 +0200
+++ b/java/nekurak.net-rest/nbproject/genfiles.properties	Mon Apr 05 22:30:08 2010 +0200
@@ -1,10 +1,10 @@
-build.xml.data.CRC32=27a024ad
+build.xml.data.CRC32=35b9fabc
 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=27a024ad
-nbproject/build-impl.xml.script.CRC32=f658df40
+nbproject/build-impl.xml.data.CRC32=35b9fabc
+nbproject/build-impl.xml.script.CRC32=41eb3ef9
 nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.2.1
 nbproject/rest-build.xml.data.CRC32=d32e8880
 nbproject/rest-build.xml.script.CRC32=23da2c77
diff -r 59ba044de164 -r 0967d5e3b470 java/nekurak.net-rest/nbproject/project.properties
--- a/java/nekurak.net-rest/nbproject/project.properties	Mon Apr 05 22:21:01 2010 +0200
+++ b/java/nekurak.net-rest/nbproject/project.properties	Mon Apr 05 22:30:08 2010 +0200
@@ -26,7 +26,8 @@
 j2ee.platform=1.6-web
 j2ee.server.type=gfv3ee6
 jar.compress=false
-javac.classpath=
+javac.classpath=\
+    ${reference.nekurak_net-lib.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.debug=true
@@ -54,6 +55,8 @@
 lib.dir=${web.docbase.dir}/WEB-INF/lib
 persistence.xml.dir=${conf.dir}
 platform.active=default_platform
+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
diff -r 59ba044de164 -r 0967d5e3b470 java/nekurak.net-rest/nbproject/project.xml
--- a/java/nekurak.net-rest/nbproject/project.xml	Mon Apr 05 22:21:01 2010 +0200
+++ b/java/nekurak.net-rest/nbproject/project.xml	Mon Apr 05 22:30:08 2010 +0200
@@ -10,7 +10,12 @@
         <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/>
+            <web-module-libraries>
+                <library dirs="200">
+                    <file>${reference.nekurak_net-lib.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+            </web-module-libraries>
             <web-module-additional-libraries/>
             <source-roots>
                 <root id="src.dir"/>
@@ -19,5 +24,15 @@
                 <root id="test.src.dir"/>
             </test-roots>
         </data>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+            <reference>
+                <foreign-project>nekurak_net-lib</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+        </references>
     </configuration>
 </project>
diff -r 59ba044de164 -r 0967d5e3b470 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 22:21:01 2010 +0200
+++ b/java/nekurak.net-rest/src/java/cz/frantovo/nekurak/rest/ClankyREST.java	Mon Apr 05 22:30:08 2010 +0200
@@ -1,5 +1,7 @@
 package cz.frantovo.nekurak.rest;
 
+import cz.frantovo.nekurak.dto.Clanek;
+import cz.frantovo.nekurak.xml.ClanekXML;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
@@ -25,10 +27,13 @@
     /** Získáme konkrétní článek */
     @GET
     @Path("/{id}")
-    @Produces("text/plain")
-    //@Produces(MIME_XML)
-    public String ziskej(@PathParam("id") int id) {
-	return "jeden článek: " + id;
+    @Produces(MIME_XML)
+    public ClanekXML ziskej(@PathParam("id") int id) {
+	Clanek c = new Clanek();
+	c.setId(id);
+	c.setNadpis("Nadpis článku");
+	c.setText("nějaký pěkný text");
+	return new ClanekXML(c);
     }
 
     /**