diff --git a/src/java/DmWebPortal/lib/primefaces-4.0.jar b/src/java/DmWebPortal/lib/primefaces-4.0.jar deleted file mode 100644 index 1bff6658be3e0a972502e943236fb19069e6c82b..0000000000000000000000000000000000000000 Binary files a/src/java/DmWebPortal/lib/primefaces-4.0.jar and /dev/null differ diff --git a/src/java/DmWebPortal/nbproject/build-impl.xml b/src/java/DmWebPortal/nbproject/build-impl.xml index 516e392b3f36640213b2f873f83224c77785dabb..9c5aa3c4cd5550bd1cd8b6892beb9552634657d4 100644 --- a/src/java/DmWebPortal/nbproject/build-impl.xml +++ b/src/java/DmWebPortal/nbproject/build-impl.xml @@ -1027,7 +1027,7 @@ exists or setup the property manually. For example like this: <copyfiles files="${file.reference.postgresql-9.3-1102.jdbc41.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> <copyfiles files="${file.reference.org-netbeans-modules-java-j2seproject-copylibstask.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> <copyfiles files="${file.reference.poi-3.10.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> - <copyfiles files="${file.reference.primefaces-4.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> + <copyfiles files="${file.reference.primefaces-5.1.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> @@ -1037,7 +1037,7 @@ exists or setup the property manually. For example like this: <copyfiles files="${file.reference.postgresql-9.3-1102.jdbc41.jar}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${file.reference.org-netbeans-modules-java-j2seproject-copylibstask.jar}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${file.reference.poi-3.10.jar}" todir="${build.web.dir}/WEB-INF/lib"/> - <copyfiles files="${file.reference.primefaces-4.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/> + <copyfiles files="${file.reference.primefaces-5.1.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"/> diff --git a/src/java/DmWebPortal/nbproject/genfiles.properties b/src/java/DmWebPortal/nbproject/genfiles.properties index 3d091c1e1378f9c88edd907282e4eb8a3ea07b46..b873a5771066abf900feb62349a2f8895342f3bd 100644 --- a/src/java/DmWebPortal/nbproject/genfiles.properties +++ b/src/java/DmWebPortal/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=e9bcf603 +build.xml.data.CRC32=60eac348 build.xml.script.CRC32=6f54d92a build.xml.stylesheet.CRC32=651128d4@1.65.1.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=e9bcf603 -nbproject/build-impl.xml.script.CRC32=953d2855 +nbproject/build-impl.xml.data.CRC32=60eac348 +nbproject/build-impl.xml.script.CRC32=e9dbfc6a nbproject/build-impl.xml.stylesheet.CRC32=d659eb7a@1.65.1.1 diff --git a/src/java/DmWebPortal/nbproject/project.properties b/src/java/DmWebPortal/nbproject/project.properties index e7136787eef3861112a790fc1a217e0315ec5448..a3c17447a13af0c087aaf88a403436b9c5dd4f70 100644 --- a/src/java/DmWebPortal/nbproject/project.properties +++ b/src/java/DmWebPortal/nbproject/project.properties @@ -35,7 +35,6 @@ file.reference.log4j-1.2.17.jar=lib/log4j-1.2.17.jar file.reference.org-netbeans-modules-java-j2seproject-copylibstask.jar=lib/org-netbeans-modules-java-j2seproject-copylibstask.jar file.reference.poi-3.10.jar=lib/poi-3.10.jar file.reference.postgresql-9.3-1102.jdbc41.jar=lib/postgresql-9.3-1102.jdbc41.jar -file.reference.primefaces-4.0.jar=lib/primefaces-4.0.jar file.reference.primefaces-5.1.jar=lib/primefaces-5.1.jar includes=** j2ee.compile.on.save=true @@ -56,8 +55,7 @@ javac.classpath=\ ${file.reference.postgresql-9.3-1102.jdbc41.jar}:\ ${file.reference.org-netbeans-modules-java-j2seproject-copylibstask.jar}:\ ${file.reference.poi-3.10.jar}:\ - ${file.reference.primefaces-5.1.jar}:\ - ${file.reference.primefaces-4.0.jar} + ${file.reference.primefaces-5.1.jar} # Space-separated list of extra javac options javac.compilerargs= javac.debug=true diff --git a/src/java/DmWebPortal/nbproject/project.xml b/src/java/DmWebPortal/nbproject/project.xml index 8fc81dfdf9073700c0323f192b3aaaaa98cd7b8b..50ed44a29e293bd191e07c5b9e0b3f794f9120cd 100644 --- a/src/java/DmWebPortal/nbproject/project.xml +++ b/src/java/DmWebPortal/nbproject/project.xml @@ -28,9 +28,6 @@ </library> <library dirs="200"> <file>${file.reference.primefaces-5.1.jar}</file> - </library> - <library dirs="200"> - <file>${file.reference.primefaces-4.0.jar}</file> <path-in-war>WEB-INF/lib</path-in-war> </library> </web-module-libraries>