# HG changeset patch # User František Kučera # Date 1269332148 -3600 # Node ID 77d86ffbf55bd9569a1a96a9396077d02b884d86 # Parent 5378f8dc8fa96795f83ce8882c95c7bd8b3608f1 úklid diff -r 5378f8dc8fa9 -r 77d86ffbf55b java/nekurak.net-ear/nbproject/build-impl.xml --- a/java/nekurak.net-ear/nbproject/build-impl.xml Tue Mar 23 01:12:16 2010 +0100 +++ b/java/nekurak.net-ear/nbproject/build-impl.xml Tue Mar 23 09:15:48 2010 +0100 @@ -166,15 +166,6 @@ - - - - - - - - - @@ -193,7 +184,6 @@ - @@ -271,7 +261,6 @@ - @@ -466,15 +455,6 @@ - - - - - - - - - diff -r 5378f8dc8fa9 -r 77d86ffbf55b java/nekurak.net-ear/nbproject/genfiles.properties --- a/java/nekurak.net-ear/nbproject/genfiles.properties Tue Mar 23 01:12:16 2010 +0100 +++ b/java/nekurak.net-ear/nbproject/genfiles.properties Tue Mar 23 09:15:48 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=efe37659 -nbproject/build-impl.xml.script.CRC32=4bf9637a +nbproject/build-impl.xml.data.CRC32=dd0510f0 +nbproject/build-impl.xml.script.CRC32=b94a2023 nbproject/build-impl.xml.stylesheet.CRC32=624b8ca2@1.17.2 diff -r 5378f8dc8fa9 -r 77d86ffbf55b java/nekurak.net-ear/nbproject/project.properties --- a/java/nekurak.net-ear/nbproject/project.properties Tue Mar 23 01:12:16 2010 +0100 +++ b/java/nekurak.net-ear/nbproject/project.properties Tue Mar 23 09:15:48 2010 +0100 @@ -16,8 +16,7 @@ jar.compress=false jar.content.additional=\ ${reference.nekurak_net-web.dist-ear}:\ - ${reference.nekurak_net-ejb.dist-ear}:\ - ${reference.nekurak_net-rest.dist-ear} + ${reference.nekurak_net-ejb.dist-ear} jar.name=nekurak.net-ear.ear javac.debug=true javac.deprecation=false @@ -27,10 +26,8 @@ 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 5378f8dc8fa9 -r 77d86ffbf55b java/nekurak.net-ear/nbproject/project.xml --- a/java/nekurak.net-ear/nbproject/project.xml Tue Mar 23 01:12:16 2010 +0100 +++ b/java/nekurak.net-ear/nbproject/project.xml Tue Mar 23 09:15:48 2010 +0100 @@ -15,10 +15,6 @@ ${reference.nekurak_net-ejb.dist-ear} / - - ${reference.nekurak_net-rest.dist-ear} - / - @@ -31,14 +27,6 @@ dist-ear - nekurak_net-rest - j2ee_ear_archive - - dist-ear - clean-ear - dist-ear - - nekurak_net-web j2ee_ear_archive diff -r 5378f8dc8fa9 -r 77d86ffbf55b java/nekurak.net-ear/src/conf/application.xml --- a/java/nekurak.net-ear/src/conf/application.xml Tue Mar 23 01:12:16 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ - - - nekurak.net-ear - - - nekurak.net-web.war - /nekurak.net-web - - - - - nekurak.net-rest.war - /nekurak.net-rest - - - - nekurak.net-ejb.jar - - diff -r 5378f8dc8fa9 -r 77d86ffbf55b java/nekurak.net-lib/src/cz/frantovo/nekurak/xml/ClanekXML.java --- a/java/nekurak.net-lib/src/cz/frantovo/nekurak/xml/ClanekXML.java Tue Mar 23 01:12:16 2010 +0100 +++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/xml/ClanekXML.java Tue Mar 23 09:15:48 2010 +0100 @@ -9,7 +9,7 @@ * Převaděč do XML * @author fiki */ -@XmlRootElement +@XmlRootElement(name="clanek") public class ClanekXML { private Clanek clanek; @@ -26,7 +26,6 @@ return clanek.getId(); } - @XmlAttribute(name = "id", required = true) public void setId(int id) { clanek.setId(id); } @@ -36,7 +35,6 @@ return clanek.getNadpis(); } - @XmlElement public void setNadpis(String nadpis) { clanek.setNadpis(nadpis); } @@ -46,7 +44,6 @@ return clanek.getText(); } - @XmlElement public void setText(String text) { clanek.setText(text); } diff -r 5378f8dc8fa9 -r 77d86ffbf55b java/nekurak.net-rest/nbproject/ant-deploy.xml --- a/java/nekurak.net-rest/nbproject/ant-deploy.xml Tue Mar 23 01:12:16 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 5378f8dc8fa9 -r 77d86ffbf55b java/nekurak.net-rest/nbproject/build-impl.xml --- a/java/nekurak.net-rest/nbproject/build-impl.xml Tue Mar 23 01:12:16 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,868 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 5378f8dc8fa9 -r 77d86ffbf55b java/nekurak.net-rest/nbproject/genfiles.properties --- a/java/nekurak.net-rest/nbproject/genfiles.properties Tue Mar 23 01:12:16 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -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=c5edf49f -nbproject/build-impl.xml.script.CRC32=41eb3ef9 -nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.2.1 diff -r 5378f8dc8fa9 -r 77d86ffbf55b java/nekurak.net-rest/nbproject/project.properties --- a/java/nekurak.net-rest/nbproject/project.properties Tue Mar 23 01:12:16 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,76 +0,0 @@ -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=\ - ${reference.nekurak_net-lib.jar} -# 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 -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}:\ - ${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 5378f8dc8fa9 -r 77d86ffbf55b java/nekurak.net-rest/nbproject/project.xml --- a/java/nekurak.net-rest/nbproject/project.xml Tue Mar 23 01:12:16 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ - - - org.netbeans.modules.web.project - - - nekurak.net-rest - 1.6.5 - - - ${reference.nekurak_net-lib.jar} - WEB-INF/lib - - - - - - - - - - - - - nekurak_net-lib - jar - - jar - clean - jar - - - - diff -r 5378f8dc8fa9 -r 77d86ffbf55b java/nekurak.net-rest/src/java/cz/frantovo/nekurak/rest/ClanekREST.java --- a/java/nekurak.net-rest/src/java/cz/frantovo/nekurak/rest/ClanekREST.java Tue Mar 23 01:12:16 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -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 5378f8dc8fa9 -r 77d86ffbf55b java/nekurak.net-rest/web/WEB-INF/beans.xml --- a/java/nekurak.net-rest/web/WEB-INF/beans.xml Tue Mar 23 01:12:16 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ - - - diff -r 5378f8dc8fa9 -r 77d86ffbf55b java/nekurak.net-rest/web/WEB-INF/sun-web.xml --- a/java/nekurak.net-rest/web/WEB-INF/sun-web.xml Tue Mar 23 01:12:16 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ - - - - /nekurak.net-rest - - - - Keep a copy of the generated servlet class' java code. - - - diff -r 5378f8dc8fa9 -r 77d86ffbf55b java/nekurak.net-rest/web/WEB-INF/web.xml --- a/java/nekurak.net-rest/web/WEB-INF/web.xml Tue Mar 23 01:12:16 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ - - - - - - 30 - - - diff -r 5378f8dc8fa9 -r 77d86ffbf55b java/nekurak.net-web/build.xml --- a/java/nekurak.net-web/build.xml Tue Mar 23 01:12:16 2010 +0100 +++ b/java/nekurak.net-web/build.xml Tue Mar 23 09:15:48 2010 +0100 @@ -85,9 +85,6 @@ nekurak.net/java/nekurak.net-web/nbproject/private/** nekurak.net/java/nekurak.net-web/dist/** nekurak.net/java/nekurak.net-web/build/** - nekurak.net/java/nekurak.net-rest/nbproject/private/** - nekurak.net/java/nekurak.net-rest/dist/** - nekurak.net/java/nekurak.net-rest/build/** nekurak.net/java/nekurak.net-lib/nbproject/private/** nekurak.net/java/nekurak.net-lib/dist/** nekurak.net/java/nekurak.net-lib/build/**