[icinga-checkins] icinga.org: icinga-web/jmosshammer/apiIntegration: * Updated doctrine, started API integration. Relations must be rebuild by hand...

git at icinga.org git at icinga.org
Wed Nov 10 16:32:23 CET 2010


Module: icinga-web
Branch: jmosshammer/apiIntegration
Commit: 8bac9f7eb65c3b6e4217abd665ce2baa1df9e014
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=8bac9f7eb65c3b6e4217abd665ce2baa1df9e014

Author: jmosshammer <jmosshammer at mojadev-VGN-NW11S-S.(none)>
Date:   Wed Nov 10 16:28:33 2010 +0100

* Updated doctrine, started API integration. Relations must be rebuild by hand...

---

 app/modules/Api/config/autoload.xml                |   10 +
 app/modules/Api/config/config_handlers.xml         |    3 +
 app/modules/Api/config/module.xml                  |   21 +
 app/modules/Api/config/validators.xml              |   13 +
 .../Api/lib/action/IcingaApiBaseAction.class.php   |   11 +
 .../lib/classes/IcingaApiDataAccessor.class.php    |   73 +++
 .../classes/IcingaApiRequestDescriptor.class.php   |   32 +
 .../lib/classes/IcingaApiRequestHelper.class.php   |   34 +
 .../lib/database/models/IcingaAcknowledgements.php |   16 +
 .../models/IcingaAcknowledgementsTable.php         |   19 +
 .../Api/lib/database/models/IcingaCommands.php     |   16 +
 .../lib/database/models/IcingaCommandsTable.php    |   19 +
 .../lib/database/models/IcingaCommenthistory.php   |   16 +
 .../database/models/IcingaCommenthistoryTable.php  |   19 +
 .../Api/lib/database/models/IcingaComments.php     |   16 +
 .../lib/database/models/IcingaCommentsTable.php    |   19 +
 .../Api/lib/database/models/IcingaConfigfiles.php  |   16 +
 .../lib/database/models/IcingaConfigfilesTable.php |   19 +
 .../database/models/IcingaConfigfilevariables.php  |   16 +
 .../models/IcingaConfigfilevariablesTable.php      |   19 +
 .../Api/lib/database/models/IcingaConninfo.php     |   16 +
 .../lib/database/models/IcingaConninfoTable.php    |   19 +
 .../lib/database/models/IcingaContactAddresses.php |   16 +
 .../models/IcingaContactAddressesTable.php         |   19 +
 .../models/IcingaContactNotificationcommands.php   |   16 +
 .../IcingaContactNotificationcommandsTable.php     |   19 +
 .../database/models/IcingaContactgroupMembers.php  |   16 +
 .../models/IcingaContactgroupMembersTable.php      |   19 +
 .../lib/database/models/IcingaContactgroups.php    |   16 +
 .../database/models/IcingaContactgroupsTable.php   |   19 +
 .../models/IcingaContactnotificationmethods.php    |   16 +
 .../IcingaContactnotificationmethodsTable.php      |   19 +
 .../database/models/IcingaContactnotifications.php |   16 +
 .../models/IcingaContactnotificationsTable.php     |   19 +
 .../Api/lib/database/models/IcingaContacts.php     |   16 +
 .../lib/database/models/IcingaContactsTable.php    |   19 +
 .../lib/database/models/IcingaContactstatus.php    |   16 +
 .../database/models/IcingaContactstatusTable.php   |   19 +
 .../lib/database/models/IcingaCustomvariables.php  |   16 +
 .../database/models/IcingaCustomvariablesTable.php |   19 +
 .../database/models/IcingaCustomvariablestatus.php |   16 +
 .../models/IcingaCustomvariablestatusTable.php     |   19 +
 .../Api/lib/database/models/IcingaDbversion.php    |   16 +
 .../lib/database/models/IcingaDbversionTable.php   |   19 +
 .../lib/database/models/IcingaDowntimehistory.php  |   16 +
 .../database/models/IcingaDowntimehistoryTable.php |   19 +
 .../lib/database/models/IcingaEventhandlers.php    |   16 +
 .../database/models/IcingaEventhandlersTable.php   |   19 +
 .../lib/database/models/IcingaExternalcommands.php |   16 +
 .../models/IcingaExternalcommandsTable.php         |   19 +
 .../lib/database/models/IcingaFlappinghistory.php  |   16 +
 .../database/models/IcingaFlappinghistoryTable.php |   19 +
 .../database/models/IcingaHostContactgroups.php    |   16 +
 .../models/IcingaHostContactgroupsTable.php        |   19 +
 .../Api/lib/database/models/IcingaHostContacts.php |   16 +
 .../database/models/IcingaHostContactsTable.php    |   19 +
 .../lib/database/models/IcingaHostParenthosts.php  |   16 +
 .../database/models/IcingaHostParenthostsTable.php |   19 +
 .../Api/lib/database/models/IcingaHostchecks.php   |   16 +
 .../lib/database/models/IcingaHostchecksTable.php  |   19 +
 .../lib/database/models/IcingaHostdependencies.php |   16 +
 .../models/IcingaHostdependenciesTable.php         |   19 +
 .../models/IcingaHostescalationContactgroups.php   |   16 +
 .../IcingaHostescalationContactgroupsTable.php     |   19 +
 .../models/IcingaHostescalationContacts.php        |   16 +
 .../models/IcingaHostescalationContactsTable.php   |   19 +
 .../lib/database/models/IcingaHostescalations.php  |   16 +
 .../database/models/IcingaHostescalationsTable.php |   19 +
 .../lib/database/models/IcingaHostgroupMembers.php |   16 +
 .../models/IcingaHostgroupMembersTable.php         |   19 +
 .../Api/lib/database/models/IcingaHostgroups.php   |   16 +
 .../lib/database/models/IcingaHostgroupsTable.php  |   19 +
 .../Api/lib/database/models/IcingaHosts.php        |   16 +
 .../Api/lib/database/models/IcingaHostsTable.php   |   19 +
 .../Api/lib/database/models/IcingaHoststatus.php   |   16 +
 .../lib/database/models/IcingaHoststatusTable.php  |   19 +
 .../Api/lib/database/models/IcingaInstances.php    |   16 +
 .../lib/database/models/IcingaInstancesTable.php   |   19 +
 .../Api/lib/database/models/IcingaLogentries.php   |   16 +
 .../lib/database/models/IcingaLogentriesTable.php  |   19 +
 .../lib/database/models/IcingaNotifications.php    |   16 +
 .../database/models/IcingaNotificationsTable.php   |   19 +
 .../Api/lib/database/models/IcingaObjects.php      |   16 +
 .../Api/lib/database/models/IcingaObjectsTable.php |   19 +
 .../lib/database/models/IcingaProcessevents.php    |   16 +
 .../database/models/IcingaProcesseventsTable.php   |   19 +
 .../lib/database/models/IcingaProgramstatus.php    |   16 +
 .../database/models/IcingaProgramstatusTable.php   |   19 +
 .../lib/database/models/IcingaRuntimevariables.php |   16 +
 .../models/IcingaRuntimevariablesTable.php         |   19 +
 .../database/models/IcingaScheduleddowntime.php    |   16 +
 .../models/IcingaScheduleddowntimeTable.php        |   19 +
 .../database/models/IcingaServiceContactgroups.php |   16 +
 .../models/IcingaServiceContactgroupsTable.php     |   19 +
 .../lib/database/models/IcingaServiceContacts.php  |   16 +
 .../database/models/IcingaServiceContactsTable.php |   19 +
 .../lib/database/models/IcingaServicechecks.php    |   16 +
 .../database/models/IcingaServicechecksTable.php   |   19 +
 .../database/models/IcingaServicedependencies.php  |   16 +
 .../models/IcingaServicedependenciesTable.php      |   19 +
 .../IcingaServiceescalationContactgroups.php       |   16 +
 .../IcingaServiceescalationContactgroupsTable.php  |   19 +
 .../models/IcingaServiceescalationContacts.php     |   16 +
 .../IcingaServiceescalationContactsTable.php       |   19 +
 .../database/models/IcingaServiceescalations.php   |   16 +
 .../models/IcingaServiceescalationsTable.php       |   19 +
 .../database/models/IcingaServicegroupMembers.php  |   16 +
 .../models/IcingaServicegroupMembersTable.php      |   19 +
 .../lib/database/models/IcingaServicegroups.php    |   16 +
 .../database/models/IcingaServicegroupsTable.php   |   19 +
 .../Api/lib/database/models/IcingaServices.php     |   16 +
 .../lib/database/models/IcingaServicesTable.php    |   19 +
 .../lib/database/models/IcingaServicestatus.php    |   16 +
 .../database/models/IcingaServicestatusTable.php   |   19 +
 .../Api/lib/database/models/IcingaStatehistory.php |   16 +
 .../database/models/IcingaStatehistoryTable.php    |   19 +
 .../lib/database/models/IcingaSystemcommands.php   |   16 +
 .../database/models/IcingaSystemcommandsTable.php  |   19 +
 .../lib/database/models/IcingaTimedeventqueue.php  |   16 +
 .../database/models/IcingaTimedeventqueueTable.php |   19 +
 .../Api/lib/database/models/IcingaTimedevents.php  |   16 +
 .../lib/database/models/IcingaTimedeventsTable.php |   19 +
 .../database/models/IcingaTimeperiodTimeranges.php |   16 +
 .../models/IcingaTimeperiodTimerangesTable.php     |   19 +
 .../Api/lib/database/models/IcingaTimeperiods.php  |   16 +
 .../lib/database/models/IcingaTimeperiodsTable.php |   19 +
 .../generated/BaseIcingaAcknowledgements.php       |  157 +++++
 .../models/generated/BaseIcingaCommands.php        |   81 +++
 .../models/generated/BaseIcingaCommenthistory.php  |  209 ++++++
 .../models/generated/BaseIcingaComments.php        |  188 ++++++
 .../models/generated/BaseIcingaConfigfiles.php     |   70 ++
 .../generated/BaseIcingaConfigfilevariables.php    |   81 +++
 .../models/generated/BaseIcingaConninfo.php        |  186 ++++++
 .../generated/BaseIcingaContactAddresses.php       |   81 +++
 .../BaseIcingaContactNotificationcommands.php      |   92 +++
 .../generated/BaseIcingaContactgroupMembers.php    |   70 ++
 .../models/generated/BaseIcingaContactgroups.php   |   81 +++
 .../BaseIcingaContactnotificationmethods.php       |  123 ++++
 .../generated/BaseIcingaContactnotifications.php   |  112 ++++
 .../models/generated/BaseIcingaContacts.php        |  279 ++++++++
 .../models/generated/BaseIcingaContactstatus.php   |  144 +++++
 .../models/generated/BaseIcingaCustomvariables.php |  103 +++
 .../generated/BaseIcingaCustomvariablestatus.php   |  102 +++
 .../models/generated/BaseIcingaDbversion.php       |   50 ++
 .../models/generated/BaseIcingaDowntimehistory.php |  230 +++++++
 .../models/generated/BaseIcingaEventhandlers.php   |  230 +++++++
 .../generated/BaseIcingaExternalcommands.php       |   91 +++
 .../models/generated/BaseIcingaFlappinghistory.php |  164 +++++
 .../generated/BaseIcingaHostContactgroups.php      |   70 ++
 .../models/generated/BaseIcingaHostContacts.php    |   70 ++
 .../models/generated/BaseIcingaHostParenthosts.php |   70 ++
 .../models/generated/BaseIcingaHostchecks.php      |  282 +++++++++
 .../generated/BaseIcingaHostdependencies.php       |  147 +++++
 .../BaseIcingaHostescalationContactgroups.php      |   70 ++
 .../generated/BaseIcingaHostescalationContacts.php |   70 ++
 .../models/generated/BaseIcingaHostescalations.php |  146 +++++
 .../generated/BaseIcingaHostgroupMembers.php       |   70 ++
 .../models/generated/BaseIcingaHostgroups.php      |   81 +++
 .../database/models/generated/BaseIcingaHosts.php  |  664 ++++++++++++++++++++
 .../models/generated/BaseIcingaHoststatus.php      |  524 +++++++++++++++
 .../models/generated/BaseIcingaInstances.php       |   59 ++
 .../models/generated/BaseIcingaLogentries.php      |  123 ++++
 .../models/generated/BaseIcingaNotifications.php   |  176 ++++++
 .../models/generated/BaseIcingaObjects.php         |   91 +++
 .../models/generated/BaseIcingaProcessevents.php   |  124 ++++
 .../models/generated/BaseIcingaProgramstatus.php   |  296 +++++++++
 .../generated/BaseIcingaRuntimevariables.php       |   70 ++
 .../generated/BaseIcingaScheduleddowntime.php      |  198 ++++++
 .../generated/BaseIcingaServiceContactgroups.php   |   70 ++
 .../models/generated/BaseIcingaServiceContacts.php |   70 ++
 .../models/generated/BaseIcingaServicechecks.php   |  271 ++++++++
 .../generated/BaseIcingaServicedependencies.php    |  158 +++++
 .../BaseIcingaServiceescalationContactgroups.php   |   70 ++
 .../BaseIcingaServiceescalationContacts.php        |   70 ++
 .../generated/BaseIcingaServiceescalations.php     |  157 +++++
 .../generated/BaseIcingaServicegroupMembers.php    |   70 ++
 .../models/generated/BaseIcingaServicegroups.php   |   81 +++
 .../models/generated/BaseIcingaServices.php        |  596 ++++++++++++++++++
 .../models/generated/BaseIcingaServicestatus.php   |  534 ++++++++++++++++
 .../models/generated/BaseIcingaStatehistory.php    |  177 ++++++
 .../models/generated/BaseIcingaSystemcommands.php  |  164 +++++
 .../models/generated/BaseIcingaTimedeventqueue.php |  112 ++++
 .../models/generated/BaseIcingaTimedevents.php     |  154 +++++
 .../generated/BaseIcingaTimeperiodTimeranges.php   |   92 +++
 .../models/generated/BaseIcingaTimeperiods.php     |   81 +++
 .../Api/lib/model/IcingaApiBaseModel.class.php     |   11 +
 .../Api/lib/view/IcingaApiBaseView.class.php       |   11 +
 .../Api/models/ApiDataRequestModel.class.php       |   46 ++
 lib/doctrine/lib/Doctrine.php                      |    2 +-
 lib/doctrine/lib/Doctrine/Adapter/Oracle.php       |   18 +-
 .../lib/Doctrine/Adapter/Statement/Oracle.php      |   13 +-
 lib/doctrine/lib/Doctrine/Collection.php           |   45 ++-
 lib/doctrine/lib/Doctrine/Column.php               |    8 +-
 lib/doctrine/lib/Doctrine/Compiler.php             |    7 +-
 lib/doctrine/lib/Doctrine/Connection.php           |    8 +-
 lib/doctrine/lib/Doctrine/Connection/Mssql.php     |    8 +-
 lib/doctrine/lib/Doctrine/Connection/Oracle.php    |   25 +-
 .../lib/Doctrine/Connection/UnitOfWork.php         |   22 +-
 lib/doctrine/lib/Doctrine/Core.php                 |   18 +-
 lib/doctrine/lib/Doctrine/Data/Export.php          |    3 +-
 lib/doctrine/lib/Doctrine/DataDict/Mssql.php       |   21 +-
 lib/doctrine/lib/Doctrine/DataDict/Mysql.php       |    6 +-
 lib/doctrine/lib/Doctrine/DataDict/Pgsql.php       |   51 ++-
 lib/doctrine/lib/Doctrine/Export.php               |    8 +-
 lib/doctrine/lib/Doctrine/Export/Mssql.php         |  128 +++--
 lib/doctrine/lib/Doctrine/Export/Mysql.php         |   45 ++-
 lib/doctrine/lib/Doctrine/Export/Pgsql.php         |   26 +-
 lib/doctrine/lib/Doctrine/Expression/Pgsql.php     |   31 +-
 lib/doctrine/lib/Doctrine/Formatter.php            |    4 +-
 lib/doctrine/lib/Doctrine/Hydrator.php             |   15 +-
 lib/doctrine/lib/Doctrine/Hydrator/Abstract.php    |   37 ++-
 lib/doctrine/lib/Doctrine/Hydrator/ArrayDriver.php |    2 +-
 .../lib/Doctrine/Hydrator/ArrayHierarchyDriver.php |    4 +-
 lib/doctrine/lib/Doctrine/Hydrator/Graph.php       |   37 +-
 .../lib/Doctrine/Hydrator/RecordDriver.php         |    4 +-
 lib/doctrine/lib/Doctrine/Import/Mssql.php         |   12 +-
 lib/doctrine/lib/Doctrine/Import/Mysql.php         |    8 +-
 lib/doctrine/lib/Doctrine/Import/Pgsql.php         |   73 ++-
 lib/doctrine/lib/Doctrine/Import/Schema.php        |    4 +-
 lib/doctrine/lib/Doctrine/Import/Sqlite.php        |   10 +-
 lib/doctrine/lib/Doctrine/Inflector.php            |    2 +-
 lib/doctrine/lib/Doctrine/Manager.php              |    6 +-
 lib/doctrine/lib/Doctrine/Migration/Diff.php       |    5 +-
 lib/doctrine/lib/Doctrine/Pager.php                |    2 +-
 lib/doctrine/lib/Doctrine/Parser.php               |    7 +-
 .../lib/Doctrine/Parser/sfYaml/sfYamlInline.php    |    2 +-
 .../lib/Doctrine/Parser/sfYaml/sfYamlParser.php    |   34 +-
 lib/doctrine/lib/Doctrine/Query.php                |   30 +-
 lib/doctrine/lib/Doctrine/Query/Having.php         |   14 +-
 lib/doctrine/lib/Doctrine/Query/Where.php          |    6 +-
 lib/doctrine/lib/Doctrine/Record.php               |   46 +-
 lib/doctrine/lib/Doctrine/Search.php               |    6 +-
 lib/doctrine/lib/Doctrine/Table.php                |  264 +++++----
 lib/doctrine/lib/Doctrine/Task/RebuildDb.php       |   20 +-
 .../lib/Doctrine/Template/Listener/Sluggable.php   |    2 +-
 lib/doctrine/lib/Doctrine/Template/SoftDelete.php  |    1 -
 lib/doctrine/lib/Doctrine/Transaction.php          |    4 +-
 237 files changed, 12339 insertions(+), 397 deletions(-)

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




More information about the icinga-checkins mailing list