Merge branch 'master' of

https://github.com/energyos/OpenESPI-Common-java.git
GreenButtonAlliance · Mar 30, 2015 · 17a4596 · 17a4596
2 parents 77190dc + d841a42
commit 17a4596
Show file tree

Hide file tree

Showing 13 changed files with 59 additions and 55 deletions.
diff --git a/etc/espiDerived.xsd b/etc/espiDerived.xsd
@@ -4,7 +4,7 @@
 	<!-- 
 ==========================================================================
  Schema: espiDerived.xsd
-    Version: 0.7.20150119     
+    Version: 0.7.20150225     
     Author: Ron Pasquarelli & Marty Burns (Hypertek for NIST), John Teeter (for NIST), Don Coffin (Remi Networks)
 ========================================================================== 
 
@@ -142,7 +142,7 @@ self link to this resource</xs:documentation>
 							<xs:documentation>URI of the Scope Selection Screen used by the Retail Customer to select the characteristics of the Green Button data to be shared with the ThirdParty.  (e.g. "https://services.greenbuttondata.org/ThirdParty/espi/1_1/RetailCustomer/ScopeSelection")</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="thirdPartyUserPortalScreenURI" type="xs:anyURI">
+					<xs:element name="thirdPartyUserPortalScreenURI" type="xs:anyURI" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>URI of a Third Party’s web page for use with Green Button Connect My Data (e.g. "https://services.greenbuttondata.org/ThirdParty/espi/1_1/home")</xs:documentation>
 						</xs:annotation>
@@ -163,7 +163,7 @@ self link to this resource</xs:documentation>
 							<xs:documentation>The name of the application to which access will be granted (OAuth client_name). (e.g. "Green Button ThirdParty")</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="client_uri" type="xs:anyURI">
+					<xs:element name="client_uri" type="xs:anyURI" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>The link to the main page of the application (OAuth client_uri). (e.g. "https://services.greenbuttondata.org/ThirdParty")</xs:documentation>
 						</xs:annotation>
@@ -268,12 +268,12 @@ Note: for privacy there is no identifier of the RetailCustomer in this structure
 		<xs:complexContent>
 			<xs:extension base="IdentifiedObject">
 				<xs:sequence>
-					<xs:element name="authorizedPeriod" type="DateTimeInterval">
+					<xs:element name="authorizedPeriod" type="DateTimeInterval" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>Restricts access to requests or subscriptions within this date time interval. (e.g. "duration=31536000,start=1333252800")</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="publishedPeriod" type="DateTimeInterval">
+					<xs:element name="publishedPeriod" type="DateTimeInterval" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>Restricts access to the objects within the associated resource that were published within this date time interval. (e.g. "duration=31536000" for most recent 365 days)</xs:documentation>
 						</xs:annotation>

