1.1 --- a/java/nekurak.net-rest/nbproject/build-impl.xml Tue Mar 23 00:54:44 2010 +0100
1.2 +++ b/java/nekurak.net-rest/nbproject/build-impl.xml Tue Mar 23 01:12:16 2010 +0100
1.3 @@ -390,8 +390,16 @@
1.4 <!--
1.5 COMPILATION SECTION
1.6 -->
1.7 - <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/>
1.8 - <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"/>
1.9 + <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps">
1.10 + <ant antfile="${project.nekurak_net-lib}/build.xml" inheritall="false" target="jar">
1.11 + <property name="deploy.on.save" value="false"/>
1.12 + </ant>
1.13 + </target>
1.14 + <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps">
1.15 + <ant antfile="${project.nekurak_net-lib}/build.xml" inheritall="false" target="jar">
1.16 + <property name="deploy.on.save" value="false"/>
1.17 + </ant>
1.18 + </target>
1.19 <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
1.20 <target depends="init,deps-jar" name="-pre-pre-compile">
1.21 <mkdir dir="${build.classes.dir}"/>
1.22 @@ -527,10 +535,13 @@
1.23 </target>
1.24 <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
1.25 <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
1.26 + <copyfiles files="${reference.nekurak_net-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
1.27 <mkdir dir="${build.web.dir}/META-INF"/>
1.28 <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
1.29 </target>
1.30 - <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
1.31 + <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
1.32 + <copyfiles files="${reference.nekurak_net-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
1.33 + </target>
1.34 <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
1.35 <delete dir="${build.web.dir}/WEB-INF/lib"/>
1.36 </target>
1.37 @@ -826,7 +837,9 @@
1.38
1.39 CLEANUP SECTION
1.40 -->
1.41 - <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
1.42 + <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps">
1.43 + <ant antfile="${project.nekurak_net-lib}/build.xml" inheritall="false" target="clean"/>
1.44 + </target>
1.45 <target depends="init" name="do-clean">
1.46 <condition property="build.dir.to.clean" value="${build.web.dir}">
1.47 <isset property="dist.ear.dir"/>
2.1 --- a/java/nekurak.net-rest/nbproject/genfiles.properties Tue Mar 23 00:54:44 2010 +0100
2.2 +++ b/java/nekurak.net-rest/nbproject/genfiles.properties Tue Mar 23 01:12:16 2010 +0100
2.3 @@ -1,8 +1,8 @@
2.4 -build.xml.data.CRC32=d32e8880
2.5 +build.xml.data.CRC32=c5edf49f
2.6 build.xml.script.CRC32=fb1b7f84
2.7 build.xml.stylesheet.CRC32=c0ebde35@1.21.2.1
2.8 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
2.9 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
2.10 -nbproject/build-impl.xml.data.CRC32=d32e8880
2.11 -nbproject/build-impl.xml.script.CRC32=45392f70
2.12 +nbproject/build-impl.xml.data.CRC32=c5edf49f
2.13 +nbproject/build-impl.xml.script.CRC32=41eb3ef9
2.14 nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.2.1
3.1 --- a/java/nekurak.net-rest/nbproject/project.properties Tue Mar 23 00:54:44 2010 +0100
3.2 +++ b/java/nekurak.net-rest/nbproject/project.properties Tue Mar 23 01:12:16 2010 +0100
3.3 @@ -26,7 +26,8 @@
3.4 j2ee.platform=1.6-web
3.5 j2ee.server.type=gfv3ee6
3.6 jar.compress=false
3.7 -javac.classpath=
3.8 +javac.classpath=\
3.9 + ${reference.nekurak_net-lib.jar}
3.10 # Space-separated list of extra javac options
3.11 javac.compilerargs=
3.12 javac.debug=true
3.13 @@ -55,6 +56,8 @@
3.14 no.dependencies=false
3.15 persistence.xml.dir=${conf.dir}
3.16 platform.active=default_platform
3.17 +project.nekurak_net-lib=../nekurak.net-lib
3.18 +reference.nekurak_net-lib.jar=${project.nekurak_net-lib}/dist/nekurak.net-lib.jar
3.19 resource.dir=setup
3.20 run.test.classpath=\
3.21 ${javac.test.classpath}:\
4.1 --- a/java/nekurak.net-rest/nbproject/project.xml Tue Mar 23 00:54:44 2010 +0100
4.2 +++ b/java/nekurak.net-rest/nbproject/project.xml Tue Mar 23 01:12:16 2010 +0100
4.3 @@ -5,7 +5,12 @@
4.4 <data xmlns="http://www.netbeans.org/ns/web-project/3">
4.5 <name>nekurak.net-rest</name>
4.6 <minimum-ant-version>1.6.5</minimum-ant-version>
4.7 - <web-module-libraries/>
4.8 + <web-module-libraries>
4.9 + <library dirs="200">
4.10 + <file>${reference.nekurak_net-lib.jar}</file>
4.11 + <path-in-war>WEB-INF/lib</path-in-war>
4.12 + </library>
4.13 + </web-module-libraries>
4.14 <web-module-additional-libraries/>
4.15 <source-roots>
4.16 <root id="src.dir" name="Source Packages"/>
4.17 @@ -14,5 +19,15 @@
4.18 <root id="test.src.dir" name="Test Packages"/>
4.19 </test-roots>
4.20 </data>
4.21 + <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
4.22 + <reference>
4.23 + <foreign-project>nekurak_net-lib</foreign-project>
4.24 + <artifact-type>jar</artifact-type>
4.25 + <script>build.xml</script>
4.26 + <target>jar</target>
4.27 + <clean-target>clean</clean-target>
4.28 + <id>jar</id>
4.29 + </reference>
4.30 + </references>
4.31 </configuration>
4.32 </project>
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
5.2 +++ b/java/nekurak.net-rest/src/java/cz/frantovo/nekurak/rest/ClanekREST.java Tue Mar 23 01:12:16 2010 +0100
5.3 @@ -0,0 +1,12 @@
5.4 +package cz.frantovo.nekurak.rest;
5.5 +
5.6 +import cz.frantovo.nekurak.xml.ClanekXML;
5.7 +
5.8 +//@Path("clanek")
5.9 +public class ClanekREST {
5.10 +
5.11 + //@GET
5.12 + public ClanekXML getClanek() {
5.13 + return null;
5.14 + }
5.15 +}
5.16 \ No newline at end of file
6.1 --- a/java/nekurak.net-rest/web/index.jsp Tue Mar 23 00:54:44 2010 +0100
6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
6.3 @@ -1,19 +0,0 @@
6.4 -<%--
6.5 - Document : index
6.6 - Created on : 23.3.2010, 0:39:07
6.7 - Author : fiki
6.8 ---%>
6.9 -
6.10 -<%@page contentType="text/html" pageEncoding="UTF-8"%>
6.11 -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
6.12 - "http://www.w3.org/TR/html4/loose.dtd">
6.13 -
6.14 -<html>
6.15 - <head>
6.16 - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
6.17 - <title>JSP Page</title>
6.18 - </head>
6.19 - <body>
6.20 - <h1>Hello World!</h1>
6.21 - </body>
6.22 -</html>