diff options
Diffstat (limited to 'champ-service')
22 files changed, 118 insertions, 93 deletions
diff --git a/champ-service/License.txt b/champ-service/License.txt index 469f362..714bbd4 100644 --- a/champ-service/License.txt +++ b/champ-service/License.txt @@ -1,14 +1,14 @@ ============LICENSE_START========================================== org.onap.aai =================================================================== -Copyright © 2017 AT&T Intellectual Property. All rights reserved. -Copyright © 2017 Amdocs +Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. +Copyright © 2017-2018 Amdocs =================================================================== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this 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, @@ -16,6 +16,6 @@ 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. ============LICENSE_END============================================ -ECOMP is a trademark and service mark of AT&T Intellectual Property. + diff --git a/champ-service/pom.xml b/champ-service/pom.xml index c5c90f4..b0dbf46 100644 --- a/champ-service/pom.xml +++ b/champ-service/pom.xml @@ -1,4 +1,23 @@ -<?xml version="1.0" encoding="UTF-8"?> +<!-- +============LICENSE_START======================================================= +org.onap.aai +================================================================================ +Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. +Copyright © 2017-2018 Amdocs +================================================================================ +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this 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. +============LICENSE_END========================================================= +--> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> @@ -13,6 +32,7 @@ <groupId>org.onap.aai</groupId> <artifactId>champ-service</artifactId> <version>1.2.0-SNAPSHOT</version> + <name>champ</name> <properties> <runAjscHome>${basedir}/target/swm/package/nix/dist_files${distFilesRoot}</runAjscHome> @@ -30,6 +50,9 @@ <common.logging.groupid>org.onap.aai.logging-service</common.logging.groupid> <common.logging.version>1.2.2</common.logging.version> <org.apache.httpcomponents.httpclient.version>4.5.2</org.apache.httpcomponents.httpclient.version> + + <docker.location>${basedir}/target</docker.location> + <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> </properties> <dependencies> @@ -39,13 +62,13 @@ <version>1.18.6</version> </dependency> - <!-- AJSC Dependencies --> <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> <version>1.6.1</version> <scope>provided</scope> </dependency> + <dependency> <groupId>com.att.aft</groupId> <artifactId>dme2</artifactId> @@ -53,7 +76,6 @@ <scope>provided</scope> </dependency> - <!--Adding this dependency explicit.--> <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> @@ -102,7 +124,6 @@ <version>${org.apache.httpcomponents.httpclient.version}</version> </dependency> - <!-- Champ graph database library. --> <dependency> <groupId>org.onap.aai</groupId> <artifactId>champ-core</artifactId> @@ -117,6 +138,19 @@ </dependency> </dependencies> + <distributionManagement> + <repository> + <id>ecomp-releases</id> + <name>ECOMP Release Repository</name> + <url>${onap.nexus.url}/content/repositories/releases/</url> + </repository> + <snapshotRepository> + <id>ecomp-snapshots</id> + <name>ECOMP Snapshot Repository</name> + <url>${onap.nexus.url}/content/repositories/snapshots/</url> + </snapshotRepository> + </distributionManagement> + <build> <finalName>${project.artifactId}</finalName> <plugins> @@ -145,12 +179,25 @@ <resource> <directory>${basedir}/src/main/bin/</directory> </resource> + <resource> + <directory>../champ-service-deps-janus/target/</directory> + </resource> + <resource> + <directory>../champ-service-deps-titan/target/</directory> + </resource> </resources> </configuration> </execution> </executions> </plugin> - + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <!-- <plugin> <groupId>com.mycila</groupId> <artifactId>license-maven-plugin</artifactId> @@ -170,7 +217,7 @@ </execution> </executions> </plugin> - + --> <plugin> <groupId>com.spotify</groupId> <artifactId>docker-maven-plugin</artifactId> @@ -178,7 +225,7 @@ <configuration> <verbose>true</verbose> <serverId>docker-hub</serverId> - <imageName>${docker.push.registry}/onap/${project.artifactId}</imageName> + <imageName>${docker.push.registry}/onap/${project.name}</imageName> <dockerDirectory>${docker.location}</dockerDirectory> <imageTags> <imageTag>latest</imageTag> @@ -186,7 +233,6 @@ <forceTags>true</forceTags> </configuration> </plugin> - <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> diff --git a/champ-service/src/main/java/org/onap/champ/ChampRESTAPI.java b/champ-service/src/main/java/org/onap/champ/ChampRESTAPI.java index 577dbc9..b75ba53 100644 --- a/champ-service/src/main/java/org/onap/champ/ChampRESTAPI.java +++ b/champ-service/src/main/java/org/onap/champ/ChampRESTAPI.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -17,7 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END============================================ - * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.onap.champ; diff --git a/champ-service/src/main/java/org/onap/champ/async/ChampAsyncRequestProcessor.java b/champ-service/src/main/java/org/onap/champ/async/ChampAsyncRequestProcessor.java index ed25f8c..610cac9 100644 --- a/champ-service/src/main/java/org/onap/champ/async/ChampAsyncRequestProcessor.java +++ b/champ-service/src/main/java/org/onap/champ/async/ChampAsyncRequestProcessor.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -17,7 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END============================================ - * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.onap.champ.async; diff --git a/champ-service/src/main/java/org/onap/champ/async/ChampAsyncResponsePublisher.java b/champ-service/src/main/java/org/onap/champ/async/ChampAsyncResponsePublisher.java index 515ed9e..a9560b0 100644 --- a/champ-service/src/main/java/org/onap/champ/async/ChampAsyncResponsePublisher.java +++ b/champ-service/src/main/java/org/onap/champ/async/ChampAsyncResponsePublisher.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -17,7 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END============================================ - * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.onap.champ.async; diff --git a/champ-service/src/main/java/org/onap/champ/entity/ChampObjectDeserializer.java b/champ-service/src/main/java/org/onap/champ/entity/ChampObjectDeserializer.java index cee7763..00e1d1b 100644 --- a/champ-service/src/main/java/org/onap/champ/entity/ChampObjectDeserializer.java +++ b/champ-service/src/main/java/org/onap/champ/entity/ChampObjectDeserializer.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -17,7 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END============================================ - * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.onap.champ.entity; diff --git a/champ-service/src/main/java/org/onap/champ/entity/ChampObjectSerializer.java b/champ-service/src/main/java/org/onap/champ/entity/ChampObjectSerializer.java index c43b6bf..9c578e0 100644 --- a/champ-service/src/main/java/org/onap/champ/entity/ChampObjectSerializer.java +++ b/champ-service/src/main/java/org/onap/champ/entity/ChampObjectSerializer.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -17,7 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END============================================ - * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.onap.champ.entity; diff --git a/champ-service/src/main/java/org/onap/champ/entity/ChampRelationshipDeserializer.java b/champ-service/src/main/java/org/onap/champ/entity/ChampRelationshipDeserializer.java index 63b9e0c..f47aa24 100644 --- a/champ-service/src/main/java/org/onap/champ/entity/ChampRelationshipDeserializer.java +++ b/champ-service/src/main/java/org/onap/champ/entity/ChampRelationshipDeserializer.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -17,7 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END============================================ - * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.onap.champ.entity; diff --git a/champ-service/src/main/java/org/onap/champ/entity/ChampRelationshipSerializer.java b/champ-service/src/main/java/org/onap/champ/entity/ChampRelationshipSerializer.java index 5d21aa5..e1db596 100644 --- a/champ-service/src/main/java/org/onap/champ/entity/ChampRelationshipSerializer.java +++ b/champ-service/src/main/java/org/onap/champ/entity/ChampRelationshipSerializer.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -17,7 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END============================================ - * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.onap.champ.entity; diff --git a/champ-service/src/main/java/org/onap/champ/event/GraphEvent.java b/champ-service/src/main/java/org/onap/champ/event/GraphEvent.java index be199a2..cf2f11d 100644 --- a/champ-service/src/main/java/org/onap/champ/event/GraphEvent.java +++ b/champ-service/src/main/java/org/onap/champ/event/GraphEvent.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -17,7 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END============================================ - * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.onap.champ.event; diff --git a/champ-service/src/main/java/org/onap/champ/event/GraphEventEdge.java b/champ-service/src/main/java/org/onap/champ/event/GraphEventEdge.java index 13809c1..d6b737f 100644 --- a/champ-service/src/main/java/org/onap/champ/event/GraphEventEdge.java +++ b/champ-service/src/main/java/org/onap/champ/event/GraphEventEdge.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -17,7 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END============================================ - * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.onap.champ.event; diff --git a/champ-service/src/main/java/org/onap/champ/event/GraphEventVertex.java b/champ-service/src/main/java/org/onap/champ/event/GraphEventVertex.java index b738dc0..cc4f493 100644 --- a/champ-service/src/main/java/org/onap/champ/event/GraphEventVertex.java +++ b/champ-service/src/main/java/org/onap/champ/event/GraphEventVertex.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -17,7 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END============================================ - * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.onap.champ.event; diff --git a/champ-service/src/main/java/org/onap/champ/exception/ChampServiceException.java b/champ-service/src/main/java/org/onap/champ/exception/ChampServiceException.java index c861bfe..c39bdb1 100644 --- a/champ-service/src/main/java/org/onap/champ/exception/ChampServiceException.java +++ b/champ-service/src/main/java/org/onap/champ/exception/ChampServiceException.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -17,7 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END============================================ - * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.onap.champ.exception; diff --git a/champ-service/src/main/java/org/onap/champ/service/ChampDataService.java b/champ-service/src/main/java/org/onap/champ/service/ChampDataService.java index b9b758b..8432a8d 100644 --- a/champ-service/src/main/java/org/onap/champ/service/ChampDataService.java +++ b/champ-service/src/main/java/org/onap/champ/service/ChampDataService.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -17,7 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END============================================ - * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.onap.champ.service; diff --git a/champ-service/src/main/java/org/onap/champ/service/ChampThreadFactory.java b/champ-service/src/main/java/org/onap/champ/service/ChampThreadFactory.java index 1e4a0b2..4194a9f 100644 --- a/champ-service/src/main/java/org/onap/champ/service/ChampThreadFactory.java +++ b/champ-service/src/main/java/org/onap/champ/service/ChampThreadFactory.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -17,7 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END============================================ - * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.onap.champ.service; diff --git a/champ-service/src/main/java/org/onap/champ/service/ChampTransactionCache.java b/champ-service/src/main/java/org/onap/champ/service/ChampTransactionCache.java index 897ee97..9dc7233 100644 --- a/champ-service/src/main/java/org/onap/champ/service/ChampTransactionCache.java +++ b/champ-service/src/main/java/org/onap/champ/service/ChampTransactionCache.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -17,9 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END============================================ - * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - package org.onap.champ.service; import java.util.concurrent.TimeUnit; diff --git a/champ-service/src/main/java/org/onap/champ/service/ChampUUIDService.java b/champ-service/src/main/java/org/onap/champ/service/ChampUUIDService.java index b1354c5..0001610 100644 --- a/champ-service/src/main/java/org/onap/champ/service/ChampUUIDService.java +++ b/champ-service/src/main/java/org/onap/champ/service/ChampUUIDService.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -17,7 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END============================================ - * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.onap.champ.service; diff --git a/champ-service/src/main/java/org/onap/champ/service/EchoService.java b/champ-service/src/main/java/org/onap/champ/service/EchoService.java index c8236b1..d30cc5f 100644 --- a/champ-service/src/main/java/org/onap/champ/service/EchoService.java +++ b/champ-service/src/main/java/org/onap/champ/service/EchoService.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -17,7 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END============================================ - * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.onap.champ.service; diff --git a/champ-service/src/main/java/org/onap/champ/service/logging/ChampMsgs.java b/champ-service/src/main/java/org/onap/champ/service/logging/ChampMsgs.java index 2ddbff4..89ec994 100644 --- a/champ-service/src/main/java/org/onap/champ/service/logging/ChampMsgs.java +++ b/champ-service/src/main/java/org/onap/champ/service/logging/ChampMsgs.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -17,7 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END============================================ - * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.onap.champ.service.logging; diff --git a/champ-service/src/main/java/org/onap/champ/service/logging/LoggingUtil.java b/champ-service/src/main/java/org/onap/champ/service/logging/LoggingUtil.java index 0f7f2d0..9463f2c 100644 --- a/champ-service/src/main/java/org/onap/champ/service/logging/LoggingUtil.java +++ b/champ-service/src/main/java/org/onap/champ/service/logging/LoggingUtil.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -17,7 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END============================================ - * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.onap.champ.service.logging; diff --git a/champ-service/src/main/java/org/onap/champ/util/ChampProperties.java b/champ-service/src/main/java/org/onap/champ/util/ChampProperties.java index f2fd6a2..ef9f534 100644 --- a/champ-service/src/main/java/org/onap/champ/util/ChampProperties.java +++ b/champ-service/src/main/java/org/onap/champ/util/ChampProperties.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -17,7 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END============================================ - * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.onap.champ.util; diff --git a/champ-service/src/main/java/org/onap/champ/util/ChampServiceConstants.java b/champ-service/src/main/java/org/onap/champ/util/ChampServiceConstants.java index 92d3350..9c9ac12 100644 --- a/champ-service/src/main/java/org/onap/champ/util/ChampServiceConstants.java +++ b/champ-service/src/main/java/org/onap/champ/util/ChampServiceConstants.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -17,7 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END============================================ - * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.onap.champ.util; |