diff --git a/etc/prepopulatesql_applicationinformation_dc.sql b/etc/prepopulatesql_applicationinformation_dc.sql
diff --git a/etc/prepopulatesql_applicationinformation_dc_localhost443.sql b/etc/prepopulatesql_applicationinformation_dc_localhost443.sql
diff --git a/etc/prepopulatesql_applicationinformation_dc_localhost8080.sql b/etc/prepopulatesql_applicationinformation_dc_localhost8080.sql
diff --git a/etc/prepopulatesql_applicationinformation_dc_services_greenbuttondata_org80.sql b/etc/prepopulatesql_applicationinformation_dc_services_greenbuttondata_org80.sql
diff --git a/etc/prepopulatesql_applicationinformation_dc_testthirdparty.sql b/etc/prepopulatesql_applicationinformation_dc_testthirdparty.sql
diff --git a/etc/prepopulatesql_applicationinformation_tp.sql b/etc/prepopulatesql_applicationinformation_tp.sql
@@ -1,6 +1,6 @@
 /* Add application_information */ 
 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`, `logoUri`, `policyUri`, `redirectUri`, `registrationAccessToken`, `registrationClientUri`, `responseTypes`, `softwareId`, `softwareVersion`, `thirdPartyApplicationDescription`, `thirdPartyApplicationName`, `thirdPartyApplicationStatus`, `thirdPartyApplicationType`, `thirdPartyApplicationUse`, `thirdPartyDataCustodianSelectionScreenURI`, `thirdPartyLoginScreenURI`, `thirdPartyNotifyUri`, `thirdPartyPhone`, `thirdPartyScopeSelectionScreenURI`, `thirdPartyUserPortalScreenURI`, `tokenEndpointAuthMethod`, `tosUri`, `dataCustodianScopeSelectionScreenURI`) VALUES
-(1, 'THIRD_PARTY', 'EnergyOS OpenESPI 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', 'http://localhost:8080/DataCustodian/espi/1_1/register', 'http://localhost:8080/DataCustodian/oauth/token', 'http://localhost:8080/DataCustodian/', 'third_party', 1403190000, 'EnergyOS OpenESPI Third Party', 'secret', 0, 'http://localhost:8080/ThirdParty','john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'http://localhost:8080/DataCustodian/espi/1_1/resource', 'http://localhost:8080/DataCustodian/RetailCustomer/1/ThirdPartyList', 'http://localhost:8080/ThirdParty/resources/ico/favicon.png', NULL, 'http://localhost:8080/ThirdParty/espi/1_1/OAuthCallBack', 'd89bb056-0f02-4d47-9fd2-ec6a19ba8d0c', NULL, 1, 'EnergyOS OpenESPI Example Third Party', '1.2', 'EnergyOS OpenESPI Example Third Party', 'Third Party (localhost)', '1', '1', '1', 'http://localhost:8080/ThirdParty/RetailCustomer/{retailCustomerId}/DataCustodianList', 'http://localhost:8080/ThirdParty/login', 'http://localhost:8080/ThirdParty/espi/1_1/Notification', NULL, 'http://localhost:8080/ThirdParty/RetailCustomer/ScopeSelection', 'http://localhost:8080/ThirdParty', 'client_secret_basic', NULL, 'http://localhost:8080/DataCustodian/RetailCustomer/ScopeSelectionList');
+(1, 'THIRD_PARTY', 'EnergyOS OpenESPI 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', 'http://localhost:8080/DataCustodian/espi/1_1/register', 'http://localhost:8080/DataCustodian/oauth/token', 'http://localhost:8080/DataCustodian/', 'third_party', 1403190000, 'EnergyOS OpenESPI Third Party', 'secret', 0, 'http://localhost:8080/ThirdParty','john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'http://localhost:8080/DataCustodian/espi/1_1/resource', 'http://localhost:8080/DataCustodian/RetailCustomer/1/ThirdPartyList', 'http://localhost:8080/ThirdParty/resources/ico/favicon.png', NULL, 'http://localhost:8080/ThirdParty/espi/1_1/OAuthCallBack', 'd89bb056-0f02-4d47-9fd2-ec6a19ba8d0c', 'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/2', 1, 'EnergyOS OpenESPI Example Third Party', '1.2', 'EnergyOS OpenESPI Example Third Party', 'Third Party (localhost)', '1', '1', '1', 'http://localhost:8080/ThirdParty/RetailCustomer/{retailCustomerId}/DataCustodianList', 'http://localhost:8080/ThirdParty/login', 'http://localhost:8080/ThirdParty/espi/1_1/Notification', NULL, 'http://localhost:8080/ThirdParty/RetailCustomer/ScopeSelection', 'http://localhost:8080/ThirdParty', 'client_secret_basic', NULL, 'http://localhost:8080/DataCustodian/RetailCustomer/ScopeSelectionList');
 
 /* Add application_information_scopes */ 
 INSERT INTO application_information_scopes (application_information_id, scope) VALUES (1, 'FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13');
@@ -15,6 +15,6 @@ INSERT INTO application_information_grant_types (application_information_id, gra
 
 /* Add authorizations */ 
 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) 
-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/Bulk',NULL,'ThirdParty_Admin_Access',NULL,'1','third_party_admin',0,1,0,NULL);
+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/Bulk',NULL,'FB=34_35',NULL,'1','third_party_admin',0,1,0,NULL);
 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) 
-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,NULL);
+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,'FB=36_40',NULL,'1','REGISTRATION_third_party',0,1,0,NULL);
diff --git a/etc/prepopulatesql_applicationinformation_tp_localhost443.sql b/etc/prepopulatesql_applicationinformation_tp_localhost443.sql
@@ -1,6 +1,6 @@
 /* Add application_information */ 
 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`, `logoUri`, `policyUri`, `redirectUri`, `registrationAccessToken`, `registrationClientUri`, `responseTypes`, `softwareId`, `softwareVersion`, `thirdPartyApplicationDescription`, `thirdPartyApplicationName`, `thirdPartyApplicationStatus`, `thirdPartyApplicationType`, `thirdPartyApplicationUse`, `thirdPartyDataCustodianSelectionScreenURI`, `thirdPartyLoginScreenURI`, `thirdPartyNotifyUri`, `thirdPartyPhone`, `thirdPartyScopeSelectionScreenURI`, `thirdPartyUserPortalScreenURI`, `tokenEndpointAuthMethod`, `tosUri`, `dataCustodianScopeSelectionScreenURI`) VALUES
