Relicensing a few files from EPL to Apache License 54/73554/6
authorDhruv Bhardwaj <db929a@@att.com>
Mon, 18 Jun 2018 03:44:47 +0000 (23:44 -0400)
committerguillaume.lambert <guillaume.lambert@orange.com>
Wed, 18 Jul 2018 14:50:24 +0000 (16:50 +0200)
Honeynode resused some files under EPL that come from a previous
testtool development. This commit relicenses those files.
FD.io honeycomb project uses the Apache License contrary to ODL.
EPL headers in honeynode generated checkstyle errors during build phase.

Change-Id: I76b02475146866e3c44802274069bdcc680c931f
Signed-off-by: Dhruv Bhardwaj <db929a@att.com>
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
tests/build.sh
tests/honeynode/fd_io_honeycomb_settings.xml [new file with mode: 0644]
tests/honeynode/honeynode-common/pom.xml
tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/AbstractDataObjectConverter.java
tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/JSONDataObjectConverter.java
tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/XMLDataObjectConverter.java
tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/api/DataObjectConverter.java
tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContext.java
tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContextImpl.java
tests/honeynode/honeynode-plugin-impl/pom.xml

index a9118397bdcacd310516322288cb4b24540497ca..8bacbf413c06de4b2b0d5d75a7d52dc25f22aacf 100755 (executable)
@@ -17,9 +17,8 @@ rm -rf netconf mdsal && git submodule update --init
 
 (cd netconf/netconf/tools/netconf-testtool &&  mvn clean install -DskipTests)
 #Honeynode build
-(cd honeynode && mvn clean install -Dcheckstyle.skip -DskipTests)
+(cd honeynode && mvn clean install -DskipTests -s fd_io_honeycomb_settings.xml)
 chmod +x ./honeynode/honeynode-distribution/target/honeynode-distribution-1.18.01-hc/honeynode-distribution-1.18.01/honeycomb-tpce
->>>>>>> 196dd32... Honeynode test tool
 rm -rf schemas && mkdir -p schemas
 #sample config for ordm 2.x are not yet ready
 #cp -r ../ordmodels/common/src/main/yang/org-openroadm-* schemas
diff --git a/tests/honeynode/fd_io_honeycomb_settings.xml b/tests/honeynode/fd_io_honeycomb_settings.xml
new file mode 100644 (file)
index 0000000..7e9c54c
--- /dev/null
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=2 tabstop=2: -->
+<!-- retrived from FD.io wiki https://wiki.fd.io/view/Honeycomb/Releases/1609/Setting_Up_Your_Dev_Environment#Setup_settings.xml -->
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+  <profiles>
+    <profile>
+      <id>fd.io-release</id>
+      <repositories>
+        <repository>
+          <id>fd.io-mirror</id>
+          <name>fd.io-mirror</name>
+          <url>https://nexus.fd.io/content/groups/public/</url>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>fd.io-mirror</id>
+          <name>fd.io-mirror</name>
+          <url>https://nexus.fd.io/content/repositories/public/</url>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+
+    <profile>
+      <id>fd.io-snapshots</id>
+      <repositories>
+        <repository>
+          <id>fd.io-snapshot</id>
+          <name>fd.io-snapshot</name>
+          <url>https://nexus.fd.io/content/repositories/fd.io.snapshot/</url>
+          <releases>
+            <enabled>false</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>fd.io-snapshot</id>
+          <name>fd.io-snapshot</name>
+          <url>https://nexus.fd.io/content/repositories/fd.io.snapshot/</url>
+          <releases>
+            <enabled>false</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+    <profile>
+      <id>opendaylight-snapshots</id>
+      <repositories>
+        <repository>
+          <id>opendaylight-snapshot</id>
+          <name>opendaylight-snapshot</name>
+          <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
+          <releases>
+            <enabled>false</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>opendaylight-shapshot</id>
+          <name>opendaylight-snapshot</name>
+          <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
+          <releases>
+            <enabled>false</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+  </profiles>
+
+  <activeProfiles>
+    <activeProfile>fd.io-release</activeProfile>
+    <activeProfile>fd.io-snapshots</activeProfile>
+    <activeProfile>opendaylight-snapshots</activeProfile>
+  </activeProfiles>
+
+</settings>
index 31d8fc842f3b6b4bba7149514e5c2583ce6593e3..78ed93281cb59b0a691863588ba745e9c2960fae 100644 (file)
@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!-- Copyright © 2017 Orange and others. All rights reserved. This program and the accompanying materials 
-    are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, 
-    and is available at http://www.eclipse.org/legal/epl-v10.html Author: Martial Coulibaly <martial.coulibaly@gfi.com> 
-    on behalf of Orange -->
+<!--
+Copyright (c) 2018 Orange and others.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+You may not use this 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.
+-->
 <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">
     <modelVersion>4.0.0</modelVersion>
