From 7e00b35826479e9e1a3d119d9b0cf9a73a3f79b6 Mon Sep 17 00:00:00 2001 From: Anubhav Date: Thu, 14 Sep 2017 16:27:55 -0700 Subject: [PATCH] US159762: Updated copyright notices for all source files --- acs-integration-tests/pom.xml | 28 +-- .../acceptance/test/ACSAcceptanceIT.java | 4 +- .../admin/PolicyCreationCucumberTest.java | 4 +- .../admin/PolicyCreationStepsDefinitions.java | 4 +- .../PolicyEvaluationCucumberTest.java | 4 +- .../PolicyEvaluationStepsDefinitions.java | 4 +- .../admin/DefaultZoneAuthorizationIT.java | 5 +- .../admin/ZoneEnforcementCucumberTest.java | 4 +- .../ZoneEnforcementStepsDefinitions.java | 5 +- .../AcsCloudFoundryConfiguration.java | 16 ++ .../AcsCloudFoundryUtilities.java | 16 ++ .../cloudfoundry/ApplicationHealthChecks.java | 16 ++ .../acs/cloudfoundry/DeleteApplications.java | 16 ++ .../acs/cloudfoundry/PushAcsApplication.java | 16 ++ .../cloudfoundry/PushAdapterApplication.java | 16 ++ .../PushMockedAdapterApplication.java | 16 ++ .../PushPredixCloudApplication.java | 16 ++ .../PushPredixCloudTitanApplication.java | 16 ++ .../acs/migration/AttributeMigrationTest.java | 16 ++ .../predix/audit/rest/PredixAuditRecord.java | 16 ++ .../predix/audit/rest/PredixAuditRequest.java | 16 ++ .../audit/rest/PredixAuditResponse.java | 16 ++ .../client/CloudFoundryApplicationHelper.java | 16 ++ .../client/CloudFoundryConfiguration.java | 16 ++ .../client/CloudFoundryService.java | 16 ++ .../client/CloudFoundryUtilities.java | 16 ++ .../integration/test/ACSCorsFilterIT.java | 17 +- .../integration/test/ACSMeteringIT.java | 5 +- .../integration/test/ACSPerformanceIT.java | 5 +- .../test/AccessControlServiceIT.java | 5 +- .../integration/test/AcsMonitoringIT.java | 16 ++ .../AttributeConnectorConfigurationIT.java | 16 ++ .../test/PolicyEvalCachingWithGraphDBIT.java | 16 ++ .../test/PolicyEvaluationCachingIT.java | 5 +- ...icyEvaluationWithAttributeConnectorIT.java | 16 ++ .../integration/test/PredixAuditIT.java | 16 ++ ...ilegeManagementAccessControlServiceIT.java | 5 +- .../test/SubjectResourceFixture.java | 17 +- .../test/TestAnnotationTransformer.java | 16 ++ .../java/com/ge/predix/test/TestCleanup.java | 16 ++ .../java/com/ge/predix/test/TestConfig.java | 16 ++ .../com/ge/predix/test/TestNameLogger.java | 16 ++ .../test/utils/ACSRestTemplateFactory.java | 4 +- .../com/ge/predix/test/utils/ACSTestUtil.java | 4 +- .../predix/test/utils/CreatePolicyStatus.java | 16 +- .../predix/test/utils/OptionalTestSetup.java | 16 ++ .../ge/predix/test/utils/PolicyHelper.java | 5 +- .../ge/predix/test/utils/PrivilegeHelper.java | 5 +- .../com/ge/predix/test/utils/UaaTestUtil.java | 5 +- .../test/utils/ZacOptionalTestSetup.java | 16 ++ .../com/ge/predix/test/utils/ZacTestUtil.java | 17 +- .../com/ge/predix/test/utils/ZoneHelper.java | 5 +- .../ge/predix/test/utils/v2/UaaTestUtil.java | 16 ++ .../acceptance-test-spring-context.xml | 27 +-- .../src/test/resources/application.properties | 18 +- .../src/test/resources/cucumber.xml | 27 +-- .../integration-test-spring-context.xml | 27 +-- .../src/test/resources/log4j.xml | 29 +-- .../resources/shared-test-spring-context.xml | 27 +-- .../testng-predix-cloud-titan.xml | 18 ++ acs-integration-tests/testng-predix-cloud.xml | 18 ++ acs-integration-tests/testng-public-titan.xml | 18 ++ acs-integration-tests/testng-public.xml | 20 +- checkstyle-config/gog-sun-checks-eclipse.xml | 27 +-- commons/pom.xml | 28 +-- .../acs/commons/attribute/AttributeType.java | 4 +- .../exception/UntrustedIssuerException.java | 16 +- .../policy/condition/AbstractHandler.java | 4 +- .../policy/condition/AbstractHandlers.java | 5 +- .../ConditionAssertionFailedException.java | 17 +- .../condition/ConditionParsingException.java | 4 +- .../policy/condition/ConditionScript.java | 16 +- .../policy/condition/ConditionShell.java | 16 +- .../policy/condition/ResourceHandler.java | 16 +- .../policy/condition/SubjectHandler.java | 16 +- .../condition/groovy/AttributeMatcher.java | 16 +- .../groovy/GroovyConditionCache.java | 17 +- .../groovy/GroovyConditionScript.java | 16 +- .../groovy/GroovyConditionShell.java | 4 +- .../groovy/GroovySecureExtension.java | 17 +- .../acs/commons/web/ACSWebConstants.java | 16 +- .../acs/commons/web/AcsApiUriTemplates.java | 5 +- .../predix/acs/commons/web/BaseRestApi.java | 5 +- .../web/BaseRestApiControllerAdvice.java | 16 ++ .../commons/web/ResponseEntityBuilder.java | 16 +- .../acs/commons/web/RestApiErrorResponse.java | 17 +- .../acs/commons/web/RestApiException.java | 16 +- .../acs/commons/web/RestErrorHandler.java | 5 +- .../acs/commons/web/UriTemplateUtils.java | 17 +- .../com/ge/predix/acs/utils/JsonUtils.java | 5 +- .../policy/condition/ResourceHandlerTest.java | 16 +- .../policy/condition/SubjectHandlerTest.java | 4 +- .../groovy/GroovyConditionCacheTest.java | 17 +- .../groovy/GroovyConditionScriptTest.java | 17 +- .../groovy/GroovyConditionShellTest.java | 17 +- .../web/BaseRestApiControllerAdviceTest.java | 5 +- .../web/ResponseEntityBuilderTest.java | 17 +- .../acs/commons/web/RestApiExceptionTest.java | 5 +- .../acs/commons/web/RestErrorHandlerTest.java | 17 +- .../ge/predix/acs/utils/JsonUtilsTest.java | 17 +- commons/src/test/resources/log4j.properties | 20 +- copyrights.sh | 200 ++++++++++++++++++ eclipse-config/clean-up.xml | 29 +-- eclipse-config/formatter.xml | 29 +-- merge-to-master.sh | 16 ++ model/pom.xml | 28 +-- .../com/ge/predix/acs/model/Attribute.java | 4 +- .../com/ge/predix/acs/model/Condition.java | 16 +- .../java/com/ge/predix/acs/model/Effect.java | 16 +- .../java/com/ge/predix/acs/model/Policy.java | 16 +- .../com/ge/predix/acs/model/PolicySet.java | 16 +- .../com/ge/predix/acs/model/ResourceType.java | 16 +- .../com/ge/predix/acs/model/SubjectType.java | 16 +- .../java/com/ge/predix/acs/model/Target.java | 16 +- .../acs/rest/AttributeAdapterConnection.java | 16 ++ .../predix/acs/rest/AttributeConnector.java | 16 ++ .../com/ge/predix/acs/rest/BaseResource.java | 5 +- .../com/ge/predix/acs/rest/BaseSubject.java | 5 +- .../java/com/ge/predix/acs/rest/Parent.java | 16 ++ .../acs/rest/PolicyEvaluationRequestV1.java | 5 +- .../acs/rest/PolicyEvaluationResult.java | 5 +- .../predix/acs/rest/RestModelIdExtractor.java | 17 +- .../java/com/ge/predix/acs/rest/Zone.java | 17 +- .../attribute/adapter/AttributesResponse.java | 16 ++ .../com/ge/predix/acs/model/ParentTest.java | 16 ++ .../ge/predix/acs/model/PolicySetTest.java | 17 +- .../com/ge/predix/acs/model/PolicySets.java | 16 +- .../rest/PolicyEvaluationRequestV1Test.java | 4 +- pom.xml | 28 +-- run-integration-tests.sh | 16 ++ service/pom.xml | 28 +-- .../ge/predix/acs/AccessControlService.java | 4 +- .../ge/predix/acs/PolicyContextResolver.java | 4 +- .../SpringSecurityPolicyContextResolver.java | 4 +- .../acs/ZoneDoesNotExistControllerAdvice.java | 16 ++ .../cache/AbstractAttributeCache.java | 16 ++ .../acs/attribute/cache/AttributeCache.java | 16 ++ .../cache/AttributeCacheFactory.java | 16 ++ .../cache/InMemoryAttributeCache.java | 16 ++ .../cache/NonCachingAttributeCache.java | 16 ++ .../attribute/cache/RedisAttributeCache.java | 16 ++ .../connector/ConnectorHttpMethodsFilter.java | 16 ++ .../AttributeConnectorController.java | 16 ++ .../AttributeConnectorException.java | 16 ++ .../management/AttributeConnectorService.java | 16 ++ .../AttributeConnectorServiceImpl.java | 16 ++ .../attribute/readers/AttributeReader.java | 16 ++ .../readers/AttributeReaderFactory.java | 16 ++ .../readers/AttributeRetrievalException.java | 16 ++ .../attribute/readers/CachedAttributes.java | 16 ++ .../readers/ExternalAttributeReader.java | 16 ++ .../ExternalResourceAttributeReader.java | 16 ++ .../ExternalSubjectAttributeReader.java | 16 ++ ...ivilegeServiceResourceAttributeReader.java | 16 ++ ...rivilegeServiceSubjectAttributeReader.java | 16 ++ .../readers/ResourceAttributeReader.java | 16 ++ .../readers/SubjectAttributeReader.java | 16 ++ .../acs/audit/ACSAuditConfiguration.java | 16 ++ .../predix/acs/audit/PredixEventMapper.java | 16 ++ .../acs/audit/PredixEventProcessor.java | 16 ++ .../ge/predix/acs/config/AcsConfigUtil.java | 4 +- .../acs/config/CloudDataSourceConfig.java | 4 +- .../CloudRedisConnectionFactoryConfig.java | 4 +- .../acs/config/CloudRedisProperties.java | 16 ++ .../predix/acs/config/CommonRedisConfig.java | 16 ++ .../acs/config/EnvDataSourceConfig.java | 4 +- ...phBeanDefinitionRegistryPostProcessor.java | 16 ++ .../com/ge/predix/acs/config/GraphConfig.java | 16 ++ .../acs/config/InMemoryDataSourceConfig.java | 4 +- .../LocalRedisConnectionFactoryConfig.java | 4 +- .../acs/config/LocalRedisProperties.java | 16 ++ .../config/PolicyEvaluationCacheConfig.java | 16 ++ .../acs/config/UrlPathHelperNonDecoding.java | 4 +- .../metering/PredixAcsMeteringConfig.java | 16 ++ .../monitoring/AcsMonitoringConfig.java | 16 ++ .../monitoring/PredixAcsMonitoringConfig.java | 16 ++ .../tokenservice/ZacTokenServiceConfig.java | 16 ++ .../ZoneAwareTokenServiceConfig.java | 16 ++ .../DecryptionFailureException.java | 16 ++ .../EncryptionFailureException.java | 16 ++ .../ge/predix/acs/encryption/Encryptor.java | 16 ++ .../SymmetricKeyValidationException.java | 16 ++ .../issuer/management/dao/IssuerEntity.java | 4 +- .../ge/predix/acs/jmx/DataSourceMBean.java | 5 +- .../AbstractCacheHealthIndicator.java | 16 ++ .../acs/monitoring/AcsDbHealthIndicator.java | 8 +- .../acs/monitoring/AcsHealthAggregator.java | 16 ++ .../monitoring/AcsMonitoringController.java | 4 +- .../monitoring/AcsMonitoringRepository.java | 4 +- .../monitoring/AcsMonitoringUtilities.java | 8 +- .../acs/monitoring/CacheHealthIndicator.java | 16 ++ .../DecisionCacheHealthIndicator.java | 16 ++ .../monitoring/GraphDbHealthIndicator.java | 16 ++ .../ManagementSecurityRoleFilter.java | 16 ++ .../MonitoringHttpMethodsFilter.java | 16 ++ .../ResourceCacheHealthIndicator.java | 16 ++ .../SubjectCacheHealthIndicator.java | 16 ++ .../acs/monitoring/UaaHealthIndicator.java | 8 +- .../acs/monitoring/ZacHealthIndicator.java | 16 ++ .../cache/AbstractPolicyEvaluationCache.java | 4 +- .../cache/InMemoryPolicyEvaluationCache.java | 4 +- .../NonCachingPolicyEvaluationCache.java | 16 ++ .../cache/PolicyEvaluationCache.java | 4 +- .../PolicyEvaluationRequestCacheKey.java | 4 +- .../cache/RedisPolicyEvaluationCache.java | 4 +- .../EntityManagementControllerAdvice.java | 16 ++ .../management/PrivilegeConverter.java | 4 +- .../PrivilegeManagementException.java | 4 +- .../PrivilegeManagementService.java | 4 +- .../PrivilegeManagementServiceImpl.java | 4 +- .../PrivilegeManagementUtility.java | 16 ++ .../management/ResourceHttpMethodsFilter.java | 16 ++ ...ResourcePrivilegeManagementController.java | 4 +- .../management/SubjectHttpMethodsFilter.java | 16 ++ .../SubjectPrivilegeManagementController.java | 5 +- .../management/ZoneDoesNotExistException.java | 16 ++ .../dao/AttributeLimitExceededException.java | 16 ++ .../management/dao/AttributePredicate.java | 16 ++ .../dao/GraphGenericRepository.java | 16 ++ .../dao/GraphResourceRepository.java | 16 ++ .../dao/GraphSubjectRepository.java | 16 ++ .../management/dao/ParentEntity.java | 16 ++ .../management/dao/ResourceEntity.java | 4 +- .../dao/ResourceHierarchicalRepository.java | 16 ++ .../dao/ResourceMigrationManager.java | 16 ++ .../management/dao/ResourceRepository.java | 4 +- .../dao/ResourceRepositoryProxy.java | 16 ++ .../management/dao/SubjectEntity.java | 4 +- .../dao/SubjectHierarchicalRepository.java | 16 ++ .../dao/SubjectMigrationManager.java | 16 ++ .../management/dao/SubjectRepository.java | 4 +- .../dao/SubjectRepositoryProxy.java | 16 ++ .../management/dao/TitanMigrationManager.java | 16 ++ .../management/dao/ZonableEntity.java | 16 ++ .../request/context/AcsRequestContext.java | 16 ++ .../context/AcsRequestContextHolder.java | 16 ++ .../context/AcsRequestEnrichingFilter.java | 16 ++ .../security/AbstractHttpMethodsFilter.java | 16 ++ .../acs/security/EmptyHttpMethodsFilter.java | 16 ++ .../security/NoAuthenticationEntryPoint.java | 16 ++ .../service/InvalidACSRequestException.java | 4 +- .../policy/admin/PolicyHttpMethodsFilter.java | 16 ++ .../admin/PolicyManagementController.java | 4 +- .../admin/PolicyManagementException.java | 4 +- .../policy/admin/PolicyManagementService.java | 4 +- .../admin/PolicyManagementServiceImpl.java | 4 +- .../policy/admin/dao/PolicySetEntity.java | 4 +- .../policy/admin/dao/PolicySetRepository.java | 4 +- .../policy/evaluation/AttributesHandler.java | 4 +- .../EvaluationHttpMethodsFilter.java | 16 ++ .../policy/evaluation/MatchedPolicy.java | 5 +- .../policy/evaluation/PolicyEvaluation.java | 5 +- .../PolicyEvaluationController.java | 5 +- .../evaluation/PolicyEvaluationException.java | 5 +- .../evaluation/PolicyEvaluationService.java | 5 +- .../PolicyEvaluationServiceImpl.java | 5 +- .../evaluation/ResourceAttributeResolver.java | 5 +- .../evaluation/SubjectAttributeResolver.java | 16 ++ .../service/policy/matcher/MatchResult.java | 16 ++ .../policy/matcher/PolicyMatchCandidate.java | 4 +- .../service/policy/matcher/PolicyMatcher.java | 4 +- .../policy/matcher/PolicyMatcherImpl.java | 4 +- .../matcher/UriTemplateVariableResolver.java | 5 +- .../PolicySetValidationException.java | 4 +- .../policy/validation/PolicySetValidator.java | 4 +- .../validation/PolicySetValidatorImpl.java | 4 +- .../acs/zone/management/ZoneController.java | 4 +- .../management/ZoneHttpMethodsFilter.java | 16 ++ .../management/ZoneManagementException.java | 5 +- .../acs/zone/management/ZoneService.java | 4 +- .../acs/zone/management/ZoneServiceImpl.java | 4 +- .../zone/management/dao/ZoneClientEntity.java | 5 +- .../zone/management/dao/ZoneConverter.java | 4 +- .../acs/zone/management/dao/ZoneEntity.java | 5 +- .../zone/management/dao/ZoneRepository.java | 5 +- .../resolver/SpringSecurityZoneResolver.java | 5 +- .../acs/zone/resolver/ZoneResolver.java | 5 +- .../java/db/postgres/PolicySetRowMapper.java | 5 +- .../java/db/postgres/ResourceRowMapper.java | 5 +- .../java/db/postgres/SubjectRowMapper.java | 5 +- .../V2_0_1__InitializeIdentityZones.java | 5 +- .../java/db/postgres/ZoneClientRowMapper.java | 5 +- .../main/resources/META-INF/persistence.xml | 29 +-- .../main/resources/application-h2.properties | 21 +- .../application-performance.properties | 21 +- .../application-production.properties | 21 +- .../src/main/resources/application.properties | 9 +- service/src/main/resources/log4j-dev.xml | 30 +-- service/src/main/resources/log4j.xml | 30 +-- .../src/main/resources/security-config.xml | 27 +-- .../cache/AttributeCacheFactoryTest.java | 16 ++ .../cache/InMemoryAttributeCacheTest.java | 16 ++ .../ConnectorHttpMethodsFilterTest.java | 16 ++ .../AttributeConnectorServiceTest.java | 16 ++ .../DefaultResourceAttributeReaderTest.java | 16 ++ .../DefaultSubjectAttributeReaderTest.java | 16 ++ .../ExternalAttributeReaderHelper.java | 16 ++ .../ExternalResourceAttributeReaderTest.java | 16 ++ .../ExternalSubjectAttributeReaderTest.java | 16 ++ .../acs/audit/PredixEventMapperTest.java | 16 ++ .../acs/audit/PredixEventProcessorTest.java | 16 ++ .../acs/config/AcsConfigLocalProfileTest.java | 5 +- .../PolicyEvaluationCacheConfigTest.java | 16 ++ .../predix/acs/encryption/EncryptorTest.java | 16 ++ .../monitoring/AcsDbHealthIndicatorTest.java | 8 +- .../monitoring/AcsHealthAggregatorTest.java | 16 ++ .../monitoring/CacheHealthIndicatorTest.java | 16 ++ .../GraphDbHealthIndicatorTest.java | 9 +- .../MonitoringHttpMethodsFilterTest.java | 16 ++ .../monitoring/UaaHealthIndicatorTest.java | 9 +- .../monitoring/ZacHealthIndicatorTest.java | 9 +- .../AbstractPolicyEvaluationCacheTest.java | 4 +- .../InMemoryPolicyEvaluationCacheTest.java | 4 +- .../PolicyEvaluationRequestCacheKeyTest.java | 16 ++ .../management/AttributesUtilities.java | 5 +- .../privilege/management/BeanUtilTests.java | 4 +- .../PrivilegeManagementNoRollbackTest.java | 5 +- .../PrivilegeManagementServiceImplTest.java | 5 +- .../ResourceHttpMethodsFilterTest.java | 16 ++ .../SubjectHttpMethodsFilterTest.java | 16 ++ .../dao/GraphResourceRepositoryTest.java | 16 ++ .../dao/GraphSubjectRepositoryTest.java | 16 ++ .../dao/TitanMigrationManagerTest.java | 16 ++ .../dao/TitanMigrationRollbackTest.java | 16 ++ .../context/AcsRequestContextHolderTest.java | 16 ++ .../AbstractHttpMethodsFilterTest.java | 16 ++ .../admin/PolicyHttpMethodsFilterTest.java | 16 ++ .../admin/PolicyManagementServiceTest.java | 5 +- .../admin/dao/PolicySetRepositoryTest.java | 5 +- .../evaluation/ConditionEvaluationTest.java | 4 +- .../EvaluationHttpMethodsFilterTest.java | 16 ++ .../PolicyEvaluationServiceTest.java | 4 +- ...licyEvaluationWithAttributeReaderTest.java | 16 ++ ...valuationWithAttributeUriTemplateTest.java | 5 +- .../ResourceAttributeResolverTest.java | 5 +- .../SubjectAttributeResolverTest.java | 5 +- .../policy/matcher/PolicyMatcherImplTest.java | 5 +- .../service/policy/matcher/PolicySets.java | 4 +- .../UriTemplateVariableResolverTest.java | 5 +- .../validation/PolicySetValidatorTest.java | 4 +- .../acs/testutils/MockAcsRequestContext.java | 16 ++ .../predix/acs/testutils/MockMvcContext.java | 5 +- .../acs/testutils/MockSecurityContext.java | 4 +- .../testutils/TestActiveProfilesResolver.java | 16 ++ .../ge/predix/acs/testutils/TestUtils.java | 4 +- .../com/ge/predix/acs/testutils/XFiles.java | 16 ++ .../acs/zone/management/ZoneEntityTest.java | 5 +- .../management/ZoneHttpMethodsFilterTest.java | 16 ++ .../zone/management/ZoneRepositoryTest.java | 16 ++ .../acs/zone/management/ZoneServiceTest.java | 4 +- .../test/AcsMonitoringControllerIT.java | 5 +- .../test/AttributeConnectorControllerIT.java | 16 ++ .../controller/test/ConfigureEnvironment.java | 5 +- .../test/HierarchicalResourcesIT.java | 16 ++ .../test/HierarchicalSubjectsIT.java | 16 ++ .../test/NonHierarchicalResourcesIT.java | 16 ++ .../test/NonHierarchicalSubjectsIT.java | 16 ++ .../PolicyEvalWithGraphDbControllerIT.java | 16 ++ .../test/PolicyEvaluationControllerIT.java | 16 ++ .../test/PolicyManagementControllerIT.java | 5 +- ...sourcePrivilegeManagementControllerIT.java | 5 +- ...ubjectPrivilegeManagementControllerIT.java | 6 +- .../controller/test/URLPathMatchingIT.java | 16 ++ .../controller/test/ZoneControllerIT.java | 5 +- .../src/test/resources/application.properties | 9 +- .../resources/controller-tests-context.xml | 31 +-- service/src/test/resources/unit-tests.xml | 27 +-- service/start-acs-postgres-predix-titan.sh | 12 +- service/start-acs-postgres-predix.sh | 12 +- service/start-acs-postgres.sh | 12 +- service/start-acs-predix-titan.sh | 12 +- service/start-acs-predix.sh | 12 +- service/start-acs-public-titan.sh | 12 +- service/start-acs-public.sh | 12 +- service/start-acs.sh | 12 +- set-env-local.sh | 16 ++ utils/acs-create-inital-clients.sh | 16 ++ utils/pretty-print-cf-logs.sh | 16 ++ versioning.sh | 16 ++ 379 files changed, 3954 insertions(+), 954 deletions(-) create mode 100755 copyrights.sh mode change 100644 => 100755 run-integration-tests.sh mode change 100644 => 100755 set-env-local.sh diff --git a/acs-integration-tests/pom.xml b/acs-integration-tests/pom.xml index 25e70f62..d2cdf6eb 100644 --- a/acs-integration-tests/pom.xml +++ b/acs-integration-tests/pom.xml @@ -1,19 +1,21 @@ - + 4.0.0 acs-integration-tests diff --git a/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/ACSAcceptanceIT.java b/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/ACSAcceptanceIT.java index b38cec93..4cce3836 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/ACSAcceptanceIT.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/ACSAcceptanceIT.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/policy/admin/PolicyCreationCucumberTest.java b/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/policy/admin/PolicyCreationCucumberTest.java index 309271e3..47e57c41 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/policy/admin/PolicyCreationCucumberTest.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/policy/admin/PolicyCreationCucumberTest.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/policy/admin/PolicyCreationStepsDefinitions.java b/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/policy/admin/PolicyCreationStepsDefinitions.java index 1db0fa33..a83d74aa 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/policy/admin/PolicyCreationStepsDefinitions.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/policy/admin/PolicyCreationStepsDefinitions.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/policy/evaluation/PolicyEvaluationCucumberTest.java b/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/policy/evaluation/PolicyEvaluationCucumberTest.java index 00c4062f..364fe375 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/policy/evaluation/PolicyEvaluationCucumberTest.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/policy/evaluation/PolicyEvaluationCucumberTest.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/policy/evaluation/PolicyEvaluationStepsDefinitions.java b/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/policy/evaluation/PolicyEvaluationStepsDefinitions.java index 84b1c261..81bf9343 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/policy/evaluation/PolicyEvaluationStepsDefinitions.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/policy/evaluation/PolicyEvaluationStepsDefinitions.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/zone/admin/DefaultZoneAuthorizationIT.java b/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/zone/admin/DefaultZoneAuthorizationIT.java index 1e3c551e..df3ef4d6 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/zone/admin/DefaultZoneAuthorizationIT.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/zone/admin/DefaultZoneAuthorizationIT.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acceptance.test.zone.admin; import java.util.Arrays; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/zone/admin/ZoneEnforcementCucumberTest.java b/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/zone/admin/ZoneEnforcementCucumberTest.java index 5c49a7fe..0dc04171 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/zone/admin/ZoneEnforcementCucumberTest.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/zone/admin/ZoneEnforcementCucumberTest.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/zone/admin/ZoneEnforcementStepsDefinitions.java b/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/zone/admin/ZoneEnforcementStepsDefinitions.java index 430a613b..d7c3b1a5 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/zone/admin/ZoneEnforcementStepsDefinitions.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/acceptance/test/zone/admin/ZoneEnforcementStepsDefinitions.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acceptance.test.zone.admin; import static com.ge.predix.test.utils.ACSTestUtil.ACS_VERSION; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/AcsCloudFoundryConfiguration.java b/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/AcsCloudFoundryConfiguration.java index 46d633fe..30c1d7f3 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/AcsCloudFoundryConfiguration.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/AcsCloudFoundryConfiguration.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.cloudfoundry; import org.cloudfoundry.client.CloudFoundryClient; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/AcsCloudFoundryUtilities.java b/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/AcsCloudFoundryUtilities.java index 24677f0a..d6934aab 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/AcsCloudFoundryUtilities.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/AcsCloudFoundryUtilities.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.cloudfoundry; import java.net.URI; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/ApplicationHealthChecks.java b/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/ApplicationHealthChecks.java index 960bacf4..6e29f1cd 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/ApplicationHealthChecks.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/ApplicationHealthChecks.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.cloudfoundry; import org.springframework.beans.factory.annotation.Autowired; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/DeleteApplications.java b/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/DeleteApplications.java index 0ac387a2..ae672a69 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/DeleteApplications.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/DeleteApplications.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.cloudfoundry; import java.util.ArrayList; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/PushAcsApplication.java b/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/PushAcsApplication.java index 7450c180..85d2ecda 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/PushAcsApplication.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/PushAcsApplication.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.cloudfoundry; import java.nio.file.Path; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/PushAdapterApplication.java b/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/PushAdapterApplication.java index 5748e5ef..4f43decc 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/PushAdapterApplication.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/PushAdapterApplication.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.cloudfoundry; import java.io.IOException; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/PushMockedAdapterApplication.java b/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/PushMockedAdapterApplication.java index 567399ab..24e58384 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/PushMockedAdapterApplication.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/PushMockedAdapterApplication.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.cloudfoundry; import java.nio.file.Path; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/PushPredixCloudApplication.java b/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/PushPredixCloudApplication.java index bd3b7204..a43c0976 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/PushPredixCloudApplication.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/PushPredixCloudApplication.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.cloudfoundry; import java.util.Collections; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/PushPredixCloudTitanApplication.java b/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/PushPredixCloudTitanApplication.java index 33e9d2ed..8a2683fe 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/PushPredixCloudTitanApplication.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/acs/cloudfoundry/PushPredixCloudTitanApplication.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.cloudfoundry; import java.util.HashMap; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/acs/migration/AttributeMigrationTest.java b/acs-integration-tests/src/test/java/com/ge/predix/acs/migration/AttributeMigrationTest.java index dade42d8..c91c5868 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/acs/migration/AttributeMigrationTest.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/acs/migration/AttributeMigrationTest.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.migration; import java.util.Arrays; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/audit/rest/PredixAuditRecord.java b/acs-integration-tests/src/test/java/com/ge/predix/audit/rest/PredixAuditRecord.java index 152d89ef..238256e6 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/audit/rest/PredixAuditRecord.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/audit/rest/PredixAuditRecord.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.audit.rest; public class PredixAuditRecord { diff --git a/acs-integration-tests/src/test/java/com/ge/predix/audit/rest/PredixAuditRequest.java b/acs-integration-tests/src/test/java/com/ge/predix/audit/rest/PredixAuditRequest.java index a22f65b4..808f9436 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/audit/rest/PredixAuditRequest.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/audit/rest/PredixAuditRequest.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.audit.rest; public class PredixAuditRequest { diff --git a/acs-integration-tests/src/test/java/com/ge/predix/audit/rest/PredixAuditResponse.java b/acs-integration-tests/src/test/java/com/ge/predix/audit/rest/PredixAuditResponse.java index 03fb9aad..447a7d93 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/audit/rest/PredixAuditResponse.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/audit/rest/PredixAuditResponse.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.audit.rest; import java.util.Set; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/cloudfoundry/client/CloudFoundryApplicationHelper.java b/acs-integration-tests/src/test/java/com/ge/predix/cloudfoundry/client/CloudFoundryApplicationHelper.java index 3bcb0dbd..834afb42 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/cloudfoundry/client/CloudFoundryApplicationHelper.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/cloudfoundry/client/CloudFoundryApplicationHelper.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.cloudfoundry.client; import java.nio.file.Path; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/cloudfoundry/client/CloudFoundryConfiguration.java b/acs-integration-tests/src/test/java/com/ge/predix/cloudfoundry/client/CloudFoundryConfiguration.java index 835b0665..fd58f53a 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/cloudfoundry/client/CloudFoundryConfiguration.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/cloudfoundry/client/CloudFoundryConfiguration.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.cloudfoundry.client; import org.apache.commons.lang3.StringUtils; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/cloudfoundry/client/CloudFoundryService.java b/acs-integration-tests/src/test/java/com/ge/predix/cloudfoundry/client/CloudFoundryService.java index e325e688..0118194e 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/cloudfoundry/client/CloudFoundryService.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/cloudfoundry/client/CloudFoundryService.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.cloudfoundry.client; import java.util.Map; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/cloudfoundry/client/CloudFoundryUtilities.java b/acs-integration-tests/src/test/java/com/ge/predix/cloudfoundry/client/CloudFoundryUtilities.java index dd2c9697..ebb1e45b 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/cloudfoundry/client/CloudFoundryUtilities.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/cloudfoundry/client/CloudFoundryUtilities.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.cloudfoundry.client; import java.io.IOException; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/integration/test/ACSCorsFilterIT.java b/acs-integration-tests/src/test/java/com/ge/predix/integration/test/ACSCorsFilterIT.java index 60eb4405..51516648 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/integration/test/ACSCorsFilterIT.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/integration/test/ACSCorsFilterIT.java @@ -1,18 +1,19 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.integration.test; import java.io.IOException; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/integration/test/ACSMeteringIT.java b/acs-integration-tests/src/test/java/com/ge/predix/integration/test/ACSMeteringIT.java index dfd20c2b..bde36d4a 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/integration/test/ACSMeteringIT.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/integration/test/ACSMeteringIT.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.integration.test; import static com.ge.predix.integration.test.SubjectResourceFixture.MARISSA_V1; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/integration/test/ACSPerformanceIT.java b/acs-integration-tests/src/test/java/com/ge/predix/integration/test/ACSPerformanceIT.java index 86c033f9..2ced979c 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/integration/test/ACSPerformanceIT.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/integration/test/ACSPerformanceIT.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.integration.test; import static com.ge.predix.test.utils.PrivilegeHelper.DEFAULT_RESOURCE_IDENTIFIER; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/integration/test/AccessControlServiceIT.java b/acs-integration-tests/src/test/java/com/ge/predix/integration/test/AccessControlServiceIT.java index c19d1291..ab5db223 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/integration/test/AccessControlServiceIT.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/integration/test/AccessControlServiceIT.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.integration.test; import static com.ge.predix.integration.test.SubjectResourceFixture.JLO_V1; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/integration/test/AcsMonitoringIT.java b/acs-integration-tests/src/test/java/com/ge/predix/integration/test/AcsMonitoringIT.java index c501018d..842bb375 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/integration/test/AcsMonitoringIT.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/integration/test/AcsMonitoringIT.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.integration.test; import java.util.Arrays; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/integration/test/AttributeConnectorConfigurationIT.java b/acs-integration-tests/src/test/java/com/ge/predix/integration/test/AttributeConnectorConfigurationIT.java index 9ed608cd..d5c63166 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/integration/test/AttributeConnectorConfigurationIT.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/integration/test/AttributeConnectorConfigurationIT.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.integration.test; import static com.ge.predix.acs.commons.web.AcsApiUriTemplates.RESOURCE_CONNECTOR_URL; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/integration/test/PolicyEvalCachingWithGraphDBIT.java b/acs-integration-tests/src/test/java/com/ge/predix/integration/test/PolicyEvalCachingWithGraphDBIT.java index 3bba7424..0eb98472 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/integration/test/PolicyEvalCachingWithGraphDBIT.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/integration/test/PolicyEvalCachingWithGraphDBIT.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.integration.test; import java.io.IOException; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/integration/test/PolicyEvaluationCachingIT.java b/acs-integration-tests/src/test/java/com/ge/predix/integration/test/PolicyEvaluationCachingIT.java index e4c3f78b..efd7fdcc 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/integration/test/PolicyEvaluationCachingIT.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/integration/test/PolicyEvaluationCachingIT.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.integration.test; import static com.ge.predix.integration.test.SubjectResourceFixture.MARISSA_V1; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/integration/test/PolicyEvaluationWithAttributeConnectorIT.java b/acs-integration-tests/src/test/java/com/ge/predix/integration/test/PolicyEvaluationWithAttributeConnectorIT.java index 7d525f0a..9ebb4069 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/integration/test/PolicyEvaluationWithAttributeConnectorIT.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/integration/test/PolicyEvaluationWithAttributeConnectorIT.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.integration.test; import java.io.IOException; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/integration/test/PredixAuditIT.java b/acs-integration-tests/src/test/java/com/ge/predix/integration/test/PredixAuditIT.java index 4fb61fcf..2f49e4d5 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/integration/test/PredixAuditIT.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/integration/test/PredixAuditIT.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.integration.test; import java.time.Instant; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/integration/test/PrivilegeManagementAccessControlServiceIT.java b/acs-integration-tests/src/test/java/com/ge/predix/integration/test/PrivilegeManagementAccessControlServiceIT.java index 8845c188..28f1ce3d 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/integration/test/PrivilegeManagementAccessControlServiceIT.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/integration/test/PrivilegeManagementAccessControlServiceIT.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.integration.test; import static com.ge.predix.integration.test.SubjectResourceFixture.BOB_V1; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/integration/test/SubjectResourceFixture.java b/acs-integration-tests/src/test/java/com/ge/predix/integration/test/SubjectResourceFixture.java index 74e7f6d3..bd5fb52b 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/integration/test/SubjectResourceFixture.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/integration/test/SubjectResourceFixture.java @@ -1,18 +1,19 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.integration.test; import com.ge.predix.acs.rest.BaseResource; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/test/TestAnnotationTransformer.java b/acs-integration-tests/src/test/java/com/ge/predix/test/TestAnnotationTransformer.java index 686f8841..709120ac 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/test/TestAnnotationTransformer.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/test/TestAnnotationTransformer.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.test; import java.lang.reflect.Constructor; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/test/TestCleanup.java b/acs-integration-tests/src/test/java/com/ge/predix/test/TestCleanup.java index 8adbebb5..16a29807 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/test/TestCleanup.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/test/TestCleanup.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/test/TestConfig.java b/acs-integration-tests/src/test/java/com/ge/predix/test/TestConfig.java index 30e1c08e..5ec2a278 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/test/TestConfig.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/test/TestConfig.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.test; import org.apache.commons.lang.StringUtils; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/test/TestNameLogger.java b/acs-integration-tests/src/test/java/com/ge/predix/test/TestNameLogger.java index b5569545..cad2363e 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/test/TestNameLogger.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/test/TestNameLogger.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.test; import org.slf4j.Logger; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/test/utils/ACSRestTemplateFactory.java b/acs-integration-tests/src/test/java/com/ge/predix/test/utils/ACSRestTemplateFactory.java index 78161990..8e6d62ae 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/test/utils/ACSRestTemplateFactory.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/test/utils/ACSRestTemplateFactory.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acs-integration-tests/src/test/java/com/ge/predix/test/utils/ACSTestUtil.java b/acs-integration-tests/src/test/java/com/ge/predix/test/utils/ACSTestUtil.java index f5c70a21..c483d071 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/test/utils/ACSTestUtil.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/test/utils/ACSTestUtil.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acs-integration-tests/src/test/java/com/ge/predix/test/utils/CreatePolicyStatus.java b/acs-integration-tests/src/test/java/com/ge/predix/test/utils/CreatePolicyStatus.java index 90df3636..d6811a4c 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/test/utils/CreatePolicyStatus.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/test/utils/CreatePolicyStatus.java @@ -1,16 +1,16 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ diff --git a/acs-integration-tests/src/test/java/com/ge/predix/test/utils/OptionalTestSetup.java b/acs-integration-tests/src/test/java/com/ge/predix/test/utils/OptionalTestSetup.java index 81765971..801d1f3a 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/test/utils/OptionalTestSetup.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/test/utils/OptionalTestSetup.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.test.utils; import java.util.Map; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/test/utils/PolicyHelper.java b/acs-integration-tests/src/test/java/com/ge/predix/test/utils/PolicyHelper.java index 1dfeda69..ebd7ff0f 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/test/utils/PolicyHelper.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/test/utils/PolicyHelper.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.test.utils; import static com.ge.predix.test.utils.ACSTestUtil.ACS_VERSION; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/test/utils/PrivilegeHelper.java b/acs-integration-tests/src/test/java/com/ge/predix/test/utils/PrivilegeHelper.java index 1e277f3c..879a9cc3 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/test/utils/PrivilegeHelper.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/test/utils/PrivilegeHelper.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.test.utils; import static com.ge.predix.test.utils.ACSTestUtil.ACS_VERSION; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/test/utils/UaaTestUtil.java b/acs-integration-tests/src/test/java/com/ge/predix/test/utils/UaaTestUtil.java index 6425dd8e..46be3227 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/test/utils/UaaTestUtil.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/test/utils/UaaTestUtil.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.test.utils; import java.util.ArrayList; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/test/utils/ZacOptionalTestSetup.java b/acs-integration-tests/src/test/java/com/ge/predix/test/utils/ZacOptionalTestSetup.java index 104811f5..56d125f2 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/test/utils/ZacOptionalTestSetup.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/test/utils/ZacOptionalTestSetup.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.test.utils; import static com.ge.predix.test.utils.ACSTestUtil.isServerListening; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/test/utils/ZacTestUtil.java b/acs-integration-tests/src/test/java/com/ge/predix/test/utils/ZacTestUtil.java index 980bc469..77bcd39c 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/test/utils/ZacTestUtil.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/test/utils/ZacTestUtil.java @@ -1,18 +1,19 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.test.utils; import static com.ge.predix.test.utils.ACSTestUtil.isServerListening; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/test/utils/ZoneHelper.java b/acs-integration-tests/src/test/java/com/ge/predix/test/utils/ZoneHelper.java index c4b66134..db1ca8e8 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/test/utils/ZoneHelper.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/test/utils/ZoneHelper.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.test.utils; import static com.ge.predix.test.utils.ACSTestUtil.ACS_VERSION; diff --git a/acs-integration-tests/src/test/java/com/ge/predix/test/utils/v2/UaaTestUtil.java b/acs-integration-tests/src/test/java/com/ge/predix/test/utils/v2/UaaTestUtil.java index 7ebd486d..5cb94e91 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/test/utils/v2/UaaTestUtil.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/test/utils/v2/UaaTestUtil.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.test.utils.v2; import java.util.ArrayList; diff --git a/acs-integration-tests/src/test/resources/acceptance-test-spring-context.xml b/acs-integration-tests/src/test/resources/acceptance-test-spring-context.xml index fff6d7b3..62449020 100644 --- a/acs-integration-tests/src/test/resources/acceptance-test-spring-context.xml +++ b/acs-integration-tests/src/test/resources/acceptance-test-spring-context.xml @@ -1,18 +1,19 @@ + + + - - - + + + diff --git a/acs-integration-tests/testng-predix-cloud.xml b/acs-integration-tests/testng-predix-cloud.xml index 187754da..7cc17361 100644 --- a/acs-integration-tests/testng-predix-cloud.xml +++ b/acs-integration-tests/testng-predix-cloud.xml @@ -1,3 +1,21 @@ + + + + diff --git a/acs-integration-tests/testng-public-titan.xml b/acs-integration-tests/testng-public-titan.xml index ed588ead..25076ea3 100644 --- a/acs-integration-tests/testng-public-titan.xml +++ b/acs-integration-tests/testng-public-titan.xml @@ -1,3 +1,21 @@ + + + + diff --git a/acs-integration-tests/testng-public.xml b/acs-integration-tests/testng-public.xml index 61e72fc0..f30f7af5 100644 --- a/acs-integration-tests/testng-public.xml +++ b/acs-integration-tests/testng-public.xml @@ -1,3 +1,21 @@ + + + + @@ -15,4 +33,4 @@ - \ No newline at end of file + diff --git a/checkstyle-config/gog-sun-checks-eclipse.xml b/checkstyle-config/gog-sun-checks-eclipse.xml index d922f673..ec4dc8d5 100644 --- a/checkstyle-config/gog-sun-checks-eclipse.xml +++ b/checkstyle-config/gog-sun-checks-eclipse.xml @@ -1,18 +1,19 @@ + diff --git a/commons/pom.xml b/commons/pom.xml index fd68ed2c..fa148cd5 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -1,19 +1,21 @@ - + 4.0.0 diff --git a/commons/src/main/java/com/ge/predix/acs/commons/attribute/AttributeType.java b/commons/src/main/java/com/ge/predix/acs/commons/attribute/AttributeType.java index 44c656d3..62e40a52 100644 --- a/commons/src/main/java/com/ge/predix/acs/commons/attribute/AttributeType.java +++ b/commons/src/main/java/com/ge/predix/acs/commons/attribute/AttributeType.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/commons/src/main/java/com/ge/predix/acs/commons/exception/UntrustedIssuerException.java b/commons/src/main/java/com/ge/predix/acs/commons/exception/UntrustedIssuerException.java index 8835908f..67ede003 100644 --- a/commons/src/main/java/com/ge/predix/acs/commons/exception/UntrustedIssuerException.java +++ b/commons/src/main/java/com/ge/predix/acs/commons/exception/UntrustedIssuerException.java @@ -1,16 +1,16 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ diff --git a/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/AbstractHandler.java b/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/AbstractHandler.java index 3cce96c4..dda2bfe2 100644 --- a/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/AbstractHandler.java +++ b/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/AbstractHandler.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/AbstractHandlers.java b/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/AbstractHandlers.java index 73bef7e3..c5964b29 100644 --- a/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/AbstractHandlers.java +++ b/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/AbstractHandlers.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.commons.policy.condition; import java.util.ArrayList; diff --git a/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/ConditionAssertionFailedException.java b/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/ConditionAssertionFailedException.java index 06e37872..ae8ef87b 100644 --- a/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/ConditionAssertionFailedException.java +++ b/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/ConditionAssertionFailedException.java @@ -1,18 +1,19 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.commons.policy.condition; public class ConditionAssertionFailedException extends RuntimeException { diff --git a/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/ConditionParsingException.java b/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/ConditionParsingException.java index 66670470..1d9875ad 100644 --- a/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/ConditionParsingException.java +++ b/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/ConditionParsingException.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/ConditionScript.java b/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/ConditionScript.java index ea583734..6ed1f975 100644 --- a/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/ConditionScript.java +++ b/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/ConditionScript.java @@ -1,16 +1,16 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ diff --git a/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/ConditionShell.java b/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/ConditionShell.java index 18b37f33..21356224 100644 --- a/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/ConditionShell.java +++ b/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/ConditionShell.java @@ -1,16 +1,16 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ diff --git a/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/ResourceHandler.java b/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/ResourceHandler.java index 41ae35d0..8172fc03 100644 --- a/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/ResourceHandler.java +++ b/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/ResourceHandler.java @@ -1,16 +1,16 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ diff --git a/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/SubjectHandler.java b/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/SubjectHandler.java index d40f9c1b..73072168 100644 --- a/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/SubjectHandler.java +++ b/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/SubjectHandler.java @@ -1,16 +1,16 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ diff --git a/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/groovy/AttributeMatcher.java b/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/groovy/AttributeMatcher.java index 2fe8c050..fbb6153b 100644 --- a/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/groovy/AttributeMatcher.java +++ b/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/groovy/AttributeMatcher.java @@ -1,16 +1,16 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ diff --git a/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovyConditionCache.java b/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovyConditionCache.java index 5c691feb..a6333e7d 100644 --- a/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovyConditionCache.java +++ b/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovyConditionCache.java @@ -1,18 +1,19 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.commons.policy.condition.groovy; import java.util.Collections; diff --git a/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovyConditionScript.java b/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovyConditionScript.java index 426d8cb1..b18bf0da 100644 --- a/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovyConditionScript.java +++ b/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovyConditionScript.java @@ -1,16 +1,16 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ diff --git a/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovyConditionShell.java b/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovyConditionShell.java index 2abfb20a..45f76b13 100644 --- a/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovyConditionShell.java +++ b/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovyConditionShell.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovySecureExtension.java b/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovySecureExtension.java index ac4d24b5..8b4d2955 100644 --- a/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovySecureExtension.java +++ b/commons/src/main/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovySecureExtension.java @@ -1,18 +1,19 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.commons.policy.condition.groovy; import org.codehaus.groovy.ast.ClassHelper; diff --git a/commons/src/main/java/com/ge/predix/acs/commons/web/ACSWebConstants.java b/commons/src/main/java/com/ge/predix/acs/commons/web/ACSWebConstants.java index 5aeb68f4..843260ea 100644 --- a/commons/src/main/java/com/ge/predix/acs/commons/web/ACSWebConstants.java +++ b/commons/src/main/java/com/ge/predix/acs/commons/web/ACSWebConstants.java @@ -1,16 +1,16 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ diff --git a/commons/src/main/java/com/ge/predix/acs/commons/web/AcsApiUriTemplates.java b/commons/src/main/java/com/ge/predix/acs/commons/web/AcsApiUriTemplates.java index d38904aa..6eb558e9 100644 --- a/commons/src/main/java/com/ge/predix/acs/commons/web/AcsApiUriTemplates.java +++ b/commons/src/main/java/com/ge/predix/acs/commons/web/AcsApiUriTemplates.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.commons.web; /** diff --git a/commons/src/main/java/com/ge/predix/acs/commons/web/BaseRestApi.java b/commons/src/main/java/com/ge/predix/acs/commons/web/BaseRestApi.java index 53063b09..4dde4022 100644 --- a/commons/src/main/java/com/ge/predix/acs/commons/web/BaseRestApi.java +++ b/commons/src/main/java/com/ge/predix/acs/commons/web/BaseRestApi.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.commons.web; import javax.annotation.Resource; diff --git a/commons/src/main/java/com/ge/predix/acs/commons/web/BaseRestApiControllerAdvice.java b/commons/src/main/java/com/ge/predix/acs/commons/web/BaseRestApiControllerAdvice.java index 8f0e9645..062ce79a 100644 --- a/commons/src/main/java/com/ge/predix/acs/commons/web/BaseRestApiControllerAdvice.java +++ b/commons/src/main/java/com/ge/predix/acs/commons/web/BaseRestApiControllerAdvice.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.commons.web; import javax.servlet.http.HttpServletRequest; diff --git a/commons/src/main/java/com/ge/predix/acs/commons/web/ResponseEntityBuilder.java b/commons/src/main/java/com/ge/predix/acs/commons/web/ResponseEntityBuilder.java index a26dae31..b62f20a8 100644 --- a/commons/src/main/java/com/ge/predix/acs/commons/web/ResponseEntityBuilder.java +++ b/commons/src/main/java/com/ge/predix/acs/commons/web/ResponseEntityBuilder.java @@ -1,16 +1,16 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ diff --git a/commons/src/main/java/com/ge/predix/acs/commons/web/RestApiErrorResponse.java b/commons/src/main/java/com/ge/predix/acs/commons/web/RestApiErrorResponse.java index f6567565..5ec9e3c8 100644 --- a/commons/src/main/java/com/ge/predix/acs/commons/web/RestApiErrorResponse.java +++ b/commons/src/main/java/com/ge/predix/acs/commons/web/RestApiErrorResponse.java @@ -1,18 +1,19 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.commons.web; /** diff --git a/commons/src/main/java/com/ge/predix/acs/commons/web/RestApiException.java b/commons/src/main/java/com/ge/predix/acs/commons/web/RestApiException.java index 3fa2c4f2..f2df0277 100644 --- a/commons/src/main/java/com/ge/predix/acs/commons/web/RestApiException.java +++ b/commons/src/main/java/com/ge/predix/acs/commons/web/RestApiException.java @@ -1,16 +1,16 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ diff --git a/commons/src/main/java/com/ge/predix/acs/commons/web/RestErrorHandler.java b/commons/src/main/java/com/ge/predix/acs/commons/web/RestErrorHandler.java index a8c9e7c7..a551311b 100644 --- a/commons/src/main/java/com/ge/predix/acs/commons/web/RestErrorHandler.java +++ b/commons/src/main/java/com/ge/predix/acs/commons/web/RestErrorHandler.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.commons.web; import javax.servlet.http.HttpServletRequest; diff --git a/commons/src/main/java/com/ge/predix/acs/commons/web/UriTemplateUtils.java b/commons/src/main/java/com/ge/predix/acs/commons/web/UriTemplateUtils.java index 9e0e0afb..76c74b3b 100644 --- a/commons/src/main/java/com/ge/predix/acs/commons/web/UriTemplateUtils.java +++ b/commons/src/main/java/com/ge/predix/acs/commons/web/UriTemplateUtils.java @@ -1,18 +1,19 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.commons.web; import java.net.URI; diff --git a/commons/src/main/java/com/ge/predix/acs/utils/JsonUtils.java b/commons/src/main/java/com/ge/predix/acs/utils/JsonUtils.java index 215e5502..b87e37f2 100644 --- a/commons/src/main/java/com/ge/predix/acs/utils/JsonUtils.java +++ b/commons/src/main/java/com/ge/predix/acs/utils/JsonUtils.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.utils; import java.io.IOException; diff --git a/commons/src/test/java/com/ge/predix/acs/commons/policy/condition/ResourceHandlerTest.java b/commons/src/test/java/com/ge/predix/acs/commons/policy/condition/ResourceHandlerTest.java index d51d214f..bc60f541 100644 --- a/commons/src/test/java/com/ge/predix/acs/commons/policy/condition/ResourceHandlerTest.java +++ b/commons/src/test/java/com/ge/predix/acs/commons/policy/condition/ResourceHandlerTest.java @@ -1,16 +1,16 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ diff --git a/commons/src/test/java/com/ge/predix/acs/commons/policy/condition/SubjectHandlerTest.java b/commons/src/test/java/com/ge/predix/acs/commons/policy/condition/SubjectHandlerTest.java index cd3af429..f50832b5 100644 --- a/commons/src/test/java/com/ge/predix/acs/commons/policy/condition/SubjectHandlerTest.java +++ b/commons/src/test/java/com/ge/predix/acs/commons/policy/condition/SubjectHandlerTest.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/commons/src/test/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovyConditionCacheTest.java b/commons/src/test/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovyConditionCacheTest.java index c0938520..b4fb9d02 100644 --- a/commons/src/test/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovyConditionCacheTest.java +++ b/commons/src/test/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovyConditionCacheTest.java @@ -1,18 +1,19 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.commons.policy.condition.groovy; import org.mockito.Mockito; diff --git a/commons/src/test/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovyConditionScriptTest.java b/commons/src/test/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovyConditionScriptTest.java index 5eda6fd4..a62df215 100644 --- a/commons/src/test/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovyConditionScriptTest.java +++ b/commons/src/test/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovyConditionScriptTest.java @@ -1,18 +1,19 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.commons.policy.condition.groovy; import java.util.HashMap; diff --git a/commons/src/test/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovyConditionShellTest.java b/commons/src/test/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovyConditionShellTest.java index ec046e84..73883ff0 100644 --- a/commons/src/test/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovyConditionShellTest.java +++ b/commons/src/test/java/com/ge/predix/acs/commons/policy/condition/groovy/GroovyConditionShellTest.java @@ -1,18 +1,19 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.commons.policy.condition.groovy; import org.testng.Assert; diff --git a/commons/src/test/java/com/ge/predix/acs/commons/web/BaseRestApiControllerAdviceTest.java b/commons/src/test/java/com/ge/predix/acs/commons/web/BaseRestApiControllerAdviceTest.java index 36393514..4876f601 100644 --- a/commons/src/test/java/com/ge/predix/acs/commons/web/BaseRestApiControllerAdviceTest.java +++ b/commons/src/test/java/com/ge/predix/acs/commons/web/BaseRestApiControllerAdviceTest.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.commons.web; import javax.servlet.http.HttpServletRequest; diff --git a/commons/src/test/java/com/ge/predix/acs/commons/web/ResponseEntityBuilderTest.java b/commons/src/test/java/com/ge/predix/acs/commons/web/ResponseEntityBuilderTest.java index c705cd75..6867a36f 100644 --- a/commons/src/test/java/com/ge/predix/acs/commons/web/ResponseEntityBuilderTest.java +++ b/commons/src/test/java/com/ge/predix/acs/commons/web/ResponseEntityBuilderTest.java @@ -1,18 +1,19 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.commons.web; import java.net.URI; diff --git a/commons/src/test/java/com/ge/predix/acs/commons/web/RestApiExceptionTest.java b/commons/src/test/java/com/ge/predix/acs/commons/web/RestApiExceptionTest.java index 40644855..452d577f 100644 --- a/commons/src/test/java/com/ge/predix/acs/commons/web/RestApiExceptionTest.java +++ b/commons/src/test/java/com/ge/predix/acs/commons/web/RestApiExceptionTest.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.commons.web; import org.springframework.http.HttpStatus; diff --git a/commons/src/test/java/com/ge/predix/acs/commons/web/RestErrorHandlerTest.java b/commons/src/test/java/com/ge/predix/acs/commons/web/RestErrorHandlerTest.java index 157edac5..e0fdc387 100644 --- a/commons/src/test/java/com/ge/predix/acs/commons/web/RestErrorHandlerTest.java +++ b/commons/src/test/java/com/ge/predix/acs/commons/web/RestErrorHandlerTest.java @@ -1,18 +1,19 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.commons.web; import javax.servlet.http.HttpServletRequest; diff --git a/commons/src/test/java/com/ge/predix/acs/utils/JsonUtilsTest.java b/commons/src/test/java/com/ge/predix/acs/utils/JsonUtilsTest.java index 2668f03f..55da483c 100644 --- a/commons/src/test/java/com/ge/predix/acs/utils/JsonUtilsTest.java +++ b/commons/src/test/java/com/ge/predix/acs/utils/JsonUtilsTest.java @@ -1,18 +1,19 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.utils; import com.fasterxml.jackson.databind.JsonNode; diff --git a/commons/src/test/resources/log4j.properties b/commons/src/test/resources/log4j.properties index 82e94caa..75f98d51 100644 --- a/commons/src/test/resources/log4j.properties +++ b/commons/src/test/resources/log4j.properties @@ -1,18 +1,18 @@ -############################################################################### -# Copyright 2016 General Electric Company. +################################################################################ +# Copyright 2017 General Electric Company # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and # limitations under the License. -############################################################################### +################################################################################ # # The logging properties used for testing diff --git a/copyrights.sh b/copyrights.sh new file mode 100755 index 00000000..030882c7 --- /dev/null +++ b/copyrights.sh @@ -0,0 +1,200 @@ +################################################################################ +# Copyright 2017 General Electric Company +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +################################################################################ + +#!/usr/bin/env bash + +{ set -e; } 2> /dev/null + +function usage { + echo "Usage: $( python -c "import os; print os.path.abspath('${BASH_SOURCE[0]}')" ) [--debug] [(-d | --delete-copyright-headers) | (-u | --upsert-copyright-headers)] [(-f | --file) ]" +} + +function read_args { + while (( "$#" )); do + case "$1" in + -d|--delete-copyright-headers) + DELETE_COPYRIGHTS='true' + ;; + -u|--upsert-copyright-headers) + UPSERT_COPYRIGHTS='true' + ;; + --debug) + DEBUG='true' + ;; + -f|--file) + shift + SRC_FILE="$1" + echo -e "Modifying source file: ${SRC_FILE}\n" + ;; + *) + echo "Unknown option: ${1}" + usage + exit 2 + ;; + esac + shift + done +} + +NEWLINE=' +' +COPYRIGHT_HEADER_TITLE="Copyright $( date +'%Y' ) General Electric Company" +COPYRIGHT_HEADER_BODY="${COPYRIGHT_HEADER_TITLE} +\n +Licensed under the Apache License, Version 2.0 (the \"License\"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at +\n + http://www.apache.org/licenses/LICENSE-2.0 +\n +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an \"AS IS\" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +" + +function generate_copyright_header { + if [[ "$1" == 'java' ]]; then + BEGINNING_COMMENT_MARKER='/' + CONTINUING_COMMENT_MARKER='*' + ENDING_COMMENT_MARKER='/' + BEGINNING_COMMENT_LINE="$( printf -- "${CONTINUING_COMMENT_MARKER}%.0s" $( seq 1 79 ) )" + elif [[ "$1" == 'xml' ]]; then + BEGINNING_COMMENT_MARKER='' + BEGINNING_COMMENT_LINE="$( printf -- "${CONTINUING_COMMENT_MARKER}%.0s" $( seq 1 2 ) )" + elif [[ "$1" == 'sh' || "$1" == 'properties' ]]; then + BEGINNING_COMMENT_MARKER='#' + CONTINUING_COMMENT_MARKER="$BEGINNING_COMMENT_MARKER" + ENDING_COMMENT_MARKER="$CONTINUING_COMMENT_MARKER" + BEGINNING_COMMENT_LINE="$( printf -- "${CONTINUING_COMMENT_MARKER}%.0s" $( seq 1 79 ) )" + else + return + fi + + ENDING_COMMENT_LINE="$BEGINNING_COMMENT_LINE" + + COPYRIGHT_HEADER="$BEGINNING_COMMENT_MARKER" + COPYRIGHT_HEADER="${COPYRIGHT_HEADER}${BEGINNING_COMMENT_LINE}${NEWLINE}" + + IFS="$NEWLINE" + for l in $COPYRIGHT_HEADER_BODY; do + if [[ "$BEGINNING_COMMENT_MARKER" != "$CONTINUING_COMMENT_MARKER" ]]; then + COPYRIGHT_HEADER="${COPYRIGHT_HEADER} " + fi + COPYRIGHT_HEADER="${COPYRIGHT_HEADER}${CONTINUING_COMMENT_MARKER}" + if [[ "$l" == '\n' ]]; then + COPYRIGHT_HEADER="${COPYRIGHT_HEADER}${NEWLINE}" + else + COPYRIGHT_HEADER="${COPYRIGHT_HEADER} ${l}${NEWLINE}" + fi + done + + if [[ "$BEGINNING_COMMENT_MARKER" != "$CONTINUING_COMMENT_MARKER" ]]; then + COPYRIGHT_HEADER="${COPYRIGHT_HEADER} " + fi + COPYRIGHT_HEADER="${COPYRIGHT_HEADER}${ENDING_COMMENT_LINE}${ENDING_COMMENT_MARKER}${NEWLINE}" + + echo "$COPYRIGHT_HEADER" +} + +function delete_copyright { + if [[ "$1" == 'java' ]]; then + perl -i -pe 'BEGIN{undef $/;} s/\/\*{79}?\s*?\*\s*?Copyright.*?(\n\s*?\*.*?)+?\n\s*?\*{79}?\/\n{1,}//' "$2" + elif [[ "$1" == 'xml' ]]; then + perl -i -pe 'BEGIN{undef $/;} s/\n{1,}//' "$2" + elif [[ "$1" == 'sh' || "$1" == 'properties' ]]; then + perl -i -pe 'BEGIN{undef $/;} s/#{80}?\s*?#\s*?Copyright.*?(\n\s*?#.*?)+?\n\s*?#{80}?\n{1,}//' "$2" + fi +} + +function upsert_copyright { + delete_copyright "$1" "$2" + + local TMP_FILE="${2}.__tmp__" + + if [[ "$1" == 'xml' ]]; then + echo -e '\n' > "$TMP_FILE" + fi + + echo "$( generate_copyright_header "$1" )" >> "$TMP_FILE" + echo '' >> "$TMP_FILE" + + if [[ "$1" == 'xml' ]]; then + cat "$2" | awk '/<\?xml/{y=1;next}y' | sed '/./,$!d' >> "$TMP_FILE" + else + cat "$2" >> "$TMP_FILE" + fi + + mv "$TMP_FILE" "$2" + + if [[ "$1" == 'sh' ]]; then + chmod a+x "$2" + fi +} + +function modify_copyright_in_file { + FILENAME="$( basename "$1" )" + EXTENSION="${FILENAME##*.}" + if [[ -n "$DELETE_COPYRIGHTS" ]]; then + echo "Deleting copyrights from file: ${1} with extension: .${EXTENSION}" + delete_copyright "$EXTENSION" "$1" + elif [[ -n "$UPSERT_COPYRIGHTS" ]]; then + echo "Upserting copyrights from file: ${1} with extension: .${EXTENSION}" + upsert_copyright "$EXTENSION" "$1" + fi +} + +unset DELETE_COPYRIGHTS +unset UPSERT_COPYRIGHTS +unset DEBUG +unset SRC_FILE + +read_args "$@" + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +if [[ -n "$DEBUG" ]]; then + echo 'The following options are set:' + echo " DELETE_COPYRIGHTS: ${DELETE_COPYRIGHTS}" + echo " UPSERT_COPYRIGHTS: ${UPSERT_COPYRIGHTS}" + echo " DEBUG: ${DEBUG}" + echo " SRC_FILE: ${SRC_FILE}" + echo " DIR: ${DIR}" + echo '' +fi + +if [[ -n "$DELETE_COPYRIGHTS" && -n "$UPSERT_COPYRIGHTS" ]]; then + echo "Can't specify the deletion and upsert options at the same time" + usage + exit 2 +fi + +if [[ -n "$DEBUG" ]]; then + generate_copyright_header 'java' + generate_copyright_header 'sh' + generate_copyright_header 'xml' +fi + +if [[ -z "$SRC_FILE" ]]; then + for f in $( find "$DIR" \( -not -path '*/\.*' -and -not -path '*/failsafe*' -and -not -path '*/surefire*' \) -type f \( -iname '*.java' -or -iname '*.sh' -or -iname '*.properties' -or -iname '*.xml' \) ); do + modify_copyright_in_file "$f" + done +else + modify_copyright_in_file "$SRC_FILE" +fi \ No newline at end of file diff --git a/eclipse-config/clean-up.xml b/eclipse-config/clean-up.xml index ae286f65..18be8499 100644 --- a/eclipse-config/clean-up.xml +++ b/eclipse-config/clean-up.xml @@ -1,18 +1,19 @@ - + + diff --git a/eclipse-config/formatter.xml b/eclipse-config/formatter.xml index 4945f880..c8b8197b 100644 --- a/eclipse-config/formatter.xml +++ b/eclipse-config/formatter.xml @@ -1,18 +1,19 @@ - + + diff --git a/merge-to-master.sh b/merge-to-master.sh index 8ab155e3..492ed4b8 100755 --- a/merge-to-master.sh +++ b/merge-to-master.sh @@ -1,3 +1,19 @@ +################################################################################ +# Copyright 2017 General Electric Company +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +################################################################################ + #!/usr/bin/env bash YES='yes' diff --git a/model/pom.xml b/model/pom.xml index 4bf9cb53..19ed5c96 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -1,19 +1,21 @@ - + 4.0.0 diff --git a/model/src/main/java/com/ge/predix/acs/model/Attribute.java b/model/src/main/java/com/ge/predix/acs/model/Attribute.java index 8c2734a1..3461e94e 100644 --- a/model/src/main/java/com/ge/predix/acs/model/Attribute.java +++ b/model/src/main/java/com/ge/predix/acs/model/Attribute.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/model/src/main/java/com/ge/predix/acs/model/Condition.java b/model/src/main/java/com/ge/predix/acs/model/Condition.java index d9c80f68..7e4c856c 100644 --- a/model/src/main/java/com/ge/predix/acs/model/Condition.java +++ b/model/src/main/java/com/ge/predix/acs/model/Condition.java @@ -1,16 +1,16 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ diff --git a/model/src/main/java/com/ge/predix/acs/model/Effect.java b/model/src/main/java/com/ge/predix/acs/model/Effect.java index ef276aa3..bf65d067 100644 --- a/model/src/main/java/com/ge/predix/acs/model/Effect.java +++ b/model/src/main/java/com/ge/predix/acs/model/Effect.java @@ -1,16 +1,16 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ diff --git a/model/src/main/java/com/ge/predix/acs/model/Policy.java b/model/src/main/java/com/ge/predix/acs/model/Policy.java index 652fd9ef..c048a9c4 100644 --- a/model/src/main/java/com/ge/predix/acs/model/Policy.java +++ b/model/src/main/java/com/ge/predix/acs/model/Policy.java @@ -1,16 +1,16 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ diff --git a/model/src/main/java/com/ge/predix/acs/model/PolicySet.java b/model/src/main/java/com/ge/predix/acs/model/PolicySet.java index 2c08b208..420f5e47 100644 --- a/model/src/main/java/com/ge/predix/acs/model/PolicySet.java +++ b/model/src/main/java/com/ge/predix/acs/model/PolicySet.java @@ -1,16 +1,16 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ diff --git a/model/src/main/java/com/ge/predix/acs/model/ResourceType.java b/model/src/main/java/com/ge/predix/acs/model/ResourceType.java index ac48eff7..aeb66459 100644 --- a/model/src/main/java/com/ge/predix/acs/model/ResourceType.java +++ b/model/src/main/java/com/ge/predix/acs/model/ResourceType.java @@ -1,16 +1,16 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ diff --git a/model/src/main/java/com/ge/predix/acs/model/SubjectType.java b/model/src/main/java/com/ge/predix/acs/model/SubjectType.java index 7d07cf16..36658979 100644 --- a/model/src/main/java/com/ge/predix/acs/model/SubjectType.java +++ b/model/src/main/java/com/ge/predix/acs/model/SubjectType.java @@ -1,16 +1,16 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ diff --git a/model/src/main/java/com/ge/predix/acs/model/Target.java b/model/src/main/java/com/ge/predix/acs/model/Target.java index 5c3be8ee..9de38298 100644 --- a/model/src/main/java/com/ge/predix/acs/model/Target.java +++ b/model/src/main/java/com/ge/predix/acs/model/Target.java @@ -1,16 +1,16 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ diff --git a/model/src/main/java/com/ge/predix/acs/rest/AttributeAdapterConnection.java b/model/src/main/java/com/ge/predix/acs/rest/AttributeAdapterConnection.java index 0be53664..f16e45d4 100644 --- a/model/src/main/java/com/ge/predix/acs/rest/AttributeAdapterConnection.java +++ b/model/src/main/java/com/ge/predix/acs/rest/AttributeAdapterConnection.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.rest; import org.apache.commons.lang.builder.EqualsBuilder; diff --git a/model/src/main/java/com/ge/predix/acs/rest/AttributeConnector.java b/model/src/main/java/com/ge/predix/acs/rest/AttributeConnector.java index c26ca20e..db8b0087 100644 --- a/model/src/main/java/com/ge/predix/acs/rest/AttributeConnector.java +++ b/model/src/main/java/com/ge/predix/acs/rest/AttributeConnector.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.rest; import java.util.Set; diff --git a/model/src/main/java/com/ge/predix/acs/rest/BaseResource.java b/model/src/main/java/com/ge/predix/acs/rest/BaseResource.java index 15589538..d5a80d53 100644 --- a/model/src/main/java/com/ge/predix/acs/rest/BaseResource.java +++ b/model/src/main/java/com/ge/predix/acs/rest/BaseResource.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.rest; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/model/src/main/java/com/ge/predix/acs/rest/BaseSubject.java b/model/src/main/java/com/ge/predix/acs/rest/BaseSubject.java index 24d6acfb..cdcef819 100644 --- a/model/src/main/java/com/ge/predix/acs/rest/BaseSubject.java +++ b/model/src/main/java/com/ge/predix/acs/rest/BaseSubject.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.rest; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/model/src/main/java/com/ge/predix/acs/rest/Parent.java b/model/src/main/java/com/ge/predix/acs/rest/Parent.java index b465ee1e..50a8eab4 100644 --- a/model/src/main/java/com/ge/predix/acs/rest/Parent.java +++ b/model/src/main/java/com/ge/predix/acs/rest/Parent.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.rest; import java.util.Collections; diff --git a/model/src/main/java/com/ge/predix/acs/rest/PolicyEvaluationRequestV1.java b/model/src/main/java/com/ge/predix/acs/rest/PolicyEvaluationRequestV1.java index 91fcf171..3884e2ce 100644 --- a/model/src/main/java/com/ge/predix/acs/rest/PolicyEvaluationRequestV1.java +++ b/model/src/main/java/com/ge/predix/acs/rest/PolicyEvaluationRequestV1.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.rest; import java.util.LinkedHashSet; diff --git a/model/src/main/java/com/ge/predix/acs/rest/PolicyEvaluationResult.java b/model/src/main/java/com/ge/predix/acs/rest/PolicyEvaluationResult.java index 5c34a371..bba51714 100644 --- a/model/src/main/java/com/ge/predix/acs/rest/PolicyEvaluationResult.java +++ b/model/src/main/java/com/ge/predix/acs/rest/PolicyEvaluationResult.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.rest; import java.util.Collections; diff --git a/model/src/main/java/com/ge/predix/acs/rest/RestModelIdExtractor.java b/model/src/main/java/com/ge/predix/acs/rest/RestModelIdExtractor.java index 20519ffd..fdc584f1 100644 --- a/model/src/main/java/com/ge/predix/acs/rest/RestModelIdExtractor.java +++ b/model/src/main/java/com/ge/predix/acs/rest/RestModelIdExtractor.java @@ -1,18 +1,19 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.rest; import java.util.Map; diff --git a/model/src/main/java/com/ge/predix/acs/rest/Zone.java b/model/src/main/java/com/ge/predix/acs/rest/Zone.java index 412a2cc1..012a5cb6 100644 --- a/model/src/main/java/com/ge/predix/acs/rest/Zone.java +++ b/model/src/main/java/com/ge/predix/acs/rest/Zone.java @@ -1,18 +1,19 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.rest; import org.apache.commons.lang.builder.EqualsBuilder; diff --git a/model/src/main/java/com/ge/predix/acs/rest/attribute/adapter/AttributesResponse.java b/model/src/main/java/com/ge/predix/acs/rest/attribute/adapter/AttributesResponse.java index 8fb12709..1cf5f0ba 100644 --- a/model/src/main/java/com/ge/predix/acs/rest/attribute/adapter/AttributesResponse.java +++ b/model/src/main/java/com/ge/predix/acs/rest/attribute/adapter/AttributesResponse.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.rest.attribute.adapter; import java.util.Set; diff --git a/model/src/test/java/com/ge/predix/acs/model/ParentTest.java b/model/src/test/java/com/ge/predix/acs/model/ParentTest.java index ec76dfce..73b0b0f8 100644 --- a/model/src/test/java/com/ge/predix/acs/model/ParentTest.java +++ b/model/src/test/java/com/ge/predix/acs/model/ParentTest.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.model; import com.ge.predix.acs.rest.Parent; diff --git a/model/src/test/java/com/ge/predix/acs/model/PolicySetTest.java b/model/src/test/java/com/ge/predix/acs/model/PolicySetTest.java index 4415f10d..50c33e9a 100644 --- a/model/src/test/java/com/ge/predix/acs/model/PolicySetTest.java +++ b/model/src/test/java/com/ge/predix/acs/model/PolicySetTest.java @@ -1,18 +1,19 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.model; import java.io.File; diff --git a/model/src/test/java/com/ge/predix/acs/model/PolicySets.java b/model/src/test/java/com/ge/predix/acs/model/PolicySets.java index 49430ea6..90ec63e3 100644 --- a/model/src/test/java/com/ge/predix/acs/model/PolicySets.java +++ b/model/src/test/java/com/ge/predix/acs/model/PolicySets.java @@ -1,16 +1,16 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ diff --git a/model/src/test/java/com/ge/predix/acs/rest/PolicyEvaluationRequestV1Test.java b/model/src/test/java/com/ge/predix/acs/rest/PolicyEvaluationRequestV1Test.java index 3381b92e..fc13f68f 100644 --- a/model/src/test/java/com/ge/predix/acs/rest/PolicyEvaluationRequestV1Test.java +++ b/model/src/test/java/com/ge/predix/acs/rest/PolicyEvaluationRequestV1Test.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/pom.xml b/pom.xml index 1b36b56f..b8eae7b5 100644 --- a/pom.xml +++ b/pom.xml @@ -1,19 +1,21 @@ - + 4.0.0 diff --git a/run-integration-tests.sh b/run-integration-tests.sh old mode 100644 new mode 100755 index 429c4130..86417dcb --- a/run-integration-tests.sh +++ b/run-integration-tests.sh @@ -1,3 +1,19 @@ +################################################################################ +# Copyright 2017 General Electric Company +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +################################################################################ + #!/usr/bin/env bash function usage { diff --git a/service/pom.xml b/service/pom.xml index a31496d5..df80c67f 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -1,19 +1,21 @@ - + 4.0.0 diff --git a/service/src/main/java/com/ge/predix/acs/AccessControlService.java b/service/src/main/java/com/ge/predix/acs/AccessControlService.java index 496a696b..64c86322 100644 --- a/service/src/main/java/com/ge/predix/acs/AccessControlService.java +++ b/service/src/main/java/com/ge/predix/acs/AccessControlService.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/PolicyContextResolver.java b/service/src/main/java/com/ge/predix/acs/PolicyContextResolver.java index 6026b3a1..37a31581 100644 --- a/service/src/main/java/com/ge/predix/acs/PolicyContextResolver.java +++ b/service/src/main/java/com/ge/predix/acs/PolicyContextResolver.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/SpringSecurityPolicyContextResolver.java b/service/src/main/java/com/ge/predix/acs/SpringSecurityPolicyContextResolver.java index fc324638..933fd222 100644 --- a/service/src/main/java/com/ge/predix/acs/SpringSecurityPolicyContextResolver.java +++ b/service/src/main/java/com/ge/predix/acs/SpringSecurityPolicyContextResolver.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/ZoneDoesNotExistControllerAdvice.java b/service/src/main/java/com/ge/predix/acs/ZoneDoesNotExistControllerAdvice.java index 008b6b06..13a68de4 100644 --- a/service/src/main/java/com/ge/predix/acs/ZoneDoesNotExistControllerAdvice.java +++ b/service/src/main/java/com/ge/predix/acs/ZoneDoesNotExistControllerAdvice.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs; import com.ge.predix.acs.attribute.connector.management.AttributeConnectorController; diff --git a/service/src/main/java/com/ge/predix/acs/attribute/cache/AbstractAttributeCache.java b/service/src/main/java/com/ge/predix/acs/attribute/cache/AbstractAttributeCache.java index f586e149..0b726949 100644 --- a/service/src/main/java/com/ge/predix/acs/attribute/cache/AbstractAttributeCache.java +++ b/service/src/main/java/com/ge/predix/acs/attribute/cache/AbstractAttributeCache.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.attribute.cache; public abstract class AbstractAttributeCache implements AttributeCache { diff --git a/service/src/main/java/com/ge/predix/acs/attribute/cache/AttributeCache.java b/service/src/main/java/com/ge/predix/acs/attribute/cache/AttributeCache.java index cb2715a6..cc5c9e32 100644 --- a/service/src/main/java/com/ge/predix/acs/attribute/cache/AttributeCache.java +++ b/service/src/main/java/com/ge/predix/acs/attribute/cache/AttributeCache.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.attribute.cache; import com.ge.predix.acs.attribute.readers.CachedAttributes; diff --git a/service/src/main/java/com/ge/predix/acs/attribute/cache/AttributeCacheFactory.java b/service/src/main/java/com/ge/predix/acs/attribute/cache/AttributeCacheFactory.java index 7d254e13..6667b161 100644 --- a/service/src/main/java/com/ge/predix/acs/attribute/cache/AttributeCacheFactory.java +++ b/service/src/main/java/com/ge/predix/acs/attribute/cache/AttributeCacheFactory.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.attribute.cache; import java.util.function.BiFunction; diff --git a/service/src/main/java/com/ge/predix/acs/attribute/cache/InMemoryAttributeCache.java b/service/src/main/java/com/ge/predix/acs/attribute/cache/InMemoryAttributeCache.java index 891b00a7..b505618d 100644 --- a/service/src/main/java/com/ge/predix/acs/attribute/cache/InMemoryAttributeCache.java +++ b/service/src/main/java/com/ge/predix/acs/attribute/cache/InMemoryAttributeCache.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.attribute.cache; import java.util.Map; diff --git a/service/src/main/java/com/ge/predix/acs/attribute/cache/NonCachingAttributeCache.java b/service/src/main/java/com/ge/predix/acs/attribute/cache/NonCachingAttributeCache.java index e756ce9c..24f1000b 100644 --- a/service/src/main/java/com/ge/predix/acs/attribute/cache/NonCachingAttributeCache.java +++ b/service/src/main/java/com/ge/predix/acs/attribute/cache/NonCachingAttributeCache.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.attribute.cache; import com.ge.predix.acs.attribute.readers.CachedAttributes; diff --git a/service/src/main/java/com/ge/predix/acs/attribute/cache/RedisAttributeCache.java b/service/src/main/java/com/ge/predix/acs/attribute/cache/RedisAttributeCache.java index 29d1d782..21c5eed6 100644 --- a/service/src/main/java/com/ge/predix/acs/attribute/cache/RedisAttributeCache.java +++ b/service/src/main/java/com/ge/predix/acs/attribute/cache/RedisAttributeCache.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.attribute.cache; import java.io.IOException; diff --git a/service/src/main/java/com/ge/predix/acs/attribute/connector/ConnectorHttpMethodsFilter.java b/service/src/main/java/com/ge/predix/acs/attribute/connector/ConnectorHttpMethodsFilter.java index 1711d3ed..547ab9e0 100644 --- a/service/src/main/java/com/ge/predix/acs/attribute/connector/ConnectorHttpMethodsFilter.java +++ b/service/src/main/java/com/ge/predix/acs/attribute/connector/ConnectorHttpMethodsFilter.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.attribute.connector; import java.util.Arrays; diff --git a/service/src/main/java/com/ge/predix/acs/attribute/connector/management/AttributeConnectorController.java b/service/src/main/java/com/ge/predix/acs/attribute/connector/management/AttributeConnectorController.java index e4a3486a..4eb2d654 100644 --- a/service/src/main/java/com/ge/predix/acs/attribute/connector/management/AttributeConnectorController.java +++ b/service/src/main/java/com/ge/predix/acs/attribute/connector/management/AttributeConnectorController.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.attribute.connector.management; import static com.ge.predix.acs.commons.web.AcsApiUriTemplates.V1; diff --git a/service/src/main/java/com/ge/predix/acs/attribute/connector/management/AttributeConnectorException.java b/service/src/main/java/com/ge/predix/acs/attribute/connector/management/AttributeConnectorException.java index 28b1a3bb..4d8f942b 100644 --- a/service/src/main/java/com/ge/predix/acs/attribute/connector/management/AttributeConnectorException.java +++ b/service/src/main/java/com/ge/predix/acs/attribute/connector/management/AttributeConnectorException.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.attribute.connector.management; public class AttributeConnectorException extends RuntimeException { diff --git a/service/src/main/java/com/ge/predix/acs/attribute/connector/management/AttributeConnectorService.java b/service/src/main/java/com/ge/predix/acs/attribute/connector/management/AttributeConnectorService.java index 324a61ab..622bd9ae 100644 --- a/service/src/main/java/com/ge/predix/acs/attribute/connector/management/AttributeConnectorService.java +++ b/service/src/main/java/com/ge/predix/acs/attribute/connector/management/AttributeConnectorService.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.attribute.connector.management; import com.ge.predix.acs.rest.AttributeConnector; diff --git a/service/src/main/java/com/ge/predix/acs/attribute/connector/management/AttributeConnectorServiceImpl.java b/service/src/main/java/com/ge/predix/acs/attribute/connector/management/AttributeConnectorServiceImpl.java index 40fc4b21..77462d07 100644 --- a/service/src/main/java/com/ge/predix/acs/attribute/connector/management/AttributeConnectorServiceImpl.java +++ b/service/src/main/java/com/ge/predix/acs/attribute/connector/management/AttributeConnectorServiceImpl.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.attribute.connector.management; import java.net.MalformedURLException; diff --git a/service/src/main/java/com/ge/predix/acs/attribute/readers/AttributeReader.java b/service/src/main/java/com/ge/predix/acs/attribute/readers/AttributeReader.java index b810b73a..c14073ea 100644 --- a/service/src/main/java/com/ge/predix/acs/attribute/readers/AttributeReader.java +++ b/service/src/main/java/com/ge/predix/acs/attribute/readers/AttributeReader.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.attribute.readers; import java.util.Set; diff --git a/service/src/main/java/com/ge/predix/acs/attribute/readers/AttributeReaderFactory.java b/service/src/main/java/com/ge/predix/acs/attribute/readers/AttributeReaderFactory.java index 1c857b16..4e478a45 100644 --- a/service/src/main/java/com/ge/predix/acs/attribute/readers/AttributeReaderFactory.java +++ b/service/src/main/java/com/ge/predix/acs/attribute/readers/AttributeReaderFactory.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.attribute.readers; import java.util.Map; diff --git a/service/src/main/java/com/ge/predix/acs/attribute/readers/AttributeRetrievalException.java b/service/src/main/java/com/ge/predix/acs/attribute/readers/AttributeRetrievalException.java index 573e3d8a..f21cb1bb 100644 --- a/service/src/main/java/com/ge/predix/acs/attribute/readers/AttributeRetrievalException.java +++ b/service/src/main/java/com/ge/predix/acs/attribute/readers/AttributeRetrievalException.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.attribute.readers; import java.text.MessageFormat; diff --git a/service/src/main/java/com/ge/predix/acs/attribute/readers/CachedAttributes.java b/service/src/main/java/com/ge/predix/acs/attribute/readers/CachedAttributes.java index b8d3136b..60daf130 100644 --- a/service/src/main/java/com/ge/predix/acs/attribute/readers/CachedAttributes.java +++ b/service/src/main/java/com/ge/predix/acs/attribute/readers/CachedAttributes.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.attribute.readers; import java.util.Set; diff --git a/service/src/main/java/com/ge/predix/acs/attribute/readers/ExternalAttributeReader.java b/service/src/main/java/com/ge/predix/acs/attribute/readers/ExternalAttributeReader.java index 0796a233..903e8336 100644 --- a/service/src/main/java/com/ge/predix/acs/attribute/readers/ExternalAttributeReader.java +++ b/service/src/main/java/com/ge/predix/acs/attribute/readers/ExternalAttributeReader.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.attribute.readers; import java.util.Collections; diff --git a/service/src/main/java/com/ge/predix/acs/attribute/readers/ExternalResourceAttributeReader.java b/service/src/main/java/com/ge/predix/acs/attribute/readers/ExternalResourceAttributeReader.java index 505cc76e..f03ed0cf 100644 --- a/service/src/main/java/com/ge/predix/acs/attribute/readers/ExternalResourceAttributeReader.java +++ b/service/src/main/java/com/ge/predix/acs/attribute/readers/ExternalResourceAttributeReader.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.attribute.readers; import java.util.Set; diff --git a/service/src/main/java/com/ge/predix/acs/attribute/readers/ExternalSubjectAttributeReader.java b/service/src/main/java/com/ge/predix/acs/attribute/readers/ExternalSubjectAttributeReader.java index 370a87ce..6d0af435 100644 --- a/service/src/main/java/com/ge/predix/acs/attribute/readers/ExternalSubjectAttributeReader.java +++ b/service/src/main/java/com/ge/predix/acs/attribute/readers/ExternalSubjectAttributeReader.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.attribute.readers; import java.util.Set; diff --git a/service/src/main/java/com/ge/predix/acs/attribute/readers/PrivilegeServiceResourceAttributeReader.java b/service/src/main/java/com/ge/predix/acs/attribute/readers/PrivilegeServiceResourceAttributeReader.java index fb8a588c..e6f57ef3 100644 --- a/service/src/main/java/com/ge/predix/acs/attribute/readers/PrivilegeServiceResourceAttributeReader.java +++ b/service/src/main/java/com/ge/predix/acs/attribute/readers/PrivilegeServiceResourceAttributeReader.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.attribute.readers; import java.util.Collections; diff --git a/service/src/main/java/com/ge/predix/acs/attribute/readers/PrivilegeServiceSubjectAttributeReader.java b/service/src/main/java/com/ge/predix/acs/attribute/readers/PrivilegeServiceSubjectAttributeReader.java index 014110c6..bd52377d 100644 --- a/service/src/main/java/com/ge/predix/acs/attribute/readers/PrivilegeServiceSubjectAttributeReader.java +++ b/service/src/main/java/com/ge/predix/acs/attribute/readers/PrivilegeServiceSubjectAttributeReader.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.attribute.readers; import java.util.Collections; diff --git a/service/src/main/java/com/ge/predix/acs/attribute/readers/ResourceAttributeReader.java b/service/src/main/java/com/ge/predix/acs/attribute/readers/ResourceAttributeReader.java index a2768453..b7b08fce 100644 --- a/service/src/main/java/com/ge/predix/acs/attribute/readers/ResourceAttributeReader.java +++ b/service/src/main/java/com/ge/predix/acs/attribute/readers/ResourceAttributeReader.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.attribute.readers; //tagging interface to create explicit type for ResourceAttributeReader diff --git a/service/src/main/java/com/ge/predix/acs/attribute/readers/SubjectAttributeReader.java b/service/src/main/java/com/ge/predix/acs/attribute/readers/SubjectAttributeReader.java index 871ebc3b..d606eee0 100644 --- a/service/src/main/java/com/ge/predix/acs/attribute/readers/SubjectAttributeReader.java +++ b/service/src/main/java/com/ge/predix/acs/attribute/readers/SubjectAttributeReader.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.attribute.readers; import java.util.Set; diff --git a/service/src/main/java/com/ge/predix/acs/audit/ACSAuditConfiguration.java b/service/src/main/java/com/ge/predix/acs/audit/ACSAuditConfiguration.java index dca39996..508e2cda 100644 --- a/service/src/main/java/com/ge/predix/acs/audit/ACSAuditConfiguration.java +++ b/service/src/main/java/com/ge/predix/acs/audit/ACSAuditConfiguration.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.audit; import java.util.List; diff --git a/service/src/main/java/com/ge/predix/acs/audit/PredixEventMapper.java b/service/src/main/java/com/ge/predix/acs/audit/PredixEventMapper.java index 294b8c99..5b9dfca5 100644 --- a/service/src/main/java/com/ge/predix/acs/audit/PredixEventMapper.java +++ b/service/src/main/java/com/ge/predix/acs/audit/PredixEventMapper.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.audit; import java.util.HashMap; diff --git a/service/src/main/java/com/ge/predix/acs/audit/PredixEventProcessor.java b/service/src/main/java/com/ge/predix/acs/audit/PredixEventProcessor.java index c8cae23d..30fbb720 100644 --- a/service/src/main/java/com/ge/predix/acs/audit/PredixEventProcessor.java +++ b/service/src/main/java/com/ge/predix/acs/audit/PredixEventProcessor.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.audit; import java.net.URI; diff --git a/service/src/main/java/com/ge/predix/acs/config/AcsConfigUtil.java b/service/src/main/java/com/ge/predix/acs/config/AcsConfigUtil.java index 26fba1b1..61f88e23 100644 --- a/service/src/main/java/com/ge/predix/acs/config/AcsConfigUtil.java +++ b/service/src/main/java/com/ge/predix/acs/config/AcsConfigUtil.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/config/CloudDataSourceConfig.java b/service/src/main/java/com/ge/predix/acs/config/CloudDataSourceConfig.java index a8d94dde..6720319b 100644 --- a/service/src/main/java/com/ge/predix/acs/config/CloudDataSourceConfig.java +++ b/service/src/main/java/com/ge/predix/acs/config/CloudDataSourceConfig.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/config/CloudRedisConnectionFactoryConfig.java b/service/src/main/java/com/ge/predix/acs/config/CloudRedisConnectionFactoryConfig.java index 0e21dc3c..26b29eeb 100644 --- a/service/src/main/java/com/ge/predix/acs/config/CloudRedisConnectionFactoryConfig.java +++ b/service/src/main/java/com/ge/predix/acs/config/CloudRedisConnectionFactoryConfig.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/config/CloudRedisProperties.java b/service/src/main/java/com/ge/predix/acs/config/CloudRedisProperties.java index 5fa3630c..5852ad7f 100644 --- a/service/src/main/java/com/ge/predix/acs/config/CloudRedisProperties.java +++ b/service/src/main/java/com/ge/predix/acs/config/CloudRedisProperties.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.config; import org.springframework.core.env.Environment; diff --git a/service/src/main/java/com/ge/predix/acs/config/CommonRedisConfig.java b/service/src/main/java/com/ge/predix/acs/config/CommonRedisConfig.java index fca613da..e975d01e 100644 --- a/service/src/main/java/com/ge/predix/acs/config/CommonRedisConfig.java +++ b/service/src/main/java/com/ge/predix/acs/config/CommonRedisConfig.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.config; import org.slf4j.Logger; diff --git a/service/src/main/java/com/ge/predix/acs/config/EnvDataSourceConfig.java b/service/src/main/java/com/ge/predix/acs/config/EnvDataSourceConfig.java index 5bac7c44..53a20ec6 100644 --- a/service/src/main/java/com/ge/predix/acs/config/EnvDataSourceConfig.java +++ b/service/src/main/java/com/ge/predix/acs/config/EnvDataSourceConfig.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/config/GraphBeanDefinitionRegistryPostProcessor.java b/service/src/main/java/com/ge/predix/acs/config/GraphBeanDefinitionRegistryPostProcessor.java index e4682eb6..13d968ce 100644 --- a/service/src/main/java/com/ge/predix/acs/config/GraphBeanDefinitionRegistryPostProcessor.java +++ b/service/src/main/java/com/ge/predix/acs/config/GraphBeanDefinitionRegistryPostProcessor.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.config; import org.springframework.beans.factory.config.BeanDefinition; diff --git a/service/src/main/java/com/ge/predix/acs/config/GraphConfig.java b/service/src/main/java/com/ge/predix/acs/config/GraphConfig.java index 1ff88c2d..a1d07bdc 100644 --- a/service/src/main/java/com/ge/predix/acs/config/GraphConfig.java +++ b/service/src/main/java/com/ge/predix/acs/config/GraphConfig.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.config; import static com.ge.predix.acs.privilege.management.dao.GraphGenericRepository.PARENT_EDGE_LABEL; diff --git a/service/src/main/java/com/ge/predix/acs/config/InMemoryDataSourceConfig.java b/service/src/main/java/com/ge/predix/acs/config/InMemoryDataSourceConfig.java index 895c9359..4b590c46 100644 --- a/service/src/main/java/com/ge/predix/acs/config/InMemoryDataSourceConfig.java +++ b/service/src/main/java/com/ge/predix/acs/config/InMemoryDataSourceConfig.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/config/LocalRedisConnectionFactoryConfig.java b/service/src/main/java/com/ge/predix/acs/config/LocalRedisConnectionFactoryConfig.java index 017d549b..99902195 100644 --- a/service/src/main/java/com/ge/predix/acs/config/LocalRedisConnectionFactoryConfig.java +++ b/service/src/main/java/com/ge/predix/acs/config/LocalRedisConnectionFactoryConfig.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/config/LocalRedisProperties.java b/service/src/main/java/com/ge/predix/acs/config/LocalRedisProperties.java index be2c8044..b3d94eb4 100644 --- a/service/src/main/java/com/ge/predix/acs/config/LocalRedisProperties.java +++ b/service/src/main/java/com/ge/predix/acs/config/LocalRedisProperties.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.config; import org.springframework.core.env.Environment; diff --git a/service/src/main/java/com/ge/predix/acs/config/PolicyEvaluationCacheConfig.java b/service/src/main/java/com/ge/predix/acs/config/PolicyEvaluationCacheConfig.java index af3752d3..140ff246 100644 --- a/service/src/main/java/com/ge/predix/acs/config/PolicyEvaluationCacheConfig.java +++ b/service/src/main/java/com/ge/predix/acs/config/PolicyEvaluationCacheConfig.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.config; import java.util.Arrays; diff --git a/service/src/main/java/com/ge/predix/acs/config/UrlPathHelperNonDecoding.java b/service/src/main/java/com/ge/predix/acs/config/UrlPathHelperNonDecoding.java index 3e1e5a98..2a46adef 100644 --- a/service/src/main/java/com/ge/predix/acs/config/UrlPathHelperNonDecoding.java +++ b/service/src/main/java/com/ge/predix/acs/config/UrlPathHelperNonDecoding.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/config/metering/PredixAcsMeteringConfig.java b/service/src/main/java/com/ge/predix/acs/config/metering/PredixAcsMeteringConfig.java index 9f27c5e0..b6b66dfe 100644 --- a/service/src/main/java/com/ge/predix/acs/config/metering/PredixAcsMeteringConfig.java +++ b/service/src/main/java/com/ge/predix/acs/config/metering/PredixAcsMeteringConfig.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.config.metering; import org.springframework.context.annotation.Configuration; diff --git a/service/src/main/java/com/ge/predix/acs/config/monitoring/AcsMonitoringConfig.java b/service/src/main/java/com/ge/predix/acs/config/monitoring/AcsMonitoringConfig.java index 224e0e64..d983f68e 100644 --- a/service/src/main/java/com/ge/predix/acs/config/monitoring/AcsMonitoringConfig.java +++ b/service/src/main/java/com/ge/predix/acs/config/monitoring/AcsMonitoringConfig.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.config.monitoring; import org.springframework.context.annotation.Bean; diff --git a/service/src/main/java/com/ge/predix/acs/config/monitoring/PredixAcsMonitoringConfig.java b/service/src/main/java/com/ge/predix/acs/config/monitoring/PredixAcsMonitoringConfig.java index b29a91d0..d904be1c 100644 --- a/service/src/main/java/com/ge/predix/acs/config/monitoring/PredixAcsMonitoringConfig.java +++ b/service/src/main/java/com/ge/predix/acs/config/monitoring/PredixAcsMonitoringConfig.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.config.monitoring; import org.springframework.context.annotation.Bean; diff --git a/service/src/main/java/com/ge/predix/acs/config/tokenservice/ZacTokenServiceConfig.java b/service/src/main/java/com/ge/predix/acs/config/tokenservice/ZacTokenServiceConfig.java index c1ca070c..77e6e5ea 100644 --- a/service/src/main/java/com/ge/predix/acs/config/tokenservice/ZacTokenServiceConfig.java +++ b/service/src/main/java/com/ge/predix/acs/config/tokenservice/ZacTokenServiceConfig.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.config.tokenservice; import java.util.Arrays; diff --git a/service/src/main/java/com/ge/predix/acs/config/tokenservice/ZoneAwareTokenServiceConfig.java b/service/src/main/java/com/ge/predix/acs/config/tokenservice/ZoneAwareTokenServiceConfig.java index 120764f1..4459f385 100644 --- a/service/src/main/java/com/ge/predix/acs/config/tokenservice/ZoneAwareTokenServiceConfig.java +++ b/service/src/main/java/com/ge/predix/acs/config/tokenservice/ZoneAwareTokenServiceConfig.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.config.tokenservice; import java.util.Arrays; diff --git a/service/src/main/java/com/ge/predix/acs/encryption/DecryptionFailureException.java b/service/src/main/java/com/ge/predix/acs/encryption/DecryptionFailureException.java index db80e778..b83a516a 100644 --- a/service/src/main/java/com/ge/predix/acs/encryption/DecryptionFailureException.java +++ b/service/src/main/java/com/ge/predix/acs/encryption/DecryptionFailureException.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.encryption; @SuppressWarnings("serial") diff --git a/service/src/main/java/com/ge/predix/acs/encryption/EncryptionFailureException.java b/service/src/main/java/com/ge/predix/acs/encryption/EncryptionFailureException.java index 4bbad0eb..37f29c25 100644 --- a/service/src/main/java/com/ge/predix/acs/encryption/EncryptionFailureException.java +++ b/service/src/main/java/com/ge/predix/acs/encryption/EncryptionFailureException.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.encryption; @SuppressWarnings("serial") diff --git a/service/src/main/java/com/ge/predix/acs/encryption/Encryptor.java b/service/src/main/java/com/ge/predix/acs/encryption/Encryptor.java index b482e141..503d1194 100644 --- a/service/src/main/java/com/ge/predix/acs/encryption/Encryptor.java +++ b/service/src/main/java/com/ge/predix/acs/encryption/Encryptor.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.encryption; import java.security.SecureRandom; diff --git a/service/src/main/java/com/ge/predix/acs/encryption/SymmetricKeyValidationException.java b/service/src/main/java/com/ge/predix/acs/encryption/SymmetricKeyValidationException.java index 69a88668..4b1ab73a 100644 --- a/service/src/main/java/com/ge/predix/acs/encryption/SymmetricKeyValidationException.java +++ b/service/src/main/java/com/ge/predix/acs/encryption/SymmetricKeyValidationException.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.encryption; @SuppressWarnings("serial") diff --git a/service/src/main/java/com/ge/predix/acs/issuer/management/dao/IssuerEntity.java b/service/src/main/java/com/ge/predix/acs/issuer/management/dao/IssuerEntity.java index 7a2b87ee..8ec71437 100644 --- a/service/src/main/java/com/ge/predix/acs/issuer/management/dao/IssuerEntity.java +++ b/service/src/main/java/com/ge/predix/acs/issuer/management/dao/IssuerEntity.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/jmx/DataSourceMBean.java b/service/src/main/java/com/ge/predix/acs/jmx/DataSourceMBean.java index f4179316..b47f0411 100644 --- a/service/src/main/java/com/ge/predix/acs/jmx/DataSourceMBean.java +++ b/service/src/main/java/com/ge/predix/acs/jmx/DataSourceMBean.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.jmx; import java.util.HashMap; diff --git a/service/src/main/java/com/ge/predix/acs/monitoring/AbstractCacheHealthIndicator.java b/service/src/main/java/com/ge/predix/acs/monitoring/AbstractCacheHealthIndicator.java index e0b949b5..0e9cf6fc 100644 --- a/service/src/main/java/com/ge/predix/acs/monitoring/AbstractCacheHealthIndicator.java +++ b/service/src/main/java/com/ge/predix/acs/monitoring/AbstractCacheHealthIndicator.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.monitoring; import java.util.function.Supplier; diff --git a/service/src/main/java/com/ge/predix/acs/monitoring/AcsDbHealthIndicator.java b/service/src/main/java/com/ge/predix/acs/monitoring/AcsDbHealthIndicator.java index 19edf258..d1691cc5 100644 --- a/service/src/main/java/com/ge/predix/acs/monitoring/AcsDbHealthIndicator.java +++ b/service/src/main/java/com/ge/predix/acs/monitoring/AcsDbHealthIndicator.java @@ -1,18 +1,18 @@ -/* - * Copyright 2016 General Electric Company. +/******************************************************************************* + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - */ + *******************************************************************************/ package com.ge.predix.acs.monitoring; diff --git a/service/src/main/java/com/ge/predix/acs/monitoring/AcsHealthAggregator.java b/service/src/main/java/com/ge/predix/acs/monitoring/AcsHealthAggregator.java index 53a9e6fc..1706c530 100644 --- a/service/src/main/java/com/ge/predix/acs/monitoring/AcsHealthAggregator.java +++ b/service/src/main/java/com/ge/predix/acs/monitoring/AcsHealthAggregator.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.monitoring; import java.util.ArrayList; diff --git a/service/src/main/java/com/ge/predix/acs/monitoring/AcsMonitoringController.java b/service/src/main/java/com/ge/predix/acs/monitoring/AcsMonitoringController.java index 1af76f28..95b0acf4 100644 --- a/service/src/main/java/com/ge/predix/acs/monitoring/AcsMonitoringController.java +++ b/service/src/main/java/com/ge/predix/acs/monitoring/AcsMonitoringController.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/monitoring/AcsMonitoringRepository.java b/service/src/main/java/com/ge/predix/acs/monitoring/AcsMonitoringRepository.java index 67cd79d4..dcc86c88 100644 --- a/service/src/main/java/com/ge/predix/acs/monitoring/AcsMonitoringRepository.java +++ b/service/src/main/java/com/ge/predix/acs/monitoring/AcsMonitoringRepository.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/monitoring/AcsMonitoringUtilities.java b/service/src/main/java/com/ge/predix/acs/monitoring/AcsMonitoringUtilities.java index be3c2416..fc407b53 100644 --- a/service/src/main/java/com/ge/predix/acs/monitoring/AcsMonitoringUtilities.java +++ b/service/src/main/java/com/ge/predix/acs/monitoring/AcsMonitoringUtilities.java @@ -1,18 +1,18 @@ -/* - * Copyright 2016 General Electric Company. +/******************************************************************************* + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - */ + *******************************************************************************/ package com.ge.predix.acs.monitoring; diff --git a/service/src/main/java/com/ge/predix/acs/monitoring/CacheHealthIndicator.java b/service/src/main/java/com/ge/predix/acs/monitoring/CacheHealthIndicator.java index d1d76a2d..9bf44d2e 100644 --- a/service/src/main/java/com/ge/predix/acs/monitoring/CacheHealthIndicator.java +++ b/service/src/main/java/com/ge/predix/acs/monitoring/CacheHealthIndicator.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.monitoring; import org.springframework.boot.actuate.health.HealthIndicator; diff --git a/service/src/main/java/com/ge/predix/acs/monitoring/DecisionCacheHealthIndicator.java b/service/src/main/java/com/ge/predix/acs/monitoring/DecisionCacheHealthIndicator.java index c3289eae..091a30b9 100644 --- a/service/src/main/java/com/ge/predix/acs/monitoring/DecisionCacheHealthIndicator.java +++ b/service/src/main/java/com/ge/predix/acs/monitoring/DecisionCacheHealthIndicator.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.monitoring; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service/src/main/java/com/ge/predix/acs/monitoring/GraphDbHealthIndicator.java b/service/src/main/java/com/ge/predix/acs/monitoring/GraphDbHealthIndicator.java index ecdeddc7..f46d97c5 100644 --- a/service/src/main/java/com/ge/predix/acs/monitoring/GraphDbHealthIndicator.java +++ b/service/src/main/java/com/ge/predix/acs/monitoring/GraphDbHealthIndicator.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.monitoring; import org.slf4j.Logger; diff --git a/service/src/main/java/com/ge/predix/acs/monitoring/ManagementSecurityRoleFilter.java b/service/src/main/java/com/ge/predix/acs/monitoring/ManagementSecurityRoleFilter.java index 7666f163..51368f95 100644 --- a/service/src/main/java/com/ge/predix/acs/monitoring/ManagementSecurityRoleFilter.java +++ b/service/src/main/java/com/ge/predix/acs/monitoring/ManagementSecurityRoleFilter.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.monitoring; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/service/src/main/java/com/ge/predix/acs/monitoring/MonitoringHttpMethodsFilter.java b/service/src/main/java/com/ge/predix/acs/monitoring/MonitoringHttpMethodsFilter.java index b4212585..78bee121 100644 --- a/service/src/main/java/com/ge/predix/acs/monitoring/MonitoringHttpMethodsFilter.java +++ b/service/src/main/java/com/ge/predix/acs/monitoring/MonitoringHttpMethodsFilter.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.monitoring; import java.util.Arrays; diff --git a/service/src/main/java/com/ge/predix/acs/monitoring/ResourceCacheHealthIndicator.java b/service/src/main/java/com/ge/predix/acs/monitoring/ResourceCacheHealthIndicator.java index e1811200..9e16a716 100644 --- a/service/src/main/java/com/ge/predix/acs/monitoring/ResourceCacheHealthIndicator.java +++ b/service/src/main/java/com/ge/predix/acs/monitoring/ResourceCacheHealthIndicator.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.monitoring; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service/src/main/java/com/ge/predix/acs/monitoring/SubjectCacheHealthIndicator.java b/service/src/main/java/com/ge/predix/acs/monitoring/SubjectCacheHealthIndicator.java index a2be202a..ff4d8b57 100644 --- a/service/src/main/java/com/ge/predix/acs/monitoring/SubjectCacheHealthIndicator.java +++ b/service/src/main/java/com/ge/predix/acs/monitoring/SubjectCacheHealthIndicator.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.monitoring; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service/src/main/java/com/ge/predix/acs/monitoring/UaaHealthIndicator.java b/service/src/main/java/com/ge/predix/acs/monitoring/UaaHealthIndicator.java index c4102222..7b47e046 100644 --- a/service/src/main/java/com/ge/predix/acs/monitoring/UaaHealthIndicator.java +++ b/service/src/main/java/com/ge/predix/acs/monitoring/UaaHealthIndicator.java @@ -1,18 +1,18 @@ -/* - * Copyright 2016 General Electric Company. +/******************************************************************************* + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - */ + *******************************************************************************/ package com.ge.predix.acs.monitoring; diff --git a/service/src/main/java/com/ge/predix/acs/monitoring/ZacHealthIndicator.java b/service/src/main/java/com/ge/predix/acs/monitoring/ZacHealthIndicator.java index 397cd731..655ba412 100644 --- a/service/src/main/java/com/ge/predix/acs/monitoring/ZacHealthIndicator.java +++ b/service/src/main/java/com/ge/predix/acs/monitoring/ZacHealthIndicator.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.monitoring; import org.codehaus.jackson.JsonNode; diff --git a/service/src/main/java/com/ge/predix/acs/policy/evaluation/cache/AbstractPolicyEvaluationCache.java b/service/src/main/java/com/ge/predix/acs/policy/evaluation/cache/AbstractPolicyEvaluationCache.java index 9cd5c97c..a8a26957 100644 --- a/service/src/main/java/com/ge/predix/acs/policy/evaluation/cache/AbstractPolicyEvaluationCache.java +++ b/service/src/main/java/com/ge/predix/acs/policy/evaluation/cache/AbstractPolicyEvaluationCache.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/policy/evaluation/cache/InMemoryPolicyEvaluationCache.java b/service/src/main/java/com/ge/predix/acs/policy/evaluation/cache/InMemoryPolicyEvaluationCache.java index e6c3972c..d3c8f8a2 100644 --- a/service/src/main/java/com/ge/predix/acs/policy/evaluation/cache/InMemoryPolicyEvaluationCache.java +++ b/service/src/main/java/com/ge/predix/acs/policy/evaluation/cache/InMemoryPolicyEvaluationCache.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/policy/evaluation/cache/NonCachingPolicyEvaluationCache.java b/service/src/main/java/com/ge/predix/acs/policy/evaluation/cache/NonCachingPolicyEvaluationCache.java index 97f68821..605503a5 100644 --- a/service/src/main/java/com/ge/predix/acs/policy/evaluation/cache/NonCachingPolicyEvaluationCache.java +++ b/service/src/main/java/com/ge/predix/acs/policy/evaluation/cache/NonCachingPolicyEvaluationCache.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.policy.evaluation.cache; import java.util.List; diff --git a/service/src/main/java/com/ge/predix/acs/policy/evaluation/cache/PolicyEvaluationCache.java b/service/src/main/java/com/ge/predix/acs/policy/evaluation/cache/PolicyEvaluationCache.java index eadfc9f0..66788c1d 100644 --- a/service/src/main/java/com/ge/predix/acs/policy/evaluation/cache/PolicyEvaluationCache.java +++ b/service/src/main/java/com/ge/predix/acs/policy/evaluation/cache/PolicyEvaluationCache.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/policy/evaluation/cache/PolicyEvaluationRequestCacheKey.java b/service/src/main/java/com/ge/predix/acs/policy/evaluation/cache/PolicyEvaluationRequestCacheKey.java index bb078973..5535d096 100644 --- a/service/src/main/java/com/ge/predix/acs/policy/evaluation/cache/PolicyEvaluationRequestCacheKey.java +++ b/service/src/main/java/com/ge/predix/acs/policy/evaluation/cache/PolicyEvaluationRequestCacheKey.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/policy/evaluation/cache/RedisPolicyEvaluationCache.java b/service/src/main/java/com/ge/predix/acs/policy/evaluation/cache/RedisPolicyEvaluationCache.java index 08b9bd88..b2b869e6 100644 --- a/service/src/main/java/com/ge/predix/acs/policy/evaluation/cache/RedisPolicyEvaluationCache.java +++ b/service/src/main/java/com/ge/predix/acs/policy/evaluation/cache/RedisPolicyEvaluationCache.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/EntityManagementControllerAdvice.java b/service/src/main/java/com/ge/predix/acs/privilege/management/EntityManagementControllerAdvice.java index c9dc8e95..cb8abe40 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/EntityManagementControllerAdvice.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/EntityManagementControllerAdvice.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.privilege.management; import org.json.simple.JSONObject; diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/PrivilegeConverter.java b/service/src/main/java/com/ge/predix/acs/privilege/management/PrivilegeConverter.java index 8ec3fa8d..f5a6014f 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/PrivilegeConverter.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/PrivilegeConverter.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/PrivilegeManagementException.java b/service/src/main/java/com/ge/predix/acs/privilege/management/PrivilegeManagementException.java index f8d058e5..30328f33 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/PrivilegeManagementException.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/PrivilegeManagementException.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/PrivilegeManagementService.java b/service/src/main/java/com/ge/predix/acs/privilege/management/PrivilegeManagementService.java index 0f6222dc..db9ec21d 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/PrivilegeManagementService.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/PrivilegeManagementService.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/PrivilegeManagementServiceImpl.java b/service/src/main/java/com/ge/predix/acs/privilege/management/PrivilegeManagementServiceImpl.java index 97e6ffdc..d4883d33 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/PrivilegeManagementServiceImpl.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/PrivilegeManagementServiceImpl.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/PrivilegeManagementUtility.java b/service/src/main/java/com/ge/predix/acs/privilege/management/PrivilegeManagementUtility.java index 98a15f9f..92fa7ac8 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/PrivilegeManagementUtility.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/PrivilegeManagementUtility.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.privilege.management; public final class PrivilegeManagementUtility { diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/ResourceHttpMethodsFilter.java b/service/src/main/java/com/ge/predix/acs/privilege/management/ResourceHttpMethodsFilter.java index 34041050..98a65b5c 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/ResourceHttpMethodsFilter.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/ResourceHttpMethodsFilter.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.privilege.management; import java.util.Arrays; diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/ResourcePrivilegeManagementController.java b/service/src/main/java/com/ge/predix/acs/privilege/management/ResourcePrivilegeManagementController.java index 1d41ac3b..c5dfb923 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/ResourcePrivilegeManagementController.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/ResourcePrivilegeManagementController.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/SubjectHttpMethodsFilter.java b/service/src/main/java/com/ge/predix/acs/privilege/management/SubjectHttpMethodsFilter.java index 6f543500..84c929f5 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/SubjectHttpMethodsFilter.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/SubjectHttpMethodsFilter.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.privilege.management; import java.util.Arrays; diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/SubjectPrivilegeManagementController.java b/service/src/main/java/com/ge/predix/acs/privilege/management/SubjectPrivilegeManagementController.java index 5cd5df9b..a0891e5e 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/SubjectPrivilegeManagementController.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/SubjectPrivilegeManagementController.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.privilege.management; import static com.ge.predix.acs.commons.web.AcsApiUriTemplates.SUBJECTS_URL; diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/ZoneDoesNotExistException.java b/service/src/main/java/com/ge/predix/acs/privilege/management/ZoneDoesNotExistException.java index 19770431..0673c621 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/ZoneDoesNotExistException.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/ZoneDoesNotExistException.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.privilege.management; public class ZoneDoesNotExistException extends RuntimeException { diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/AttributeLimitExceededException.java b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/AttributeLimitExceededException.java index e3d39161..faa40c90 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/AttributeLimitExceededException.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/AttributeLimitExceededException.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.privilege.management.dao; public class AttributeLimitExceededException extends RuntimeException { diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/AttributePredicate.java b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/AttributePredicate.java index bfd89ef1..ed7d8552 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/AttributePredicate.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/AttributePredicate.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.privilege.management.dao; import java.util.Set; diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/GraphGenericRepository.java b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/GraphGenericRepository.java index 3e200165..c993d5e6 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/GraphGenericRepository.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/GraphGenericRepository.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.privilege.management.dao; import static com.ge.predix.acs.privilege.management.dao.AttributePredicate.elementOf; diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/GraphResourceRepository.java b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/GraphResourceRepository.java index 61c51d17..f9c0122d 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/GraphResourceRepository.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/GraphResourceRepository.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.privilege.management.dao; import java.util.Collections; diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/GraphSubjectRepository.java b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/GraphSubjectRepository.java index 17051bbb..0c496d46 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/GraphSubjectRepository.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/GraphSubjectRepository.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.privilege.management.dao; import java.util.Collections; diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ParentEntity.java b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ParentEntity.java index 5ab5d01c..16fe7fa0 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ParentEntity.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ParentEntity.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.privilege.management.dao; import java.util.Set; diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ResourceEntity.java b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ResourceEntity.java index bd935acc..2ef7e96a 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ResourceEntity.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ResourceEntity.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ResourceHierarchicalRepository.java b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ResourceHierarchicalRepository.java index da4d3a8a..d40551e2 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ResourceHierarchicalRepository.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ResourceHierarchicalRepository.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.privilege.management.dao; import com.ge.predix.acs.zone.management.dao.ZoneEntity; diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ResourceMigrationManager.java b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ResourceMigrationManager.java index e9edf18f..d7f84868 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ResourceMigrationManager.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ResourceMigrationManager.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.privilege.management.dao; import java.util.List; diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ResourceRepository.java b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ResourceRepository.java index 91c91b95..879a97f0 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ResourceRepository.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ResourceRepository.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ResourceRepositoryProxy.java b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ResourceRepositoryProxy.java index f7a73d10..afdc0f09 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ResourceRepositoryProxy.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ResourceRepositoryProxy.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.privilege.management.dao; import java.util.Arrays; diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/SubjectEntity.java b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/SubjectEntity.java index 2f6cd400..e2ed1cdb 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/SubjectEntity.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/SubjectEntity.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/SubjectHierarchicalRepository.java b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/SubjectHierarchicalRepository.java index afbdc1d6..cfdad968 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/SubjectHierarchicalRepository.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/SubjectHierarchicalRepository.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.privilege.management.dao; import com.ge.predix.acs.model.Attribute; diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/SubjectMigrationManager.java b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/SubjectMigrationManager.java index b471699d..36e36c8c 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/SubjectMigrationManager.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/SubjectMigrationManager.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.privilege.management.dao; import java.util.List; diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/SubjectRepository.java b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/SubjectRepository.java index 6bdb503f..fd8c67e2 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/SubjectRepository.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/SubjectRepository.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/SubjectRepositoryProxy.java b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/SubjectRepositoryProxy.java index af2f0ca3..099f8723 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/SubjectRepositoryProxy.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/SubjectRepositoryProxy.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.privilege.management.dao; import java.util.Arrays; diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/TitanMigrationManager.java b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/TitanMigrationManager.java index 238e5924..97f4ac05 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/TitanMigrationManager.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/TitanMigrationManager.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.privilege.management.dao; import org.slf4j.Logger; diff --git a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ZonableEntity.java b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ZonableEntity.java index 714d4307..1a3bce04 100644 --- a/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ZonableEntity.java +++ b/service/src/main/java/com/ge/predix/acs/privilege/management/dao/ZonableEntity.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.privilege.management.dao; import com.ge.predix.acs.model.Attribute; diff --git a/service/src/main/java/com/ge/predix/acs/request/context/AcsRequestContext.java b/service/src/main/java/com/ge/predix/acs/request/context/AcsRequestContext.java index 7fd44a6b..87a07921 100644 --- a/service/src/main/java/com/ge/predix/acs/request/context/AcsRequestContext.java +++ b/service/src/main/java/com/ge/predix/acs/request/context/AcsRequestContext.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.request.context; import java.util.Map; diff --git a/service/src/main/java/com/ge/predix/acs/request/context/AcsRequestContextHolder.java b/service/src/main/java/com/ge/predix/acs/request/context/AcsRequestContextHolder.java index 74c3e0ae..90dd45ed 100644 --- a/service/src/main/java/com/ge/predix/acs/request/context/AcsRequestContextHolder.java +++ b/service/src/main/java/com/ge/predix/acs/request/context/AcsRequestContextHolder.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.request.context; import java.util.Collections; diff --git a/service/src/main/java/com/ge/predix/acs/request/context/AcsRequestEnrichingFilter.java b/service/src/main/java/com/ge/predix/acs/request/context/AcsRequestEnrichingFilter.java index eb23168b..490bc63b 100644 --- a/service/src/main/java/com/ge/predix/acs/request/context/AcsRequestEnrichingFilter.java +++ b/service/src/main/java/com/ge/predix/acs/request/context/AcsRequestEnrichingFilter.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.request.context; import java.io.IOException; diff --git a/service/src/main/java/com/ge/predix/acs/security/AbstractHttpMethodsFilter.java b/service/src/main/java/com/ge/predix/acs/security/AbstractHttpMethodsFilter.java index c45efb3d..555033f7 100644 --- a/service/src/main/java/com/ge/predix/acs/security/AbstractHttpMethodsFilter.java +++ b/service/src/main/java/com/ge/predix/acs/security/AbstractHttpMethodsFilter.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.security; import java.io.IOException; diff --git a/service/src/main/java/com/ge/predix/acs/security/EmptyHttpMethodsFilter.java b/service/src/main/java/com/ge/predix/acs/security/EmptyHttpMethodsFilter.java index cb61e6d3..640e8ee0 100644 --- a/service/src/main/java/com/ge/predix/acs/security/EmptyHttpMethodsFilter.java +++ b/service/src/main/java/com/ge/predix/acs/security/EmptyHttpMethodsFilter.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.security; import java.io.IOException; diff --git a/service/src/main/java/com/ge/predix/acs/security/NoAuthenticationEntryPoint.java b/service/src/main/java/com/ge/predix/acs/security/NoAuthenticationEntryPoint.java index 30f51460..92417837 100644 --- a/service/src/main/java/com/ge/predix/acs/security/NoAuthenticationEntryPoint.java +++ b/service/src/main/java/com/ge/predix/acs/security/NoAuthenticationEntryPoint.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.security; import java.io.IOException; diff --git a/service/src/main/java/com/ge/predix/acs/service/InvalidACSRequestException.java b/service/src/main/java/com/ge/predix/acs/service/InvalidACSRequestException.java index 349f9a42..8716b50f 100644 --- a/service/src/main/java/com/ge/predix/acs/service/InvalidACSRequestException.java +++ b/service/src/main/java/com/ge/predix/acs/service/InvalidACSRequestException.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/service/policy/admin/PolicyHttpMethodsFilter.java b/service/src/main/java/com/ge/predix/acs/service/policy/admin/PolicyHttpMethodsFilter.java index a3e53067..f126a2dd 100644 --- a/service/src/main/java/com/ge/predix/acs/service/policy/admin/PolicyHttpMethodsFilter.java +++ b/service/src/main/java/com/ge/predix/acs/service/policy/admin/PolicyHttpMethodsFilter.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.service.policy.admin; import java.util.Arrays; diff --git a/service/src/main/java/com/ge/predix/acs/service/policy/admin/PolicyManagementController.java b/service/src/main/java/com/ge/predix/acs/service/policy/admin/PolicyManagementController.java index f3d2a193..b68fe4a1 100644 --- a/service/src/main/java/com/ge/predix/acs/service/policy/admin/PolicyManagementController.java +++ b/service/src/main/java/com/ge/predix/acs/service/policy/admin/PolicyManagementController.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/service/policy/admin/PolicyManagementException.java b/service/src/main/java/com/ge/predix/acs/service/policy/admin/PolicyManagementException.java index 2fd079bb..584ae786 100644 --- a/service/src/main/java/com/ge/predix/acs/service/policy/admin/PolicyManagementException.java +++ b/service/src/main/java/com/ge/predix/acs/service/policy/admin/PolicyManagementException.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/service/policy/admin/PolicyManagementService.java b/service/src/main/java/com/ge/predix/acs/service/policy/admin/PolicyManagementService.java index a6079af8..11fafc5c 100644 --- a/service/src/main/java/com/ge/predix/acs/service/policy/admin/PolicyManagementService.java +++ b/service/src/main/java/com/ge/predix/acs/service/policy/admin/PolicyManagementService.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/service/policy/admin/PolicyManagementServiceImpl.java b/service/src/main/java/com/ge/predix/acs/service/policy/admin/PolicyManagementServiceImpl.java index 691dc5a8..cde69d5b 100644 --- a/service/src/main/java/com/ge/predix/acs/service/policy/admin/PolicyManagementServiceImpl.java +++ b/service/src/main/java/com/ge/predix/acs/service/policy/admin/PolicyManagementServiceImpl.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/service/policy/admin/dao/PolicySetEntity.java b/service/src/main/java/com/ge/predix/acs/service/policy/admin/dao/PolicySetEntity.java index 6b7a2472..1f43d241 100644 --- a/service/src/main/java/com/ge/predix/acs/service/policy/admin/dao/PolicySetEntity.java +++ b/service/src/main/java/com/ge/predix/acs/service/policy/admin/dao/PolicySetEntity.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/service/policy/admin/dao/PolicySetRepository.java b/service/src/main/java/com/ge/predix/acs/service/policy/admin/dao/PolicySetRepository.java index f96edee7..f933c7f5 100644 --- a/service/src/main/java/com/ge/predix/acs/service/policy/admin/dao/PolicySetRepository.java +++ b/service/src/main/java/com/ge/predix/acs/service/policy/admin/dao/PolicySetRepository.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/AttributesHandler.java b/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/AttributesHandler.java index 82897705..dc47bd83 100644 --- a/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/AttributesHandler.java +++ b/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/AttributesHandler.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/EvaluationHttpMethodsFilter.java b/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/EvaluationHttpMethodsFilter.java index 68377f40..a1813133 100644 --- a/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/EvaluationHttpMethodsFilter.java +++ b/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/EvaluationHttpMethodsFilter.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.service.policy.evaluation; import java.util.Collections; diff --git a/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/MatchedPolicy.java b/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/MatchedPolicy.java index fddab8cd..21df6674 100644 --- a/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/MatchedPolicy.java +++ b/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/MatchedPolicy.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.service.policy.evaluation; import java.util.Set; diff --git a/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/PolicyEvaluation.java b/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/PolicyEvaluation.java index 828b25e7..1aeec21b 100644 --- a/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/PolicyEvaluation.java +++ b/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/PolicyEvaluation.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.service.policy.evaluation; import org.springframework.http.ResponseEntity; diff --git a/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/PolicyEvaluationController.java b/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/PolicyEvaluationController.java index e98c989e..59ac4d2e 100644 --- a/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/PolicyEvaluationController.java +++ b/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/PolicyEvaluationController.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.service.policy.evaluation; import static com.ge.predix.acs.commons.web.AcsApiUriTemplates.POLICY_EVALUATION_URL; diff --git a/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/PolicyEvaluationException.java b/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/PolicyEvaluationException.java index 0b819c6b..6d661477 100644 --- a/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/PolicyEvaluationException.java +++ b/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/PolicyEvaluationException.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.service.policy.evaluation; public class PolicyEvaluationException extends RuntimeException { diff --git a/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/PolicyEvaluationService.java b/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/PolicyEvaluationService.java index 812af230..97780365 100644 --- a/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/PolicyEvaluationService.java +++ b/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/PolicyEvaluationService.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.service.policy.evaluation; import com.ge.predix.acs.rest.PolicyEvaluationRequestV1; diff --git a/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/PolicyEvaluationServiceImpl.java b/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/PolicyEvaluationServiceImpl.java index 2aaa7d6a..916b77f9 100644 --- a/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/PolicyEvaluationServiceImpl.java +++ b/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/PolicyEvaluationServiceImpl.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.service.policy.evaluation; import java.util.ArrayList; diff --git a/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/ResourceAttributeResolver.java b/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/ResourceAttributeResolver.java index 6981ad3e..d627b359 100644 --- a/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/ResourceAttributeResolver.java +++ b/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/ResourceAttributeResolver.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.service.policy.evaluation; import java.util.Collections; diff --git a/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/SubjectAttributeResolver.java b/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/SubjectAttributeResolver.java index b3a606e2..abeb8e51 100644 --- a/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/SubjectAttributeResolver.java +++ b/service/src/main/java/com/ge/predix/acs/service/policy/evaluation/SubjectAttributeResolver.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.service.policy.evaluation; import java.util.Collections; diff --git a/service/src/main/java/com/ge/predix/acs/service/policy/matcher/MatchResult.java b/service/src/main/java/com/ge/predix/acs/service/policy/matcher/MatchResult.java index 5cb02aac..fbd611e2 100644 --- a/service/src/main/java/com/ge/predix/acs/service/policy/matcher/MatchResult.java +++ b/service/src/main/java/com/ge/predix/acs/service/policy/matcher/MatchResult.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.service.policy.matcher; import java.util.List; diff --git a/service/src/main/java/com/ge/predix/acs/service/policy/matcher/PolicyMatchCandidate.java b/service/src/main/java/com/ge/predix/acs/service/policy/matcher/PolicyMatchCandidate.java index b0321550..55909fe3 100644 --- a/service/src/main/java/com/ge/predix/acs/service/policy/matcher/PolicyMatchCandidate.java +++ b/service/src/main/java/com/ge/predix/acs/service/policy/matcher/PolicyMatchCandidate.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/service/policy/matcher/PolicyMatcher.java b/service/src/main/java/com/ge/predix/acs/service/policy/matcher/PolicyMatcher.java index 93af83ca..ead400b2 100644 --- a/service/src/main/java/com/ge/predix/acs/service/policy/matcher/PolicyMatcher.java +++ b/service/src/main/java/com/ge/predix/acs/service/policy/matcher/PolicyMatcher.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/service/policy/matcher/PolicyMatcherImpl.java b/service/src/main/java/com/ge/predix/acs/service/policy/matcher/PolicyMatcherImpl.java index 4d90ffa0..605d598a 100644 --- a/service/src/main/java/com/ge/predix/acs/service/policy/matcher/PolicyMatcherImpl.java +++ b/service/src/main/java/com/ge/predix/acs/service/policy/matcher/PolicyMatcherImpl.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/service/policy/matcher/UriTemplateVariableResolver.java b/service/src/main/java/com/ge/predix/acs/service/policy/matcher/UriTemplateVariableResolver.java index c1bd77e0..9f4a6ec8 100644 --- a/service/src/main/java/com/ge/predix/acs/service/policy/matcher/UriTemplateVariableResolver.java +++ b/service/src/main/java/com/ge/predix/acs/service/policy/matcher/UriTemplateVariableResolver.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.service.policy.matcher; import java.util.Map; diff --git a/service/src/main/java/com/ge/predix/acs/service/policy/validation/PolicySetValidationException.java b/service/src/main/java/com/ge/predix/acs/service/policy/validation/PolicySetValidationException.java index 51ef4af3..282d8a6c 100644 --- a/service/src/main/java/com/ge/predix/acs/service/policy/validation/PolicySetValidationException.java +++ b/service/src/main/java/com/ge/predix/acs/service/policy/validation/PolicySetValidationException.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/service/policy/validation/PolicySetValidator.java b/service/src/main/java/com/ge/predix/acs/service/policy/validation/PolicySetValidator.java index 5047a363..234147c8 100644 --- a/service/src/main/java/com/ge/predix/acs/service/policy/validation/PolicySetValidator.java +++ b/service/src/main/java/com/ge/predix/acs/service/policy/validation/PolicySetValidator.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/service/policy/validation/PolicySetValidatorImpl.java b/service/src/main/java/com/ge/predix/acs/service/policy/validation/PolicySetValidatorImpl.java index a593311a..df475d7d 100644 --- a/service/src/main/java/com/ge/predix/acs/service/policy/validation/PolicySetValidatorImpl.java +++ b/service/src/main/java/com/ge/predix/acs/service/policy/validation/PolicySetValidatorImpl.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/zone/management/ZoneController.java b/service/src/main/java/com/ge/predix/acs/zone/management/ZoneController.java index f94210a8..6245455c 100644 --- a/service/src/main/java/com/ge/predix/acs/zone/management/ZoneController.java +++ b/service/src/main/java/com/ge/predix/acs/zone/management/ZoneController.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/zone/management/ZoneHttpMethodsFilter.java b/service/src/main/java/com/ge/predix/acs/zone/management/ZoneHttpMethodsFilter.java index 6d6094d2..c629395a 100644 --- a/service/src/main/java/com/ge/predix/acs/zone/management/ZoneHttpMethodsFilter.java +++ b/service/src/main/java/com/ge/predix/acs/zone/management/ZoneHttpMethodsFilter.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright 2017 General Electric Company + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *******************************************************************************/ + package com.ge.predix.acs.zone.management; import java.util.Arrays; diff --git a/service/src/main/java/com/ge/predix/acs/zone/management/ZoneManagementException.java b/service/src/main/java/com/ge/predix/acs/zone/management/ZoneManagementException.java index b502c618..82c40eb8 100644 --- a/service/src/main/java/com/ge/predix/acs/zone/management/ZoneManagementException.java +++ b/service/src/main/java/com/ge/predix/acs/zone/management/ZoneManagementException.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.zone.management; public class ZoneManagementException extends RuntimeException { diff --git a/service/src/main/java/com/ge/predix/acs/zone/management/ZoneService.java b/service/src/main/java/com/ge/predix/acs/zone/management/ZoneService.java index 9be01c49..26c189f8 100644 --- a/service/src/main/java/com/ge/predix/acs/zone/management/ZoneService.java +++ b/service/src/main/java/com/ge/predix/acs/zone/management/ZoneService.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/zone/management/ZoneServiceImpl.java b/service/src/main/java/com/ge/predix/acs/zone/management/ZoneServiceImpl.java index 30ee9ffb..14451633 100644 --- a/service/src/main/java/com/ge/predix/acs/zone/management/ZoneServiceImpl.java +++ b/service/src/main/java/com/ge/predix/acs/zone/management/ZoneServiceImpl.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/zone/management/dao/ZoneClientEntity.java b/service/src/main/java/com/ge/predix/acs/zone/management/dao/ZoneClientEntity.java index c455bb07..2bc81597 100644 --- a/service/src/main/java/com/ge/predix/acs/zone/management/dao/ZoneClientEntity.java +++ b/service/src/main/java/com/ge/predix/acs/zone/management/dao/ZoneClientEntity.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.zone.management.dao; import javax.persistence.Column; diff --git a/service/src/main/java/com/ge/predix/acs/zone/management/dao/ZoneConverter.java b/service/src/main/java/com/ge/predix/acs/zone/management/dao/ZoneConverter.java index 8721fd7b..31a27a5c 100644 --- a/service/src/main/java/com/ge/predix/acs/zone/management/dao/ZoneConverter.java +++ b/service/src/main/java/com/ge/predix/acs/zone/management/dao/ZoneConverter.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/service/src/main/java/com/ge/predix/acs/zone/management/dao/ZoneEntity.java b/service/src/main/java/com/ge/predix/acs/zone/management/dao/ZoneEntity.java index fa41503f..cfccf411 100644 --- a/service/src/main/java/com/ge/predix/acs/zone/management/dao/ZoneEntity.java +++ b/service/src/main/java/com/ge/predix/acs/zone/management/dao/ZoneEntity.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.zone.management.dao; import java.io.IOException; diff --git a/service/src/main/java/com/ge/predix/acs/zone/management/dao/ZoneRepository.java b/service/src/main/java/com/ge/predix/acs/zone/management/dao/ZoneRepository.java index 47710b06..f3132a23 100644 --- a/service/src/main/java/com/ge/predix/acs/zone/management/dao/ZoneRepository.java +++ b/service/src/main/java/com/ge/predix/acs/zone/management/dao/ZoneRepository.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.zone.management.dao; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/service/src/main/java/com/ge/predix/acs/zone/resolver/SpringSecurityZoneResolver.java b/service/src/main/java/com/ge/predix/acs/zone/resolver/SpringSecurityZoneResolver.java index 8920cb29..f0382291 100644 --- a/service/src/main/java/com/ge/predix/acs/zone/resolver/SpringSecurityZoneResolver.java +++ b/service/src/main/java/com/ge/predix/acs/zone/resolver/SpringSecurityZoneResolver.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.zone.resolver; import com.ge.predix.acs.privilege.management.ZoneDoesNotExistException; diff --git a/service/src/main/java/com/ge/predix/acs/zone/resolver/ZoneResolver.java b/service/src/main/java/com/ge/predix/acs/zone/resolver/ZoneResolver.java index b7192fe6..dd322529 100644 --- a/service/src/main/java/com/ge/predix/acs/zone/resolver/ZoneResolver.java +++ b/service/src/main/java/com/ge/predix/acs/zone/resolver/ZoneResolver.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package com.ge.predix.acs.zone.resolver; import com.ge.predix.acs.zone.management.dao.ZoneEntity; diff --git a/service/src/main/java/db/postgres/PolicySetRowMapper.java b/service/src/main/java/db/postgres/PolicySetRowMapper.java index 28c6228b..2e5a030b 100644 --- a/service/src/main/java/db/postgres/PolicySetRowMapper.java +++ b/service/src/main/java/db/postgres/PolicySetRowMapper.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package db.postgres; import java.sql.ResultSet; diff --git a/service/src/main/java/db/postgres/ResourceRowMapper.java b/service/src/main/java/db/postgres/ResourceRowMapper.java index 440b37cd..ab965b49 100644 --- a/service/src/main/java/db/postgres/ResourceRowMapper.java +++ b/service/src/main/java/db/postgres/ResourceRowMapper.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package db.postgres; import java.sql.ResultSet; diff --git a/service/src/main/java/db/postgres/SubjectRowMapper.java b/service/src/main/java/db/postgres/SubjectRowMapper.java index 1f6a8743..6faed7f6 100644 --- a/service/src/main/java/db/postgres/SubjectRowMapper.java +++ b/service/src/main/java/db/postgres/SubjectRowMapper.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package db.postgres; import java.sql.ResultSet; diff --git a/service/src/main/java/db/postgres/V2_0_1__InitializeIdentityZones.java b/service/src/main/java/db/postgres/V2_0_1__InitializeIdentityZones.java index 7135306e..cf2180c9 100644 --- a/service/src/main/java/db/postgres/V2_0_1__InitializeIdentityZones.java +++ b/service/src/main/java/db/postgres/V2_0_1__InitializeIdentityZones.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package db.postgres; import java.sql.Connection; diff --git a/service/src/main/java/db/postgres/ZoneClientRowMapper.java b/service/src/main/java/db/postgres/ZoneClientRowMapper.java index ec844c5a..41fcc891 100644 --- a/service/src/main/java/db/postgres/ZoneClientRowMapper.java +++ b/service/src/main/java/db/postgres/ZoneClientRowMapper.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright 2016 General Electric Company. + * Copyright 2017 General Electric Company * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ + package db.postgres; import java.sql.ResultSet; diff --git a/service/src/main/resources/META-INF/persistence.xml b/service/src/main/resources/META-INF/persistence.xml index e8deb798..eece6f7e 100644 --- a/service/src/main/resources/META-INF/persistence.xml +++ b/service/src/main/resources/META-INF/persistence.xml @@ -1,18 +1,19 @@ - + + - + diff --git a/service/src/main/resources/log4j.xml b/service/src/main/resources/log4j.xml index 0c367adf..ebe74c9f 100644 --- a/service/src/main/resources/log4j.xml +++ b/service/src/main/resources/log4j.xml @@ -1,19 +1,21 @@ - - + diff --git a/service/src/main/resources/security-config.xml b/service/src/main/resources/security-config.xml index 7193fadd..b410637d 100644 --- a/service/src/main/resources/security-config.xml +++ b/service/src/main/resources/security-config.xml @@ -1,18 +1,19 @@ - + @@ -29,7 +30,7 @@ --> - + diff --git a/service/src/test/resources/unit-tests.xml b/service/src/test/resources/unit-tests.xml index 1a58ad1e..4bebe8b2 100644 --- a/service/src/test/resources/unit-tests.xml +++ b/service/src/test/resources/unit-tests.xml @@ -1,18 +1,19 @@ + diff --git a/service/start-acs-postgres-predix-titan.sh b/service/start-acs-postgres-predix-titan.sh index 688f3ae2..1e13dcf0 100755 --- a/service/start-acs-postgres-predix-titan.sh +++ b/service/start-acs-postgres-predix-titan.sh @@ -1,20 +1,20 @@ -#!/usr/bin/env bash - -#******************************************************************************* -# Copyright 2016 General Electric Company. +################################################################################ +# Copyright 2017 General Electric Company # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -#******************************************************************************* +################################################################################ + +#!/usr/bin/env bash # This script will run ACS against a local PostgreSQL database. To setup the database: # 1. Install PostgreSQL diff --git a/service/start-acs-postgres-predix.sh b/service/start-acs-postgres-predix.sh index 09308b7b..d87bc135 100755 --- a/service/start-acs-postgres-predix.sh +++ b/service/start-acs-postgres-predix.sh @@ -1,20 +1,20 @@ -#!/usr/bin/env bash - -#******************************************************************************* -# Copyright 2016 General Electric Company. +################################################################################ +# Copyright 2017 General Electric Company # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -#******************************************************************************* +################################################################################ + +#!/usr/bin/env bash # This script will run ACS against a local PostgreSQL database. To setup the database: # 1. Install PostgreSQL diff --git a/service/start-acs-postgres.sh b/service/start-acs-postgres.sh index 48514e96..8411b4d2 100755 --- a/service/start-acs-postgres.sh +++ b/service/start-acs-postgres.sh @@ -1,20 +1,20 @@ -#!/usr/bin/env bash - -#******************************************************************************* -# Copyright 2016 General Electric Company. +################################################################################ +# Copyright 2017 General Electric Company # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -#******************************************************************************* +################################################################################ + +#!/usr/bin/env bash # This script will run ACS against a local PostgreSQL database. To setup the database: # 1. Install PostgreSQL diff --git a/service/start-acs-predix-titan.sh b/service/start-acs-predix-titan.sh index 7156a23a..03a82034 100755 --- a/service/start-acs-predix-titan.sh +++ b/service/start-acs-predix-titan.sh @@ -1,20 +1,20 @@ -#!/usr/bin/env bash - -#******************************************************************************* -# Copyright 2016 General Electric Company. +################################################################################ +# Copyright 2017 General Electric Company # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -#******************************************************************************* +################################################################################ + +#!/usr/bin/env bash if [[ -z "$SPRING_PROFILES_ACTIVE" ]]; then export SPRING_PROFILES_ACTIVE='h2,predix,simple-cache,titan' diff --git a/service/start-acs-predix.sh b/service/start-acs-predix.sh index 07b5d37e..37335df1 100755 --- a/service/start-acs-predix.sh +++ b/service/start-acs-predix.sh @@ -1,20 +1,20 @@ -#!/usr/bin/env bash - -#******************************************************************************* -# Copyright 2016 General Electric Company. +################################################################################ +# Copyright 2017 General Electric Company # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -#******************************************************************************* +################################################################################ + +#!/usr/bin/env bash if [[ -z "$SPRING_PROFILES_ACTIVE" ]]; then export SPRING_PROFILES_ACTIVE='h2,predix,simple-cache' diff --git a/service/start-acs-public-titan.sh b/service/start-acs-public-titan.sh index 9e87852d..93825fbd 100755 --- a/service/start-acs-public-titan.sh +++ b/service/start-acs-public-titan.sh @@ -1,20 +1,20 @@ -#!/usr/bin/env bash - -#******************************************************************************* -# Copyright 2016 General Electric Company. +################################################################################ +# Copyright 2017 General Electric Company # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -#******************************************************************************* +################################################################################ + +#!/usr/bin/env bash unset PROXY_OPTS diff --git a/service/start-acs-public.sh b/service/start-acs-public.sh index 1ca48c1b..3a248b1c 100755 --- a/service/start-acs-public.sh +++ b/service/start-acs-public.sh @@ -1,20 +1,20 @@ -#!/usr/bin/env bash - -#******************************************************************************* -# Copyright 2016 General Electric Company. +################################################################################ +# Copyright 2017 General Electric Company # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -#******************************************************************************* +################################################################################ + +#!/usr/bin/env bash unset PROXY_OPTS diff --git a/service/start-acs.sh b/service/start-acs.sh index 7d393616..956162b3 100755 --- a/service/start-acs.sh +++ b/service/start-acs.sh @@ -1,20 +1,20 @@ -#!/usr/bin/env bash - -#******************************************************************************* -# Copyright 2016 General Electric Company. +################################################################################ +# Copyright 2017 General Electric Company # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -#******************************************************************************* +################################################################################ + +#!/usr/bin/env bash HTTP_VALIDATION_SPRING_PROFILE='httpValidation' if [[ -z "$SPRING_PROFILES_ACTIVE" ]]; then diff --git a/set-env-local.sh b/set-env-local.sh old mode 100644 new mode 100755 index b9ba795a..d28138a3 --- a/set-env-local.sh +++ b/set-env-local.sh @@ -1,3 +1,19 @@ +################################################################################ +# Copyright 2017 General Electric Company +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +################################################################################ + #!/usr/bin/env bash export PORT_OFFSET=${PORT_OFFSET:-0} diff --git a/utils/acs-create-inital-clients.sh b/utils/acs-create-inital-clients.sh index 6e5817bd..69ea82be 100755 --- a/utils/acs-create-inital-clients.sh +++ b/utils/acs-create-inital-clients.sh @@ -1,3 +1,19 @@ +################################################################################ +# Copyright 2017 General Electric Company +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +################################################################################ + CF_OUTPUT=$(cf t) if [[ $CF_OUTPUT == *"Not logged in"* ]]; then diff --git a/utils/pretty-print-cf-logs.sh b/utils/pretty-print-cf-logs.sh index afaf4f6c..98ca7cd4 100755 --- a/utils/pretty-print-cf-logs.sh +++ b/utils/pretty-print-cf-logs.sh @@ -1,3 +1,19 @@ +################################################################################ +# Copyright 2017 General Electric Company +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +################################################################################ + #!/usr/bin/env bash unset SHOW_ROUTER_LOGS diff --git a/versioning.sh b/versioning.sh index 5c3eafaa..f4d3dd4a 100755 --- a/versioning.sh +++ b/versioning.sh @@ -1,3 +1,19 @@ +################################################################################ +# Copyright 2017 General Electric Company +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +################################################################################ + #!/usr/bin/env bash set -ex