-(1, 'THIRD_PARTY', 'EnergyOS OpenESPI 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', 'https://localhost/DataCustodian/oauth/authorize', 'https://localhost/DataCustodian/espi/1_1/register', 'https://localhost/DataCustodian/oauth/token', 'https://localhost/DataCustodian/', 'third_party', 1403190000, 'EnergyOS OpenESPI Third Party', 'secret', 0, 'https://localhost/ThirdParty','john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'https://localhost/DataCustodian/espi/1_1/resource/Batch/Bulk', 'https://localhost/DataCustodian/espi/1_1/resource/Batch', 'https://localhost/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'https://localhost/DataCustodian/espi/1_1/resource', 'https://localhost/DataCustodian/RetailCustomer/1/ThirdPartyList', 'https://localhost/ThirdParty/resources/ico/favicon.png', NULL, 'https://localhost/ThirdParty/espi/1_1/OAuthCallBack', 'd89bb056-0f02-4d47-9fd2-ec6a19ba8d0c', NULL, 1, 'EnergyOS OpenESPI Example Third Party', '1.2', 'EnergyOS OpenESPI Example Third Party', 'Third Party (localhost)', '1', '1', '1', 'https://localhost/ThirdParty/RetailCustomer/{retailCustomerId}/DataCustodianList', 'https://localhost/ThirdParty/login', 'https://localhost/ThirdParty/espi/1_1/Notification', NULL, 'https://localhost/ThirdParty/RetailCustomer/ScopeSelection', 'https://localhost/ThirdParty', 'client_secret_basic', NULL, 'https://localhost/DataCustodian/RetailCustomer/ScopeSelectionList');
+(1, 'THIRD_PARTY', 'EnergyOS OpenESPI 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', 'https://localhost/DataCustodian/oauth/authorize', 'https://localhost/DataCustodian/espi/1_1/register', 'https://localhost/DataCustodian/oauth/token', 'https://localhost/DataCustodian/', 'third_party', 1403190000, 'EnergyOS OpenESPI Third Party', 'secret', 0, 'https://localhost/ThirdParty','john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'https://localhost/DataCustodian/espi/1_1/resource/Batch/Bulk', 'https://localhost/DataCustodian/espi/1_1/resource/Batch', 'https://localhost/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'https://localhost/DataCustodian/espi/1_1/resource', 'https://localhost/DataCustodian/RetailCustomer/1/ThirdPartyList', 'https://localhost/ThirdParty/resources/ico/favicon.png', NULL, 'https://localhost/ThirdParty/espi/1_1/OAuthCallBack', 'd89bb056-0f02-4d47-9fd2-ec6a19ba8d0c', 'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/2', 1, 'EnergyOS OpenESPI Example Third Party', '1.2', 'EnergyOS OpenESPI Example Third Party', 'Third Party (localhost)', '1', '1', '1', 'https://localhost/ThirdParty/RetailCustomer/{retailCustomerId}/DataCustodianList', 'https://localhost/ThirdParty/login', 'https://localhost/ThirdParty/espi/1_1/Notification', NULL, 'https://localhost/ThirdParty/RetailCustomer/ScopeSelection', 'https://localhost/ThirdParty', 'client_secret_basic', NULL, 'https://localhost/DataCustodian/RetailCustomer/ScopeSelectionList');
 
 /* Add application_information_scopes */ 
 INSERT INTO application_information_scopes (application_information_id, scope) VALUES (1, 'FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13');
@@ -15,6 +15,6 @@ INSERT INTO application_information_grant_types (application_information_id, gra
 
 /* Add authorizations */ 
 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) 
-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','https://localhost/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://localhost/DataCustodian/espi/1_1/resource/Batch/Bulk',NULL,'ThirdParty_Admin_Access',NULL,'1','third_party_admin',0,1,0,NULL);
+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','https://localhost/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://localhost/DataCustodian/espi/1_1/resource/Batch/Bulk',NULL,'FB=34_35',NULL,'1','third_party_admin',0,1,0,NULL);
 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) 
-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','https://localhost/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://localhost/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'ThirdParty_Registration_Access',NULL,'1','REGISTRATION_third_party',0,1,0,NULL);
+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','https://localhost/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://localhost/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'FB=36_40',NULL,'1','REGISTRATION_third_party',0,1,0,NULL);