[icinga-checkins] icinga.org: icinga-web/jmosshammer/default: * Added connection identifier to internal icinga_web doctrine models ( icinga_web connection can now

git at icinga.org git at icinga.org
Mon Jun 6 14:16:18 CEST 2011


Module: icinga-web
Branch: jmosshammer/default
Commit: 542984d2913d500ee41a089bbe7e788b2a2137ea
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=542984d2913d500ee41a089bbe7e788b2a2137ea

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Mon Jun  6 14:07:13 2011 +0200

* Added connection identifier to internal icinga_web doctrine models (icinga_web connection can now
* be placed in anywhere in the databases.xml and needn't to be the last element anymore)
* Prepared API tests to succeed where they should
* Added 'connection' property to ConsoleCommand
* Removed deleted files

---

 app/modules/Api/config/autoload.xml                |    7 +-
 .../lib/database/IcingaDoctrine_Query.class.php    |   13 ++
 .../lib/datastore/AbstractDataStoreModel.class.php |   14 ++-
 .../lib/datastore/IFilterableDataStore.class.php   |   69 ---------
 .../interfaces/IFilterableDataStore.class.php      |    9 -
 .../lib/model/ApiDataRequestBaseModel.class.php    |   22 +--
 .../Api/models/.ApiHostRequestModel.class.php.swo  |  Bin 0 -> 20480 bytes
 .../Api/models/ApiHostRequestModel.class.php       |    1 +
 .../models/Console/ConsoleCommandModel.class.php   |    6 +
 .../Api/models/DBALMetaManagerModel.class.php      |    4 +-
 .../models/Store/IcingaApiDataStoreModel.class.php |   32 +++-
 .../Modifiers/StoreTargetModifierModel.class.php   |   52 +++++++
 .../lib/database/AppKitSQLConstants.class.php      |    7 +-
 app/modules/AppKit/lib/database/models/Cronk.php   |    3 +-
 .../AppKit/lib/database/models/CronkCategory.php   |    2 +-
 .../lib/database/models/CronkCategoryCronk.php     |    2 +-
 .../lib/database/models/CronkPrincipalCronk.php    |    3 +-
 .../lib/database/models/generated/BaseCronk.php    |    4 +-
 .../models/generated/BaseCronkCategory.php         |    3 +-
 .../models/generated/BaseCronkCategoryCronk.php    |    4 +-
 .../models/generated/BaseCronkPrincipalCronk.php   |    4 +-
 .../database/models/generated/BaseNsmDbVersion.php |    3 +-
 .../lib/database/models/generated/BaseNsmLog.php   |    5 +-
 .../database/models/generated/BaseNsmPrincipal.php |    4 +-
 .../models/generated/BaseNsmPrincipalTarget.php    |    2 +
 .../lib/database/models/generated/BaseNsmRole.php  |    4 +-
 .../database/models/generated/BaseNsmSession.php   |    4 +-
 .../database/models/generated/BaseNsmTarget.php    |    2 +
 .../models/generated/BaseNsmTargetValue.php        |    3 +-
 .../lib/database/models/generated/BaseNsmUser.php  |    1 +
 .../models/generated/BaseNsmUserPreference.php     |    2 +
 .../database/models/generated/BaseNsmUserRole.php  |    3 +-
 tests/phpunit/tests/api/ConsoleInterfaceTest.php   |    5 +-
 .../tests/api/apiprovider/DataStoreTest.php        |   10 +-
 .../api/apiprovider/IcingaApiDatastoreTest.php     |   31 ++++
 .../tests/api/hostgroups/HostgroupCommandsTest.php |   16 +-
 .../tests/api/hostgroups/HostgroupDetailTest.php   |   12 +-
 tests/phpunit/tests/api/hosts/HostCommandsTest.php |   44 +++---
 tests/phpunit/tests/api/hosts/HostDetailTest.php   |    9 +-
 .../api/servicegroups/ServicegroupCommandsTest.php |   16 +-
 .../tests/api/services/ServiceCommandsTest.php     |   34 ++--
 .../tests/validators/AppKitJsonValidatorTest.php   |  155 ++++++++++++++++++++
 42 files changed, 427 insertions(+), 199 deletions(-)

Diff:   https://git.icinga.org/?p=icinga-web.git;a=commitdiff;h=542984d2913d500ee41a089bbe7e788b2a2137ea




More information about the icinga-checkins mailing list