# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1269303136 -3600
# Node ID 5378f8dc8fa96795f83ce8882c95c7bd8b3608f1
# Parent  40b2282968150078f00fedc82c20e4bd836245c1
ClanekREST.java

diff -r 40b228296815 -r 5378f8dc8fa9 java/nekurak.net-rest/nbproject/build-impl.xml
--- a/java/nekurak.net-rest/nbproject/build-impl.xml	Tue Mar 23 00:54:44 2010 +0100
+++ b/java/nekurak.net-rest/nbproject/build-impl.xml	Tue Mar 23 01:12:16 2010 +0100
@@ -390,8 +390,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" name="-pre-pre-compile">
         <mkdir dir="${build.classes.dir}"/>
@@ -527,10 +535,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>
@@ -826,7 +837,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 40b228296815 -r 5378f8dc8fa9 java/nekurak.net-rest/nbproject/genfiles.properties
--- a/java/nekurak.net-rest/nbproject/genfiles.properties	Tue Mar 23 00:54:44 2010 +0100
+++ b/java/nekurak.net-rest/nbproject/genfiles.properties	Tue Mar 23 01:12:16 2010 +0100
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=d32e8880
+build.xml.data.CRC32=c5edf49f
 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.data.CRC32=c5edf49f
+nbproject/build-impl.xml.script.CRC32=41eb3ef9
 nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.2.1
diff -r 40b228296815 -r 5378f8dc8fa9 java/nekurak.net-rest/nbproject/project.properties
--- a/java/nekurak.net-rest/nbproject/project.properties	Tue Mar 23 00:54:44 2010 +0100
+++ b/java/nekurak.net-rest/nbproject/project.properties	Tue Mar 23 01:12:16 2010 +0100
@@ -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
@@ -55,6 +56,8 @@
 no.dependencies=false
 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
 run.test.classpath=\
     ${javac.test.classpath}:\
diff -r 40b228296815 -r 5378f8dc8fa9 java/nekurak.net-rest/nbproject/project.xml
--- a/java/nekurak.net-rest/nbproject/project.xml	Tue Mar 23 00:54:44 2010 +0100
+++ b/java/nekurak.net-rest/nbproject/project.xml	Tue Mar 23 01:12:16 2010 +0100
@@ -5,7 +5,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" name="Source Packages"/>
@@ -14,5 +19,15 @@
                 <root id="test.src.dir" name="Test Packages"/>
             </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 40b228296815 -r 5378f8dc8fa9 java/nekurak.net-rest/src/java/cz/frantovo/nekurak/rest/ClanekREST.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-rest/src/java/cz/frantovo/nekurak/rest/ClanekREST.java	Tue Mar 23 01:12:16 2010 +0100
@@ -0,0 +1,12 @@
+package cz.frantovo.nekurak.rest;
+
+import cz.frantovo.nekurak.xml.ClanekXML;
+
+//@Path("clanek")
+public class ClanekREST {
+
+    //@GET
+    public ClanekXML getClanek() {
+	return null;
+    }
+}
\ No newline at end of file
diff -r 40b228296815 -r 5378f8dc8fa9 java/nekurak.net-rest/web/index.jsp
--- a/java/nekurak.net-rest/web/index.jsp	Tue Mar 23 00:54:44 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<%-- 
-    Document   : index
-    Created on : 23.3.2010, 0:39:07
-    Author     : fiki
---%>
-
-<%@page contentType="text/html" pageEncoding="UTF-8"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-   "http://www.w3.org/TR/html4/loose.dtd">
-
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>JSP Page</title>
-    </head>
-    <body>
-        <h1>Hello World!</h1>
-    </body>
-</html>