Permalink
Browse files

change libs and build

  • Loading branch information...
1 parent 4d470a1 commit fc2fdfba945909dddf5f5815e541ec829b759b8d @rjnichols committed Sep 9, 2011
@@ -28,7 +28,7 @@ libs.Wicket.javadoc=\
libs.Wicket.src=\
${base}/Wicket/wicket-1.4.0-sources.jar
libs.visural-wicket.classpath=\
- ${base}/visural-wicket/visural-common-0.4.3.jar;\
- ${base}/visural-wicket/visural-wicket-trunk.jar
+ ${base}/visural-wicket/visural-wicket-trunk.jar;\
+ ${base}/visural-wicket/visural-common-0.5.0.jar
libs.visural-common.classpath=\
${base}/visural-common/visural-common-0.2.jar
@@ -1,6 +1,5 @@
annotation.processing.enabled=true
annotation.processing.enabled.in.editor=true
-annotation.processing.processors.list=
annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
build.classes.dir=${build.web.dir}/WEB-INF/classes
View
@@ -71,8 +71,9 @@
</target>
<target name="-pre-init">
+ <property environment="env"/>
<if>
- <equals arg1="${env.RELEASE_NUMBER}" arg2="${env.RELEASE_NUMBER}" />
+ <equals arg1="${env.RELEASE_NUMBER}" arg2="$${env.RELEASE_NUMBER}" />
<then>
<property name="project.version" value="trunk"/>
</then>
@@ -1,31 +1,31 @@
-libs.junit.classpath=\
- ${base}/junit/junit-3.8.2.jar
-libs.junit.javadoc=\
- ${base}/junit/junit-3.8.2-api.zip
-libs.junit_4.classpath=\
- ${base}/junit_4/junit-4.5.jar
-libs.junit_4.javadoc=\
- ${base}/junit_4/junit-4.5-api.zip
-libs.junit_4.src=\
- ${base}/junit_4/junit-4.5-src.jar
-libs.CopyLibs.classpath=\
- ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
-libs.Rhino.classpath=\
- ${base}/Rhino/js.jar
-libs.servlet-api.classpath=\
- ${base}/servlet-api/javax.servlet.jar
-libs.Wicket.classpath=\
- ${base}/Wicket/slf4j-api-1.4.2.jar;\
- ${base}/Wicket/slf4j-jdk14-1.4.2.jar;\
- ${base}/Wicket/wicket-1.4.3.jar
-libs.Wicket.javadoc=\
- ${base}/Wicket/wicket-1.4.0-javadoc.jar
-libs.Wicket.src=\
- ${base}/Wicket/wicket-1.4.0-sources.jar
-libs.WicketExtensions.classpath=\
- ${base}/WicketExtensions/wicket-extensions-1.4.3.jar
-libs.visural-common.classpath=\
- ${base}/visural-common/visural-common-0.4.3.jar
-libs.JSR303.classpath=\
- ${base}/JSR303/hibernate-validator-4.0.2.GA.jar;\
- ${base}/JSR303/validation-api-1.0.0.GA.jar
+libs.junit.classpath=\
+ ${base}/junit/junit-3.8.2.jar
+libs.junit.javadoc=\
+ ${base}/junit/junit-3.8.2-api.zip
+libs.junit_4.classpath=\
+ ${base}/junit_4/junit-4.5.jar
+libs.junit_4.javadoc=\
+ ${base}/junit_4/junit-4.5-api.zip
+libs.junit_4.src=\
+ ${base}/junit_4/junit-4.5-src.jar
+libs.CopyLibs.classpath=\
+ ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
+libs.Rhino.classpath=\
+ ${base}/Rhino/js.jar
+libs.servlet-api.classpath=\
+ ${base}/servlet-api/javax.servlet.jar
+libs.Wicket.classpath=\
+ ${base}/Wicket/slf4j-api-1.4.2.jar;\
+ ${base}/Wicket/slf4j-jdk14-1.4.2.jar;\
+ ${base}/Wicket/wicket-1.4.3.jar
+libs.Wicket.javadoc=\
+ ${base}/Wicket/wicket-1.4.0-javadoc.jar
+libs.Wicket.src=\
+ ${base}/Wicket/wicket-1.4.0-sources.jar
+libs.WicketExtensions.classpath=\
+ ${base}/WicketExtensions/wicket-extensions-1.4.3.jar
+libs.visural-common.classpath=\
+ ${base}/visural-common/visural-common-0.5.0.jar
+libs.JSR303.classpath=\
+ ${base}/JSR303/hibernate-validator-4.0.2.GA.jar;\
+ ${base}/JSR303/validation-api-1.0.0.GA.jar
@@ -1,71 +1,77 @@
-application.title=visural-wicket
-application.vendor=Richard Nichols
-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}/visural-wicket.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-includes=**
-jar.compress=true
-javac.classpath=\
- ${libs.Wicket.classpath}:\
- ${libs.WicketExtensions.classpath}:\
- ${libs.visural-common.classpath}:\
- ${libs.JSR303.classpath}:\
- ${libs.Rhino.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_4.classpath}
-javadoc.additionalparam=
-javadoc.author=true
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=true
-javadoc.windowtitle=
-jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
-main.class=
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-platform.active=default_platform
-project.license=apache20
-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
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.run.all.processors=true
+application.title=visural-wicket
+application.vendor=Richard Nichols
+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}/visural-wicket.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+excludes=
+includes=**
+jar.compress=true
+javac.classpath=\
+ ${libs.Wicket.classpath}:\
+ ${libs.WicketExtensions.classpath}:\
+ ${libs.visural-common.classpath}:\
+ ${libs.JSR303.classpath}:\
+ ${libs.Rhino.classpath}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.processorpath=\
+ ${javac.classpath}
+javac.source=1.5
+javac.target=1.5
+javac.test.classpath=\
+ ${javac.classpath}:\
+ ${build.classes.dir}:\
+ ${libs.junit_4.classpath}
+javadoc.additionalparam=
+javadoc.author=true
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=true
+javadoc.windowtitle=
+jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
+main.class=
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=default_platform
+project.license=apache20
+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

0 comments on commit fc2fdfb

Please sign in to comment.