From c4ea21283d0dca4854c74721380543a3e6552775 Mon Sep 17 00:00:00 2001 From: Rafael Queiroz Date: Sun, 5 Mar 2017 15:31:58 -0300 Subject: [PATCH 01/11] Added composer autoload in example --- examples/example.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/examples/example.php b/examples/example.php index af8da5f..d9d3593 100755 --- a/examples/example.php +++ b/examples/example.php @@ -1,6 +1,5 @@ Date: Sun, 5 Mar 2017 16:04:42 -0300 Subject: [PATCH 02/11] Changes for new directory structure --- {src/JasperStarter => bin/jasperstart}/CHANGES | 0 {src/JasperStarter => bin/jasperstart}/LICENSE | 0 {src/JasperStarter => bin/jasperstart}/NOTICE | 0 {src/JasperStarter => bin/jasperstart}/README.md | 0 .../jasperstart}/bin/jasperstarter | 0 .../jasperstart}/bin/jasperstarter.exe | Bin .../jasperstart}/examples/Blank_A4_1.jrxml | 0 .../jasperstart}/examples/CancelAck.jrxml | 0 .../jasperstart}/examples/CancelAck.xml | 0 .../jasperstart}/examples/charactersetTest.jrxml | 0 ...charactersetTestWithStudioBuiltinFunctions.jrxml | 0 .../jasperstart}/examples/contacts.json | 0 .../jasperstart}/examples/contacts.xml | 0 .../jasperstart}/examples/csv.jrxml | 0 .../jasperstart}/examples/csvExampleHeaders.csv | 0 .../jasperstart}/examples/csvMeta.jrxml | 0 .../jasperstart}/examples/details.jrxml | 0 .../jasperstart}/examples/header.jrxml | 0 .../jasperstart}/examples/i18n-bundle.properties | 0 .../jasperstart}/examples/i18n-bundle_de.properties | 0 .../jasperstart}/examples/i18n-bundle_ru.properties | 0 .../jasperstart}/examples/json.jrxml | 0 .../jasperstart}/examples/main.jrxml | 0 .../jasperstart}/examples/noDB-i18n.jrxml | 0 .../jasperstart}/examples/noDB-params.jrxml | 0 {src/JasperStarter => bin/jasperstart}/jdbc/README | 0 .../jdbc/mysql-connector-java-5.1.39-bin.jar | Bin .../jasperstart}/jdbc/postgresql-9.4-1203.jdbc4.jar | Bin .../jasperstart}/lib/ant-1.7.1.jar | Bin .../jasperstart}/lib/ant-launcher-1.7.1.jar | Bin .../jasperstart}/lib/aopalliance-1.0.jar | Bin .../jasperstart}/lib/argparse4j-0.5.0.jar | Bin .../lib/avalon-framework-impl-4.2.0.jar | Bin .../jasperstart}/lib/barbecue-1.5-beta1.jar | Bin .../jasperstart}/lib/barcode4j-2.1.jar | Bin .../jasperstart}/lib/batik-anim-1.7.jar | Bin .../jasperstart}/lib/batik-awt-util-1.7.jar | Bin .../jasperstart}/lib/batik-bridge-1.7.jar | Bin .../jasperstart}/lib/batik-css-1.7.jar | Bin .../jasperstart}/lib/batik-dom-1.7.jar | Bin .../jasperstart}/lib/batik-ext-1.7.jar | Bin .../jasperstart}/lib/batik-gvt-1.7.jar | Bin .../jasperstart}/lib/batik-js-1.7.jar | Bin .../jasperstart}/lib/batik-parser-1.7.jar | Bin .../jasperstart}/lib/batik-script-1.7.jar | Bin .../jasperstart}/lib/batik-svg-dom-1.7.jar | Bin .../jasperstart}/lib/batik-svggen-1.7.jar | Bin .../jasperstart}/lib/batik-util-1.7.jar | Bin .../jasperstart}/lib/batik-xml-1.7.jar | Bin .../jasperstart}/lib/bcmail-jdk14-1.38.jar | Bin .../jasperstart}/lib/bcmail-jdk14-138.jar | Bin .../jasperstart}/lib/bcprov-jdk14-1.38.jar | Bin .../jasperstart}/lib/bcprov-jdk14-138.jar | Bin .../jasperstart}/lib/bctsp-jdk14-1.38.jar | Bin .../jasperstart}/lib/castor-core-1.3.3.jar | Bin .../jasperstart}/lib/castor-xml-1.3.3.jar | Bin .../jasperstart}/lib/commons-beanutils-1.9.0.jar | Bin .../jasperstart}/lib/commons-cli-1.0.jar | Bin .../jasperstart}/lib/commons-codec-1.5.jar | Bin .../jasperstart}/lib/commons-collections-3.2.1.jar | Bin .../jasperstart}/lib/commons-digester-2.1.jar | Bin .../jasperstart}/lib/commons-io-2.4.jar | Bin .../jasperstart}/lib/commons-lang-2.6.jar | Bin .../jasperstart}/lib/commons-logging-1.1.1.jar | Bin .../jasperstart}/lib/core-2.3.0.jar | Bin .../jasperstart}/lib/ecj-4.3.1.jar | Bin .../jasperstart}/lib/groovy-all-2.4.1.jar | Bin .../jasperstart}/lib/itext-2.1.7.js2.jar | Bin .../jasperstart}/lib/jackson-annotations-2.1.4.jar | Bin .../jasperstart}/lib/jackson-core-2.1.4.jar | Bin .../jasperstart}/lib/jackson-databind-2.1.4.jar | Bin .../jasperstart}/lib/jakarta-regexp-1.4.jar | Bin .../jasperstart}/lib/jasperreports-6.1.0.jar | Bin .../jasperstart}/lib/jasperreports-fonts-6.0.0.jar | Bin .../lib/jasperreports-functions-6.1.0.jar | Bin .../jasperstart}/lib/jasperstarter.jar | Bin .../jasperstart}/lib/javax.inject-1.jar | Bin .../jasperstart}/lib/jcalendar-1.4.jar | Bin .../jasperstart}/lib/jcommon-1.0.15.jar | Bin .../jasperstart}/lib/jfreechart-1.0.12.jar | Bin .../jasperstart}/lib/joda-time-2.0.jar | Bin .../jasperstart}/lib/log4j-1.2.17.jar | Bin .../lib/lucene-analyzers-common-4.5.1.jar | Bin .../jasperstart}/lib/lucene-core-4.5.1.jar | Bin .../jasperstart}/lib/lucene-queries-4.5.1.jar | Bin .../jasperstart}/lib/lucene-queryparser-4.5.1.jar | Bin .../jasperstart}/lib/lucene-sandbox-4.5.1.jar | Bin .../jasperstart}/lib/olap4j-0.9.7.309-JS-3.jar | Bin .../jasperstart}/lib/poi-3.10-FINAL.jar | Bin .../jasperstart}/lib/servlet-api-2.5.jar | Bin .../jasperstart}/lib/spring-aop-3.0.6.RELEASE.jar | Bin .../jasperstart}/lib/spring-asm-3.0.6.RELEASE.jar | Bin .../jasperstart}/lib/spring-beans-3.0.6.RELEASE.jar | Bin .../lib/spring-context-3.0.6.RELEASE.jar | Bin .../jasperstart}/lib/spring-core-3.0.6.RELEASE.jar | Bin .../lib/spring-expression-3.0.6.RELEASE.jar | Bin .../jasperstart}/lib/stax-1.2.0.jar | Bin .../jasperstart}/lib/stax-api-1.0-2.jar | Bin .../jasperstart}/lib/stax-api-1.0.1.jar | Bin .../jasperstart}/lib/xalan-2.6.0.jar | Bin .../jasperstart}/lib/xml-apis-1.3.02.jar | Bin .../jasperstart}/lib/xml-apis-ext-1.3.04.jar | Bin src/{JasperPHP => Command}/JasperPHPCommand.php | 0 src/{JasperPHP => }/Facades/JasperPHP.php | 0 src/{JasperPHP => }/JasperPHP.php | 0 .../JasperPHPServiceProvider.php | 0 106 files changed, 0 insertions(+), 0 deletions(-) rename {src/JasperStarter => bin/jasperstart}/CHANGES (100%) rename {src/JasperStarter => bin/jasperstart}/LICENSE (100%) rename {src/JasperStarter => bin/jasperstart}/NOTICE (100%) rename {src/JasperStarter => bin/jasperstart}/README.md (100%) rename {src/JasperStarter => bin/jasperstart}/bin/jasperstarter (100%) rename {src/JasperStarter => bin/jasperstart}/bin/jasperstarter.exe (100%) rename {src/JasperStarter => bin/jasperstart}/examples/Blank_A4_1.jrxml (100%) rename {src/JasperStarter => bin/jasperstart}/examples/CancelAck.jrxml (100%) rename {src/JasperStarter => bin/jasperstart}/examples/CancelAck.xml (100%) rename {src/JasperStarter => bin/jasperstart}/examples/charactersetTest.jrxml (100%) rename {src/JasperStarter => bin/jasperstart}/examples/charactersetTestWithStudioBuiltinFunctions.jrxml (100%) rename {src/JasperStarter => bin/jasperstart}/examples/contacts.json (100%) rename {src/JasperStarter => bin/jasperstart}/examples/contacts.xml (100%) rename {src/JasperStarter => bin/jasperstart}/examples/csv.jrxml (100%) rename {src/JasperStarter => bin/jasperstart}/examples/csvExampleHeaders.csv (100%) rename {src/JasperStarter => bin/jasperstart}/examples/csvMeta.jrxml (100%) rename {src/JasperStarter => bin/jasperstart}/examples/details.jrxml (100%) rename {src/JasperStarter => bin/jasperstart}/examples/header.jrxml (100%) rename {src/JasperStarter => bin/jasperstart}/examples/i18n-bundle.properties (100%) rename {src/JasperStarter => bin/jasperstart}/examples/i18n-bundle_de.properties (100%) rename {src/JasperStarter => bin/jasperstart}/examples/i18n-bundle_ru.properties (100%) rename {src/JasperStarter => bin/jasperstart}/examples/json.jrxml (100%) rename {src/JasperStarter => bin/jasperstart}/examples/main.jrxml (100%) rename {src/JasperStarter => bin/jasperstart}/examples/noDB-i18n.jrxml (100%) rename {src/JasperStarter => bin/jasperstart}/examples/noDB-params.jrxml (100%) rename {src/JasperStarter => bin/jasperstart}/jdbc/README (100%) rename {src/JasperStarter => bin/jasperstart}/jdbc/mysql-connector-java-5.1.39-bin.jar (100%) rename {src/JasperStarter => bin/jasperstart}/jdbc/postgresql-9.4-1203.jdbc4.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/ant-1.7.1.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/ant-launcher-1.7.1.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/aopalliance-1.0.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/argparse4j-0.5.0.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/avalon-framework-impl-4.2.0.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/barbecue-1.5-beta1.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/barcode4j-2.1.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/batik-anim-1.7.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/batik-awt-util-1.7.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/batik-bridge-1.7.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/batik-css-1.7.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/batik-dom-1.7.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/batik-ext-1.7.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/batik-gvt-1.7.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/batik-js-1.7.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/batik-parser-1.7.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/batik-script-1.7.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/batik-svg-dom-1.7.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/batik-svggen-1.7.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/batik-util-1.7.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/batik-xml-1.7.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/bcmail-jdk14-1.38.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/bcmail-jdk14-138.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/bcprov-jdk14-1.38.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/bcprov-jdk14-138.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/bctsp-jdk14-1.38.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/castor-core-1.3.3.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/castor-xml-1.3.3.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/commons-beanutils-1.9.0.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/commons-cli-1.0.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/commons-codec-1.5.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/commons-collections-3.2.1.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/commons-digester-2.1.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/commons-io-2.4.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/commons-lang-2.6.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/commons-logging-1.1.1.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/core-2.3.0.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/ecj-4.3.1.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/groovy-all-2.4.1.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/itext-2.1.7.js2.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/jackson-annotations-2.1.4.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/jackson-core-2.1.4.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/jackson-databind-2.1.4.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/jakarta-regexp-1.4.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/jasperreports-6.1.0.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/jasperreports-fonts-6.0.0.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/jasperreports-functions-6.1.0.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/jasperstarter.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/javax.inject-1.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/jcalendar-1.4.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/jcommon-1.0.15.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/jfreechart-1.0.12.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/joda-time-2.0.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/log4j-1.2.17.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/lucene-analyzers-common-4.5.1.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/lucene-core-4.5.1.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/lucene-queries-4.5.1.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/lucene-queryparser-4.5.1.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/lucene-sandbox-4.5.1.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/olap4j-0.9.7.309-JS-3.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/poi-3.10-FINAL.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/servlet-api-2.5.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/spring-aop-3.0.6.RELEASE.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/spring-asm-3.0.6.RELEASE.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/spring-beans-3.0.6.RELEASE.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/spring-context-3.0.6.RELEASE.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/spring-core-3.0.6.RELEASE.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/spring-expression-3.0.6.RELEASE.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/stax-1.2.0.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/stax-api-1.0-2.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/stax-api-1.0.1.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/xalan-2.6.0.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/xml-apis-1.3.02.jar (100%) rename {src/JasperStarter => bin/jasperstart}/lib/xml-apis-ext-1.3.04.jar (100%) rename src/{JasperPHP => Command}/JasperPHPCommand.php (100%) rename src/{JasperPHP => }/Facades/JasperPHP.php (100%) rename src/{JasperPHP => }/JasperPHP.php (100%) rename src/{JasperPHP => Service}/JasperPHPServiceProvider.php (100%) diff --git a/src/JasperStarter/CHANGES b/bin/jasperstart/CHANGES similarity index 100% rename from src/JasperStarter/CHANGES rename to bin/jasperstart/CHANGES diff --git a/src/JasperStarter/LICENSE b/bin/jasperstart/LICENSE similarity index 100% rename from src/JasperStarter/LICENSE rename to bin/jasperstart/LICENSE diff --git a/src/JasperStarter/NOTICE b/bin/jasperstart/NOTICE similarity index 100% rename from src/JasperStarter/NOTICE rename to bin/jasperstart/NOTICE diff --git a/src/JasperStarter/README.md b/bin/jasperstart/README.md similarity index 100% rename from src/JasperStarter/README.md rename to bin/jasperstart/README.md diff --git a/src/JasperStarter/bin/jasperstarter b/bin/jasperstart/bin/jasperstarter similarity index 100% rename from src/JasperStarter/bin/jasperstarter rename to bin/jasperstart/bin/jasperstarter diff --git a/src/JasperStarter/bin/jasperstarter.exe b/bin/jasperstart/bin/jasperstarter.exe similarity index 100% rename from src/JasperStarter/bin/jasperstarter.exe rename to bin/jasperstart/bin/jasperstarter.exe diff --git a/src/JasperStarter/examples/Blank_A4_1.jrxml b/bin/jasperstart/examples/Blank_A4_1.jrxml similarity index 100% rename from src/JasperStarter/examples/Blank_A4_1.jrxml rename to bin/jasperstart/examples/Blank_A4_1.jrxml diff --git a/src/JasperStarter/examples/CancelAck.jrxml b/bin/jasperstart/examples/CancelAck.jrxml similarity index 100% rename from src/JasperStarter/examples/CancelAck.jrxml rename to bin/jasperstart/examples/CancelAck.jrxml diff --git a/src/JasperStarter/examples/CancelAck.xml b/bin/jasperstart/examples/CancelAck.xml similarity index 100% rename from src/JasperStarter/examples/CancelAck.xml rename to bin/jasperstart/examples/CancelAck.xml diff --git a/src/JasperStarter/examples/charactersetTest.jrxml b/bin/jasperstart/examples/charactersetTest.jrxml similarity index 100% rename from src/JasperStarter/examples/charactersetTest.jrxml rename to bin/jasperstart/examples/charactersetTest.jrxml diff --git a/src/JasperStarter/examples/charactersetTestWithStudioBuiltinFunctions.jrxml b/bin/jasperstart/examples/charactersetTestWithStudioBuiltinFunctions.jrxml similarity index 100% rename from src/JasperStarter/examples/charactersetTestWithStudioBuiltinFunctions.jrxml rename to bin/jasperstart/examples/charactersetTestWithStudioBuiltinFunctions.jrxml diff --git a/src/JasperStarter/examples/contacts.json b/bin/jasperstart/examples/contacts.json similarity index 100% rename from src/JasperStarter/examples/contacts.json rename to bin/jasperstart/examples/contacts.json diff --git a/src/JasperStarter/examples/contacts.xml b/bin/jasperstart/examples/contacts.xml similarity index 100% rename from src/JasperStarter/examples/contacts.xml rename to bin/jasperstart/examples/contacts.xml diff --git a/src/JasperStarter/examples/csv.jrxml b/bin/jasperstart/examples/csv.jrxml similarity index 100% rename from src/JasperStarter/examples/csv.jrxml rename to bin/jasperstart/examples/csv.jrxml diff --git a/src/JasperStarter/examples/csvExampleHeaders.csv b/bin/jasperstart/examples/csvExampleHeaders.csv similarity index 100% rename from src/JasperStarter/examples/csvExampleHeaders.csv rename to bin/jasperstart/examples/csvExampleHeaders.csv diff --git a/src/JasperStarter/examples/csvMeta.jrxml b/bin/jasperstart/examples/csvMeta.jrxml similarity index 100% rename from src/JasperStarter/examples/csvMeta.jrxml rename to bin/jasperstart/examples/csvMeta.jrxml diff --git a/src/JasperStarter/examples/details.jrxml b/bin/jasperstart/examples/details.jrxml similarity index 100% rename from src/JasperStarter/examples/details.jrxml rename to bin/jasperstart/examples/details.jrxml diff --git a/src/JasperStarter/examples/header.jrxml b/bin/jasperstart/examples/header.jrxml similarity index 100% rename from src/JasperStarter/examples/header.jrxml rename to bin/jasperstart/examples/header.jrxml diff --git a/src/JasperStarter/examples/i18n-bundle.properties b/bin/jasperstart/examples/i18n-bundle.properties similarity index 100% rename from src/JasperStarter/examples/i18n-bundle.properties rename to bin/jasperstart/examples/i18n-bundle.properties diff --git a/src/JasperStarter/examples/i18n-bundle_de.properties b/bin/jasperstart/examples/i18n-bundle_de.properties similarity index 100% rename from src/JasperStarter/examples/i18n-bundle_de.properties rename to bin/jasperstart/examples/i18n-bundle_de.properties diff --git a/src/JasperStarter/examples/i18n-bundle_ru.properties b/bin/jasperstart/examples/i18n-bundle_ru.properties similarity index 100% rename from src/JasperStarter/examples/i18n-bundle_ru.properties rename to bin/jasperstart/examples/i18n-bundle_ru.properties diff --git a/src/JasperStarter/examples/json.jrxml b/bin/jasperstart/examples/json.jrxml similarity index 100% rename from src/JasperStarter/examples/json.jrxml rename to bin/jasperstart/examples/json.jrxml diff --git a/src/JasperStarter/examples/main.jrxml b/bin/jasperstart/examples/main.jrxml similarity index 100% rename from src/JasperStarter/examples/main.jrxml rename to bin/jasperstart/examples/main.jrxml diff --git a/src/JasperStarter/examples/noDB-i18n.jrxml b/bin/jasperstart/examples/noDB-i18n.jrxml similarity index 100% rename from src/JasperStarter/examples/noDB-i18n.jrxml rename to bin/jasperstart/examples/noDB-i18n.jrxml diff --git a/src/JasperStarter/examples/noDB-params.jrxml b/bin/jasperstart/examples/noDB-params.jrxml similarity index 100% rename from src/JasperStarter/examples/noDB-params.jrxml rename to bin/jasperstart/examples/noDB-params.jrxml diff --git a/src/JasperStarter/jdbc/README b/bin/jasperstart/jdbc/README similarity index 100% rename from src/JasperStarter/jdbc/README rename to bin/jasperstart/jdbc/README diff --git a/src/JasperStarter/jdbc/mysql-connector-java-5.1.39-bin.jar b/bin/jasperstart/jdbc/mysql-connector-java-5.1.39-bin.jar similarity index 100% rename from src/JasperStarter/jdbc/mysql-connector-java-5.1.39-bin.jar rename to bin/jasperstart/jdbc/mysql-connector-java-5.1.39-bin.jar diff --git a/src/JasperStarter/jdbc/postgresql-9.4-1203.jdbc4.jar b/bin/jasperstart/jdbc/postgresql-9.4-1203.jdbc4.jar similarity index 100% rename from src/JasperStarter/jdbc/postgresql-9.4-1203.jdbc4.jar rename to bin/jasperstart/jdbc/postgresql-9.4-1203.jdbc4.jar diff --git a/src/JasperStarter/lib/ant-1.7.1.jar b/bin/jasperstart/lib/ant-1.7.1.jar similarity index 100% rename from src/JasperStarter/lib/ant-1.7.1.jar rename to bin/jasperstart/lib/ant-1.7.1.jar diff --git a/src/JasperStarter/lib/ant-launcher-1.7.1.jar b/bin/jasperstart/lib/ant-launcher-1.7.1.jar similarity index 100% rename from src/JasperStarter/lib/ant-launcher-1.7.1.jar rename to bin/jasperstart/lib/ant-launcher-1.7.1.jar diff --git a/src/JasperStarter/lib/aopalliance-1.0.jar b/bin/jasperstart/lib/aopalliance-1.0.jar similarity index 100% rename from src/JasperStarter/lib/aopalliance-1.0.jar rename to bin/jasperstart/lib/aopalliance-1.0.jar diff --git a/src/JasperStarter/lib/argparse4j-0.5.0.jar b/bin/jasperstart/lib/argparse4j-0.5.0.jar similarity index 100% rename from src/JasperStarter/lib/argparse4j-0.5.0.jar rename to bin/jasperstart/lib/argparse4j-0.5.0.jar diff --git a/src/JasperStarter/lib/avalon-framework-impl-4.2.0.jar b/bin/jasperstart/lib/avalon-framework-impl-4.2.0.jar similarity index 100% rename from src/JasperStarter/lib/avalon-framework-impl-4.2.0.jar rename to bin/jasperstart/lib/avalon-framework-impl-4.2.0.jar diff --git a/src/JasperStarter/lib/barbecue-1.5-beta1.jar b/bin/jasperstart/lib/barbecue-1.5-beta1.jar similarity index 100% rename from src/JasperStarter/lib/barbecue-1.5-beta1.jar rename to bin/jasperstart/lib/barbecue-1.5-beta1.jar diff --git a/src/JasperStarter/lib/barcode4j-2.1.jar b/bin/jasperstart/lib/barcode4j-2.1.jar similarity index 100% rename from src/JasperStarter/lib/barcode4j-2.1.jar rename to bin/jasperstart/lib/barcode4j-2.1.jar diff --git a/src/JasperStarter/lib/batik-anim-1.7.jar b/bin/jasperstart/lib/batik-anim-1.7.jar similarity index 100% rename from src/JasperStarter/lib/batik-anim-1.7.jar rename to bin/jasperstart/lib/batik-anim-1.7.jar diff --git a/src/JasperStarter/lib/batik-awt-util-1.7.jar b/bin/jasperstart/lib/batik-awt-util-1.7.jar similarity index 100% rename from src/JasperStarter/lib/batik-awt-util-1.7.jar rename to bin/jasperstart/lib/batik-awt-util-1.7.jar diff --git a/src/JasperStarter/lib/batik-bridge-1.7.jar b/bin/jasperstart/lib/batik-bridge-1.7.jar similarity index 100% rename from src/JasperStarter/lib/batik-bridge-1.7.jar rename to bin/jasperstart/lib/batik-bridge-1.7.jar diff --git a/src/JasperStarter/lib/batik-css-1.7.jar b/bin/jasperstart/lib/batik-css-1.7.jar similarity index 100% rename from src/JasperStarter/lib/batik-css-1.7.jar rename to bin/jasperstart/lib/batik-css-1.7.jar diff --git a/src/JasperStarter/lib/batik-dom-1.7.jar b/bin/jasperstart/lib/batik-dom-1.7.jar similarity index 100% rename from src/JasperStarter/lib/batik-dom-1.7.jar rename to bin/jasperstart/lib/batik-dom-1.7.jar diff --git a/src/JasperStarter/lib/batik-ext-1.7.jar b/bin/jasperstart/lib/batik-ext-1.7.jar similarity index 100% rename from src/JasperStarter/lib/batik-ext-1.7.jar rename to bin/jasperstart/lib/batik-ext-1.7.jar diff --git a/src/JasperStarter/lib/batik-gvt-1.7.jar b/bin/jasperstart/lib/batik-gvt-1.7.jar similarity index 100% rename from src/JasperStarter/lib/batik-gvt-1.7.jar rename to bin/jasperstart/lib/batik-gvt-1.7.jar diff --git a/src/JasperStarter/lib/batik-js-1.7.jar b/bin/jasperstart/lib/batik-js-1.7.jar similarity index 100% rename from src/JasperStarter/lib/batik-js-1.7.jar rename to bin/jasperstart/lib/batik-js-1.7.jar diff --git a/src/JasperStarter/lib/batik-parser-1.7.jar b/bin/jasperstart/lib/batik-parser-1.7.jar similarity index 100% rename from src/JasperStarter/lib/batik-parser-1.7.jar rename to bin/jasperstart/lib/batik-parser-1.7.jar diff --git a/src/JasperStarter/lib/batik-script-1.7.jar b/bin/jasperstart/lib/batik-script-1.7.jar similarity index 100% rename from src/JasperStarter/lib/batik-script-1.7.jar rename to bin/jasperstart/lib/batik-script-1.7.jar diff --git a/src/JasperStarter/lib/batik-svg-dom-1.7.jar b/bin/jasperstart/lib/batik-svg-dom-1.7.jar similarity index 100% rename from src/JasperStarter/lib/batik-svg-dom-1.7.jar rename to bin/jasperstart/lib/batik-svg-dom-1.7.jar diff --git a/src/JasperStarter/lib/batik-svggen-1.7.jar b/bin/jasperstart/lib/batik-svggen-1.7.jar similarity index 100% rename from src/JasperStarter/lib/batik-svggen-1.7.jar rename to bin/jasperstart/lib/batik-svggen-1.7.jar diff --git a/src/JasperStarter/lib/batik-util-1.7.jar b/bin/jasperstart/lib/batik-util-1.7.jar similarity index 100% rename from src/JasperStarter/lib/batik-util-1.7.jar rename to bin/jasperstart/lib/batik-util-1.7.jar diff --git a/src/JasperStarter/lib/batik-xml-1.7.jar b/bin/jasperstart/lib/batik-xml-1.7.jar similarity index 100% rename from src/JasperStarter/lib/batik-xml-1.7.jar rename to bin/jasperstart/lib/batik-xml-1.7.jar diff --git a/src/JasperStarter/lib/bcmail-jdk14-1.38.jar b/bin/jasperstart/lib/bcmail-jdk14-1.38.jar similarity index 100% rename from src/JasperStarter/lib/bcmail-jdk14-1.38.jar rename to bin/jasperstart/lib/bcmail-jdk14-1.38.jar diff --git a/src/JasperStarter/lib/bcmail-jdk14-138.jar b/bin/jasperstart/lib/bcmail-jdk14-138.jar similarity index 100% rename from src/JasperStarter/lib/bcmail-jdk14-138.jar rename to bin/jasperstart/lib/bcmail-jdk14-138.jar diff --git a/src/JasperStarter/lib/bcprov-jdk14-1.38.jar b/bin/jasperstart/lib/bcprov-jdk14-1.38.jar similarity index 100% rename from src/JasperStarter/lib/bcprov-jdk14-1.38.jar rename to bin/jasperstart/lib/bcprov-jdk14-1.38.jar diff --git a/src/JasperStarter/lib/bcprov-jdk14-138.jar b/bin/jasperstart/lib/bcprov-jdk14-138.jar similarity index 100% rename from src/JasperStarter/lib/bcprov-jdk14-138.jar rename to bin/jasperstart/lib/bcprov-jdk14-138.jar diff --git a/src/JasperStarter/lib/bctsp-jdk14-1.38.jar b/bin/jasperstart/lib/bctsp-jdk14-1.38.jar similarity index 100% rename from src/JasperStarter/lib/bctsp-jdk14-1.38.jar rename to bin/jasperstart/lib/bctsp-jdk14-1.38.jar diff --git a/src/JasperStarter/lib/castor-core-1.3.3.jar b/bin/jasperstart/lib/castor-core-1.3.3.jar similarity index 100% rename from src/JasperStarter/lib/castor-core-1.3.3.jar rename to bin/jasperstart/lib/castor-core-1.3.3.jar diff --git a/src/JasperStarter/lib/castor-xml-1.3.3.jar b/bin/jasperstart/lib/castor-xml-1.3.3.jar similarity index 100% rename from src/JasperStarter/lib/castor-xml-1.3.3.jar rename to bin/jasperstart/lib/castor-xml-1.3.3.jar diff --git a/src/JasperStarter/lib/commons-beanutils-1.9.0.jar b/bin/jasperstart/lib/commons-beanutils-1.9.0.jar similarity index 100% rename from src/JasperStarter/lib/commons-beanutils-1.9.0.jar rename to bin/jasperstart/lib/commons-beanutils-1.9.0.jar diff --git a/src/JasperStarter/lib/commons-cli-1.0.jar b/bin/jasperstart/lib/commons-cli-1.0.jar similarity index 100% rename from src/JasperStarter/lib/commons-cli-1.0.jar rename to bin/jasperstart/lib/commons-cli-1.0.jar diff --git a/src/JasperStarter/lib/commons-codec-1.5.jar b/bin/jasperstart/lib/commons-codec-1.5.jar similarity index 100% rename from src/JasperStarter/lib/commons-codec-1.5.jar rename to bin/jasperstart/lib/commons-codec-1.5.jar diff --git a/src/JasperStarter/lib/commons-collections-3.2.1.jar b/bin/jasperstart/lib/commons-collections-3.2.1.jar similarity index 100% rename from src/JasperStarter/lib/commons-collections-3.2.1.jar rename to bin/jasperstart/lib/commons-collections-3.2.1.jar diff --git a/src/JasperStarter/lib/commons-digester-2.1.jar b/bin/jasperstart/lib/commons-digester-2.1.jar similarity index 100% rename from src/JasperStarter/lib/commons-digester-2.1.jar rename to bin/jasperstart/lib/commons-digester-2.1.jar diff --git a/src/JasperStarter/lib/commons-io-2.4.jar b/bin/jasperstart/lib/commons-io-2.4.jar similarity index 100% rename from src/JasperStarter/lib/commons-io-2.4.jar rename to bin/jasperstart/lib/commons-io-2.4.jar diff --git a/src/JasperStarter/lib/commons-lang-2.6.jar b/bin/jasperstart/lib/commons-lang-2.6.jar similarity index 100% rename from src/JasperStarter/lib/commons-lang-2.6.jar rename to bin/jasperstart/lib/commons-lang-2.6.jar diff --git a/src/JasperStarter/lib/commons-logging-1.1.1.jar b/bin/jasperstart/lib/commons-logging-1.1.1.jar similarity index 100% rename from src/JasperStarter/lib/commons-logging-1.1.1.jar rename to bin/jasperstart/lib/commons-logging-1.1.1.jar diff --git a/src/JasperStarter/lib/core-2.3.0.jar b/bin/jasperstart/lib/core-2.3.0.jar similarity index 100% rename from src/JasperStarter/lib/core-2.3.0.jar rename to bin/jasperstart/lib/core-2.3.0.jar diff --git a/src/JasperStarter/lib/ecj-4.3.1.jar b/bin/jasperstart/lib/ecj-4.3.1.jar similarity index 100% rename from src/JasperStarter/lib/ecj-4.3.1.jar rename to bin/jasperstart/lib/ecj-4.3.1.jar diff --git a/src/JasperStarter/lib/groovy-all-2.4.1.jar b/bin/jasperstart/lib/groovy-all-2.4.1.jar similarity index 100% rename from src/JasperStarter/lib/groovy-all-2.4.1.jar rename to bin/jasperstart/lib/groovy-all-2.4.1.jar diff --git a/src/JasperStarter/lib/itext-2.1.7.js2.jar b/bin/jasperstart/lib/itext-2.1.7.js2.jar similarity index 100% rename from src/JasperStarter/lib/itext-2.1.7.js2.jar rename to bin/jasperstart/lib/itext-2.1.7.js2.jar diff --git a/src/JasperStarter/lib/jackson-annotations-2.1.4.jar b/bin/jasperstart/lib/jackson-annotations-2.1.4.jar similarity index 100% rename from src/JasperStarter/lib/jackson-annotations-2.1.4.jar rename to bin/jasperstart/lib/jackson-annotations-2.1.4.jar diff --git a/src/JasperStarter/lib/jackson-core-2.1.4.jar b/bin/jasperstart/lib/jackson-core-2.1.4.jar similarity index 100% rename from src/JasperStarter/lib/jackson-core-2.1.4.jar rename to bin/jasperstart/lib/jackson-core-2.1.4.jar diff --git a/src/JasperStarter/lib/jackson-databind-2.1.4.jar b/bin/jasperstart/lib/jackson-databind-2.1.4.jar similarity index 100% rename from src/JasperStarter/lib/jackson-databind-2.1.4.jar rename to bin/jasperstart/lib/jackson-databind-2.1.4.jar diff --git a/src/JasperStarter/lib/jakarta-regexp-1.4.jar b/bin/jasperstart/lib/jakarta-regexp-1.4.jar similarity index 100% rename from src/JasperStarter/lib/jakarta-regexp-1.4.jar rename to bin/jasperstart/lib/jakarta-regexp-1.4.jar diff --git a/src/JasperStarter/lib/jasperreports-6.1.0.jar b/bin/jasperstart/lib/jasperreports-6.1.0.jar similarity index 100% rename from src/JasperStarter/lib/jasperreports-6.1.0.jar rename to bin/jasperstart/lib/jasperreports-6.1.0.jar diff --git a/src/JasperStarter/lib/jasperreports-fonts-6.0.0.jar b/bin/jasperstart/lib/jasperreports-fonts-6.0.0.jar similarity index 100% rename from src/JasperStarter/lib/jasperreports-fonts-6.0.0.jar rename to bin/jasperstart/lib/jasperreports-fonts-6.0.0.jar diff --git a/src/JasperStarter/lib/jasperreports-functions-6.1.0.jar b/bin/jasperstart/lib/jasperreports-functions-6.1.0.jar similarity index 100% rename from src/JasperStarter/lib/jasperreports-functions-6.1.0.jar rename to bin/jasperstart/lib/jasperreports-functions-6.1.0.jar diff --git a/src/JasperStarter/lib/jasperstarter.jar b/bin/jasperstart/lib/jasperstarter.jar similarity index 100% rename from src/JasperStarter/lib/jasperstarter.jar rename to bin/jasperstart/lib/jasperstarter.jar diff --git a/src/JasperStarter/lib/javax.inject-1.jar b/bin/jasperstart/lib/javax.inject-1.jar similarity index 100% rename from src/JasperStarter/lib/javax.inject-1.jar rename to bin/jasperstart/lib/javax.inject-1.jar diff --git a/src/JasperStarter/lib/jcalendar-1.4.jar b/bin/jasperstart/lib/jcalendar-1.4.jar similarity index 100% rename from src/JasperStarter/lib/jcalendar-1.4.jar rename to bin/jasperstart/lib/jcalendar-1.4.jar diff --git a/src/JasperStarter/lib/jcommon-1.0.15.jar b/bin/jasperstart/lib/jcommon-1.0.15.jar similarity index 100% rename from src/JasperStarter/lib/jcommon-1.0.15.jar rename to bin/jasperstart/lib/jcommon-1.0.15.jar diff --git a/src/JasperStarter/lib/jfreechart-1.0.12.jar b/bin/jasperstart/lib/jfreechart-1.0.12.jar similarity index 100% rename from src/JasperStarter/lib/jfreechart-1.0.12.jar rename to bin/jasperstart/lib/jfreechart-1.0.12.jar diff --git a/src/JasperStarter/lib/joda-time-2.0.jar b/bin/jasperstart/lib/joda-time-2.0.jar similarity index 100% rename from src/JasperStarter/lib/joda-time-2.0.jar rename to bin/jasperstart/lib/joda-time-2.0.jar diff --git a/src/JasperStarter/lib/log4j-1.2.17.jar b/bin/jasperstart/lib/log4j-1.2.17.jar similarity index 100% rename from src/JasperStarter/lib/log4j-1.2.17.jar rename to bin/jasperstart/lib/log4j-1.2.17.jar diff --git a/src/JasperStarter/lib/lucene-analyzers-common-4.5.1.jar b/bin/jasperstart/lib/lucene-analyzers-common-4.5.1.jar similarity index 100% rename from src/JasperStarter/lib/lucene-analyzers-common-4.5.1.jar rename to bin/jasperstart/lib/lucene-analyzers-common-4.5.1.jar diff --git a/src/JasperStarter/lib/lucene-core-4.5.1.jar b/bin/jasperstart/lib/lucene-core-4.5.1.jar similarity index 100% rename from src/JasperStarter/lib/lucene-core-4.5.1.jar rename to bin/jasperstart/lib/lucene-core-4.5.1.jar diff --git a/src/JasperStarter/lib/lucene-queries-4.5.1.jar b/bin/jasperstart/lib/lucene-queries-4.5.1.jar similarity index 100% rename from src/JasperStarter/lib/lucene-queries-4.5.1.jar rename to bin/jasperstart/lib/lucene-queries-4.5.1.jar diff --git a/src/JasperStarter/lib/lucene-queryparser-4.5.1.jar b/bin/jasperstart/lib/lucene-queryparser-4.5.1.jar similarity index 100% rename from src/JasperStarter/lib/lucene-queryparser-4.5.1.jar rename to bin/jasperstart/lib/lucene-queryparser-4.5.1.jar diff --git a/src/JasperStarter/lib/lucene-sandbox-4.5.1.jar b/bin/jasperstart/lib/lucene-sandbox-4.5.1.jar similarity index 100% rename from src/JasperStarter/lib/lucene-sandbox-4.5.1.jar rename to bin/jasperstart/lib/lucene-sandbox-4.5.1.jar diff --git a/src/JasperStarter/lib/olap4j-0.9.7.309-JS-3.jar b/bin/jasperstart/lib/olap4j-0.9.7.309-JS-3.jar similarity index 100% rename from src/JasperStarter/lib/olap4j-0.9.7.309-JS-3.jar rename to bin/jasperstart/lib/olap4j-0.9.7.309-JS-3.jar diff --git a/src/JasperStarter/lib/poi-3.10-FINAL.jar b/bin/jasperstart/lib/poi-3.10-FINAL.jar similarity index 100% rename from src/JasperStarter/lib/poi-3.10-FINAL.jar rename to bin/jasperstart/lib/poi-3.10-FINAL.jar diff --git a/src/JasperStarter/lib/servlet-api-2.5.jar b/bin/jasperstart/lib/servlet-api-2.5.jar similarity index 100% rename from src/JasperStarter/lib/servlet-api-2.5.jar rename to bin/jasperstart/lib/servlet-api-2.5.jar diff --git a/src/JasperStarter/lib/spring-aop-3.0.6.RELEASE.jar b/bin/jasperstart/lib/spring-aop-3.0.6.RELEASE.jar similarity index 100% rename from src/JasperStarter/lib/spring-aop-3.0.6.RELEASE.jar rename to bin/jasperstart/lib/spring-aop-3.0.6.RELEASE.jar diff --git a/src/JasperStarter/lib/spring-asm-3.0.6.RELEASE.jar b/bin/jasperstart/lib/spring-asm-3.0.6.RELEASE.jar similarity index 100% rename from src/JasperStarter/lib/spring-asm-3.0.6.RELEASE.jar rename to bin/jasperstart/lib/spring-asm-3.0.6.RELEASE.jar diff --git a/src/JasperStarter/lib/spring-beans-3.0.6.RELEASE.jar b/bin/jasperstart/lib/spring-beans-3.0.6.RELEASE.jar similarity index 100% rename from src/JasperStarter/lib/spring-beans-3.0.6.RELEASE.jar rename to bin/jasperstart/lib/spring-beans-3.0.6.RELEASE.jar diff --git a/src/JasperStarter/lib/spring-context-3.0.6.RELEASE.jar b/bin/jasperstart/lib/spring-context-3.0.6.RELEASE.jar similarity index 100% rename from src/JasperStarter/lib/spring-context-3.0.6.RELEASE.jar rename to bin/jasperstart/lib/spring-context-3.0.6.RELEASE.jar diff --git a/src/JasperStarter/lib/spring-core-3.0.6.RELEASE.jar b/bin/jasperstart/lib/spring-core-3.0.6.RELEASE.jar similarity index 100% rename from src/JasperStarter/lib/spring-core-3.0.6.RELEASE.jar rename to bin/jasperstart/lib/spring-core-3.0.6.RELEASE.jar diff --git a/src/JasperStarter/lib/spring-expression-3.0.6.RELEASE.jar b/bin/jasperstart/lib/spring-expression-3.0.6.RELEASE.jar similarity index 100% rename from src/JasperStarter/lib/spring-expression-3.0.6.RELEASE.jar rename to bin/jasperstart/lib/spring-expression-3.0.6.RELEASE.jar diff --git a/src/JasperStarter/lib/stax-1.2.0.jar b/bin/jasperstart/lib/stax-1.2.0.jar similarity index 100% rename from src/JasperStarter/lib/stax-1.2.0.jar rename to bin/jasperstart/lib/stax-1.2.0.jar diff --git a/src/JasperStarter/lib/stax-api-1.0-2.jar b/bin/jasperstart/lib/stax-api-1.0-2.jar similarity index 100% rename from src/JasperStarter/lib/stax-api-1.0-2.jar rename to bin/jasperstart/lib/stax-api-1.0-2.jar diff --git a/src/JasperStarter/lib/stax-api-1.0.1.jar b/bin/jasperstart/lib/stax-api-1.0.1.jar similarity index 100% rename from src/JasperStarter/lib/stax-api-1.0.1.jar rename to bin/jasperstart/lib/stax-api-1.0.1.jar diff --git a/src/JasperStarter/lib/xalan-2.6.0.jar b/bin/jasperstart/lib/xalan-2.6.0.jar similarity index 100% rename from src/JasperStarter/lib/xalan-2.6.0.jar rename to bin/jasperstart/lib/xalan-2.6.0.jar diff --git a/src/JasperStarter/lib/xml-apis-1.3.02.jar b/bin/jasperstart/lib/xml-apis-1.3.02.jar similarity index 100% rename from src/JasperStarter/lib/xml-apis-1.3.02.jar rename to bin/jasperstart/lib/xml-apis-1.3.02.jar diff --git a/src/JasperStarter/lib/xml-apis-ext-1.3.04.jar b/bin/jasperstart/lib/xml-apis-ext-1.3.04.jar similarity index 100% rename from src/JasperStarter/lib/xml-apis-ext-1.3.04.jar rename to bin/jasperstart/lib/xml-apis-ext-1.3.04.jar diff --git a/src/JasperPHP/JasperPHPCommand.php b/src/Command/JasperPHPCommand.php similarity index 100% rename from src/JasperPHP/JasperPHPCommand.php rename to src/Command/JasperPHPCommand.php diff --git a/src/JasperPHP/Facades/JasperPHP.php b/src/Facades/JasperPHP.php similarity index 100% rename from src/JasperPHP/Facades/JasperPHP.php rename to src/Facades/JasperPHP.php diff --git a/src/JasperPHP/JasperPHP.php b/src/JasperPHP.php similarity index 100% rename from src/JasperPHP/JasperPHP.php rename to src/JasperPHP.php diff --git a/src/JasperPHP/JasperPHPServiceProvider.php b/src/Service/JasperPHPServiceProvider.php similarity index 100% rename from src/JasperPHP/JasperPHPServiceProvider.php rename to src/Service/JasperPHPServiceProvider.php From d30690546bc599a2f15729183c99b6fdd5af2bae Mon Sep 17 00:00:00 2001 From: Rafael Queiroz Date: Sun, 5 Mar 2017 16:05:24 -0300 Subject: [PATCH 03/11] Change psr-0 to psr-4 --- composer.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/composer.json b/composer.json index ece0c91..b07cfc8 100755 --- a/composer.json +++ b/composer.json @@ -36,8 +36,6 @@ "phpunit/phpunit": "4.8.*" }, "autoload": { - "psr-0": { - "JasperPHP": "src/" - } + "psr-4": { "JasperPHP\\": "src/" } } } From 2932178ac21321f06b558be42d46a8277c5ca14d Mon Sep 17 00:00:00 2001 From: Rafael Queiroz Date: Sun, 5 Mar 2017 17:15:12 -0300 Subject: [PATCH 04/11] Rename bin/jasperstart to bin/jasperstarter --- bin/{jasperstart => jasperstarter}/CHANGES | 0 bin/{jasperstart => jasperstarter}/LICENSE | 0 bin/{jasperstart => jasperstarter}/NOTICE | 0 bin/{jasperstart => jasperstarter}/README.md | 0 .../bin/jasperstarter | 0 .../bin/jasperstarter.exe | Bin .../examples/Blank_A4_1.jrxml | 0 .../examples/CancelAck.jrxml | 0 .../examples/CancelAck.xml | 0 .../examples/charactersetTest.jrxml | 0 ...charactersetTestWithStudioBuiltinFunctions.jrxml | 0 .../examples/contacts.json | 0 .../examples/contacts.xml | 0 .../examples/csv.jrxml | 0 .../examples/csvExampleHeaders.csv | 0 .../examples/csvMeta.jrxml | 0 .../examples/details.jrxml | 0 .../examples/header.jrxml | 0 .../examples/i18n-bundle.properties | 0 .../examples/i18n-bundle_de.properties | 0 .../examples/i18n-bundle_ru.properties | 0 .../examples/json.jrxml | 0 .../examples/main.jrxml | 0 .../examples/noDB-i18n.jrxml | 0 .../examples/noDB-params.jrxml | 0 bin/{jasperstart => jasperstarter}/jdbc/README | 0 .../jdbc/mysql-connector-java-5.1.39-bin.jar | Bin .../jdbc/postgresql-9.4-1203.jdbc4.jar | Bin .../lib/ant-1.7.1.jar | Bin .../lib/ant-launcher-1.7.1.jar | Bin .../lib/aopalliance-1.0.jar | Bin .../lib/argparse4j-0.5.0.jar | Bin .../lib/avalon-framework-impl-4.2.0.jar | Bin .../lib/barbecue-1.5-beta1.jar | Bin .../lib/barcode4j-2.1.jar | Bin .../lib/batik-anim-1.7.jar | Bin .../lib/batik-awt-util-1.7.jar | Bin .../lib/batik-bridge-1.7.jar | Bin .../lib/batik-css-1.7.jar | Bin .../lib/batik-dom-1.7.jar | Bin .../lib/batik-ext-1.7.jar | Bin .../lib/batik-gvt-1.7.jar | Bin .../lib/batik-js-1.7.jar | Bin .../lib/batik-parser-1.7.jar | Bin .../lib/batik-script-1.7.jar | Bin .../lib/batik-svg-dom-1.7.jar | Bin .../lib/batik-svggen-1.7.jar | Bin .../lib/batik-util-1.7.jar | Bin .../lib/batik-xml-1.7.jar | Bin .../lib/bcmail-jdk14-1.38.jar | Bin .../lib/bcmail-jdk14-138.jar | Bin .../lib/bcprov-jdk14-1.38.jar | Bin .../lib/bcprov-jdk14-138.jar | Bin .../lib/bctsp-jdk14-1.38.jar | Bin .../lib/castor-core-1.3.3.jar | Bin .../lib/castor-xml-1.3.3.jar | Bin .../lib/commons-beanutils-1.9.0.jar | Bin .../lib/commons-cli-1.0.jar | Bin .../lib/commons-codec-1.5.jar | Bin .../lib/commons-collections-3.2.1.jar | Bin .../lib/commons-digester-2.1.jar | Bin .../lib/commons-io-2.4.jar | Bin .../lib/commons-lang-2.6.jar | Bin .../lib/commons-logging-1.1.1.jar | Bin .../lib/core-2.3.0.jar | Bin .../lib/ecj-4.3.1.jar | Bin .../lib/groovy-all-2.4.1.jar | Bin .../lib/itext-2.1.7.js2.jar | Bin .../lib/jackson-annotations-2.1.4.jar | Bin .../lib/jackson-core-2.1.4.jar | Bin .../lib/jackson-databind-2.1.4.jar | Bin .../lib/jakarta-regexp-1.4.jar | Bin .../lib/jasperreports-6.1.0.jar | Bin .../lib/jasperreports-fonts-6.0.0.jar | Bin .../lib/jasperreports-functions-6.1.0.jar | Bin .../lib/jasperstarter.jar | Bin .../lib/javax.inject-1.jar | Bin .../lib/jcalendar-1.4.jar | Bin .../lib/jcommon-1.0.15.jar | Bin .../lib/jfreechart-1.0.12.jar | Bin .../lib/joda-time-2.0.jar | Bin .../lib/log4j-1.2.17.jar | Bin .../lib/lucene-analyzers-common-4.5.1.jar | Bin .../lib/lucene-core-4.5.1.jar | Bin .../lib/lucene-queries-4.5.1.jar | Bin .../lib/lucene-queryparser-4.5.1.jar | Bin .../lib/lucene-sandbox-4.5.1.jar | Bin .../lib/olap4j-0.9.7.309-JS-3.jar | Bin .../lib/poi-3.10-FINAL.jar | Bin .../lib/servlet-api-2.5.jar | Bin .../lib/spring-aop-3.0.6.RELEASE.jar | Bin .../lib/spring-asm-3.0.6.RELEASE.jar | Bin .../lib/spring-beans-3.0.6.RELEASE.jar | Bin .../lib/spring-context-3.0.6.RELEASE.jar | Bin .../lib/spring-core-3.0.6.RELEASE.jar | Bin .../lib/spring-expression-3.0.6.RELEASE.jar | Bin .../lib/stax-1.2.0.jar | Bin .../lib/stax-api-1.0-2.jar | Bin .../lib/stax-api-1.0.1.jar | Bin .../lib/xalan-2.6.0.jar | Bin .../lib/xml-apis-1.3.02.jar | Bin .../lib/xml-apis-ext-1.3.04.jar | Bin 102 files changed, 0 insertions(+), 0 deletions(-) rename bin/{jasperstart => jasperstarter}/CHANGES (100%) rename bin/{jasperstart => jasperstarter}/LICENSE (100%) rename bin/{jasperstart => jasperstarter}/NOTICE (100%) rename bin/{jasperstart => jasperstarter}/README.md (100%) rename bin/{jasperstart => jasperstarter}/bin/jasperstarter (100%) rename bin/{jasperstart => jasperstarter}/bin/jasperstarter.exe (100%) rename bin/{jasperstart => jasperstarter}/examples/Blank_A4_1.jrxml (100%) rename bin/{jasperstart => jasperstarter}/examples/CancelAck.jrxml (100%) rename bin/{jasperstart => jasperstarter}/examples/CancelAck.xml (100%) rename bin/{jasperstart => jasperstarter}/examples/charactersetTest.jrxml (100%) rename bin/{jasperstart => jasperstarter}/examples/charactersetTestWithStudioBuiltinFunctions.jrxml (100%) rename bin/{jasperstart => jasperstarter}/examples/contacts.json (100%) rename bin/{jasperstart => jasperstarter}/examples/contacts.xml (100%) rename bin/{jasperstart => jasperstarter}/examples/csv.jrxml (100%) rename bin/{jasperstart => jasperstarter}/examples/csvExampleHeaders.csv (100%) rename bin/{jasperstart => jasperstarter}/examples/csvMeta.jrxml (100%) rename bin/{jasperstart => jasperstarter}/examples/details.jrxml (100%) rename bin/{jasperstart => jasperstarter}/examples/header.jrxml (100%) rename bin/{jasperstart => jasperstarter}/examples/i18n-bundle.properties (100%) rename bin/{jasperstart => jasperstarter}/examples/i18n-bundle_de.properties (100%) rename bin/{jasperstart => jasperstarter}/examples/i18n-bundle_ru.properties (100%) rename bin/{jasperstart => jasperstarter}/examples/json.jrxml (100%) rename bin/{jasperstart => jasperstarter}/examples/main.jrxml (100%) rename bin/{jasperstart => jasperstarter}/examples/noDB-i18n.jrxml (100%) rename bin/{jasperstart => jasperstarter}/examples/noDB-params.jrxml (100%) rename bin/{jasperstart => jasperstarter}/jdbc/README (100%) rename bin/{jasperstart => jasperstarter}/jdbc/mysql-connector-java-5.1.39-bin.jar (100%) rename bin/{jasperstart => jasperstarter}/jdbc/postgresql-9.4-1203.jdbc4.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/ant-1.7.1.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/ant-launcher-1.7.1.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/aopalliance-1.0.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/argparse4j-0.5.0.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/avalon-framework-impl-4.2.0.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/barbecue-1.5-beta1.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/barcode4j-2.1.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/batik-anim-1.7.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/batik-awt-util-1.7.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/batik-bridge-1.7.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/batik-css-1.7.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/batik-dom-1.7.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/batik-ext-1.7.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/batik-gvt-1.7.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/batik-js-1.7.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/batik-parser-1.7.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/batik-script-1.7.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/batik-svg-dom-1.7.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/batik-svggen-1.7.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/batik-util-1.7.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/batik-xml-1.7.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/bcmail-jdk14-1.38.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/bcmail-jdk14-138.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/bcprov-jdk14-1.38.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/bcprov-jdk14-138.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/bctsp-jdk14-1.38.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/castor-core-1.3.3.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/castor-xml-1.3.3.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/commons-beanutils-1.9.0.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/commons-cli-1.0.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/commons-codec-1.5.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/commons-collections-3.2.1.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/commons-digester-2.1.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/commons-io-2.4.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/commons-lang-2.6.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/commons-logging-1.1.1.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/core-2.3.0.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/ecj-4.3.1.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/groovy-all-2.4.1.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/itext-2.1.7.js2.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/jackson-annotations-2.1.4.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/jackson-core-2.1.4.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/jackson-databind-2.1.4.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/jakarta-regexp-1.4.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/jasperreports-6.1.0.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/jasperreports-fonts-6.0.0.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/jasperreports-functions-6.1.0.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/jasperstarter.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/javax.inject-1.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/jcalendar-1.4.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/jcommon-1.0.15.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/jfreechart-1.0.12.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/joda-time-2.0.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/log4j-1.2.17.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/lucene-analyzers-common-4.5.1.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/lucene-core-4.5.1.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/lucene-queries-4.5.1.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/lucene-queryparser-4.5.1.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/lucene-sandbox-4.5.1.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/olap4j-0.9.7.309-JS-3.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/poi-3.10-FINAL.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/servlet-api-2.5.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/spring-aop-3.0.6.RELEASE.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/spring-asm-3.0.6.RELEASE.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/spring-beans-3.0.6.RELEASE.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/spring-context-3.0.6.RELEASE.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/spring-core-3.0.6.RELEASE.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/spring-expression-3.0.6.RELEASE.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/stax-1.2.0.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/stax-api-1.0-2.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/stax-api-1.0.1.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/xalan-2.6.0.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/xml-apis-1.3.02.jar (100%) rename bin/{jasperstart => jasperstarter}/lib/xml-apis-ext-1.3.04.jar (100%) diff --git a/bin/jasperstart/CHANGES b/bin/jasperstarter/CHANGES similarity index 100% rename from bin/jasperstart/CHANGES rename to bin/jasperstarter/CHANGES diff --git a/bin/jasperstart/LICENSE b/bin/jasperstarter/LICENSE similarity index 100% rename from bin/jasperstart/LICENSE rename to bin/jasperstarter/LICENSE diff --git a/bin/jasperstart/NOTICE b/bin/jasperstarter/NOTICE similarity index 100% rename from bin/jasperstart/NOTICE rename to bin/jasperstarter/NOTICE diff --git a/bin/jasperstart/README.md b/bin/jasperstarter/README.md similarity index 100% rename from bin/jasperstart/README.md rename to bin/jasperstarter/README.md diff --git a/bin/jasperstart/bin/jasperstarter b/bin/jasperstarter/bin/jasperstarter similarity index 100% rename from bin/jasperstart/bin/jasperstarter rename to bin/jasperstarter/bin/jasperstarter diff --git a/bin/jasperstart/bin/jasperstarter.exe b/bin/jasperstarter/bin/jasperstarter.exe similarity index 100% rename from bin/jasperstart/bin/jasperstarter.exe rename to bin/jasperstarter/bin/jasperstarter.exe diff --git a/bin/jasperstart/examples/Blank_A4_1.jrxml b/bin/jasperstarter/examples/Blank_A4_1.jrxml similarity index 100% rename from bin/jasperstart/examples/Blank_A4_1.jrxml rename to bin/jasperstarter/examples/Blank_A4_1.jrxml diff --git a/bin/jasperstart/examples/CancelAck.jrxml b/bin/jasperstarter/examples/CancelAck.jrxml similarity index 100% rename from bin/jasperstart/examples/CancelAck.jrxml rename to bin/jasperstarter/examples/CancelAck.jrxml diff --git a/bin/jasperstart/examples/CancelAck.xml b/bin/jasperstarter/examples/CancelAck.xml similarity index 100% rename from bin/jasperstart/examples/CancelAck.xml rename to bin/jasperstarter/examples/CancelAck.xml diff --git a/bin/jasperstart/examples/charactersetTest.jrxml b/bin/jasperstarter/examples/charactersetTest.jrxml similarity index 100% rename from bin/jasperstart/examples/charactersetTest.jrxml rename to bin/jasperstarter/examples/charactersetTest.jrxml diff --git a/bin/jasperstart/examples/charactersetTestWithStudioBuiltinFunctions.jrxml b/bin/jasperstarter/examples/charactersetTestWithStudioBuiltinFunctions.jrxml similarity index 100% rename from bin/jasperstart/examples/charactersetTestWithStudioBuiltinFunctions.jrxml rename to bin/jasperstarter/examples/charactersetTestWithStudioBuiltinFunctions.jrxml diff --git a/bin/jasperstart/examples/contacts.json b/bin/jasperstarter/examples/contacts.json similarity index 100% rename from bin/jasperstart/examples/contacts.json rename to bin/jasperstarter/examples/contacts.json diff --git a/bin/jasperstart/examples/contacts.xml b/bin/jasperstarter/examples/contacts.xml similarity index 100% rename from bin/jasperstart/examples/contacts.xml rename to bin/jasperstarter/examples/contacts.xml diff --git a/bin/jasperstart/examples/csv.jrxml b/bin/jasperstarter/examples/csv.jrxml similarity index 100% rename from bin/jasperstart/examples/csv.jrxml rename to bin/jasperstarter/examples/csv.jrxml diff --git a/bin/jasperstart/examples/csvExampleHeaders.csv b/bin/jasperstarter/examples/csvExampleHeaders.csv similarity index 100% rename from bin/jasperstart/examples/csvExampleHeaders.csv rename to bin/jasperstarter/examples/csvExampleHeaders.csv diff --git a/bin/jasperstart/examples/csvMeta.jrxml b/bin/jasperstarter/examples/csvMeta.jrxml similarity index 100% rename from bin/jasperstart/examples/csvMeta.jrxml rename to bin/jasperstarter/examples/csvMeta.jrxml diff --git a/bin/jasperstart/examples/details.jrxml b/bin/jasperstarter/examples/details.jrxml similarity index 100% rename from bin/jasperstart/examples/details.jrxml rename to bin/jasperstarter/examples/details.jrxml diff --git a/bin/jasperstart/examples/header.jrxml b/bin/jasperstarter/examples/header.jrxml similarity index 100% rename from bin/jasperstart/examples/header.jrxml rename to bin/jasperstarter/examples/header.jrxml diff --git a/bin/jasperstart/examples/i18n-bundle.properties b/bin/jasperstarter/examples/i18n-bundle.properties similarity index 100% rename from bin/jasperstart/examples/i18n-bundle.properties rename to bin/jasperstarter/examples/i18n-bundle.properties diff --git a/bin/jasperstart/examples/i18n-bundle_de.properties b/bin/jasperstarter/examples/i18n-bundle_de.properties similarity index 100% rename from bin/jasperstart/examples/i18n-bundle_de.properties rename to bin/jasperstarter/examples/i18n-bundle_de.properties diff --git a/bin/jasperstart/examples/i18n-bundle_ru.properties b/bin/jasperstarter/examples/i18n-bundle_ru.properties similarity index 100% rename from bin/jasperstart/examples/i18n-bundle_ru.properties rename to bin/jasperstarter/examples/i18n-bundle_ru.properties diff --git a/bin/jasperstart/examples/json.jrxml b/bin/jasperstarter/examples/json.jrxml similarity index 100% rename from bin/jasperstart/examples/json.jrxml rename to bin/jasperstarter/examples/json.jrxml diff --git a/bin/jasperstart/examples/main.jrxml b/bin/jasperstarter/examples/main.jrxml similarity index 100% rename from bin/jasperstart/examples/main.jrxml rename to bin/jasperstarter/examples/main.jrxml diff --git a/bin/jasperstart/examples/noDB-i18n.jrxml b/bin/jasperstarter/examples/noDB-i18n.jrxml similarity index 100% rename from bin/jasperstart/examples/noDB-i18n.jrxml rename to bin/jasperstarter/examples/noDB-i18n.jrxml diff --git a/bin/jasperstart/examples/noDB-params.jrxml b/bin/jasperstarter/examples/noDB-params.jrxml similarity index 100% rename from bin/jasperstart/examples/noDB-params.jrxml rename to bin/jasperstarter/examples/noDB-params.jrxml diff --git a/bin/jasperstart/jdbc/README b/bin/jasperstarter/jdbc/README similarity index 100% rename from bin/jasperstart/jdbc/README rename to bin/jasperstarter/jdbc/README diff --git a/bin/jasperstart/jdbc/mysql-connector-java-5.1.39-bin.jar b/bin/jasperstarter/jdbc/mysql-connector-java-5.1.39-bin.jar similarity index 100% rename from bin/jasperstart/jdbc/mysql-connector-java-5.1.39-bin.jar rename to bin/jasperstarter/jdbc/mysql-connector-java-5.1.39-bin.jar diff --git a/bin/jasperstart/jdbc/postgresql-9.4-1203.jdbc4.jar b/bin/jasperstarter/jdbc/postgresql-9.4-1203.jdbc4.jar similarity index 100% rename from bin/jasperstart/jdbc/postgresql-9.4-1203.jdbc4.jar rename to bin/jasperstarter/jdbc/postgresql-9.4-1203.jdbc4.jar diff --git a/bin/jasperstart/lib/ant-1.7.1.jar b/bin/jasperstarter/lib/ant-1.7.1.jar similarity index 100% rename from bin/jasperstart/lib/ant-1.7.1.jar rename to bin/jasperstarter/lib/ant-1.7.1.jar diff --git a/bin/jasperstart/lib/ant-launcher-1.7.1.jar b/bin/jasperstarter/lib/ant-launcher-1.7.1.jar similarity index 100% rename from bin/jasperstart/lib/ant-launcher-1.7.1.jar rename to bin/jasperstarter/lib/ant-launcher-1.7.1.jar diff --git a/bin/jasperstart/lib/aopalliance-1.0.jar b/bin/jasperstarter/lib/aopalliance-1.0.jar similarity index 100% rename from bin/jasperstart/lib/aopalliance-1.0.jar rename to bin/jasperstarter/lib/aopalliance-1.0.jar diff --git a/bin/jasperstart/lib/argparse4j-0.5.0.jar b/bin/jasperstarter/lib/argparse4j-0.5.0.jar similarity index 100% rename from bin/jasperstart/lib/argparse4j-0.5.0.jar rename to bin/jasperstarter/lib/argparse4j-0.5.0.jar diff --git a/bin/jasperstart/lib/avalon-framework-impl-4.2.0.jar b/bin/jasperstarter/lib/avalon-framework-impl-4.2.0.jar similarity index 100% rename from bin/jasperstart/lib/avalon-framework-impl-4.2.0.jar rename to bin/jasperstarter/lib/avalon-framework-impl-4.2.0.jar diff --git a/bin/jasperstart/lib/barbecue-1.5-beta1.jar b/bin/jasperstarter/lib/barbecue-1.5-beta1.jar similarity index 100% rename from bin/jasperstart/lib/barbecue-1.5-beta1.jar rename to bin/jasperstarter/lib/barbecue-1.5-beta1.jar diff --git a/bin/jasperstart/lib/barcode4j-2.1.jar b/bin/jasperstarter/lib/barcode4j-2.1.jar similarity index 100% rename from bin/jasperstart/lib/barcode4j-2.1.jar rename to bin/jasperstarter/lib/barcode4j-2.1.jar diff --git a/bin/jasperstart/lib/batik-anim-1.7.jar b/bin/jasperstarter/lib/batik-anim-1.7.jar similarity index 100% rename from bin/jasperstart/lib/batik-anim-1.7.jar rename to bin/jasperstarter/lib/batik-anim-1.7.jar diff --git a/bin/jasperstart/lib/batik-awt-util-1.7.jar b/bin/jasperstarter/lib/batik-awt-util-1.7.jar similarity index 100% rename from bin/jasperstart/lib/batik-awt-util-1.7.jar rename to bin/jasperstarter/lib/batik-awt-util-1.7.jar diff --git a/bin/jasperstart/lib/batik-bridge-1.7.jar b/bin/jasperstarter/lib/batik-bridge-1.7.jar similarity index 100% rename from bin/jasperstart/lib/batik-bridge-1.7.jar rename to bin/jasperstarter/lib/batik-bridge-1.7.jar diff --git a/bin/jasperstart/lib/batik-css-1.7.jar b/bin/jasperstarter/lib/batik-css-1.7.jar similarity index 100% rename from bin/jasperstart/lib/batik-css-1.7.jar rename to bin/jasperstarter/lib/batik-css-1.7.jar diff --git a/bin/jasperstart/lib/batik-dom-1.7.jar b/bin/jasperstarter/lib/batik-dom-1.7.jar similarity index 100% rename from bin/jasperstart/lib/batik-dom-1.7.jar rename to bin/jasperstarter/lib/batik-dom-1.7.jar diff --git a/bin/jasperstart/lib/batik-ext-1.7.jar b/bin/jasperstarter/lib/batik-ext-1.7.jar similarity index 100% rename from bin/jasperstart/lib/batik-ext-1.7.jar rename to bin/jasperstarter/lib/batik-ext-1.7.jar diff --git a/bin/jasperstart/lib/batik-gvt-1.7.jar b/bin/jasperstarter/lib/batik-gvt-1.7.jar similarity index 100% rename from bin/jasperstart/lib/batik-gvt-1.7.jar rename to bin/jasperstarter/lib/batik-gvt-1.7.jar diff --git a/bin/jasperstart/lib/batik-js-1.7.jar b/bin/jasperstarter/lib/batik-js-1.7.jar similarity index 100% rename from bin/jasperstart/lib/batik-js-1.7.jar rename to bin/jasperstarter/lib/batik-js-1.7.jar diff --git a/bin/jasperstart/lib/batik-parser-1.7.jar b/bin/jasperstarter/lib/batik-parser-1.7.jar similarity index 100% rename from bin/jasperstart/lib/batik-parser-1.7.jar rename to bin/jasperstarter/lib/batik-parser-1.7.jar diff --git a/bin/jasperstart/lib/batik-script-1.7.jar b/bin/jasperstarter/lib/batik-script-1.7.jar similarity index 100% rename from bin/jasperstart/lib/batik-script-1.7.jar rename to bin/jasperstarter/lib/batik-script-1.7.jar diff --git a/bin/jasperstart/lib/batik-svg-dom-1.7.jar b/bin/jasperstarter/lib/batik-svg-dom-1.7.jar similarity index 100% rename from bin/jasperstart/lib/batik-svg-dom-1.7.jar rename to bin/jasperstarter/lib/batik-svg-dom-1.7.jar diff --git a/bin/jasperstart/lib/batik-svggen-1.7.jar b/bin/jasperstarter/lib/batik-svggen-1.7.jar similarity index 100% rename from bin/jasperstart/lib/batik-svggen-1.7.jar rename to bin/jasperstarter/lib/batik-svggen-1.7.jar diff --git a/bin/jasperstart/lib/batik-util-1.7.jar b/bin/jasperstarter/lib/batik-util-1.7.jar similarity index 100% rename from bin/jasperstart/lib/batik-util-1.7.jar rename to bin/jasperstarter/lib/batik-util-1.7.jar diff --git a/bin/jasperstart/lib/batik-xml-1.7.jar b/bin/jasperstarter/lib/batik-xml-1.7.jar similarity index 100% rename from bin/jasperstart/lib/batik-xml-1.7.jar rename to bin/jasperstarter/lib/batik-xml-1.7.jar diff --git a/bin/jasperstart/lib/bcmail-jdk14-1.38.jar b/bin/jasperstarter/lib/bcmail-jdk14-1.38.jar similarity index 100% rename from bin/jasperstart/lib/bcmail-jdk14-1.38.jar rename to bin/jasperstarter/lib/bcmail-jdk14-1.38.jar diff --git a/bin/jasperstart/lib/bcmail-jdk14-138.jar b/bin/jasperstarter/lib/bcmail-jdk14-138.jar similarity index 100% rename from bin/jasperstart/lib/bcmail-jdk14-138.jar rename to bin/jasperstarter/lib/bcmail-jdk14-138.jar diff --git a/bin/jasperstart/lib/bcprov-jdk14-1.38.jar b/bin/jasperstarter/lib/bcprov-jdk14-1.38.jar similarity index 100% rename from bin/jasperstart/lib/bcprov-jdk14-1.38.jar rename to bin/jasperstarter/lib/bcprov-jdk14-1.38.jar diff --git a/bin/jasperstart/lib/bcprov-jdk14-138.jar b/bin/jasperstarter/lib/bcprov-jdk14-138.jar similarity index 100% rename from bin/jasperstart/lib/bcprov-jdk14-138.jar rename to bin/jasperstarter/lib/bcprov-jdk14-138.jar diff --git a/bin/jasperstart/lib/bctsp-jdk14-1.38.jar b/bin/jasperstarter/lib/bctsp-jdk14-1.38.jar similarity index 100% rename from bin/jasperstart/lib/bctsp-jdk14-1.38.jar rename to bin/jasperstarter/lib/bctsp-jdk14-1.38.jar diff --git a/bin/jasperstart/lib/castor-core-1.3.3.jar b/bin/jasperstarter/lib/castor-core-1.3.3.jar similarity index 100% rename from bin/jasperstart/lib/castor-core-1.3.3.jar rename to bin/jasperstarter/lib/castor-core-1.3.3.jar diff --git a/bin/jasperstart/lib/castor-xml-1.3.3.jar b/bin/jasperstarter/lib/castor-xml-1.3.3.jar similarity index 100% rename from bin/jasperstart/lib/castor-xml-1.3.3.jar rename to bin/jasperstarter/lib/castor-xml-1.3.3.jar diff --git a/bin/jasperstart/lib/commons-beanutils-1.9.0.jar b/bin/jasperstarter/lib/commons-beanutils-1.9.0.jar similarity index 100% rename from bin/jasperstart/lib/commons-beanutils-1.9.0.jar rename to bin/jasperstarter/lib/commons-beanutils-1.9.0.jar diff --git a/bin/jasperstart/lib/commons-cli-1.0.jar b/bin/jasperstarter/lib/commons-cli-1.0.jar similarity index 100% rename from bin/jasperstart/lib/commons-cli-1.0.jar rename to bin/jasperstarter/lib/commons-cli-1.0.jar diff --git a/bin/jasperstart/lib/commons-codec-1.5.jar b/bin/jasperstarter/lib/commons-codec-1.5.jar similarity index 100% rename from bin/jasperstart/lib/commons-codec-1.5.jar rename to bin/jasperstarter/lib/commons-codec-1.5.jar diff --git a/bin/jasperstart/lib/commons-collections-3.2.1.jar b/bin/jasperstarter/lib/commons-collections-3.2.1.jar similarity index 100% rename from bin/jasperstart/lib/commons-collections-3.2.1.jar rename to bin/jasperstarter/lib/commons-collections-3.2.1.jar diff --git a/bin/jasperstart/lib/commons-digester-2.1.jar b/bin/jasperstarter/lib/commons-digester-2.1.jar similarity index 100% rename from bin/jasperstart/lib/commons-digester-2.1.jar rename to bin/jasperstarter/lib/commons-digester-2.1.jar diff --git a/bin/jasperstart/lib/commons-io-2.4.jar b/bin/jasperstarter/lib/commons-io-2.4.jar similarity index 100% rename from bin/jasperstart/lib/commons-io-2.4.jar rename to bin/jasperstarter/lib/commons-io-2.4.jar diff --git a/bin/jasperstart/lib/commons-lang-2.6.jar b/bin/jasperstarter/lib/commons-lang-2.6.jar similarity index 100% rename from bin/jasperstart/lib/commons-lang-2.6.jar rename to bin/jasperstarter/lib/commons-lang-2.6.jar diff --git a/bin/jasperstart/lib/commons-logging-1.1.1.jar b/bin/jasperstarter/lib/commons-logging-1.1.1.jar similarity index 100% rename from bin/jasperstart/lib/commons-logging-1.1.1.jar rename to bin/jasperstarter/lib/commons-logging-1.1.1.jar diff --git a/bin/jasperstart/lib/core-2.3.0.jar b/bin/jasperstarter/lib/core-2.3.0.jar similarity index 100% rename from bin/jasperstart/lib/core-2.3.0.jar rename to bin/jasperstarter/lib/core-2.3.0.jar diff --git a/bin/jasperstart/lib/ecj-4.3.1.jar b/bin/jasperstarter/lib/ecj-4.3.1.jar similarity index 100% rename from bin/jasperstart/lib/ecj-4.3.1.jar rename to bin/jasperstarter/lib/ecj-4.3.1.jar diff --git a/bin/jasperstart/lib/groovy-all-2.4.1.jar b/bin/jasperstarter/lib/groovy-all-2.4.1.jar similarity index 100% rename from bin/jasperstart/lib/groovy-all-2.4.1.jar rename to bin/jasperstarter/lib/groovy-all-2.4.1.jar diff --git a/bin/jasperstart/lib/itext-2.1.7.js2.jar b/bin/jasperstarter/lib/itext-2.1.7.js2.jar similarity index 100% rename from bin/jasperstart/lib/itext-2.1.7.js2.jar rename to bin/jasperstarter/lib/itext-2.1.7.js2.jar diff --git a/bin/jasperstart/lib/jackson-annotations-2.1.4.jar b/bin/jasperstarter/lib/jackson-annotations-2.1.4.jar similarity index 100% rename from bin/jasperstart/lib/jackson-annotations-2.1.4.jar rename to bin/jasperstarter/lib/jackson-annotations-2.1.4.jar diff --git a/bin/jasperstart/lib/jackson-core-2.1.4.jar b/bin/jasperstarter/lib/jackson-core-2.1.4.jar similarity index 100% rename from bin/jasperstart/lib/jackson-core-2.1.4.jar rename to bin/jasperstarter/lib/jackson-core-2.1.4.jar diff --git a/bin/jasperstart/lib/jackson-databind-2.1.4.jar b/bin/jasperstarter/lib/jackson-databind-2.1.4.jar similarity index 100% rename from bin/jasperstart/lib/jackson-databind-2.1.4.jar rename to bin/jasperstarter/lib/jackson-databind-2.1.4.jar diff --git a/bin/jasperstart/lib/jakarta-regexp-1.4.jar b/bin/jasperstarter/lib/jakarta-regexp-1.4.jar similarity index 100% rename from bin/jasperstart/lib/jakarta-regexp-1.4.jar rename to bin/jasperstarter/lib/jakarta-regexp-1.4.jar diff --git a/bin/jasperstart/lib/jasperreports-6.1.0.jar b/bin/jasperstarter/lib/jasperreports-6.1.0.jar similarity index 100% rename from bin/jasperstart/lib/jasperreports-6.1.0.jar rename to bin/jasperstarter/lib/jasperreports-6.1.0.jar diff --git a/bin/jasperstart/lib/jasperreports-fonts-6.0.0.jar b/bin/jasperstarter/lib/jasperreports-fonts-6.0.0.jar similarity index 100% rename from bin/jasperstart/lib/jasperreports-fonts-6.0.0.jar rename to bin/jasperstarter/lib/jasperreports-fonts-6.0.0.jar diff --git a/bin/jasperstart/lib/jasperreports-functions-6.1.0.jar b/bin/jasperstarter/lib/jasperreports-functions-6.1.0.jar similarity index 100% rename from bin/jasperstart/lib/jasperreports-functions-6.1.0.jar rename to bin/jasperstarter/lib/jasperreports-functions-6.1.0.jar diff --git a/bin/jasperstart/lib/jasperstarter.jar b/bin/jasperstarter/lib/jasperstarter.jar similarity index 100% rename from bin/jasperstart/lib/jasperstarter.jar rename to bin/jasperstarter/lib/jasperstarter.jar diff --git a/bin/jasperstart/lib/javax.inject-1.jar b/bin/jasperstarter/lib/javax.inject-1.jar similarity index 100% rename from bin/jasperstart/lib/javax.inject-1.jar rename to bin/jasperstarter/lib/javax.inject-1.jar diff --git a/bin/jasperstart/lib/jcalendar-1.4.jar b/bin/jasperstarter/lib/jcalendar-1.4.jar similarity index 100% rename from bin/jasperstart/lib/jcalendar-1.4.jar rename to bin/jasperstarter/lib/jcalendar-1.4.jar diff --git a/bin/jasperstart/lib/jcommon-1.0.15.jar b/bin/jasperstarter/lib/jcommon-1.0.15.jar similarity index 100% rename from bin/jasperstart/lib/jcommon-1.0.15.jar rename to bin/jasperstarter/lib/jcommon-1.0.15.jar diff --git a/bin/jasperstart/lib/jfreechart-1.0.12.jar b/bin/jasperstarter/lib/jfreechart-1.0.12.jar similarity index 100% rename from bin/jasperstart/lib/jfreechart-1.0.12.jar rename to bin/jasperstarter/lib/jfreechart-1.0.12.jar diff --git a/bin/jasperstart/lib/joda-time-2.0.jar b/bin/jasperstarter/lib/joda-time-2.0.jar similarity index 100% rename from bin/jasperstart/lib/joda-time-2.0.jar rename to bin/jasperstarter/lib/joda-time-2.0.jar diff --git a/bin/jasperstart/lib/log4j-1.2.17.jar b/bin/jasperstarter/lib/log4j-1.2.17.jar similarity index 100% rename from bin/jasperstart/lib/log4j-1.2.17.jar rename to bin/jasperstarter/lib/log4j-1.2.17.jar diff --git a/bin/jasperstart/lib/lucene-analyzers-common-4.5.1.jar b/bin/jasperstarter/lib/lucene-analyzers-common-4.5.1.jar similarity index 100% rename from bin/jasperstart/lib/lucene-analyzers-common-4.5.1.jar rename to bin/jasperstarter/lib/lucene-analyzers-common-4.5.1.jar diff --git a/bin/jasperstart/lib/lucene-core-4.5.1.jar b/bin/jasperstarter/lib/lucene-core-4.5.1.jar similarity index 100% rename from bin/jasperstart/lib/lucene-core-4.5.1.jar rename to bin/jasperstarter/lib/lucene-core-4.5.1.jar diff --git a/bin/jasperstart/lib/lucene-queries-4.5.1.jar b/bin/jasperstarter/lib/lucene-queries-4.5.1.jar similarity index 100% rename from bin/jasperstart/lib/lucene-queries-4.5.1.jar rename to bin/jasperstarter/lib/lucene-queries-4.5.1.jar diff --git a/bin/jasperstart/lib/lucene-queryparser-4.5.1.jar b/bin/jasperstarter/lib/lucene-queryparser-4.5.1.jar similarity index 100% rename from bin/jasperstart/lib/lucene-queryparser-4.5.1.jar rename to bin/jasperstarter/lib/lucene-queryparser-4.5.1.jar diff --git a/bin/jasperstart/lib/lucene-sandbox-4.5.1.jar b/bin/jasperstarter/lib/lucene-sandbox-4.5.1.jar similarity index 100% rename from bin/jasperstart/lib/lucene-sandbox-4.5.1.jar rename to bin/jasperstarter/lib/lucene-sandbox-4.5.1.jar diff --git a/bin/jasperstart/lib/olap4j-0.9.7.309-JS-3.jar b/bin/jasperstarter/lib/olap4j-0.9.7.309-JS-3.jar similarity index 100% rename from bin/jasperstart/lib/olap4j-0.9.7.309-JS-3.jar rename to bin/jasperstarter/lib/olap4j-0.9.7.309-JS-3.jar diff --git a/bin/jasperstart/lib/poi-3.10-FINAL.jar b/bin/jasperstarter/lib/poi-3.10-FINAL.jar similarity index 100% rename from bin/jasperstart/lib/poi-3.10-FINAL.jar rename to bin/jasperstarter/lib/poi-3.10-FINAL.jar diff --git a/bin/jasperstart/lib/servlet-api-2.5.jar b/bin/jasperstarter/lib/servlet-api-2.5.jar similarity index 100% rename from bin/jasperstart/lib/servlet-api-2.5.jar rename to bin/jasperstarter/lib/servlet-api-2.5.jar diff --git a/bin/jasperstart/lib/spring-aop-3.0.6.RELEASE.jar b/bin/jasperstarter/lib/spring-aop-3.0.6.RELEASE.jar similarity index 100% rename from bin/jasperstart/lib/spring-aop-3.0.6.RELEASE.jar rename to bin/jasperstarter/lib/spring-aop-3.0.6.RELEASE.jar diff --git a/bin/jasperstart/lib/spring-asm-3.0.6.RELEASE.jar b/bin/jasperstarter/lib/spring-asm-3.0.6.RELEASE.jar similarity index 100% rename from bin/jasperstart/lib/spring-asm-3.0.6.RELEASE.jar rename to bin/jasperstarter/lib/spring-asm-3.0.6.RELEASE.jar diff --git a/bin/jasperstart/lib/spring-beans-3.0.6.RELEASE.jar b/bin/jasperstarter/lib/spring-beans-3.0.6.RELEASE.jar similarity index 100% rename from bin/jasperstart/lib/spring-beans-3.0.6.RELEASE.jar rename to bin/jasperstarter/lib/spring-beans-3.0.6.RELEASE.jar diff --git a/bin/jasperstart/lib/spring-context-3.0.6.RELEASE.jar b/bin/jasperstarter/lib/spring-context-3.0.6.RELEASE.jar similarity index 100% rename from bin/jasperstart/lib/spring-context-3.0.6.RELEASE.jar rename to bin/jasperstarter/lib/spring-context-3.0.6.RELEASE.jar diff --git a/bin/jasperstart/lib/spring-core-3.0.6.RELEASE.jar b/bin/jasperstarter/lib/spring-core-3.0.6.RELEASE.jar similarity index 100% rename from bin/jasperstart/lib/spring-core-3.0.6.RELEASE.jar rename to bin/jasperstarter/lib/spring-core-3.0.6.RELEASE.jar diff --git a/bin/jasperstart/lib/spring-expression-3.0.6.RELEASE.jar b/bin/jasperstarter/lib/spring-expression-3.0.6.RELEASE.jar similarity index 100% rename from bin/jasperstart/lib/spring-expression-3.0.6.RELEASE.jar rename to bin/jasperstarter/lib/spring-expression-3.0.6.RELEASE.jar diff --git a/bin/jasperstart/lib/stax-1.2.0.jar b/bin/jasperstarter/lib/stax-1.2.0.jar similarity index 100% rename from bin/jasperstart/lib/stax-1.2.0.jar rename to bin/jasperstarter/lib/stax-1.2.0.jar diff --git a/bin/jasperstart/lib/stax-api-1.0-2.jar b/bin/jasperstarter/lib/stax-api-1.0-2.jar similarity index 100% rename from bin/jasperstart/lib/stax-api-1.0-2.jar rename to bin/jasperstarter/lib/stax-api-1.0-2.jar diff --git a/bin/jasperstart/lib/stax-api-1.0.1.jar b/bin/jasperstarter/lib/stax-api-1.0.1.jar similarity index 100% rename from bin/jasperstart/lib/stax-api-1.0.1.jar rename to bin/jasperstarter/lib/stax-api-1.0.1.jar diff --git a/bin/jasperstart/lib/xalan-2.6.0.jar b/bin/jasperstarter/lib/xalan-2.6.0.jar similarity index 100% rename from bin/jasperstart/lib/xalan-2.6.0.jar rename to bin/jasperstarter/lib/xalan-2.6.0.jar diff --git a/bin/jasperstart/lib/xml-apis-1.3.02.jar b/bin/jasperstarter/lib/xml-apis-1.3.02.jar similarity index 100% rename from bin/jasperstart/lib/xml-apis-1.3.02.jar rename to bin/jasperstarter/lib/xml-apis-1.3.02.jar diff --git a/bin/jasperstart/lib/xml-apis-ext-1.3.04.jar b/bin/jasperstarter/lib/xml-apis-ext-1.3.04.jar similarity index 100% rename from bin/jasperstart/lib/xml-apis-ext-1.3.04.jar rename to bin/jasperstarter/lib/xml-apis-ext-1.3.04.jar From d3c86ca1615a534e1af50b6dc422b8c0ffea83cf Mon Sep 17 00:00:00 2001 From: Rafael Queiroz Date: Sun, 5 Mar 2017 17:18:12 -0300 Subject: [PATCH 05/11] Refactor in JasperPHP::__construct() --- src/JasperPHP.php | 47 ++++++++++++++++++------------- tests/JasperPHP/JasperPHPTest.php | 24 ++++++++-------- 2 files changed, 40 insertions(+), 31 deletions(-) diff --git a/src/JasperPHP.php b/src/JasperPHP.php index fc43772..f5df5b1 100755 --- a/src/JasperPHP.php +++ b/src/JasperPHP.php @@ -1,33 +1,40 @@ path_executable = __DIR__ . '/../JasperStarter/bin'; //Path to executable - if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { - $this->windows = true; - } - - if (!$resource_dir) { - $this->resource_directory = __DIR__ . '/../../../vendor/geekcom/jasperphp/src/JasperStarter/bin'; - } else { - if (!file_exists($resource_dir)) { - throw new \Exception('Invalid resource directory.', 1); - } - - $this->resource_directory = $resource_dir; - } + $this->executable = 'jasperstarter'; + $this->path_executable = __DIR__ . '/../bin/jasperstarter/bin'; + $this->windows = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' ? true : false; } public static function __callStatic($method, $parameters) diff --git a/tests/JasperPHP/JasperPHPTest.php b/tests/JasperPHP/JasperPHPTest.php index f8d9764..7d9f6df 100644 --- a/tests/JasperPHP/JasperPHPTest.php +++ b/tests/JasperPHP/JasperPHPTest.php @@ -1,18 +1,20 @@ + * @package JasperPHP + */ +class JasperPHPTest extends \PHPUnit_Framework_TestCase { /** - * - */ - public function testCompileWithWrongArgs() - { - - } - - public function testCompile() + * @return JasperPHP + */ + public function testConstructor() { - + $this->assertInstanceOf(JasperPHP::class, new JasperPHP()); } -} +} \ No newline at end of file From d56749c220b07115cd6432f043a04e8859bb46ce Mon Sep 17 00:00:00 2001 From: Rafael Queiroz Date: Sun, 5 Mar 2017 18:15:12 -0300 Subject: [PATCH 06/11] Refactor in JasperPHP::execute() and create a Exceptions --- src/Exception/ErrorCommandExecutable.php | 14 ++++++ src/Exception/InvalidCommandExecutable.php | 21 +++++++++ src/Exception/InvalidResourceDirectory.php | 22 +++++++++ src/JasperPHP.php | 53 +++++++++++++++++----- tests/JasperPHP/JasperPHPTest.php | 22 +++++++++ 5 files changed, 120 insertions(+), 12 deletions(-) create mode 100644 src/Exception/ErrorCommandExecutable.php create mode 100644 src/Exception/InvalidCommandExecutable.php create mode 100644 src/Exception/InvalidResourceDirectory.php diff --git a/src/Exception/ErrorCommandExecutable.php b/src/Exception/ErrorCommandExecutable.php new file mode 100644 index 0000000..cc3aea4 --- /dev/null +++ b/src/Exception/ErrorCommandExecutable.php @@ -0,0 +1,14 @@ +the_command; } - public function execute($run_as_user = false) + /** + * @param bool $user + * @return mixed + * @throws Exception\InvalidCommandExecutable + * @throws Exception\InvalidResourceDirectory + * @throws Exception\ErrorCommandExecutable + */ + public function execute($user = false) { - if ($run_as_user !== false && strlen($run_as_user > 0) && !$this->windows) { - $this->the_command = 'su -u ' . $run_as_user . " -c \"" . $this->the_command . "\""; - } + $this->validateExecute(); + $this->addUserToCommand($user); + $command = $this->the_command; $output = []; $return_var = 0; - if (is_dir($this->path_executable)) { - chdir($this->path_executable); - exec($this->the_command, $output, $return_var); - } else { - throw new \Exception('Invalid resource directory.', 1); + chdir($this->path_executable); + exec($command, $output, $return_var); + if ($return_var !== 0) { + throw new \JasperPHP\Exception\ErrorCommandExecutable(); + } + + return $output; + } + + /** + * @param $user + */ + protected function addUserToCommand($user) + { + if ($user && !$this->windows) { + $this->the_command = 'su -u ' . $user . " -c \"" . $this->the_command . "\""; } + } - if ($return_var != 0) { - throw new \Exception('Your report has an error and couldn \'t be processed!\ Try to output the command using the function `output();` and run it manually in the console.', 1); + /** + * @throws Exception\InvalidCommandExecutable + * @throws Exception\InvalidResourceDirectory + */ + protected function validateExecute() + { + if (!$this->the_command) { + throw new \JasperPHP\Exception\InvalidCommandExecutable(); + } + if (!is_dir ($this->path_executable)) { + throw new \JasperPHP\Exception\InvalidResourceDirectory(); } - return $output; } + } \ No newline at end of file diff --git a/tests/JasperPHP/JasperPHPTest.php b/tests/JasperPHP/JasperPHPTest.php index 7d9f6df..954cde3 100644 --- a/tests/JasperPHP/JasperPHPTest.php +++ b/tests/JasperPHP/JasperPHPTest.php @@ -17,4 +17,26 @@ public function testConstructor() $this->assertInstanceOf(JasperPHP::class, new JasperPHP()); } + /** + * + */ + public function testExecuteWithoutCompile() + { + $this->setExpectedException(\JasperPHP\Exception\InvalidCommandExecutable::class); + + $jasper = new JasperPHP(); + $jasper->execute(); + } + + /** + * + */ + public function testExecuteWithCompileAndWrongInput() + { + $this->setExpectedException(\JasperPHP\Exception\ErrorCommandExecutable::class); + + $jasper = new JasperPHP(); + $jasper->compile('hello_world.jrxml')->execute(); + } + } \ No newline at end of file From ec802a9b86e61d2dfadde3509afdafad81874331 Mon Sep 17 00:00:00 2001 From: Rafael Queiroz Date: Sun, 5 Mar 2017 18:29:34 -0300 Subject: [PATCH 07/11] Refacotr in JasperPHP::compile() --- src/Exception/InvalidInputFile.php | 21 +++++++++++++++++++++ src/JasperPHP.php | 22 ++++++++++++---------- tests/JasperPHP/JasperPHPTest.php | 26 ++++++++++++++++++++++++-- 3 files changed, 57 insertions(+), 12 deletions(-) create mode 100644 src/Exception/InvalidInputFile.php diff --git a/src/Exception/InvalidInputFile.php b/src/Exception/InvalidInputFile.php new file mode 100644 index 0000000..5713e6f --- /dev/null +++ b/src/Exception/InvalidInputFile.php @@ -0,0 +1,21 @@ +windows) ? $this->executable : './' . $this->executable; - - $command .= ' compile '; - - $command .= "\"$input_file\""; + $this->the_command = $this->windows ? $this->executable : './' . $this->executable; + $this->the_command .= ' compile '; + $this->the_command .= "\"$input_file\""; if ($output_file !== false) { - $command .= ' -o ' . "\"$output_file\""; + $this->the_command .= ' -o ' . "\"$output_file\""; } - $this->the_command = $command; - return $this; } diff --git a/tests/JasperPHP/JasperPHPTest.php b/tests/JasperPHP/JasperPHPTest.php index 954cde3..2a69d3b 100644 --- a/tests/JasperPHP/JasperPHPTest.php +++ b/tests/JasperPHP/JasperPHPTest.php @@ -10,13 +10,35 @@ class JasperPHPTest extends \PHPUnit_Framework_TestCase { /** - * @return JasperPHP + * */ public function testConstructor() { $this->assertInstanceOf(JasperPHP::class, new JasperPHP()); } + /** + * + */ + public function testCompileWithWrongInput() + { + $this->setExpectedException(\JasperPHP\Exception\InvalidInputFile::class); + + $jasper = new JasperPHP(); + $jasper->compile(null); + } + + /** + * + */ + public function testCompile() + { + $jasper = new JasperPHP(); + $result = $jasper->compile('hello_world.jrxml'); + + $this->assertInstanceOf(JasperPHP::class, $result); + } + /** * */ @@ -31,7 +53,7 @@ public function testExecuteWithoutCompile() /** * */ - public function testExecuteWithCompileAndWrongInput() + public function testExecuteWithCompile() { $this->setExpectedException(\JasperPHP\Exception\ErrorCommandExecutable::class); From 6609340ee709e74b29a5f82670d4b4838e874070 Mon Sep 17 00:00:00 2001 From: Rafael Queiroz Date: Sun, 5 Mar 2017 18:32:31 -0300 Subject: [PATCH 08/11] Adding assert in JasperPHPTest::testCompile() --- tests/JasperPHP/JasperPHPTest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/JasperPHP/JasperPHPTest.php b/tests/JasperPHP/JasperPHPTest.php index 2a69d3b..758b3e7 100644 --- a/tests/JasperPHP/JasperPHPTest.php +++ b/tests/JasperPHP/JasperPHPTest.php @@ -37,6 +37,7 @@ public function testCompile() $result = $jasper->compile('hello_world.jrxml'); $this->assertInstanceOf(JasperPHP::class, $result); + $this->assertEquals('./jasperstarter compile "hello_world.jrxml"', $result->output()); } /** @@ -61,4 +62,5 @@ public function testExecuteWithCompile() $jasper->compile('hello_world.jrxml')->execute(); } + } \ No newline at end of file From 714360d464b7224cf7f1258740b980990bc24110 Mon Sep 17 00:00:00 2001 From: Rafael Queiroz Date: Sun, 5 Mar 2017 18:35:13 -0300 Subject: [PATCH 09/11] Remove __callStatic method --- src/JasperPHP.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/JasperPHP.php b/src/JasperPHP.php index 784632d..d4af3c9 100755 --- a/src/JasperPHP.php +++ b/src/JasperPHP.php @@ -38,15 +38,6 @@ public function __construct() $this->windows = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' ? true : false; } - public static function __callStatic($method, $parameters) - { - // Create a new instance of the called class, in this case it is Post - $model = get_called_class(); - - // Call the requested method on the newly created object - return call_user_func_array(array(new $model, $method), $parameters); - } - /** * @param $input_file * @param bool $output_file From 67907482d33e645eda5e418400dc8b50999cd08d Mon Sep 17 00:00:00 2001 From: Rafael Queiroz Date: Sun, 5 Mar 2017 18:37:54 -0300 Subject: [PATCH 10/11] Change JasperPHP->the_command to JasperPHP->command attribute --- src/JasperPHP.php | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/src/JasperPHP.php b/src/JasperPHP.php index d4af3c9..0e73e75 100755 --- a/src/JasperPHP.php +++ b/src/JasperPHP.php @@ -1,14 +1,17 @@ the_command = $this->windows ? $this->executable : './' . $this->executable; - $this->the_command .= ' compile '; - $this->the_command .= "\"$input_file\""; + $this->command = $this->windows ? $this->executable : './' . $this->executable; + $this->command .= ' compile '; + $this->command .= "\"$input_file\""; if ($output_file !== false) { - $this->the_command .= ' -o ' . "\"$output_file\""; + $this->command .= ' -o ' . "\"$output_file\""; } return $this; @@ -159,7 +163,7 @@ public function process($input_file, $output_file = false, $format = ['pdf'], $p } } - $this->the_command = $command; + $this->command = $command; return $this; } @@ -176,16 +180,11 @@ public function list_parameters($input_file) $command .= "\"$input_file\""; - $this->the_command = $command; + $this->command = $command; return $this; } - public function output() - { - return $this->the_command; - } - /** * @param bool $user * @return mixed @@ -198,12 +197,11 @@ public function execute($user = false) $this->validateExecute(); $this->addUserToCommand($user); - $command = $this->the_command; $output = []; $return_var = 0; chdir($this->path_executable); - exec($command, $output, $return_var); + exec($this->command, $output, $return_var); if ($return_var !== 0) { throw new \JasperPHP\Exception\ErrorCommandExecutable(); } @@ -211,13 +209,21 @@ public function execute($user = false) return $output; } + /** + * @return string + */ + public function output() + { + return $this->command; + } + /** * @param $user */ protected function addUserToCommand($user) { if ($user && !$this->windows) { - $this->the_command = 'su -u ' . $user . " -c \"" . $this->the_command . "\""; + $this->command = 'su -u ' . $user . " -c \"" . $this->command . "\""; } } @@ -227,7 +233,7 @@ protected function addUserToCommand($user) */ protected function validateExecute() { - if (!$this->the_command) { + if (!$this->command) { throw new \JasperPHP\Exception\InvalidCommandExecutable(); } if (!is_dir ($this->path_executable)) { From d160daaeaba1d0b8aaa6146102418300090d30c1 Mon Sep 17 00:00:00 2001 From: Rafael Queiroz Date: Sun, 5 Mar 2017 19:26:12 -0300 Subject: [PATCH 11/11] Refactor JasperPHP::process() --- src/Exception/InvalidFormat.php | 14 +++ src/JasperPHP.php | 162 ++++++++++++------------------ tests/JasperPHP/JasperPHPTest.php | 55 ++++++++++ 3 files changed, 135 insertions(+), 96 deletions(-) create mode 100644 src/Exception/InvalidFormat.php diff --git a/src/Exception/InvalidFormat.php b/src/Exception/InvalidFormat.php new file mode 100644 index 0000000..7fb7c0f --- /dev/null +++ b/src/Exception/InvalidFormat.php @@ -0,0 +1,14 @@ +parseProcessOptions($options); + if (!$input_file) { + throw new \JasperPHP\Exception\InvalidInputFile(); } + $this->validateFormat($options['format']); - if (is_array($format)) { - foreach ($format as $key) { - if (!in_array($key, $this->formats)) { - throw new \Exception('Invalid format!', 1); - } - } - } else { - if (!in_array($format, $this->formats)) { - throw new \Exception('Invalid format!', 1); - } + $this->command = $this->windows ? $this->executable : './' . $this->executable; + if ($options['locale']) { + $this->command .= " --locale {$options['locale']}"; } - $command = ($this->windows) ? $this->executable : './' . $this->executable; - - $command .= ($locale) ? " --locale $locale" : ''; - - $command .= ' process '; - - $command .= "\"$input_file\""; - + $this->command .= ' process '; + $this->command .= "\"$input_file\""; if ($output_file !== false) { - $command .= ' -o ' . "\"$output_file\""; - } - - if (is_array($format)) { - $command .= ' -f ' . join(' ', $format); - } else { - $command .= ' -f ' . $format; + $this->command .= ' -o ' . "\"$output_file\""; } - if (count($parameters) > 0) { - $command .= ' -P '; - - foreach ($parameters as $key => $value) { - $param = $key . '="' . $value . '" '; - $command .= " " . $param . " "; + $this->command .= ' -f ' . join(' ', $options['format']); + if ($options['params']) { + $this->command .= ' -P '; + foreach ($options['params'] as $key => $value) { + $this->command .= " " . $key . '="' . $value . '" ' . " "; } - } - if (count($db_connection) > 0) { - $command .= ' -t ' . $db_connection['driver']; - - if (isset($db_connection['username'])) { - $command .= " -u " . $db_connection['username']; - } - - if (isset($db_connection['password']) && !empty($db_connection['password'])) { - $command .= ' -p ' . $db_connection['password']; - } - - if (isset($db_connection['host']) && !empty($db_connection['host'])) { - $command .= ' -H ' . $db_connection['host']; - } - - if (isset($db_connection['database']) && !empty($db_connection['database'])) { - $command .= ' -n ' . $db_connection['database']; - } - - if (isset($db_connection['port']) && !empty($db_connection['port'])) { - $command .= ' --db-port ' . $db_connection['port']; - } - - if (isset($db_connection['jdbc_driver']) && !empty($db_connection['jdbc_driver'])) { - $command .= ' --db-driver ' . $db_connection['jdbc_driver']; - } - - if (isset($db_connection['jdbc_url']) && !empty($db_connection['jdbc_url'])) { - $command .= ' --db-url ' . $db_connection['jdbc_url']; - } - - if (isset($db_connection['jdbc_dir']) && !empty($db_connection['jdbc_dir'])) { - $command .= ' --jdbc-dir ' . $db_connection['jdbc_dir']; - } - - if (isset($db_connection['db_sid']) && !empty($db_connection['db_sid'])) { - $command .= ' --db-sid ' . $db_connection['db_sid']; - } - - if (isset($db_connection['xml_xpath'])) { - $command .= ' --xml-xpath ' . $db_connection['xml_xpath']; - } + return $this; + } - if (isset($db_connection['data_file'])) { - $command .= ' --data-file ' . $db_connection['data_file']; - } + /** + * + * @param $options + * @return array + */ + protected function parseProcessOptions($options) + { + $defaultOptions = [ + 'format' => ['pdf'], + 'params' => [], + 'locale' => false, + 'db_connection' => [] + ]; + + return array_merge($defaultOptions, $options); + } - if (isset($db_connection['json_query'])) { - $command .= ' --json-query ' . $db_connection['json_query']; + /** + * @param $format + * @throws Exception\InvalidFormat + */ + protected function validateFormat($format) + { + if (!is_array($format)) { + $format = [$format]; + } + foreach ($format as $value) { + if (!in_array($value, $this->formats)) { + throw new \JasperPHP\Exception\InvalidFormat(); } } - - $this->command = $command; - - return $this; } - public function list_parameters($input_file) + /** + * @param $input_file + * @return $this + * @throws \Exception + */ + public function listParameters($input_file) { - if (is_null($input_file) || empty($input_file)) { - throw new \Exception('No input file', 1); + if (!$input_file) { + throw new \JasperPHP\Exception\InvalidInputFile(); } - $command = ($this->windows) ? $this->executable : './' . $this->executable; - - $command .= ' list_parameters '; - - $command .= "\"$input_file\""; - - $this->command = $command; + $this->command = $this->windows ? $this->executable : './' . $this->executable; + $this->command .= ' list_parameters '; + $this->command .= "\"$input_file\""; return $this; } diff --git a/tests/JasperPHP/JasperPHPTest.php b/tests/JasperPHP/JasperPHPTest.php index 758b3e7..f601c5f 100644 --- a/tests/JasperPHP/JasperPHPTest.php +++ b/tests/JasperPHP/JasperPHPTest.php @@ -62,5 +62,60 @@ public function testExecuteWithCompile() $jasper->compile('hello_world.jrxml')->execute(); } + /** + * + */ + public function testListParametersWithWrongInput() + { + $this->setExpectedException(\JasperPHP\Exception\InvalidInputFile::class); + + $jasper = new JasperPHP(); + $jasper->listParameters(''); + } + + /** + * + */ + public function testListParameters() + { + $jasper = new JasperPHP(); + $result = $jasper->listParameters('hello_world.jrxml'); + + $this->assertInstanceOf(JasperPHP::class, $result); + $this->assertEquals('./jasperstarter list_parameters "hello_world.jrxml"', $result->output()); + } + + /** + * + */ + public function testProcessWithWrongInput() + { + $this->setExpectedException(\JasperPHP\Exception\InvalidInputFile::class); + + $jasper = new JasperPHP(); + $jasper->process(0); + } + + /** + * + */ + public function testProcessWithWrongFormat() + { + $this->setExpectedException(\JasperPHP\Exception\InvalidFormat::class); + + $jasper = new JasperPHP(); + $jasper->process('hello_world.jrxml', false, [ + 'format' => 'mp3' + ]); + } + + /** + * + */ + public function testProcess() + { + $jasper = new JasperPHP(); + $this->assertInstanceOf(JasperPHP::class, $jasper->process('hello_world.jrxml')); + } } \ No newline at end of file