# HG changeset patch # User František Kučera # Date 1265874770 -3600 # Node ID 88f3012c60a2533b4184493fd8ca872cb95b7fff # Parent fc3e84d87e01fa62ed34691182ebc1f1a131bb99 Přidání projektů: ear, ejb a lib. diff -r fc3e84d87e01 -r 88f3012c60a2 .hgignore --- a/.hgignore Thu Feb 11 03:13:57 2010 +0100 +++ b/.hgignore Thu Feb 11 08:52:50 2010 +0100 @@ -4,3 +4,16 @@ java/nekurak.net-web/web/nekurak.net-web-src.zip java/nekurak.net-web/src/conf/MANIFEST.MF java/nekurak.net-mvn/target/* + +java/nekurak.net-ear/dist/* +java/nekurak.net-ear/build/* +java/nekurak.net-ear/nbproject/private + +java/nekurak.net-ejb/dist/* +java/nekurak.net-ejb/build/* +java/nekurak.net-ejb/nbproject/private + +java/nekurak.net-lib/dist/* +java/nekurak.net-lib/build/* +java/nekurak.net-lib/nbproject/private + diff -r fc3e84d87e01 -r 88f3012c60a2 java/nekurak.net-ear/nbproject/ant-deploy.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-ear/nbproject/ant-deploy.xml Thu Feb 11 08:52:50 2010 +0100 @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r fc3e84d87e01 -r 88f3012c60a2 java/nekurak.net-ear/nbproject/build-impl.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-ear/nbproject/build-impl.xml Thu Feb 11 08:52:50 2010 +0100 @@ -0,0 +1,476 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set build.dir + Must set build.generated.dir + Must set dist.dir + Must set build.classes.excludes + Must set dist.jar + + + +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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable. + + + Launching ${browse.url} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r fc3e84d87e01 -r 88f3012c60a2 java/nekurak.net-ear/nbproject/genfiles.properties --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-ear/nbproject/genfiles.properties Thu Feb 11 08:52:50 2010 +0100 @@ -0,0 +1,8 @@ +build.xml.data.CRC32=dd0510f0 +build.xml.script.CRC32=85b7b58d +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=dd0510f0 +nbproject/build-impl.xml.script.CRC32=b94a2023 +nbproject/build-impl.xml.stylesheet.CRC32=624b8ca2@1.17.2 diff -r fc3e84d87e01 -r 88f3012c60a2 java/nekurak.net-ear/nbproject/project.properties --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-ear/nbproject/project.properties Thu Feb 11 08:52:50 2010 +0100 @@ -0,0 +1,33 @@ +build.classes.excludes=**/*.java,**/*.form,**/.nbattrs +build.dir=build +build.generated.dir=${build.dir}/generated +client.module.uri=nekurak.net-web +client.urlPart= +debug.classpath=${javac.classpath}::${jar.content.additional}:${run.classpath} +display.browser=true +dist.dir=dist +dist.jar=${dist.dir}/${jar.name} +endorsed.classpath=\ + ${libs.javaee-endorsed-api-6.0.classpath} +j2ee.appclient.mainclass.args=${j2ee.appclient.tool.args} +j2ee.deploy.on.save=false +j2ee.platform=1.6 +j2ee.server.type=gfv3ee6 +jar.compress=false +jar.content.additional=\ + ${reference.nekurak_net-web.dist-ear}:\ + ${reference.nekurak_net-ejb.dist-ear} +jar.name=nekurak.net-ear.ear +javac.debug=true +javac.deprecation=false +javac.source=1.5 +javac.target=1.5 +meta.inf=src/conf +no.dependencies=false +platform.active=default_platform +project.nekurak_net-ejb=../nekurak.net-ejb +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-web.dist-ear=${project.nekurak_net-web}/dist/nekurak.net-web.war +resource.dir=setup +source.root=. diff -r fc3e84d87e01 -r 88f3012c60a2 java/nekurak.net-ear/nbproject/project.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-ear/nbproject/project.xml Thu Feb 11 08:52:50 2010 +0100 @@ -0,0 +1,39 @@ + + + org.netbeans.modules.j2ee.earproject + + + nekurak.net-ear + 1.6.5 + + + + ${reference.nekurak_net-web.dist-ear} + / + + + ${reference.nekurak_net-ejb.dist-ear} + / + + + + + + nekurak_net-ejb + j2ee_ear_archive + + dist-ear + clean-ear + dist-ear + + + nekurak_net-web + j2ee_ear_archive + + dist-ear + clean-ear + dist-ear + + + + diff -r fc3e84d87e01 -r 88f3012c60a2 java/nekurak.net-ear/src/conf/MANIFEST.MF --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-ear/src/conf/MANIFEST.MF Thu Feb 11 08:52:50 2010 +0100 @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 + diff -r fc3e84d87e01 -r 88f3012c60a2 java/nekurak.net-ejb/nbproject/ant-deploy.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-ejb/nbproject/ant-deploy.xml Thu Feb 11 08:52:50 2010 +0100 @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r fc3e84d87e01 -r 88f3012c60a2 java/nekurak.net-ejb/nbproject/build-impl.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-ejb/nbproject/build-impl.xml Thu Feb 11 08:52:50 2010 +0100 @@ -0,0 +1,645 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set src.dir + Must set test.src.dir + Must set build.dir + Must set build.generated.dir + Must set dist.dir + Must set build.classes.dir + Must set dist.javadoc.dir + Must set build.classes.excludes + Must set dist.jar + +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 one file in the IDE or set run.class + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set main.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 fc3e84d87e01 -r 88f3012c60a2 java/nekurak.net-ejb/nbproject/genfiles.properties --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-ejb/nbproject/genfiles.properties Thu Feb 11 08:52:50 2010 +0100 @@ -0,0 +1,8 @@ +build.xml.data.CRC32=c812c3c4 +build.xml.script.CRC32=d7a2a0ed +build.xml.stylesheet.CRC32=e5f4c432@1.19.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=c812c3c4 +nbproject/build-impl.xml.script.CRC32=9437cdd7 +nbproject/build-impl.xml.stylesheet.CRC32=b9c9cfe1@1.19.2 diff -r fc3e84d87e01 -r 88f3012c60a2 java/nekurak.net-ejb/nbproject/project.properties --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-ejb/nbproject/project.properties Thu Feb 11 08:52:50 2010 +0100 @@ -0,0 +1,63 @@ +build.classes.dir=${build.dir}/classes +build.classes.excludes=**/*.java,**/*.form,**/.nbattrs +build.dir=build +build.ear.classes.dir=${build.dir}/classes +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 +debug.classpath=${javac.classpath}:${build.classes.dir} +debug.test.classpath=\ + ${run.test.classpath} +dist.dir=dist +dist.ear.jar=${dist.dir}/${jar.name} +dist.jar=${dist.dir}/${jar.name} +dist.javadoc.dir=${dist.dir}/javadoc +endorsed.classpath=\ + ${libs.javaee-endorsed-api-6.0.classpath} +excludes= +includes=** +j2ee.deploy.on.save=false +j2ee.platform=1.6 +j2ee.server.type=gfv3ee6 +jar.compress=false +jar.name=nekurak.net-ejb.jar +javac.classpath=\ + ${reference.nekurak_net-lib.jar} +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= +meta.inf=${source.root}/conf +meta.inf.excludes=sun-cmp-mappings.xml +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 diff -r fc3e84d87e01 -r 88f3012c60a2 java/nekurak.net-ejb/nbproject/project.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-ejb/nbproject/project.xml Thu Feb 11 08:52:50 2010 +0100 @@ -0,0 +1,27 @@ + + + org.netbeans.modules.j2ee.ejbjarproject + + + nekurak.net-ejb + 1.6.5 + reference.nekurak_net-lib.jar + + + + + + + + + + nekurak_net-lib + jar + + jar + clean + jar + + + + diff -r fc3e84d87e01 -r 88f3012c60a2 java/nekurak.net-ejb/src/conf/MANIFEST.MF --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-ejb/src/conf/MANIFEST.MF Thu Feb 11 08:52:50 2010 +0100 @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 + diff -r fc3e84d87e01 -r 88f3012c60a2 java/nekurak.net-ejb/src/conf/beans.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-ejb/src/conf/beans.xml Thu Feb 11 08:52:50 2010 +0100 @@ -0,0 +1,5 @@ + + + diff -r fc3e84d87e01 -r 88f3012c60a2 java/nekurak.net-lib/nbproject/build-impl.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-lib/nbproject/build-impl.xml Thu Feb 11 08:52:50 2010 +0100 @@ -0,0 +1,805 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set src.dir + Must set test.src.dir + Must set build.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.jar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + To run this application from the command line without Ant, try: + + + + + + + java -cp "${run.classpath.with.dist.jar}" ${main.class} + + + + + + + + + + + + + + + + + + + + + + + To run this application from the command line without Ant, try: + + java -jar "${dist.jar.resolved}" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r fc3e84d87e01 -r 88f3012c60a2 java/nekurak.net-lib/nbproject/genfiles.properties --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-lib/nbproject/genfiles.properties Thu Feb 11 08:52:50 2010 +0100 @@ -0,0 +1,8 @@ +build.xml.data.CRC32=11ce77af +build.xml.script.CRC32=f10c3672 +build.xml.stylesheet.CRC32=958a1d3e@1.32.1.45 +# 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=11ce77af +nbproject/build-impl.xml.script.CRC32=4e6301c4 +nbproject/build-impl.xml.stylesheet.CRC32=576378a2@1.32.1.45 diff -r fc3e84d87e01 -r 88f3012c60a2 java/nekurak.net-lib/nbproject/project.properties --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-lib/nbproject/project.properties Thu Feb 11 08:52:50 2010 +0100 @@ -0,0 +1,61 @@ +build.classes.dir=${build.dir}/classes +build.classes.excludes=**/*.java,**/*.form +# This directory is removed when the project is cleaned: +build.dir=build +build.generated.dir=${build.dir}/generated +build.generated.sources.dir=${build.dir}/generated-sources +# Only compile against the classpath explicitly listed here: +build.sysclasspath=ignore +build.test.classes.dir=${build.dir}/test/classes +build.test.results.dir=${build.dir}/test/results +# Uncomment to specify the preferred debugger connection transport: +#debug.transport=dt_socket +debug.classpath=\ + ${run.classpath} +debug.test.classpath=\ + ${run.test.classpath} +# This directory is removed when the project is cleaned: +dist.dir=dist +dist.jar=${dist.dir}/nekurak.net-lib.jar +dist.javadoc.dir=${dist.dir}/javadoc +excludes= +includes=** +jar.compress=false +javac.classpath=\ + ${libs.javaee-api-6.0.classpath} +# Space-separated list of extra javac options +javac.compilerargs= +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.private=false +javadoc.splitindex=true +javadoc.use=true +javadoc.version=false +javadoc.windowtitle= +meta.inf.dir=${src.dir}/META-INF +platform.active=default_platform +run.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir} +# Space-separated list of JVM arguments used when running the project +# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value +# or test-sys-prop.name=value to set system properties for unit tests): +run.jvmargs= +run.test.classpath=\ + ${javac.test.classpath}:\ + ${build.test.classes.dir} +source.encoding=UTF-8 +src.dir=src +test.src.dir=test diff -r fc3e84d87e01 -r 88f3012c60a2 java/nekurak.net-lib/nbproject/project.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/nekurak.net-lib/nbproject/project.xml Thu Feb 11 08:52:50 2010 +0100 @@ -0,0 +1,15 @@ + + + org.netbeans.modules.java.j2seproject + + + nekurak.net-lib + + + + + + + + + diff -r fc3e84d87e01 -r 88f3012c60a2 java/nekurak.net-web/nbproject/build-impl.xml --- a/java/nekurak.net-web/nbproject/build-impl.xml Thu Feb 11 03:13:57 2010 +0100 +++ b/java/nekurak.net-web/nbproject/build-impl.xml Thu Feb 11 08:52:50 2010 +0100 @@ -390,8 +390,16 @@ - - + + + + + + + + + + @@ -528,11 +536,13 @@ + + @@ -829,7 +839,9 @@ CLEANUP SECTION --> - + + + diff -r fc3e84d87e01 -r 88f3012c60a2 java/nekurak.net-web/nbproject/genfiles.properties --- a/java/nekurak.net-web/nbproject/genfiles.properties Thu Feb 11 03:13:57 2010 +0100 +++ b/java/nekurak.net-web/nbproject/genfiles.properties Thu Feb 11 08:52:50 2010 +0100 @@ -1,8 +1,8 @@ -build.xml.data.CRC32=e61550c0 +build.xml.data.CRC32=017e6ccf build.xml.script.CRC32=d97fcc7d 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=e61550c0 -nbproject/build-impl.xml.script.CRC32=78de9ffb +nbproject/build-impl.xml.data.CRC32=017e6ccf +nbproject/build-impl.xml.script.CRC32=c30cc1f7 nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.2.1 diff -r fc3e84d87e01 -r 88f3012c60a2 java/nekurak.net-web/nbproject/project.properties --- a/java/nekurak.net-web/nbproject/project.properties Thu Feb 11 03:13:57 2010 +0100 +++ b/java/nekurak.net-web/nbproject/project.properties Thu Feb 11 08:52:50 2010 +0100 @@ -26,7 +26,8 @@ j2ee.server.type=gfv3ee6 jar.compress=false javac.classpath=\ - ${libs.spring-framework.classpath} + ${libs.spring-framework.classpath}:\ + ${reference.nekurak_net-lib.jar} # Space-separated list of extra javac options javac.compilerargs= javac.debug=true @@ -55,6 +56,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 run.test.classpath=\ ${javac.test.classpath}:\ diff -r fc3e84d87e01 -r 88f3012c60a2 java/nekurak.net-web/nbproject/project.xml --- a/java/nekurak.net-web/nbproject/project.xml Thu Feb 11 03:13:57 2010 +0100 +++ b/java/nekurak.net-web/nbproject/project.xml Thu Feb 11 08:52:50 2010 +0100 @@ -10,6 +10,10 @@ ${libs.spring-framework.classpath} WEB-INF/lib + + ${reference.nekurak_net-lib.jar} + WEB-INF/lib + @@ -19,5 +23,15 @@ + + + nekurak_net-lib + jar + + jar + clean + jar + + diff -r fc3e84d87e01 -r 88f3012c60a2 java/nekurak.net-web/src/java/cz/frantovo/nekurak/dao/NekurakSuperDAO.java --- a/java/nekurak.net-web/src/java/cz/frantovo/nekurak/dao/NekurakSuperDAO.java Thu Feb 11 03:13:57 2010 +0100 +++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/dao/NekurakSuperDAO.java Thu Feb 11 08:52:50 2010 +0100 @@ -1,8 +1,6 @@ package cz.frantovo.nekurak.dao; import cz.frantovo.superDAO.SuperDAO; -import java.sql.Connection; -import java.sql.SQLException; import java.util.logging.Level; import javax.naming.InitialContext; import javax.naming.NamingException;