[CSVDIR-11] fixes

NOTICE

@@ -0,0 +1,16 @@
+ConnId CSVDir bundle 
+Copyright 2011-2015 ConnId
+
+This product includes software developed by:
+The ConnId project (https://connid.tirasa.net/).
+
+The following copyright notice(s) were affixed to portions of this code
+with which this file is now or was at one time distributed.
+
+==
+
+This product includes software developed by the ConnId Database bundle project (https://github.com/Tirasa/ConnIdDBBundle).
+
+==
+
+This project includes software developed by the HyperSQL project (http://hsqldb.org/)

pom.xml

@@ -1,26 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    ====================
-    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+    Copyright (C) ${project.inceptionYear} ConnId ([email protected])
 
-    Copyright 2011 ConnId. 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
 
-    The contents of this file are subject to the terms of the Common Development
-    and Distribution License("CDDL") (the "License").  You may not use this file
-    except in compliance with the License.
+            http://www.apache.org/licenses/LICENSE-2.0
 
-    You can obtain a copy of the License at
-    http://opensource.org/licenses/cddl1.php
-    See the License for the specific language governing permissions and limitations
-    under the License.
-
-    When distributing the Covered Code, include this CDDL Header Notice in each file
-    and include the License file at http://opensource.org/licenses/cddl1.php.
-    If applicable, add the following below this CDDL Header, with the fields
-    enclosed by brackets [] replaced by your own identifying information:
-    "Portions Copyrighted [year] [name of copyright owner]"
-    ====================
+    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/maven-v4_0_0.xsd">
@@ -45,8 +38,8 @@
 
   <licenses>
     <license>
-      <name>CDDL 1.0</name>
-      <url>http://opensource.org/licenses/CDDL-1.0</url>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
       <distribution>repo</distribution>
     </license>
   </licenses>
@@ -132,6 +125,84 @@
 
   <build>
     <plugins>
+      <plugin>        
+        <groupId>com.mycila.maven-license-plugin</groupId>
+        <artifactId>maven-license-plugin</artifactId>
+        <version>1.10.b1</version>
+        <inherited>false</inherited>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.6</version>
+        <executions>
+          <execution>
+            <id>copy-javadoc-legal-files</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/apidocs/META-INF</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>.</directory>
+                  <includes>
+                    <include>LICENSE</include>
+                    <include>NOTICE</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>com.mycila</groupId>
+        <artifactId>license-maven-plugin</artifactId>
+        <version>2.8</version>
+        <inherited>false</inherited>
+        <configuration>
+          <header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</header>
+          <properties>
+            <owner>ConnId</owner>
+            <email>[email protected]</email>
+          </properties>
+          <excludes>
+            <exclude>**/LICENSE*</exclude>
+            <exclude>**/NOTICE*</exclude>
+            <exclude>**/*.pfx</exclude>
+            <exclude>**/*.dll</exclude>
+            <exclude>**/*.so</exclude>
+            <exclude>**/*.jnilib</exclude>
+            <exclude>nbactions.xml</exclude>
+            <exclude>nb-configuration.xml</exclude>
+            <exclude>**/META-INF/services/**</exclude>
+            <exclude>**/*.css</exclude>
+            <exclude>**/*.js</exclude>
+            <exclude>**/*.csv</exclude>
+            <exclude>**/maven-eclipse.xml</exclude>
+            <exclude>**/*.iml</exclude>
+            <exclude>**/*.log</exclude>
+            <exclude>.externalToolBuilders/**</exclude>
+            <exclude>.git/**</exclude>
+            <exclude>.idea/**</exclude>
+            <exclude>**/.*</exclude>
+          </excludes>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -144,24 +215,7 @@
           <showDeprecation>true</showDeprecation>
           <compilerArgument>-Xlint:unchecked</compilerArgument>
         </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>com.mycila.maven-license-plugin</groupId>
-        <artifactId>maven-license-plugin</artifactId>
-        <inherited>true</inherited>
-        <configuration>
-          <header>https://raw.githubusercontent.com/Tirasa/ConnId/connid-${connid.version}/java/src/main/resources/header.txt</header>
-          <headerDefinitions>
-            <headerDefinition>https://raw.githubusercontent.com/Tirasa/ConnId/connid-${connid.version}/java/src/main/resources/java-single-star.xml</headerDefinition>
-          </headerDefinitions>
-          <excludes>
-            <exclude>README.md</exclude>
-            <exclude>**/LICENSE*</exclude>
-            <exclude>**/.*</exclude>
-          </excludes>
-        </configuration>
-      </plugin>      
+      </plugin>   
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -203,11 +257,30 @@
       </plugin>
     </plugins>
 
+    <resources>
+      <resource>
+        <directory>.</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+        </includes>
+      </resource>
+    </resources>
+
     <testResources>
       <testResource>
         <directory>src/test/resources</directory>
         <filtering>true</filtering>
       </testResource>
+      <testResource>
+        <directory>.</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+        </includes>
+      </testResource>
     </testResources>
   </build>
 

src/assemble/connector.xml

@@ -1,26 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    ====================
-    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+    Copyright (C) ${project.inceptionYear} ConnId ([email protected])
 
-    Copyright 2011 ConnId. 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
 
-    The contents of this file are subject to the terms of the Common Development
-    and Distribution License("CDDL") (the "License").  You may not use this file
-    except in compliance with the License.
+            http://www.apache.org/licenses/LICENSE-2.0
 
-    You can obtain a copy of the License at
-    http://opensource.org/licenses/cddl1.php
-    See the License for the specific language governing permissions and limitations
-    under the License.
-
-    When distributing the Covered Code, include this CDDL Header Notice in each file
-    and include the License file at http://opensource.org/licenses/cddl1.php.
-    If applicable, add the following below this CDDL Header, with the fields
-    enclosed by brackets [] replaced by your own identifying information:
-    "Portions Copyrighted [year] [name of copyright owner]"
-    ====================
+    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.
 
 -->
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"

src/main/java/net/tirasa/connid/bundles/csvdir/CSVDirConfiguration.java

@@ -1,24 +1,17 @@
-/* 
- * ====================
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 2011 ConnId. All rights reserved.
- * 
- * The contents of this file are subject to the terms of the Common Development
- * and Distribution License("CDDL") (the "License").  You may not use this file
- * except in compliance with the License.
- * 
- * You can obtain a copy of the License at
- * http://opensource.org/licenses/cddl1.php
- * See the License for the specific language governing permissions and limitations
- * under the License.
- * 
- * When distributing the Covered Code, include this CDDL Header Notice in each file
- * and include the License file at http://opensource.org/licenses/cddl1.php.
- * If applicable, add the following below this CDDL Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- * ====================
+/**
+ * Copyright (C) ${project.inceptionYear} ConnId ([email protected])
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this 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 net.tirasa.connid.bundles.csvdir;
 

src/main/java/net/tirasa/connid/bundles/csvdir/CSVDirConnection.java

@@ -1,24 +1,17 @@
-/* 
- * ====================
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 2011 ConnId. All rights reserved.
- * 
- * The contents of this file are subject to the terms of the Common Development
- * and Distribution License("CDDL") (the "License").  You may not use this file
- * except in compliance with the License.
- * 
- * You can obtain a copy of the License at
- * http://opensource.org/licenses/cddl1.php
- * See the License for the specific language governing permissions and limitations
- * under the License.
- * 
- * When distributing the Covered Code, include this CDDL Header Notice in each file
- * and include the License file at http://opensource.org/licenses/cddl1.php.
- * If applicable, add the following below this CDDL Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- * ====================
+/**
+ * Copyright (C) ${project.inceptionYear} ConnId ([email protected])
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this 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 net.tirasa.connid.bundles.csvdir;
 

src/main/java/net/tirasa/connid/bundles/csvdir/CSVDirConnector.java

@@ -1,24 +1,17 @@
-/* 
- * ====================
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 2011 ConnId. All rights reserved.
- * 
- * The contents of this file are subject to the terms of the Common Development
- * and Distribution License("CDDL") (the "License").  You may not use this file
- * except in compliance with the License.
- * 
- * You can obtain a copy of the License at
- * http://opensource.org/licenses/cddl1.php
- * See the License for the specific language governing permissions and limitations
- * under the License.
- * 
- * When distributing the Covered Code, include this CDDL Header Notice in each file
- * and include the License file at http://opensource.org/licenses/cddl1.php.
- * If applicable, add the following below this CDDL Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- * ====================
+/**
+ * Copyright (C) ${project.inceptionYear} ConnId ([email protected])
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this 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 net.tirasa.connid.bundles.csvdir;
 

src/main/java/net/tirasa/connid/bundles/csvdir/database/FileSystem.java

@@ -1,24 +1,17 @@
-/* 
- * ====================
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 2011 ConnId. All rights reserved.
- * 
- * The contents of this file are subject to the terms of the Common Development
- * and Distribution License("CDDL") (the "License").  You may not use this file
- * except in compliance with the License.
- * 
- * You can obtain a copy of the License at
- * http://opensource.org/licenses/cddl1.php
- * See the License for the specific language governing permissions and limitations
- * under the License.
- * 
- * When distributing the Covered Code, include this CDDL Header Notice in each file
- * and include the License file at http://opensource.org/licenses/cddl1.php.
- * If applicable, add the following below this CDDL Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- * ====================
+/**
+ * Copyright (C) ${project.inceptionYear} ConnId ([email protected])
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this 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 net.tirasa.connid.bundles.csvdir.database;