Merge remote-tracking branch 'upstream/master'

Author: jateeter

README.md

@@ -14,6 +14,9 @@ cd OpenESPI-Common
 Then install the OpenESPI-Common JAR in your local repository:
 ```bash
 mvn clean install
+
+# or for a specific profile
+mvn -P <profile name> -Dmaven.test.skip=true clean install
 ```
 
 ## IDE Setup

etc/cleantables.sql

@@ -2,7 +2,7 @@ SET FOREIGN_KEY_CHECKS=0;
 
 USE datacustodian
 DELETE FROM authorizations;
-DELETE FROM batchlist;
+DELETE FROM BatchList;
 DELETE FROM electric_power_quality_summaries;
 DELETE FROM electric_power_usage_summaries;
 DELETE FROM interval_readings;
@@ -27,7 +27,7 @@ DELETE FROM application_information;
 
 ALTER TABLE application_information AUTO_INCREMENT = 1;
 ALTER TABLE authorizations AUTO_INCREMENT = 1;
-ALTER TABLE batchlist  AUTO_INCREMENT = 1;
+ALTER TABLE BatchList  AUTO_INCREMENT = 1;
 ALTER TABLE electric_power_quality_summaries  AUTO_INCREMENT = 1;
 ALTER TABLE electric_power_usage_summaries AUTO_INCREMENT = 1;
 ALTER TABLE interval_blocks AUTO_INCREMENT = 1;
@@ -46,7 +46,7 @@ ALTER TABLE usage_points AUTO_INCREMENT = 1;
 
 USE thirdparty
 DELETE FROM authorizations;
-DELETE FROM batchlist;
+DELETE FROM BatchList;
 DELETE FROM electric_power_quality_summaries;
 DELETE FROM electric_power_usage_summaries;
 DELETE FROM interval_readings;
@@ -71,7 +71,7 @@ DELETE FROM application_information;
 
 ALTER TABLE application_information AUTO_INCREMENT = 1;
 ALTER TABLE authorizations AUTO_INCREMENT = 1;
-ALTER TABLE batchlist  AUTO_INCREMENT = 1;
+ALTER TABLE BatchList  AUTO_INCREMENT = 1;
 ALTER TABLE electric_power_quality_summaries  AUTO_INCREMENT = 1;
 ALTER TABLE electric_power_usage_summaries AUTO_INCREMENT = 1;
 ALTER TABLE interval_blocks AUTO_INCREMENT = 1;

etc/datacustodianmysql.sql

@@ -51,8 +51,8 @@ INSERT INTO service_categories (kind) VALUES (8);
 INSERT INTO service_categories (kind) VALUES (9);
 
 /* Add retail customers */ 
-INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('alan',    'Alan',    'Turing',       'koala', TRUE, 'ROLE_USER');
-INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('marissa', 'Marissa',  'Meyer',       'koala', TRUE, 'ROLE_USER');
+INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('alan',    'Alan',     'Turing',      'koala', TRUE, 'ROLE_USER');
+INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('joe',     'Joe',      'Black',       'koala', TRUE, 'ROLE_USER');
 INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('sam',     'Sam',      'White',       'koala', TRUE, 'ROLE_USER');
 INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('grace',   'Grace',    'Hopper',      'koala', TRUE, 'ROLE_CUSTODIAN');
 

etc/prepopulatesql_localhost8080.sql

@@ -52,7 +52,7 @@ INSERT INTO service_categories (kind) VALUES (9);
 
 /* Add retail customers */ 
 INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('alan',    'Alan',    'Turing',       'koala', TRUE, 'ROLE_USER');
-INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('marissa', 'Marissa',  'Meyer',       'koala', TRUE, 'ROLE_USER');
+INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('joe',     'Joe',      'Black',       'koala', TRUE, 'ROLE_USER');
 INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('sam',     'Sam',      'White',       'koala', TRUE, 'ROLE_USER');
 INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('grace',   'Grace',    'Hopper',      'koala', TRUE, 'ROLE_CUSTODIAN');
 

etc/prepopulatesql_services_greenbuttondata_org80.sql

@@ -244,7 +244,7 @@ public EntryTypeIterator findEntryTypeIterator(Long retailCustomerId, Long usage
 	    temp.add(usagePointId);
 		try {
 			// make the call to insure it is a valid usagePointId
-			resourceService.findAllIdsByXPath(retailCustomerId, usagePointId, UsagePoint.class);
+			resourceService.findIdByXPath(retailCustomerId, usagePointId, UsagePoint.class);
 			result = (new EntryTypeIterator(resourceService, temp, UsagePoint.class));
 		} catch (Exception e) {
             System.out.printf("****UsagePointService: Seraching for an invalide UsagePointId - %d: %s\n", usagePointId, e.toString());

etc/thirdpartymysql.sql

@@ -9,11 +9,22 @@ INSERT INTO service_categories (kind) VALUES (7);
 INSERT INTO service_categories (kind) VALUES (8);
 INSERT INTO service_categories (kind) VALUES (9);
 
-INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('alan',    'Alan',    'Turing',      'koala', 1, 'ROLE_USER');
-INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('donald',  'Donald',  'Knuth',       'koala', 1, 'ROLE_USER');
-INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('paul',    'Paul',    'Dirac',       'koala', 1, 'ROLE_USER');
-INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('alonzo',  'Alonzo',  'Church',      'koala', 1, 'ROLE_USER');
-INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('charles', 'Charles', 'Babbage',     'koala', 1, 'ROLE_USER');
-INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('john',    'John',    'von Neumann', 'koala', 1, 'ROLE_USER');
-INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('marian',  'Marian',  'Rejewski',    'koala', 1, 'ROLE_USER');
-INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('grace',   'Grace',   'Hopper',      'koala', 1, 'ROLE_CUSTODIAN');
+/* Add retail customers */ 
+INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('alan',    'Alan',    'Turing',      'koala', TRUE, 'ROLE_USER');
+INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('donald',  'Donald',  'Knuth',       'koala', TRUE, 'ROLE_USER');
+INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('paul',    'Paul',    'Dirac',       'koala', TRUE, 'ROLE_USER');
+INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('alonzo',  'Alonzo',  'Church',      'koala', TRUE, 'ROLE_USER');
+INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('charles', 'Charles', 'Babbage',     'koala', TRUE, 'ROLE_USER');
+INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('john',    'John',    'von Neumann', 'koala', TRUE, 'ROLE_USER');
+INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('marian',  'Marian',  'Rejewski',    'koala', TRUE, 'ROLE_USER');
+INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('vinny',   'Vint',    'Koala',       'koala', TRUE, 'ROLE_USER');
+INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('johnny',  'Johnny',  'Koala',       'koala', TRUE, 'ROLE_USER');
+INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('don',     'Don',     'Koala',       'koala', TRUE, 'ROLE_USER');
+
+INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('marty',    'Marty',  'Koala',       'koala', TRUE, 'ROLE_USER');
+INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('ron',      'Ron',    'Koala',       'koala', TRUE, 'ROLE_USER');
+INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('dave',     'Dave',   'Koala',       'koala', TRUE, 'ROLE_USER');
+
+INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('net0',     'net0',   'NIST',        'koala', TRUE, 'ROLE_USER');
+
+INSERT INTO retail_customers (username, first_name, last_name, password, enabled, role) VALUES ('grace',   'Grace',   'Hopper',      'koala', TRUE, 'ROLE_CUSTODIAN');