Merge branch 'master' of https://github.com/apache/empire-db
Project: http://git-wip-us.apache.org/repos/asf/empire-db/repo Commit: http://git-wip-us.apache.org/repos/asf/empire-db/commit/b1b1446d Tree: http://git-wip-us.apache.org/repos/asf/empire-db/tree/b1b1446d Diff: http://git-wip-us.apache.org/repos/asf/empire-db/diff/b1b1446d Branch: refs/heads/master Commit: b1b1446dc96c4585ccde83b7fdab3be6f239a78b Parents: 824151c 2685083 Author: jan <[email protected]> Authored: Wed Sep 30 09:38:22 2015 +0200 Committer: jan <[email protected]> Committed: Wed Sep 30 09:38:22 2015 +0200 ---------------------------------------------------------------------- .gitignore | 9 +- CHANGELOG.txt | 21 + empire-db-codegen/pom.xml | 2 +- empire-db-dist/pom.xml | 2 +- empire-db-eclipse-codegen/.gitignore | 3 + empire-db-eclipse-codegen/META-INF/MANIFEST.MF | 30 + empire-db-eclipse-codegen/build.properties | 30 + empire-db-eclipse-codegen/lib/.gitignore | 8 + empire-db-eclipse-codegen/lib/readme.txt | 24 + empire-db-eclipse-codegen/plugin.xml | 76 +++ empire-db-eclipse-codegen/pom.xml | 86 +++ .../apache/empire/db/eclipse/CodeGenConfig.java | 574 +++++++++++++++++++ .../org/apache/empire/db/eclipse/Plugin.java | 190 ++++++ .../apache/empire/db/eclipse/PluginConsts.java | 47 ++ .../db/eclipse/handler/ConfigDialogHandler.java | 48 ++ .../empire/db/eclipse/model/ConfigFile.java | 64 +++ .../db/eclipse/model/JdbcDriverClass.java | 39 ++ .../db/eclipse/service/ConfigFileService.java | 38 ++ .../eclipse/service/ConfigFileServiceImpl.java | 234 ++++++++ .../db/eclipse/service/MessageService.java | 26 + .../db/eclipse/service/MessageServiceImpl.java | 52 ++ .../db/eclipse/ui/ClassParameterPage.java | 272 +++++++++ .../db/eclipse/ui/ConfigurationDialog.java | 293 ++++++++++ .../empire/db/eclipse/ui/DBTablesDialog.java | 350 +++++++++++ .../apache/empire/db/eclipse/ui/INavigator.java | 46 ++ .../org/apache/empire/db/eclipse/ui/IPage.java | 30 + .../apache/empire/db/eclipse/ui/MainPage.java | 305 ++++++++++ .../apache/empire/db/eclipse/ui/Navigator.java | 145 +++++ .../org/apache/empire/db/eclipse/ui/Page.java | 51 ++ .../empire/db/eclipse/ui/SchemaOptionsPage.java | 241 ++++++++ .../db/eclipse/util/SWTResourceManager.java | 455 +++++++++++++++ .../src/main/resources/defaultConfig.xml | 84 +++ .../src/main/resources/icons/addButton.png | Bin 0 -> 366 bytes .../src/main/resources/icons/check_all.gif | Bin 0 -> 344 bytes .../src/main/resources/icons/db_element.gif | Bin 0 -> 959 bytes .../src/main/resources/icons/deleteButton.png | Bin 0 -> 582 bytes .../src/main/resources/icons/empire-db-logo.gif | Bin 0 -> 12167 bytes .../src/main/resources/icons/empire_db_icon.png | Bin 0 -> 581 bytes .../src/main/resources/icons/folder.gif | Bin 0 -> 219 bytes .../src/main/resources/icons/logo.png | Bin 0 -> 5482 bytes .../src/main/resources/icons/save.png | Bin 0 -> 550 bytes .../src/main/resources/icons/testConnection.gif | Bin 0 -> 920 bytes .../src/main/resources/icons/uncheck_all.gif | Bin 0 -> 148 bytes .../main/resources/lang/messages_en.properties | 141 +++++ .../src/main/resources/templates/BaseRecord.vm | 41 ++ .../src/main/resources/templates/BaseTable.vm | 31 + .../src/main/resources/templates/BaseView.vm | 31 + .../src/main/resources/templates/Database.vm | 136 +++++ .../src/main/resources/templates/Record.vm | 66 +++ .../src/main/resources/templates/Table.vm | 76 +++ .../src/main/resources/templates/View.vm | 68 +++ .../empire-db-example-advanced/.gitignore | 1 + .../empire-db-example-advanced/pom.xml | 2 +- .../samples/db/advanced/SampleAdvApp.java | 45 +- .../empire-db-example-basic/.gitignore | 2 + .../empire-db-example-basic/pom.xml | 3 +- .../empire-db-example-cxf/pom.xml | 2 +- .../empire-db-example-jsf2/.gitignore | 1 + .../empire-db-example-jsf2/pom.xml | 2 +- .../src/main/webapp/.gitignore | 1 + .../empire-db-example-spring/pom.xml | 2 +- .../empire-db-example-struts2-cxf/.gitignore | 1 + .../empire-db-example-struts2-cxf/pom.xml | 4 +- .../src/main/webapp/WEB-INF/web.xml | 4 +- .../empire-db-example-struts2/.gitignore | 1 + .../empire-db-example-struts2/pom.xml | 4 +- .../src/main/webapp/WEB-INF/web.xml | 4 +- empire-db-examples/pom.xml | 12 +- empire-db-jsf2/pom.xml | 2 +- .../apache/empire/jsf2/components/InputTag.java | 2 +- .../apache/empire/jsf2/components/LabelTag.java | 2 +- .../apache/empire/jsf2/components/LinkTag.java | 2 +- .../empire/jsf2/components/MenuItemTag.java | 4 +- .../empire/jsf2/components/MenuListTag.java | 2 +- .../apache/empire/jsf2/components/TitleTag.java | 2 +- .../apache/empire/jsf2/components/ValueTag.java | 4 +- .../empire/jsf2/controls/InputControl.java | 2 +- .../empire/jsf2/controls/TextInputControl.java | 13 +- empire-db-maven-plugin/pom.xml | 6 +- empire-db-spring/pom.xml | 64 +++ .../empire/spring/DbDatabaseFactoryBean.java | 137 +++++ .../apache/empire/spring/EmpireDaoSupport.java | 91 +++ .../apache/empire/spring/EmpireDataReader.java | 27 + .../empire/spring/EmpireDriverFactory.java | 101 ++++ .../empire/spring/EmpireIntegerValueReader.java | 39 ++ .../empire/spring/EmpireLongValueReader.java | 39 ++ .../org/apache/empire/spring/EmpireReader.java | 104 ++++ .../empire/spring/EmpireReaderExtractor.java | 27 + .../org/apache/empire/spring/EmpireRecord.java | 68 +++ .../empire/spring/EmpireRecordWriter.java | 28 + .../empire/spring/EmpireRowCallbackHandler.java | 27 + .../empire/spring/EmpireStringValueReader.java | 37 ++ .../apache/empire/spring/EmpireTemplate.java | 301 ++++++++++ .../apache/empire/spring/EmpireValueReader.java | 37 ++ .../empire/spring/example1/EmpireApp.java | 47 ++ .../empire/spring/example1/EmpireAppImpl.java | 337 +++++++++++ .../empire/spring/example1/SampleBean.java | 126 ++++ .../apache/empire/spring/example1/SampleDB.java | 148 +++++ .../empire/spring/example1/SampleSpringApp.java | 86 +++ .../empire/spring/example2/Department.java | 90 +++ .../apache/empire/spring/example2/Employee.java | 140 +++++ .../empire/spring/example2/EmployeeDao.java | 45 ++ .../empire/spring/example2/EmployeeDaoImpl.java | 225 ++++++++ .../spring/example2/EmployeeSpringApp.java | 220 +++++++ .../resources/example1/applicationContext.xml | 83 +++ .../example2/applicationContext-employee.xml | 85 +++ .../src/main/resources/log4j.properties | 21 + .../src/main/resources/settings.properties | 44 ++ empire-db-struts2/pom.xml | 2 +- empire-db/pom.xml | 2 +- .../java/org/apache/empire/db/DBCommand.java | 23 +- .../org/apache/empire/db/DBDatabaseDriver.java | 85 ++- .../java/org/apache/empire/db/DBSQLScript.java | 357 ++++++++++-- .../db/sqlite/DBDatabaseDriverSQLite.java | 89 ++- pom.xml | 58 +- 115 files changed, 7840 insertions(+), 197 deletions(-) ----------------------------------------------------------------------