@@ -28,7 +35,7 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>
index 8808891584c80612965a05687354098dfc15580e..2493df11067005b559c7f2ae8c82984bfbb7e218 100644 (file)
@@ -1,9 +1,17 @@
 /*
- * Copyright © 2016 AT&T and others.  All rights reserved.
+ * Copyright (c) 2018 AT&T and/or its affiliates.
  *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this 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 io.fd.honeycomb.transportpce.binding.converter;
 
index b878cfa255f03ef011adf93ba993a68e84abc5e2..fc0d74e70a5e934b6df8c0340c01510ca5ed8f2a 100644 (file)
@@ -1,9 +1,17 @@
 /*
- * Copyright © 2016 AT&T and others.  All rights reserved.
+ * Copyright (c) 2018 AT&T and/or its affiliates.
  *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this 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 io.fd.honeycomb.transportpce.binding.converter;
 
index 3a95b833ba1e94173b6fcf0d1e7f14ba80db9d11..70c45dca27419adbb76cbb6a0e6db9c8d775c2b9 100644 (file)
@@ -1,9 +1,17 @@
 /*
- * Copyright © 2016 AT&T and others. All rights reserved.
+ * Copyright (c) 2018 AT&T and/or its affiliates.
  *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this 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 io.fd.honeycomb.transportpce.binding.converter;
 
index 0c3a56cac77787c4a650b597b7aa5728b3f204bd..1de88573390906fbae2fe9d59a680d1692b29322 100644 (file)
@@ -1,9 +1,17 @@
 /*
- * Copyright © 2016 AT&T and others.  All rights reserved.
+ * Copyright (c) 2018 AT&T and/or its affiliates.
  *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this 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 io.fd.honeycomb.transportpce.binding.converter.api;
 
index b92fe9d8c9197303c8ac6d925ae81e278ee71b78..9af16fa6ff14102da3a6d867f82c9cfd1b625a63 100644 (file)
@@ -1,9 +1,17 @@
 /*
- * Copyright © 2016 AT&T and others.  All rights reserved.
+ * Copyright (c) 2018 AT&T and/or its affiliates.
  *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this 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 io.fd.honeycomb.transportpce.test.common;
 
index 2900e9e06e58be1deed15c1147831bdacd7f6561..c7ebc08818c6bff3eb8dca6e1b8da757d512b3b6 100644 (file)
@@ -1,9 +1,17 @@
 /*
- * Copyright © 2016 AT&T and others.  All rights reserved.
+ * Copyright (c) 2018 AT&T and/or its affiliates.
  *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this 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 io.fd.honeycomb.transportpce.test.common;
 
index a6cd757f7178a92ea138ee180e13aa1709df0e9d..bd16c1b7aa28ede852cd9839e927744a494c1e82 100644 (file)
@@ -42,7 +42,7 @@
             <artifactId>honeynode-plugin-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>minimal-distribution-core</artifactId>