Skip to content
This repository was archived by the owner on Jul 1, 2025. It is now read-only.

Commit d1d866d

Browse files
jateeterjateeter
committed
Merge remote-tracking branch 'upstream/master'
2 parents 5e0bd7a + e449590 commit d1d866d

24 files changed

+282
-348
lines changed

‎etc/datacustodianmysql.sql‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@ CREATE TABLE `interval_readings` (
6666
`start` bigint(20) DEFAULT NULL,
6767
`value` bigint(20) DEFAULT NULL,
6868
`interval_block_id` bigint(20) DEFAULT NULL,
69+
`consumptionTier` bigint(20) DEFAULT NULL,
70+
`tou` bigint(20) DEFAULT NULL,
71+
`cpp` bigint(20) DEFAULT NULL,
72+
6973
PRIMARY KEY (`id`),
7074
KEY `FK_982b1bcd359b47fcb5823a43d21` (`interval_block_id`),
7175
CONSTRAINT `FK_982b1bcd359b47fcb5823a43d21` FOREIGN KEY (`interval_block_id`) REFERENCES `interval_blocks` (`id`)
@@ -353,7 +357,6 @@ CREATE TABLE `authorizations` (
353357
`scope` varchar(255) DEFAULT NULL,
354358
`state` varchar(255) DEFAULT NULL,
355359
`status` varchar(255) DEFAULT NULL,
356-
`subscriptionURI` varchar(255) DEFAULT NULL,
357360
`third_party` varchar(255) DEFAULT NULL,
358361
`tokenType` int(11) DEFAULT NULL,
359362
`application_information_id` bigint(20) DEFAULT NULL,

‎etc/espiDerived.xsd‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!--
44
==========================================================================
55
Schema: espiDerived.xsd
6-
Version: 0.7.20140619
6+
Version: 0.7.20140810
77
Author: Ron Pasquarelli & Marty Burns (Hypertek for NIST), John Teeter (for NIST), Don Coffin (Remi Networks)
88
==========================================================================
99
@@ -749,6 +749,21 @@ Other EUI Types
749749
<xs:documentation>[correction] Value in units specified by ReadingType</xs:documentation>
750750
</xs:annotation>
751751
</xs:element>
752+
<xs:element name="consumptionTier" type="Int16" minOccurs="0" maxOccurs="1">
753+
<xs:annotation>
754+
<xs:documentation>[extension] Code for consumption tier associated with reading.</xs:documentation>
755+
</xs:annotation>
756+
</xs:element>
757+
<xs:element name="tou" type="Int16" minOccurs="0" maxOccurs="1">
758+
<xs:annotation>
759+
<xs:documentation>[extension] Code for the TOU type of reading. </xs:documentation>
760+
</xs:annotation>
761+
</xs:element>
762+
<xs:element name="cpp" type="Int16" minOccurs="0" maxOccurs="1">
763+
<xs:annotation>
764+
<xs:documentation>[extension] Critical peak period (CPP) bucket the reading value is attributed to. Value 0 means not applicable. Even though CPP is usually considered a specialized form of time of use 'tou', this attribute is defined explicitly for flexibility.</xs:documentation>
765+
</xs:annotation>
766+
</xs:element>
752767
</xs:sequence>
753768
</xs:extension>
754769
</xs:complexContent>

‎etc/prepopulatesql_applicationinformation_dc.sql‎

Lines changed: 24 additions & 19 deletions
Large diffs are not rendered by default.

‎etc/prepopulatesql_applicationinformation_dc_localhost443.sql‎

Lines changed: 25 additions & 20 deletions
Large diffs are not rendered by default.

‎etc/prepopulatesql_applicationinformation_dc_localhost8080.sql‎

Lines changed: 25 additions & 21 deletions
Large diffs are not rendered by default.

‎etc/prepopulatesql_applicationinformation_dc_services_greenbuttondata_org80.sql‎

Lines changed: 25 additions & 21 deletions
Large diffs are not rendered by default.

‎etc/prepopulatesql_applicationinformation_tp.sql‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,24 @@
11
/* Add application_information */
2-
INSERT INTO `application_information` (`id`,`description`,`published`,`self_link_href`,`self_link_rel`,`up_link_href`,`up_link_rel`,`updated`,`uuid`,`authorizationServerAuthorizationEndpoint`,`authorizationServerRegistrationEndpoint`,`authorizationServerTokenEndpoint`,`authorizationServerUri`,`clientId`,`clientIdIssuedAt`,`clientName`,`clientSecret`,`clientSecretExpiresAt`,`clientUri`,`contacts`,`dataCustodianApplicationStatus`,`dataCustodianBulkRequestURI`,`dataCustodianDefaultBatchResource`,`dataCustodianDefaultSubscriptionResource`,`dataCustodianId`,`dataCustodianResourceEndpoint`,`dataCustodianThirdPartySelectionScreenURI`,`grantTypes`,`logoUri`,`policyUri`,`redirectUri`,`registrationAccessToken`,`registrationClientUri`,`responseTypes`,`softwareId`,`softwareVersion`,`thirdPartyApplicationDescription`,`thirdPartyApplicationName`,`thirdPartyApplicationStatus`,`thirdPartyApplicationType`,`thirdPartyApplicationUse`,`thirdPartyDataCustodianSelectionScreenURI`,`thirdPartyLoginScreenURI`,`thirdPartyNotifyUri`,`thirdPartyPhone`,`thirdPartyScopeSelectionScreenURI`,`thirdPartyUserPortalScreenURI`,`tokenEndpointAuthMethod`,`tosUri`, `dataCustodianScopeSelectionScreenURI`)
3-
VALUES (1,'GreenButtonData.org ThirdParty Application','2014-01-02 05:00:00','/espi/1_1/resource/ThirdParty/ApplicationInformation/1','self','/espi/1_1/resource/ThirdParty/ApplicationInformation','up','2014-01-02 05:00:00','B921A307-A7EC-429E-A34D-37B6370FEE0F','http://localhost:8080/DataCustodian/oauth/authorize',NULL,'http://localhost:8080/DataCustodian/oauth/token',NULL,'third_party',NULL,NULL,'secret',NULL,NULL,NULL,'1','',NULL,NULL,'data_custodian','http://localhost:8080/DataCustodian/espi/1_1/resource',NULL,NULL,NULL,NULL,'http://localhost:8080/ThirdParty/espi/1_1/OAuthCallBack',NULL,NULL,NULL,NULL,NULL,NULL,'Third Party (localhost)',NULL,NULL,NULL,NULL,NULL,'http://localhost:8080/ThirdParty/espi/1_1/Notification',NULL,'http://localhost:8080/ThirdParty/RetailCustomer/ScopeSelection',NULL,NULL,NULL,'http://localhost:8080/DataCustodian/RetailCustomer/ScopeSelectionList');
4-
INSERT INTO `application_information` (`id`,`description`,`published`,`self_link_href`,`self_link_rel`,`up_link_href`,`up_link_rel`,`updated`,`uuid`,`authorizationServerAuthorizationEndpoint`,`authorizationServerRegistrationEndpoint`,`authorizationServerTokenEndpoint`,`authorizationServerUri`,`clientId`,`clientIdIssuedAt`,`clientName`,`clientSecret`,`clientSecretExpiresAt`,`clientUri`,`contacts`,`dataCustodianApplicationStatus`,`dataCustodianBulkRequestURI`,`dataCustodianDefaultBatchResource`,`dataCustodianDefaultSubscriptionResource`,`dataCustodianId`,`dataCustodianResourceEndpoint`,`dataCustodianThirdPartySelectionScreenURI`,`grantTypes`,`logoUri`,`policyUri`,`redirectUri`,`registrationAccessToken`,`registrationClientUri`,`responseTypes`,`softwareId`,`softwareVersion`,`thirdPartyApplicationDescription`,`thirdPartyApplicationName`,`thirdPartyApplicationStatus`,`thirdPartyApplicationType`,`thirdPartyApplicationUse`,`thirdPartyDataCustodianSelectionScreenURI`,`thirdPartyLoginScreenURI`,`thirdPartyNotifyUri`,`thirdPartyPhone`,`thirdPartyScopeSelectionScreenURI`,`thirdPartyUserPortalScreenURI`,`tokenEndpointAuthMethod`,`tosUri`, `dataCustodianScopeSelectionScreenURI`)
5-
VALUES (2,'GreenButtonData.org ThirdParty Application','2014-01-02 05:00:00','/espi/1_1/resource/ThirdParty/ApplicationInformation/2','self','/espi/1_1/resource/ThirdParty/ApplicationInformation','up','2014-01-02 05:00:00','B921A307-A7EC-429E-A34D-37B6370FEE0F','http://localhost:8080/DataCustodian/oauth/authorize',NULL,'http://localhost:8080/DataCustodian/oauth/token',NULL,'third_party',NULL,NULL,'secret',NULL,NULL,NULL,'1','',NULL,NULL,'data_custodian2','http://localhost:8080/DataCustodian/espi/1_1/resource',NULL,NULL,NULL,NULL,'http://localhost:8080/ThirdParty/espi/1_1/OAuthCallBack',NULL,NULL,NULL,NULL,NULL,NULL,'Third Party (localhost)',NULL,NULL,NULL,NULL,NULL,'http://localhost:8080/ThirdParty/espi/1_1/Notification',NULL,'http://localhost:8080/ThirdParty/RetailCustomer/ScopeSelection',NULL,NULL,NULL,'http://localhost:8080/DataCustodian/RetailCustomer/ScopeSelectionList');
2+
INSERT INTO application_information (id, kind, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, authorizationServerAuthorizationEndpoint, authorizationServerRegistrationEndpoint, authorizationServerTokenEndpoint, authorizationServerUri, clientId, clientIdIssuedAt , clientName, clientSecret, clientSecretExpiresAt, clientUri, contacts, dataCustodianApplicationStatus, dataCustodianBulkRequestURI, dataCustodianDefaultBatchResource, dataCustodianDefaultSubscriptionResource, dataCustodianId, dataCustodianResourceEndpoint, dataCustodianThirdPartySelectionScreenURI, grantTypes, logoUri, policyUri, redirectUri, registrationAccessToken, registrationClientUri, responseTypes, softwareId, softwareVersion, thirdPartyApplicationDescription, thirdPartyApplicationName, thirdPartyApplicationStatus, thirdPartyApplicationType, thirdPartyApplicationUse, thirdPartyDataCustodianSelectionScreenURI, thirdPartyLoginScreenURI, thirdPartyNotifyUri, thirdPartyPhone, thirdPartyScopeSelectionScreenURI, thirdPartyUserPortalScreenURI, tokenEndpointAuthMethod, tosUri, dataCustodianScopeSelectionScreenURI)
3+
VALUES (1,'THIRD_PARTY','GreenButtonData.org ThirdParty Application','2014-01-02 05:00:00','/espi/1_1/resource/DataCustodian/ApplicationInformation/1','self','/espi/1_1/resource/DataCustodian/ApplicationInformation','up','2014-01-02 05:00:00','AF6E8B03-0299-467E-972A-A883ECDCC575','http://localhost:8080/DataCustodian/oauth/authorize',NULL,'http://localhost:8080/DataCustodian/oauth/token',NULL,'third_party',NULL,NULL,'secret',NULL,NULL,NULL,'1','',NULL,NULL,'data_custodian','http://localhost:8080/DataCustodian/espi/1_1/resource',NULL,'authorization_code,refresh_token',NULL,NULL,'http://localhost:8080/ThirdParty/espi/1_1/OAuthCallBack',NULL,NULL,NULL,NULL,NULL,NULL,'Third Party (localhost)',NULL,NULL,NULL,NULL,NULL,'http://localhost:8080/ThirdParty/espi/1_1/Notification',NULL,'http://localhost:8080/ThirdParty/RetailCustomer/ScopeSelection',NULL,'client_secret_basic',NULL,'http://localhost:8080/DataCustodian/RetailCustomer/ScopeSelectionList');
4+
INSERT INTO application_information (id, kind, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, authorizationServerAuthorizationEndpoint, authorizationServerRegistrationEndpoint, authorizationServerTokenEndpoint, authorizationServerUri, clientId, clientIdIssuedAt , clientName, clientSecret, clientSecretExpiresAt, clientUri, contacts, dataCustodianApplicationStatus, dataCustodianBulkRequestURI, dataCustodianDefaultBatchResource, dataCustodianDefaultSubscriptionResource, dataCustodianId, dataCustodianResourceEndpoint, dataCustodianThirdPartySelectionScreenURI, grantTypes, logoUri, policyUri, redirectUri, registrationAccessToken, registrationClientUri, responseTypes, softwareId, softwareVersion, thirdPartyApplicationDescription, thirdPartyApplicationName, thirdPartyApplicationStatus, thirdPartyApplicationType, thirdPartyApplicationUse, thirdPartyDataCustodianSelectionScreenURI, thirdPartyLoginScreenURI, thirdPartyNotifyUri, thirdPartyPhone, thirdPartyScopeSelectionScreenURI, thirdPartyUserPortalScreenURI, tokenEndpointAuthMethod, tosUri, dataCustodianScopeSelectionScreenURI)
5+
VALUES (2,'THIRD_PARTY','GreenButtonData.org ThirdParty Application','2014-01-02 05:00:00','/espi/1_1/resource/DataCustodian/ApplicationInformation/2','self','/espi/1_1/resource/DataCustodian/ApplicationInformation','up','2014-01-02 05:00:00','AF6E8B03-0299-467E-972A-A883ECDCC575','http://localhost:8080/DataCustodian/oauth/authorize',NULL,'http://localhost:8080/DataCustodian/oauth/token',NULL,'third_party',NULL,NULL,'secret',NULL,NULL,NULL,'1','',NULL,NULL,'data_custodian2','http://localhost:8080/DataCustodian/espi/1_1/resource',NULL,'authorization_code,refresh_token',NULL,NULL,'http://localhost:8080/ThirdParty/espi/1_1/OAuthCallBack',NULL,NULL,NULL,NULL,NULL,NULL,'Third Party (localhost)',NULL,NULL,NULL,NULL,NULL,'http://localhost:8080/ThirdParty/espi/1_1/Notification',NULL,'http://localhost:8080/ThirdParty/RetailCustomer/ScopeSelection',NULL,'client_secret_basic',NULL,'http://localhost:8080/DataCustodian/RetailCustomer/ScopeSelectionList');
66

77
/* Add application_information_scopes */
88
INSERT INTO application_information_scopes (application_information_id, scope) VALUES (1, 'FB=4_5_15;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13');
99
INSERT INTO application_information_scopes (application_information_id, scope) VALUES (1, 'FB=4_5_15;IntervalDuration=900;BlockDuration=monthly;HistoryLength=13');
1010
INSERT INTO application_information_scopes (application_information_id, scope) VALUES (2, 'FB=4_5_12_15_16;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13');
1111

12+
/* Add authorizations */
13+
INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id)
14+
VALUES (1,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','0BA247E0-87F0-41E1-BB50-271468B00DC0','75dd9c46-becf-48b5-9cb5-9c3233d718d0','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Subscription',NULL,'ThirdParty_Admin_Access',NULL,'1','third_party_admin',0,1,0,1);
15+
INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id)
16+
VALUES (2,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','2BBCC436-E545-459F-90E9-99113C11FFD4','d89bb056-0f02-4d47-9fd2-ec6a19ba8d0c','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'ThirdParty_Registration_Access',NULL,'1','REGISTRATION_third_party',0,1,0,2);
17+
18+
/* Add subscriptions */
19+
INSERT INTO subscriptions (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, hashedId, lastUpdate, applicationInformation_id, authorization_id, retail_customer_id)
20+
VALUES (1,NULL,'2014-05-22 12:15:41',NULL,'self',NULL,'up','2014-05-22 12:15:41','580919F0-7C94-418B-9A12-0CA342EF27A2','0c0c2ee9-c988-43ba-9bef-e798b5049a5b','2014-05-22 12:15:41',1,1,0);
21+
INSERT INTO subscriptions (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, hashedId, lastUpdate, applicationInformation_id, authorization_id, retail_customer_id)
22+
VALUES (2,NULL,'2014-05-22 12:15:41',NULL,'self',NULL,'up','2014-05-22 12:15:41','CDF90DE3-3ED1-4E76-9B25-39AA59167F40','0c0c2ee9-c988-43ba-9bef-e798b5049a5d','2014-05-22 12:15:41',1,2,0);
23+
24+

0 commit comments

Comments
 (0)