diff --git a/branches/NetbeansIndependency/PlanosActuacao/lib/appbase.jar b/branches/NetbeansIndependency/PlanosActuacao/lib/appbase.jar new file mode 100644 index 00000000..cfca6d0a Binary files /dev/null and b/branches/NetbeansIndependency/PlanosActuacao/lib/appbase.jar differ diff --git a/branches/NetbeansIndependency/PlanosActuacao/lib/dataprovider.jar b/branches/NetbeansIndependency/PlanosActuacao/lib/dataprovider.jar new file mode 100644 index 00000000..a12b68ad Binary files /dev/null and b/branches/NetbeansIndependency/PlanosActuacao/lib/dataprovider.jar differ diff --git a/branches/NetbeansIndependency/PlanosActuacao/lib/jsf-api.jar b/branches/NetbeansIndependency/PlanosActuacao/lib/jsf-api.jar new file mode 100644 index 00000000..7824f8a0 Binary files /dev/null and b/branches/NetbeansIndependency/PlanosActuacao/lib/jsf-api.jar differ diff --git a/branches/NetbeansIndependency/PlanosActuacao/lib/jsf-extensions-common-0.1.jar b/branches/NetbeansIndependency/PlanosActuacao/lib/jsf-extensions-common-0.1.jar new file mode 100644 index 00000000..e8766f33 Binary files /dev/null and b/branches/NetbeansIndependency/PlanosActuacao/lib/jsf-extensions-common-0.1.jar differ diff --git a/branches/NetbeansIndependency/PlanosActuacao/lib/jsf-extensions-dynamic-faces-0.1.jar b/branches/NetbeansIndependency/PlanosActuacao/lib/jsf-extensions-dynamic-faces-0.1.jar new file mode 100644 index 00000000..4a5af1cd Binary files /dev/null and b/branches/NetbeansIndependency/PlanosActuacao/lib/jsf-extensions-dynamic-faces-0.1.jar differ diff --git a/branches/NetbeansIndependency/PlanosActuacao/lib/jsf-impl.jar b/branches/NetbeansIndependency/PlanosActuacao/lib/jsf-impl.jar new file mode 100644 index 00000000..d656bdc3 Binary files /dev/null and b/branches/NetbeansIndependency/PlanosActuacao/lib/jsf-impl.jar differ diff --git a/branches/NetbeansIndependency/PlanosActuacao/lib/jsfcl.jar b/branches/NetbeansIndependency/PlanosActuacao/lib/jsfcl.jar new file mode 100644 index 00000000..524dc8af Binary files /dev/null and b/branches/NetbeansIndependency/PlanosActuacao/lib/jsfcl.jar differ diff --git a/branches/NetbeansIndependency/PlanosActuacao/lib/json-2.jar b/branches/NetbeansIndependency/PlanosActuacao/lib/json-2.jar new file mode 100644 index 00000000..b89f579c Binary files /dev/null and b/branches/NetbeansIndependency/PlanosActuacao/lib/json-2.jar differ diff --git a/branches/NetbeansIndependency/PlanosActuacao/lib/jstl.jar b/branches/NetbeansIndependency/PlanosActuacao/lib/jstl.jar new file mode 100644 index 00000000..0e64b5fb Binary files /dev/null and b/branches/NetbeansIndependency/PlanosActuacao/lib/jstl.jar differ diff --git a/branches/NetbeansIndependency/PlanosActuacao/lib/sqlx.jar b/branches/NetbeansIndependency/PlanosActuacao/lib/sqlx.jar new file mode 100644 index 00000000..2b341bb3 Binary files /dev/null and b/branches/NetbeansIndependency/PlanosActuacao/lib/sqlx.jar differ diff --git a/branches/NetbeansIndependency/PlanosActuacao/lib/standard.jar b/branches/NetbeansIndependency/PlanosActuacao/lib/standard.jar new file mode 100644 index 00000000..ab559dd1 Binary files /dev/null and b/branches/NetbeansIndependency/PlanosActuacao/lib/standard.jar differ diff --git a/branches/NetbeansIndependency/PlanosActuacao/lib/webui-jsf-suntheme.jar b/branches/NetbeansIndependency/PlanosActuacao/lib/webui-jsf-suntheme.jar new file mode 100644 index 00000000..8a69ce70 Binary files /dev/null and b/branches/NetbeansIndependency/PlanosActuacao/lib/webui-jsf-suntheme.jar differ diff --git a/branches/NetbeansIndependency/PlanosActuacao/lib/webui-jsf.jar b/branches/NetbeansIndependency/PlanosActuacao/lib/webui-jsf.jar new file mode 100644 index 00000000..9c939bbc Binary files /dev/null and b/branches/NetbeansIndependency/PlanosActuacao/lib/webui-jsf.jar differ diff --git a/branches/NetbeansIndependency/PlanosActuacao/nbproject/build-impl.xml b/branches/NetbeansIndependency/PlanosActuacao/nbproject/build-impl.xml index 929b682e..1011e8f7 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/nbproject/build-impl.xml +++ b/branches/NetbeansIndependency/PlanosActuacao/nbproject/build-impl.xml @@ -516,12 +516,8 @@ exists or setup the property manually. For example like this: - - - - - + @@ -534,12 +530,20 @@ exists or setup the property manually. For example like this: + + + + + + + + @@ -549,6 +553,10 @@ exists or setup the property manually. For example like this: + + + + @@ -557,16 +565,12 @@ exists or setup the property manually. For example like this: - + - - - - - + @@ -579,12 +583,20 @@ exists or setup the property manually. For example like this: + + + + + + + + @@ -594,6 +606,10 @@ exists or setup the property manually. For example like this: + + + + diff --git a/branches/NetbeansIndependency/PlanosActuacao/nbproject/genfiles.properties b/branches/NetbeansIndependency/PlanosActuacao/nbproject/genfiles.properties index d1c440cc..10069d02 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/nbproject/genfiles.properties +++ b/branches/NetbeansIndependency/PlanosActuacao/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=68c8c433 +build.xml.data.CRC32=b022afcb build.xml.script.CRC32=50b8b881 build.xml.stylesheet.CRC32=c0ebde35@1.15.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=68c8c433 -nbproject/build-impl.xml.script.CRC32=0f9e6147 +nbproject/build-impl.xml.data.CRC32=b022afcb +nbproject/build-impl.xml.script.CRC32=be34a64d nbproject/build-impl.xml.stylesheet.CRC32=8ab4467e@1.15.2.1 diff --git a/branches/NetbeansIndependency/PlanosActuacao/nbproject/project.properties b/branches/NetbeansIndependency/PlanosActuacao/nbproject/project.properties index a3dbef95..35b26b03 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/nbproject/project.properties +++ b/branches/NetbeansIndependency/PlanosActuacao/nbproject/project.properties @@ -22,6 +22,7 @@ dist.javadoc.dir=${dist.dir}/javadoc dist.war=${dist.dir}/${war.name} excludes= file.reference.activation.jar=lib/activation.jar +file.reference.appbase.jar=lib/appbase.jar file.reference.ashwood-2.0.jar=lib/ashwood-2.0.jar file.reference.avalon-framework-4.2.0.jar=lib/avalon-framework-4.2.0.jar file.reference.batik-all-1.7.jar=lib/batik-all-1.7.jar @@ -35,12 +36,20 @@ file.reference.commons-lang-2.4.jar=lib/commons-lang-2.4.jar file.reference.commons-logging-1.1.1.jar=lib/commons-logging-1.1.1.jar file.reference.commons-validator-1.3.1.jar=lib/commons-validator-1.3.1.jar file.reference.cursos.jar=lib/cursos.jar +file.reference.dataprovider.jar=lib/dataprovider.jar file.reference.evologger.jar=lib/evologger.jar file.reference.evolute.jar=lib/evolute.jar file.reference.fop.jar=lib/fop.jar file.reference.jai_imageio.jar=lib/jai_imageio.jar file.reference.jdbcappender.jar=lib/jdbcappender.jar file.reference.jdom.jar=lib/jdom.jar +file.reference.jsf-api.jar=lib/jsf-api.jar +file.reference.jsf-extensions-common-0.1.jar=lib/jsf-extensions-common-0.1.jar +file.reference.jsf-extensions-dynamic-faces-0.1.jar=lib/jsf-extensions-dynamic-faces-0.1.jar +file.reference.jsf-impl.jar=lib/jsf-impl.jar +file.reference.jsfcl.jar=lib/jsfcl.jar +file.reference.json-2.jar=lib/json-2.jar +file.reference.jstl.jar=lib/jstl.jar file.reference.log4j-1.2.15.jar=lib/log4j-1.2.15.jar file.reference.mail.jar-1=lib/mail.jar file.reference.postgresql-8.4-701.jdbc4.jar=lib/postgresql-8.4-701.jdbc4.jar @@ -50,6 +59,10 @@ file.reference.richfaces-impl-jsf2-3.3.3.Final.jar=lib/richfaces-impl-jsf2-3.3.3 file.reference.richfaces-ui-3.3.3.Final.jar=lib/richfaces-ui-3.3.3.Final.jar file.reference.serializer-2.7.0.jar=lib/serializer-2.7.0.jar file.reference.shst.jar=lib/shst.jar +file.reference.sqlx.jar=lib/sqlx.jar +file.reference.standard.jar=lib/standard.jar +file.reference.webui-jsf-suntheme.jar=lib/webui-jsf-suntheme.jar +file.reference.webui-jsf.jar=lib/webui-jsf.jar file.reference.xalan-2.7.0.jar=lib/xalan-2.7.0.jar file.reference.xercesImpl-2.7.1.jar=lib/xercesImpl-2.7.1.jar file.reference.xml-apis-1.3.04.jar=lib/xml-apis-1.3.04.jar @@ -61,12 +74,8 @@ j2ee.platform=1.5 j2ee.server.type=Tomcat60 jar.compress=false javac.classpath=\ - ${libs.jsf12.classpath}:\ - ${libs.jstl11.classpath}:\ - ${libs.jsf12-support.classpath}:\ - ${libs.woodstock-components.classpath}:\ - ${libs.woodstock-theme-default.classpath}:\ ${file.reference.activation.jar}:\ + ${file.reference.appbase.jar}:\ ${file.reference.ashwood-2.0.jar}:\ ${file.reference.avalon-framework-4.2.0.jar}:\ ${file.reference.batik-all-1.7.jar}:\ @@ -79,12 +88,20 @@ javac.classpath=\ ${file.reference.commons-logging-1.1.1.jar}:\ ${file.reference.commons-validator-1.3.1.jar}:\ ${file.reference.cursos.jar}:\ + ${file.reference.dataprovider.jar}:\ ${file.reference.evologger.jar}:\ ${file.reference.evolute.jar}:\ ${file.reference.fop.jar}:\ ${file.reference.jai_imageio.jar}:\ ${file.reference.jdbcappender.jar}:\ ${file.reference.jdom.jar}:\ + ${file.reference.jsf-api.jar}:\ + ${file.reference.jsf-extensions-common-0.1.jar}:\ + ${file.reference.jsf-extensions-dynamic-faces-0.1.jar}:\ + ${file.reference.jsf-impl.jar}:\ + ${file.reference.jsfcl.jar}:\ + ${file.reference.json-2.jar}:\ + ${file.reference.jstl.jar}:\ ${file.reference.log4j-1.2.15.jar}:\ ${file.reference.mail.jar-1}:\ ${file.reference.postgresql-8.4-701.jdbc4.jar}:\ @@ -94,6 +111,10 @@ javac.classpath=\ ${file.reference.richfaces-ui-3.3.3.Final.jar}:\ ${file.reference.serializer-2.7.0.jar}:\ ${file.reference.shst.jar}:\ + ${file.reference.sqlx.jar}:\ + ${file.reference.standard.jar}:\ + ${file.reference.webui-jsf-suntheme.jar}:\ + ${file.reference.webui-jsf.jar}:\ ${file.reference.xalan-2.7.0.jar}:\ ${file.reference.xercesImpl-2.7.1.jar}:\ ${file.reference.xml-apis-1.3.04.jar}:\ diff --git a/branches/NetbeansIndependency/PlanosActuacao/nbproject/project.xml b/branches/NetbeansIndependency/PlanosActuacao/nbproject/project.xml index df9778c0..53fb8a8f 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/nbproject/project.xml +++ b/branches/NetbeansIndependency/PlanosActuacao/nbproject/project.xml @@ -8,27 +8,11 @@ 1.6 - ${libs.jsf12.classpath} - WEB-INF/lib - - - ${libs.jstl11.classpath} - WEB-INF/lib - - - ${libs.jsf12-support.classpath} - WEB-INF/lib - - - ${libs.woodstock-components.classpath} + ${file.reference.activation.jar} WEB-INF/lib - ${libs.woodstock-theme-default.classpath} - WEB-INF/lib - - - ${file.reference.activation.jar} + ${file.reference.appbase.jar} WEB-INF/lib @@ -79,6 +63,10 @@ ${file.reference.cursos.jar} WEB-INF/lib + + ${file.reference.dataprovider.jar} + WEB-INF/lib + ${file.reference.evologger.jar} WEB-INF/lib @@ -103,6 +91,34 @@ ${file.reference.jdom.jar} WEB-INF/lib + + ${file.reference.jsf-api.jar} + WEB-INF/lib + + + ${file.reference.jsf-extensions-common-0.1.jar} + WEB-INF/lib + + + ${file.reference.jsf-extensions-dynamic-faces-0.1.jar} + WEB-INF/lib + + + ${file.reference.jsf-impl.jar} + WEB-INF/lib + + + ${file.reference.jsfcl.jar} + WEB-INF/lib + + + ${file.reference.json-2.jar} + WEB-INF/lib + + + ${file.reference.jstl.jar} + WEB-INF/lib + ${file.reference.log4j-1.2.15.jar} WEB-INF/lib @@ -139,6 +155,22 @@ ${file.reference.shst.jar} WEB-INF/lib + + ${file.reference.sqlx.jar} + WEB-INF/lib + + + ${file.reference.standard.jar} + WEB-INF/lib + + + ${file.reference.webui-jsf-suntheme.jar} + WEB-INF/lib + + + ${file.reference.webui-jsf.jar} + WEB-INF/lib + ${file.reference.xalan-2.7.0.jar} WEB-INF/lib