diff options
17 files changed, 91 insertions, 144 deletions
@@ -25,7 +25,7 @@ <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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.openecomp.aai</groupId> + <groupId>org.onap.aai</groupId> <artifactId>sparky-fe</artifactId> <packaging>war</packaging> <version>1.0.0-SNAPSHOT</version> @@ -104,7 +104,7 @@ </plugin> </plugins> </build> - + <distributionManagement> <repository> <id>ecomp-releases</id> diff --git a/pom_license.xml b/pom_license.xml index 40bf42b..b07678c 100644 --- a/pom_license.xml +++ b/pom_license.xml @@ -35,7 +35,7 @@ </dependencies> <properties> - <nexusproxy>${nexusTarget}</nexusproxy> + <nexusproxy>${nexusTarget}</nexusproxy> </properties> @@ -43,39 +43,51 @@ <plugins> <!-- license plugin --> - <plugin> - <groupId>com.mycila</groupId> - <artifactId>license-maven-plugin</artifactId> - <version>3.0</version> + <plugin> + <groupId>com.mycila</groupId> + <artifactId>license-maven-plugin</artifactId> + <version>3.0</version> - <configuration> - <header>LICENSE</header> + <configuration> + <header>LICENSE</header> <excludes> <exclude>resources/scss/bootstrap/**</exclude> <exclude>resources/scss/bootstrap-cust/**</exclude> + <exclude>.idea/**</exclude> + <exclude>dist/**</exclude> + <exclude>node_modules/**</exclude> + <exclude>.npmrc/**</exclude> + <exclude>test/coverage/**</exclude> + <exclude>.vscode/**</exclude> + <exclude>node/**</exclude> + <exclude>target/**</exclude> </excludes> - <includes> - <include>src/**/*.js</include> + <includes> + <include>src/**/*.js</include> <include>src/**/*.jsx</include> <include>src/**/*.html</include> + <include>test/**/*.js</include> + <include>test/**/*.jsx</include> + <include>test/**/*.html</include> + <include>tools/**/*.js</include> <include>*.js</include> <include>*.xml</include> <include>resources/scss/**/*.scss</include> - </includes> + </includes> <mapping> <JSX>SLASHSTAR_STYLE</JSX> <SCSS>JAVADOC_STYLE</SCSS> </mapping> - </configuration> - <executions> - <execution> - <goals> - <goal>format</goal> - </goals> - <phase>process-sources</phase> - </execution> - </executions> - </plugin> + </configuration> + <executions> + <execution> + <goals> + <goal>format</goal> + </goals> + <phase>process-sources</phase> + </execution> + </executions> + </plugin> </plugins> </build> diff --git a/src/app/GlobalInlineMessageBar/GlobalInlineMessageBar.jsx b/src/app/GlobalInlineMessageBar/GlobalInlineMessageBar.jsx index 076b328..3b2c7da 100644 --- a/src/app/GlobalInlineMessageBar/GlobalInlineMessageBar.jsx +++ b/src/app/GlobalInlineMessageBar/GlobalInlineMessageBar.jsx @@ -20,30 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -/* - * ============LICENSE_START=================================================== - * SPARKY (AAI UI service) - * ============================================================================ - * Copyright © 2017 AT&T Intellectual Property. - * Copyright © 2017 Amdocs - * All rights reserved. - * ============================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this 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===================================================== - * - * ECOMP and OpenECOMP are trademarks - * and service marks of AT&T Intellectual Property. - */ + import {connect} from 'react-redux'; import React, {Component} from 'react'; diff --git a/test/components/dateRange.test.js b/test/components/dateRange.test.js index 07ae2b5..d142624 100644 --- a/test/components/dateRange.test.js +++ b/test/components/dateRange.test.js @@ -1,16 +1,15 @@ /* * ============LICENSE_START======================================================= - * SPARKY (AAI UI service) + * org.onap.aai * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. * Copyright © 2017 Amdocs - * All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -19,10 +18,8 @@ * limitations under the License. * ============LICENSE_END========================================================= * - * ECOMP and OpenECOMP are trademarks - * and service marks of AT&T Intellectual Property. + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - import React from 'react'; import TestUtils from 'react-dom/lib/ReactTestUtils'; import {Provider} from 'react-redux'; diff --git a/test/components/dateRangeSelector.test.js b/test/components/dateRangeSelector.test.js index e78de48..fd578b1 100644 --- a/test/components/dateRangeSelector.test.js +++ b/test/components/dateRangeSelector.test.js @@ -1,16 +1,15 @@ /* * ============LICENSE_START======================================================= - * SPARKY (AAI UI service) + * org.onap.aai * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. * Copyright © 2017 Amdocs - * All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -19,10 +18,8 @@ * limitations under the License. * ============LICENSE_END========================================================= * - * ECOMP and OpenECOMP are trademarks - * and service marks of AT&T Intellectual Property. + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - import React from "react"; import TestUtils from "react-dom/lib/ReactTestUtils"; import {Provider} from "react-redux"; diff --git a/test/components/inlineMessage.test.js b/test/components/inlineMessage.test.js index 4bfd1a4..1e31295 100644 --- a/test/components/inlineMessage.test.js +++ b/test/components/inlineMessage.test.js @@ -1,16 +1,15 @@ /* * ============LICENSE_START======================================================= - * SPARKY (AAI UI service) + * org.onap.aai * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. * Copyright © 2017 Amdocs - * All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -19,10 +18,8 @@ * limitations under the License. * ============LICENSE_END========================================================= * - * ECOMP and OpenECOMP are trademarks - * and service marks of AT&T Intellectual Property. + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - import { expect } from 'chai'; import React from 'react'; import TestUtils from 'react-dom/lib/ReactTestUtils'; diff --git a/test/components/notificationReducer.test.js b/test/components/notificationReducer.test.js index 37d5c94..7a2d1ee 100644 --- a/test/components/notificationReducer.test.js +++ b/test/components/notificationReducer.test.js @@ -1,16 +1,15 @@ /* * ============LICENSE_START======================================================= - * SPARKY (AAI UI service) + * org.onap.aai * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. * Copyright © 2017 Amdocs - * All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -19,10 +18,8 @@ * limitations under the License. * ============LICENSE_END========================================================= * - * ECOMP and OpenECOMP are trademarks - * and service marks of AT&T Intellectual Property. + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - import { expect } from 'chai'; import NotificationConstants from 'generic-components/notifications/NotificationConstants.js'; import reducer from 'generic-components/notifications/NotificationReducer.js'; diff --git a/test/components/toggleButtonGroupReducer.test.js b/test/components/toggleButtonGroupReducer.test.js index d5ce6f9..864ac7e 100644 --- a/test/components/toggleButtonGroupReducer.test.js +++ b/test/components/toggleButtonGroupReducer.test.js @@ -1,16 +1,15 @@ /* * ============LICENSE_START======================================================= - * SPARKY (AAI UI service) + * org.onap.aai * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. * Copyright © 2017 Amdocs - * All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -19,10 +18,8 @@ * limitations under the License. * ============LICENSE_END========================================================= * - * ECOMP and OpenECOMP are trademarks - * and service marks of AT&T Intellectual Property. + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - import { expect } from 'chai'; import {BUTTON_TOGGLED} from 'generic-components/toggleButtonGroup/ToggleButtonGroupConstants.js'; import reducer from 'generic-components/toggleButtonGroup/ToggleButtonGroupReducer.js'; diff --git a/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBar.test.js b/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBar.test.js index d56c44b..d95977d 100644 --- a/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBar.test.js +++ b/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBar.test.js @@ -1,16 +1,15 @@ /* * ============LICENSE_START======================================================= - * SPARKY (AAI UI service) + * org.onap.aai * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. * Copyright © 2017 Amdocs - * All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -19,10 +18,8 @@ * limitations under the License. * ============LICENSE_END========================================================= * - * ECOMP and OpenECOMP are trademarks - * and service marks of AT&T Intellectual Property. + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - import {expect, deep} from 'chai'; import React from 'react'; import {Provider} from 'react-redux'; diff --git a/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBarActions.test.js b/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBarActions.test.js index 13cfd63..0b03dbf 100644 --- a/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBarActions.test.js +++ b/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBarActions.test.js @@ -1,16 +1,15 @@ /* * ============LICENSE_START======================================================= - * SPARKY (AAI UI service) + * org.onap.aai * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. * Copyright © 2017 Amdocs - * All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -19,10 +18,8 @@ * limitations under the License. * ============LICENSE_END========================================================= * - * ECOMP and OpenECOMP are trademarks - * and service marks of AT&T Intellectual Property. + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - import {expect, deep} from "chai"; import React from "react"; import {Provider} from "react-redux"; diff --git a/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBarReducer.test.js b/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBarReducer.test.js index f3f1c19..89b17e9 100644 --- a/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBarReducer.test.js +++ b/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBarReducer.test.js @@ -1,16 +1,15 @@ /*
* ============LICENSE_START=======================================================
- * SPARKY (AAI UI service)
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this 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,
@@ -19,10 +18,8 @@ * limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-
import {expect} from 'chai';
import React from 'react';
import {Provider} from 'react-redux';
diff --git a/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBarTestConstants.js b/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBarTestConstants.js index f8fd893..daf8bb1 100644 --- a/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBarTestConstants.js +++ b/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBarTestConstants.js @@ -1,16 +1,15 @@ /* * ============LICENSE_START======================================================= - * SPARKY (AAI UI service) + * org.onap.aai * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. * Copyright © 2017 Amdocs - * All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -19,10 +18,8 @@ * limitations under the License. * ============LICENSE_END========================================================= * - * ECOMP and OpenECOMP are trademarks - * and service marks of AT&T Intellectual Property. + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - const validResponseJsonForRequestFromFetchWithHitsType1 = { "took": 5, "timed_out": false, diff --git a/test/tierSupport/tierSupport.test.js b/test/tierSupport/tierSupport.test.js index b7ec343..8535a06 100644 --- a/test/tierSupport/tierSupport.test.js +++ b/test/tierSupport/tierSupport.test.js @@ -1,16 +1,15 @@ /*
* ============LICENSE_START=======================================================
- * SPARKY (AAI UI service)
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* Copyright © 2017 Amdocs
- * All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this 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,
@@ -19,10 +18,8 @@ * limitations under the License.
* ============LICENSE_END=========================================================
*
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-
import React from 'react';
import {Provider} from 'react-redux';
diff --git a/test/utils/MockRest.js b/test/utils/MockRest.js index f40b120..6d99633 100644 --- a/test/utils/MockRest.js +++ b/test/utils/MockRest.js @@ -1,16 +1,15 @@ /* * ============LICENSE_START======================================================= - * SPARKY (AAI UI service) + * org.onap.aai * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. * Copyright © 2017 Amdocs - * All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -19,10 +18,8 @@ * limitations under the License. * ============LICENSE_END========================================================= * - * ECOMP and OpenECOMP are trademarks - * and service marks of AT&T Intellectual Property. + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - const queue = { fetch: [], put: [], diff --git a/test/vnfSearch/vnfSearchVisualizations/vnfSearchVisualizations.test.js b/test/vnfSearch/vnfSearchVisualizations/vnfSearchVisualizations.test.js index 0905d35..c3aeb91 100644 --- a/test/vnfSearch/vnfSearchVisualizations/vnfSearchVisualizations.test.js +++ b/test/vnfSearch/vnfSearchVisualizations/vnfSearchVisualizations.test.js @@ -1,16 +1,15 @@ /* * ============LICENSE_START======================================================= - * SPARKY (AAI UI service) + * org.onap.aai * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. * Copyright © 2017 Amdocs - * All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -19,10 +18,8 @@ * limitations under the License. * ============LICENSE_END========================================================= * - * ECOMP and OpenECOMP are trademarks - * and service marks of AT&T Intellectual Property. + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - import React from 'react'; import TestUtils from 'react-dom/lib/ReactTestUtils'; import {storeCreator} from 'app/AppStore.js'; diff --git a/test/vnfSearch/vnfSearchVisualizations/vnfSearchVisualizationsReducer.test.js b/test/vnfSearch/vnfSearchVisualizations/vnfSearchVisualizationsReducer.test.js index e146f11..325daf9 100644 --- a/test/vnfSearch/vnfSearchVisualizations/vnfSearchVisualizationsReducer.test.js +++ b/test/vnfSearch/vnfSearchVisualizations/vnfSearchVisualizationsReducer.test.js @@ -1,16 +1,15 @@ /* * ============LICENSE_START======================================================= - * SPARKY (AAI UI service) + * org.onap.aai * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. * Copyright © 2017 Amdocs - * All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -19,10 +18,8 @@ * limitations under the License. * ============LICENSE_END========================================================= * - * ECOMP and OpenECOMP are trademarks - * and service marks of AT&T Intellectual Property. + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - import React from 'react'; import { expect } from 'chai'; import reducer from 'app/vnfSearch/vnfSearchVisualizations/VnfSearchVisualizationsReducer.js'; diff --git a/tools/webpack/config-json-loader/index.js b/tools/webpack/config-json-loader/index.js index d7d6317..7c7369a 100644 --- a/tools/webpack/config-json-loader/index.js +++ b/tools/webpack/config-json-loader/index.js @@ -1,16 +1,15 @@ /* * ============LICENSE_START======================================================= - * SPARKY (AAI UI service) + * org.onap.aai * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. * Copyright © 2017 Amdocs - * All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this 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, @@ -19,10 +18,8 @@ * limitations under the License. * ============LICENSE_END========================================================= * - * ECOMP and OpenECOMP are trademarks - * and service marks of AT&T Intellectual Property. + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ - module.exports = function(content) { var config = JSON.parse(content); var build = process.env.BUILD_NUMBER || '0'; |