diff --git a/as-modules/build.xml b/as-modules/build.xml
index f5416312421d..49173e76c967 100644
--- a/as-modules/build.xml
+++ b/as-modules/build.xml
@@ -1,21 +1,3 @@
-<!--
-  ~ Copyright 2011 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
 <project name="as-modules" basedir="." default="clean">
 
    <property name="output.dir" value="${project.build.directory}/infinispan-as-modules" />
diff --git a/as-modules/lib.xml b/as-modules/lib.xml
index 239d49834a76..ec180e4541aa 100644
--- a/as-modules/lib.xml
+++ b/as-modules/lib.xml
@@ -1,25 +1,3 @@
-<!--
-  ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2010, Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags. See the copyright.txt file in the
-  ~ distribution for a full listing of individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-
 <project name="module-repository-lib" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
 
     <property name="src.dir" value="src"/>
diff --git a/as-modules/pom.xml b/as-modules/pom.xml
index 5789bdec7f42..3da7fb443956 100644
--- a/as-modules/pom.xml
+++ b/as-modules/pom.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- ~ Copyright 2012 Red Hat, Inc. and/or its affiliates. ~ ~ This is free software; you can redistribute it and/or modify it ~ under the terms of the GNU Lesser General Public License as ~ published by the Free Software Foundation; either version 2.1 of ~ the License, or (at your option) any later 
-   version. ~ ~ This software is distributed in the hope that it will be useful, ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ Lesser General Public License for more details. ~ ~ You should have received a copy of the 
-   GNU Lesser General Public ~ License along with this library; if not, write to the Free Software ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ~ 02110-1301 USA -->
-
 <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>
    <parent>
diff --git a/as-modules/src/main/assembly/dist.xml b/as-modules/src/main/assembly/dist.xml
index 7bc0386bccf9..06c881c75e42 100644
--- a/as-modules/src/main/assembly/dist.xml
+++ b/as-modules/src/main/assembly/dist.xml
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" 
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
diff --git a/as-modules/src/main/resources/org/infinispan/cachestore/jdbc/main/module.xml b/as-modules/src/main/resources/org/infinispan/cachestore/jdbc/main/module.xml
index 384394ad9341..78d0b8c8a59b 100644
--- a/as-modules/src/main/resources/org/infinispan/cachestore/jdbc/main/module.xml
+++ b/as-modules/src/main/resources/org/infinispan/cachestore/jdbc/main/module.xml
@@ -1,25 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2010, Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags. See the copyright.txt file in the
-  ~ distribution for a full listing of individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <module xmlns="urn:jboss:module:1.1" name="org.infinispan.cachestore.jdbc" slot="${slot}">
     <resources>
         <!-- Insert resources here -->
diff --git a/as-modules/src/main/resources/org/infinispan/cachestore/remote/main/module.xml b/as-modules/src/main/resources/org/infinispan/cachestore/remote/main/module.xml
index af9462d3aba5..8a25e000f967 100644
--- a/as-modules/src/main/resources/org/infinispan/cachestore/remote/main/module.xml
+++ b/as-modules/src/main/resources/org/infinispan/cachestore/remote/main/module.xml
@@ -1,25 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2010, Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags. See the copyright.txt file in the
-  ~ distribution for a full listing of individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <module xmlns="urn:jboss:module:1.1" name="org.infinispan.cachestore.remote" slot="${slot}">
     <resources>
         <!-- Insert resources here -->
diff --git a/as-modules/src/main/resources/org/infinispan/client/hotrod/main/module.xml b/as-modules/src/main/resources/org/infinispan/client/hotrod/main/module.xml
index 2029bb6c7334..7867ecf64f53 100644
--- a/as-modules/src/main/resources/org/infinispan/client/hotrod/main/module.xml
+++ b/as-modules/src/main/resources/org/infinispan/client/hotrod/main/module.xml
@@ -1,25 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2010, Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags. See the copyright.txt file in the
-  ~ distribution for a full listing of individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <module xmlns="urn:jboss:module:1.1" name="org.infinispan.client.hotrod" slot="${slot}">
     <resources>
         <!-- Insert resources here -->
diff --git a/as-modules/src/main/resources/org/infinispan/main/module.xml b/as-modules/src/main/resources/org/infinispan/main/module.xml
index 454e94ebeff4..924971598019 100644
--- a/as-modules/src/main/resources/org/infinispan/main/module.xml
+++ b/as-modules/src/main/resources/org/infinispan/main/module.xml
@@ -1,25 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2010, Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags. See the copyright.txt file in the
-  ~ distribution for a full listing of individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <module xmlns="urn:jboss:module:1.1" name="org.infinispan" slot="${slot}">
     <resources>
         <!-- Insert resources here -->
diff --git a/as-modules/src/main/resources/org/infinispan/tree/main/module.xml b/as-modules/src/main/resources/org/infinispan/tree/main/module.xml
index e6fe18fe972a..ddd28821cbe2 100644
--- a/as-modules/src/main/resources/org/infinispan/tree/main/module.xml
+++ b/as-modules/src/main/resources/org/infinispan/tree/main/module.xml
@@ -1,25 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2010, Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags. See the copyright.txt file in the
-  ~ distribution for a full listing of individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <module xmlns="urn:jboss:module:1.1" name="org.infinispan.tree" slot="${slot}">
     <resources>
         <!-- Insert resources here -->
diff --git a/as-modules/src/main/resources/org/jgroups/main/module.xml b/as-modules/src/main/resources/org/jgroups/main/module.xml
index 889c2c89da6c..5739c036869c 100644
--- a/as-modules/src/main/resources/org/jgroups/main/module.xml
+++ b/as-modules/src/main/resources/org/jgroups/main/module.xml
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2010, Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags. See the copyright.txt file in the
-  ~ distribution for a full listing of individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-
 <module xmlns="urn:jboss:module:1.1" name="org.jgroups" slot="${slot}">
     <resources>
         <!-- Insert resources here -->
diff --git a/cachestore/bdbje/pom.xml b/cachestore/bdbje/pom.xml
index 4a1fce20acc9..26173c946075 100644
--- a/cachestore/bdbje/pom.xml
+++ b/cachestore/bdbje/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
diff --git a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStore.java b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStore.java
index 96e3deb728cc..73cb521e84ac 100644
--- a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStore.java
+++ b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStore.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.bdbje;
 
 import com.sleepycat.bind.serial.StoredClassCatalog;
diff --git a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreConfig.java b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreConfig.java
index 70526f74896c..53294e9f343d 100644
--- a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreConfig.java
+++ b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreConfig.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.bdbje;
 
 import org.infinispan.loaders.AbstractCacheStoreConfig;
diff --git a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeResourceFactory.java b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeResourceFactory.java
index 31a3c1e003fe..2e7e7a29dadc 100644
--- a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeResourceFactory.java
+++ b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeResourceFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.bdbje;
 
 import com.sleepycat.bind.EntryBinding;
diff --git a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/InternalCacheEntryBinding.java b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/InternalCacheEntryBinding.java
index 9586159ee248..b91ef4af6392 100644
--- a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/InternalCacheEntryBinding.java
+++ b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/InternalCacheEntryBinding.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.bdbje;
 
 import com.sleepycat.bind.EntryBinding;
diff --git a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/ModificationsTransactionWorker.java b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/ModificationsTransactionWorker.java
index c0560ff7305a..f02f7cf4da9b 100644
--- a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/ModificationsTransactionWorker.java
+++ b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/ModificationsTransactionWorker.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.bdbje;
 
 import com.sleepycat.collections.TransactionWorker;
diff --git a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/PreparableTransactionRunner.java b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/PreparableTransactionRunner.java
index 9069f5eb0253..0e359f582522 100644
--- a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/PreparableTransactionRunner.java
+++ b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/PreparableTransactionRunner.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.bdbje;
 
 import com.sleepycat.collections.CurrentTransaction;
diff --git a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/configuration/Attribute.java b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/configuration/Attribute.java
index 94ce4fdebb5f..4c8a686e39c2 100644
--- a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/configuration/Attribute.java
+++ b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/configuration/Attribute.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.bdbje.configuration;
 
 import java.util.HashMap;
diff --git a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/configuration/BdbjeCacheStoreConfiguration.java b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/configuration/BdbjeCacheStoreConfiguration.java
index b130607d8bb1..7779c9d0a816 100644
--- a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/configuration/BdbjeCacheStoreConfiguration.java
+++ b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/configuration/BdbjeCacheStoreConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.bdbje.configuration;
 
 import org.infinispan.configuration.cache.AbstractStoreConfiguration;
diff --git a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/configuration/BdbjeCacheStoreConfigurationBuilder.java b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/configuration/BdbjeCacheStoreConfigurationBuilder.java
index 8fc06f7f59ca..ec84518fad67 100644
--- a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/configuration/BdbjeCacheStoreConfigurationBuilder.java
+++ b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/configuration/BdbjeCacheStoreConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.bdbje.configuration;
 
 import org.infinispan.configuration.cache.AbstractStoreConfigurationBuilder;
diff --git a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/configuration/BdbjeCacheStoreConfigurationParser52.java b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/configuration/BdbjeCacheStoreConfigurationParser52.java
index 0418884426db..f6fbea14390f 100644
--- a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/configuration/BdbjeCacheStoreConfigurationParser52.java
+++ b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/configuration/BdbjeCacheStoreConfigurationParser52.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.bdbje.configuration;
 
 import static org.infinispan.commons.util.StringPropertyReplacer.replaceProperties;
diff --git a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/configuration/BdbjeCacheStoreConfigurationParser53.java b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/configuration/BdbjeCacheStoreConfigurationParser53.java
index 6107d99b3074..530dc6dabb6e 100644
--- a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/configuration/BdbjeCacheStoreConfigurationParser53.java
+++ b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/configuration/BdbjeCacheStoreConfigurationParser53.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.bdbje.configuration;
 
 import static org.infinispan.commons.util.StringPropertyReplacer.replaceProperties;
diff --git a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/configuration/Element.java b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/configuration/Element.java
index fcc29e017d5a..03c2e8c9a608 100644
--- a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/configuration/Element.java
+++ b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/configuration/Element.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.loaders.bdbje.configuration;
 
 import java.util.HashMap;
diff --git a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/logging/Log.java b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/logging/Log.java
index ca670f8a3f58..ab669f66807b 100644
--- a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/logging/Log.java
+++ b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/logging/Log.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.loaders.bdbje.logging;
 
 import org.jboss.logging.Cause;
diff --git a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/package-info.java b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/package-info.java
index 485a97a4e1e6..95188b8bc390 100644
--- a/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/package-info.java
+++ b/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * This package contains a {@link org.infinispan.loaders.CacheStore} implementation based on
  * Oracle's BDBJE storage engine.
diff --git a/cachestore/bdbje/src/main/resources/schema/infinispan-cachestore-bdbje-config-5.2.xsd b/cachestore/bdbje/src/main/resources/schema/infinispan-cachestore-bdbje-config-5.2.xsd
index 2627cc54e668..5126ca6f5df3 100644
--- a/cachestore/bdbje/src/main/resources/schema/infinispan-cachestore-bdbje-config-5.2.xsd
+++ b/cachestore/bdbje/src/main/resources/schema/infinispan-cachestore-bdbje-config-5.2.xsd
@@ -1,24 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!--
-  ~ Copyright 2012 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" version="1.0" targetNamespace="urn:infinispan:config:bdbje:5.2" xmlns:tns="urn:infinispan:config:bdbje:5.2" xmlns:config="urn:infinispan:config:5.2" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import namespace="urn:infinispan:config:5.2" schemaLocation="http://www.infinispan.org/schemas/infinispan-config-5.2.xsd" />
 
diff --git a/cachestore/bdbje/src/main/resources/schema/infinispan-cachestore-bdbje-config-5.3.xsd b/cachestore/bdbje/src/main/resources/schema/infinispan-cachestore-bdbje-config-5.3.xsd
index 4afc09b5c6e1..8ab2543af8cd 100644
--- a/cachestore/bdbje/src/main/resources/schema/infinispan-cachestore-bdbje-config-5.3.xsd
+++ b/cachestore/bdbje/src/main/resources/schema/infinispan-cachestore-bdbje-config-5.3.xsd
@@ -1,24 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!--
-  ~ Copyright 2012 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" version="1.0"
            targetNamespace="urn:infinispan:config:bdbje:5.3"
            xmlns:tns="urn:infinispan:config:bdbje:5.3"
diff --git a/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreConfigTest.java b/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreConfigTest.java
index 78d256e3f300..9cdc5040e04a 100644
--- a/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreConfigTest.java
+++ b/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreConfigTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.bdbje;
 
 import org.infinispan.loaders.CacheLoaderException;
diff --git a/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreFunctionalIntegrationTest.java b/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreFunctionalIntegrationTest.java
index 552796df417b..b1febb2bd0f2 100644
--- a/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreFunctionalIntegrationTest.java
+++ b/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreFunctionalIntegrationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.bdbje;
 
 import java.io.File;
diff --git a/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreIntegrationTest.java b/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreIntegrationTest.java
index 96e4a1ea8100..9af5e0e72dec 100644
--- a/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreIntegrationTest.java
+++ b/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreIntegrationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.bdbje;
 
 import org.infinispan.test.fwk.TestInternalCacheEntryFactory;
diff --git a/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreTest.java b/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreTest.java
index bf0ddb6c1e36..f584f7d2ac8b 100644
--- a/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreTest.java
+++ b/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.bdbje;
 
 import com.sleepycat.bind.serial.StoredClassCatalog;
diff --git a/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeLearningTest.java b/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeLearningTest.java
index a01dbaf55a51..0ae331f7940d 100644
--- a/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeLearningTest.java
+++ b/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeLearningTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.bdbje;
 
 import com.sleepycat.bind.EntryBinding;
diff --git a/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/ModificationsTransactionWorkerTest.java b/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/ModificationsTransactionWorkerTest.java
index 022613fb6b9e..7bece4b7f553 100644
--- a/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/ModificationsTransactionWorkerTest.java
+++ b/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/ModificationsTransactionWorkerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.bdbje;
 
 import static org.mockito.Mockito.*;
diff --git a/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/PreparableTransactionRunnerTest.java b/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/PreparableTransactionRunnerTest.java
index b6fa2292f3b9..e50e928ba6f4 100644
--- a/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/PreparableTransactionRunnerTest.java
+++ b/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/PreparableTransactionRunnerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.bdbje;
 
 import com.sleepycat.collections.CurrentTransaction;
diff --git a/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/configuration/ConfigurationTest.java b/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/configuration/ConfigurationTest.java
index abc42396c6c7..4fdf9dd68354 100644
--- a/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/configuration/ConfigurationTest.java
+++ b/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/configuration/ConfigurationTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.bdbje.configuration;
 
 import org.infinispan.configuration.cache.Configuration;
diff --git a/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/configuration/XmlFileParsingTest.java b/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/configuration/XmlFileParsingTest.java
index 3fe6da0ce663..24aa6f5d2ffb 100644
--- a/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/configuration/XmlFileParsingTest.java
+++ b/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/configuration/XmlFileParsingTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.bdbje.configuration;
 
 import static org.infinispan.test.TestingUtil.INFINISPAN_START_TAG;
diff --git a/cachestore/cassandra/pom.xml b/cachestore/cassandra/pom.xml
index ec8289ce39de..c321e812adf3 100644
--- a/cachestore/cassandra/pom.xml
+++ b/cachestore/cassandra/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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>
    <parent>
diff --git a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/ByteBufferUtil.java b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/ByteBufferUtil.java
index 35eacff7027d..c526322f2707 100644
--- a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/ByteBufferUtil.java
+++ b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/ByteBufferUtil.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.cassandra;
 
 import java.nio.ByteBuffer;
diff --git a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/CassandraCacheStore.java b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/CassandraCacheStore.java
index e7c61d30adfe..dd4963937ce1 100644
--- a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/CassandraCacheStore.java
+++ b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/CassandraCacheStore.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.cassandra;
 
 import java.io.IOException;
diff --git a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/CassandraCacheStoreConfig.java b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/CassandraCacheStoreConfig.java
index eb68e2dd5b40..7fd3a378e429 100644
--- a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/CassandraCacheStoreConfig.java
+++ b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/CassandraCacheStoreConfig.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.cassandra;
 
 import java.io.IOException;
diff --git a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/AbstractCassandraCacheStoreConfigurationChildBuilder.java b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/AbstractCassandraCacheStoreConfigurationChildBuilder.java
index 4ec719648aec..52671c2779fa 100644
--- a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/AbstractCassandraCacheStoreConfigurationChildBuilder.java
+++ b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/AbstractCassandraCacheStoreConfigurationChildBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.cassandra.configuration;
 
 import org.apache.cassandra.thrift.ConsistencyLevel;
diff --git a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/Attribute.java b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/Attribute.java
index b0cbf40184e1..c8e454b3b5d3 100644
--- a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/Attribute.java
+++ b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/Attribute.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.cassandra.configuration;
 
 import java.util.HashMap;
diff --git a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraCacheStoreConfiguration.java b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraCacheStoreConfiguration.java
index 106290373aec..d259a039f49c 100644
--- a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraCacheStoreConfiguration.java
+++ b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraCacheStoreConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.cassandra.configuration;
 
 import java.util.Collections;
diff --git a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraCacheStoreConfigurationBuilder.java b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraCacheStoreConfigurationBuilder.java
index 641ccd14344a..de709a7e3937 100644
--- a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraCacheStoreConfigurationBuilder.java
+++ b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraCacheStoreConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.cassandra.configuration;
 
 import java.util.ArrayList;
diff --git a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraCacheStoreConfigurationChildBuilder.java b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraCacheStoreConfigurationChildBuilder.java
index a7d69e4610d8..846621853f85 100644
--- a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraCacheStoreConfigurationChildBuilder.java
+++ b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraCacheStoreConfigurationChildBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.cassandra.configuration;
 
 import org.apache.cassandra.thrift.ConsistencyLevel;
diff --git a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraCacheStoreConfigurationParser52.java b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraCacheStoreConfigurationParser52.java
index 99d954a2aa30..37d4fb68a54f 100644
--- a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraCacheStoreConfigurationParser52.java
+++ b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraCacheStoreConfigurationParser52.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.cassandra.configuration;
 
 import static org.infinispan.commons.util.StringPropertyReplacer.replaceProperties;
diff --git a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraCacheStoreConfigurationParser53.java b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraCacheStoreConfigurationParser53.java
index c82bcb93bb66..50340e959b4e 100644
--- a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraCacheStoreConfigurationParser53.java
+++ b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraCacheStoreConfigurationParser53.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.cassandra.configuration;
 
 import static org.infinispan.commons.util.StringPropertyReplacer.replaceProperties;
diff --git a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraServerConfiguration.java b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraServerConfiguration.java
index cba7ffc9d086..3ff6a4e97458 100644
--- a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraServerConfiguration.java
+++ b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraServerConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.cassandra.configuration;
 
 /**
diff --git a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraServerConfigurationBuilder.java b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraServerConfigurationBuilder.java
index ad0a3f1f81b6..ecd8e0b1170e 100644
--- a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraServerConfigurationBuilder.java
+++ b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/CassandraServerConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.cassandra.configuration;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/Element.java b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/Element.java
index 67182cb12269..5a9fb947a896 100644
--- a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/Element.java
+++ b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/configuration/Element.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.loaders.cassandra.configuration;
 
 import java.util.HashMap;
diff --git a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/logging/Log.java b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/logging/Log.java
index e1d191296312..e6df4a29f8d5 100644
--- a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/logging/Log.java
+++ b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/logging/Log.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.loaders.cassandra.logging;
 
 import org.jboss.logging.Cause;
diff --git a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/package-info.java b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/package-info.java
index 1ddf50ae64e2..b96671a4a099 100644
--- a/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/package-info.java
+++ b/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * This package contains a {@link org.infinispan.loaders.CacheStore} implementation based on
  * persisting to Apache Cassandra
diff --git a/cachestore/cassandra/src/main/resources/schema/infinispan-cachestore-cassandra-config-5.2.xsd b/cachestore/cassandra/src/main/resources/schema/infinispan-cachestore-cassandra-config-5.2.xsd
index c345cfd48c55..6543085fd822 100644
--- a/cachestore/cassandra/src/main/resources/schema/infinispan-cachestore-cassandra-config-5.2.xsd
+++ b/cachestore/cassandra/src/main/resources/schema/infinispan-cachestore-cassandra-config-5.2.xsd
@@ -1,24 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!--
-  ~ Copyright 2012 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" version="1.0" targetNamespace="urn:infinispan:config:cassandra:5.2" xmlns:tns="urn:infinispan:config:cassandra:5.2" xmlns:config="urn:infinispan:config:5.2" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import namespace="urn:infinispan:config:5.2" schemaLocation="http://www.infinispan.org/schemas/infinispan-config-5.2.xsd" />
 
diff --git a/cachestore/cassandra/src/main/resources/schema/infinispan-cachestore-cassandra-config-5.3.xsd b/cachestore/cassandra/src/main/resources/schema/infinispan-cachestore-cassandra-config-5.3.xsd
index 7a22fa836b08..60dd38ff6659 100644
--- a/cachestore/cassandra/src/main/resources/schema/infinispan-cachestore-cassandra-config-5.3.xsd
+++ b/cachestore/cassandra/src/main/resources/schema/infinispan-cachestore-cassandra-config-5.3.xsd
@@ -1,24 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!--
-  ~ Copyright 2012 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified"  version="1.0"
            targetNamespace="urn:infinispan:config:cassandra:5.3"
            xmlns:tns="urn:infinispan:config:cassandra:5.3"
diff --git a/cachestore/cassandra/src/test/java/org/infinispan/loaders/cassandra/CassandraCacheStoreConfigTest.java b/cachestore/cassandra/src/test/java/org/infinispan/loaders/cassandra/CassandraCacheStoreConfigTest.java
index 89ab1f7d4c94..19f3097eeffe 100644
--- a/cachestore/cassandra/src/test/java/org/infinispan/loaders/cassandra/CassandraCacheStoreConfigTest.java
+++ b/cachestore/cassandra/src/test/java/org/infinispan/loaders/cassandra/CassandraCacheStoreConfigTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.cassandra;
 
 import org.infinispan.loaders.CacheLoaderException;
diff --git a/cachestore/cassandra/src/test/java/org/infinispan/loaders/cassandra/CassandraCacheStoreTest.java b/cachestore/cassandra/src/test/java/org/infinispan/loaders/cassandra/CassandraCacheStoreTest.java
index 84a0b5f2d578..863c31530fca 100644
--- a/cachestore/cassandra/src/test/java/org/infinispan/loaders/cassandra/CassandraCacheStoreTest.java
+++ b/cachestore/cassandra/src/test/java/org/infinispan/loaders/cassandra/CassandraCacheStoreTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.cassandra;
 
 import java.io.IOException;
diff --git a/cachestore/cassandra/src/test/java/org/infinispan/loaders/cassandra/configuration/ConfigurationTest.java b/cachestore/cassandra/src/test/java/org/infinispan/loaders/cassandra/configuration/ConfigurationTest.java
index 0b3ac3b58f22..89a66f454146 100644
--- a/cachestore/cassandra/src/test/java/org/infinispan/loaders/cassandra/configuration/ConfigurationTest.java
+++ b/cachestore/cassandra/src/test/java/org/infinispan/loaders/cassandra/configuration/ConfigurationTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.cassandra.configuration;
 
 import org.apache.cassandra.thrift.ConsistencyLevel;
diff --git a/cachestore/cassandra/src/test/java/org/infinispan/loaders/cassandra/configuration/XmlFileParsingTest.java b/cachestore/cassandra/src/test/java/org/infinispan/loaders/cassandra/configuration/XmlFileParsingTest.java
index aa626ea36970..d8b252b4f193 100644
--- a/cachestore/cassandra/src/test/java/org/infinispan/loaders/cassandra/configuration/XmlFileParsingTest.java
+++ b/cachestore/cassandra/src/test/java/org/infinispan/loaders/cassandra/configuration/XmlFileParsingTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.cassandra.configuration;
 
 import static org.infinispan.test.TestingUtil.INFINISPAN_START_TAG;
diff --git a/cachestore/cassandra/src/test/resources/cassandrapool.properties b/cachestore/cassandra/src/test/resources/cassandrapool.properties
index 7e2e0d46f31f..9e6cedbd42e5 100644
--- a/cachestore/cassandra/src/test/resources/cassandrapool.properties
+++ b/cachestore/cassandra/src/test/resources/cassandrapool.properties
@@ -1,25 +1,3 @@
-#
-# JBoss, Home of Professional Open Source
-# Copyright 2010 Red Hat Inc. and/or its affiliates and other
-# contributors as indicated by the @author tags. All rights reserved.
-# See the copyright.txt in the distribution for a full listing of
-# individual contributors.
-#
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
 socketTimeout = 10000
 initialSize = 2
 maxActive = 100
diff --git a/cachestore/cassandra/src/test/resources/log4j.properties b/cachestore/cassandra/src/test/resources/log4j.properties
index 2f3c1a4f25fc..eeaf0b7822fc 100644
--- a/cachestore/cassandra/src/test/resources/log4j.properties
+++ b/cachestore/cassandra/src/test/resources/log4j.properties
@@ -1,27 +1,3 @@
-#
-# JBoss, Home of Professional Open Source
-# Copyright 2010 Red Hat Inc. and/or its affiliates and other
-# contributors as indicated by the @author tags. All rights reserved.
-# See the copyright.txt in the distribution for a full listing of
-# individual contributors.
-#
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
-log4j.rootCategory=INFO, STDOUT
-
 log4j.appender.STDOUT = org.apache.log4j.ConsoleAppender
 log4j.appender.STDOUT.layout = org.apache.log4j.PatternLayout
 log4j.appender.STDOUT.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss} %c{1} [%p] %m%n
diff --git a/cachestore/cloud/pom.xml b/cachestore/cloud/pom.xml
index 7c77958e11c8..f4745d0f360a 100644
--- a/cachestore/cloud/pom.xml
+++ b/cachestore/cloud/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
diff --git a/cachestore/cloud/src/integrationtest/java/org/infinispan/loaders/cloud/CloudCacheStoreFunctionalIntegrationTest.java b/cachestore/cloud/src/integrationtest/java/org/infinispan/loaders/cloud/CloudCacheStoreFunctionalIntegrationTest.java
index dbfd9600cd9a..7bbb0ffcea6d 100644
--- a/cachestore/cloud/src/integrationtest/java/org/infinispan/loaders/cloud/CloudCacheStoreFunctionalIntegrationTest.java
+++ b/cachestore/cloud/src/integrationtest/java/org/infinispan/loaders/cloud/CloudCacheStoreFunctionalIntegrationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.cloud;
 
 import org.infinispan.Cache;
diff --git a/cachestore/cloud/src/integrationtest/java/org/infinispan/loaders/cloud/CloudCacheStoreIntegrationTest.java b/cachestore/cloud/src/integrationtest/java/org/infinispan/loaders/cloud/CloudCacheStoreIntegrationTest.java
index 8e7befbc086a..a93b220300e0 100644
--- a/cachestore/cloud/src/integrationtest/java/org/infinispan/loaders/cloud/CloudCacheStoreIntegrationTest.java
+++ b/cachestore/cloud/src/integrationtest/java/org/infinispan/loaders/cloud/CloudCacheStoreIntegrationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.cloud;
 
 import org.infinispan.CacheDelegate;
diff --git a/cachestore/cloud/src/integrationtest/java/org/infinispan/loaders/cloud/CloudCacheStoreIntegrationVamTest.java b/cachestore/cloud/src/integrationtest/java/org/infinispan/loaders/cloud/CloudCacheStoreIntegrationVamTest.java
index d17f999234c0..ae2e6c4babea 100644
--- a/cachestore/cloud/src/integrationtest/java/org/infinispan/loaders/cloud/CloudCacheStoreIntegrationVamTest.java
+++ b/cachestore/cloud/src/integrationtest/java/org/infinispan/loaders/cloud/CloudCacheStoreIntegrationVamTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.cloud;
 
 import org.infinispan.loaders.CacheLoaderException;
diff --git a/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/CloudCacheStore.java b/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/CloudCacheStore.java
index d2c10e35454f..e8e9af21d65b 100644
--- a/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/CloudCacheStore.java
+++ b/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/CloudCacheStore.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.cloud;
 
 import java.io.ByteArrayInputStream;
diff --git a/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/CloudCacheStoreConfig.java b/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/CloudCacheStoreConfig.java
index 89afb2cc8352..b08eda391b1d 100644
--- a/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/CloudCacheStoreConfig.java
+++ b/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/CloudCacheStoreConfig.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.cloud;
 
 import org.infinispan.loaders.LockSupportCacheStoreConfig;
diff --git a/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/configuration/Attribute.java b/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/configuration/Attribute.java
index 705bbff28978..9bcb9367fc08 100644
--- a/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/configuration/Attribute.java
+++ b/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/configuration/Attribute.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.cloud.configuration;
 
 import java.util.HashMap;
diff --git a/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/configuration/CloudCacheStoreConfiguration.java b/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/configuration/CloudCacheStoreConfiguration.java
index 8c473419c41b..6121d12dbbe1 100644
--- a/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/configuration/CloudCacheStoreConfiguration.java
+++ b/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/configuration/CloudCacheStoreConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.cloud.configuration;
 
 import org.infinispan.configuration.cache.AbstractStoreConfiguration;
diff --git a/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/configuration/CloudCacheStoreConfigurationBuilder.java b/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/configuration/CloudCacheStoreConfigurationBuilder.java
index 855b66ddf8e5..abef2b74203f 100644
--- a/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/configuration/CloudCacheStoreConfigurationBuilder.java
+++ b/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/configuration/CloudCacheStoreConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.cloud.configuration;
 
 import org.infinispan.configuration.cache.AbstractStoreConfigurationBuilder;
diff --git a/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/configuration/CloudCacheStoreConfigurationParser52.java b/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/configuration/CloudCacheStoreConfigurationParser52.java
index 2c2f8c1920c7..7dd52b116b75 100644
--- a/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/configuration/CloudCacheStoreConfigurationParser52.java
+++ b/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/configuration/CloudCacheStoreConfigurationParser52.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.cloud.configuration;
 
 import static org.infinispan.commons.util.StringPropertyReplacer.replaceProperties;
diff --git a/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/configuration/CloudCacheStoreConfigurationParser53.java b/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/configuration/CloudCacheStoreConfigurationParser53.java
index 85ceabb96668..706b9502c025 100644
--- a/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/configuration/CloudCacheStoreConfigurationParser53.java
+++ b/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/configuration/CloudCacheStoreConfigurationParser53.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.cloud.configuration;
 
 import static org.infinispan.commons.util.StringPropertyReplacer.replaceProperties;
diff --git a/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/configuration/Element.java b/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/configuration/Element.java
index 8b8044b4f5ed..03ed538a0342 100644
--- a/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/configuration/Element.java
+++ b/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/configuration/Element.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.loaders.cloud.configuration;
 
 import java.util.HashMap;
diff --git a/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/logging/Log.java b/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/logging/Log.java
index 73148cfee139..5cfc59ee5682 100644
--- a/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/logging/Log.java
+++ b/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/logging/Log.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.loaders.cloud.logging;
 
 import org.infinispan.loaders.CacheLoaderException;
diff --git a/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/package-info.java b/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/package-info.java
index 05996d9255c9..e3be0a8cdc16 100644
--- a/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/package-info.java
+++ b/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * This package contains a {@link org.infinispan.loaders.CacheStore} implementation based on
  * <a href="http://code.google.com/p/jclouds/">JClouds</a>, which in turn is an abstraction layer to store data on cloud infrastructure providers
diff --git a/cachestore/cloud/src/main/resources/schema/infinispan-cachestore-cloud-config-5.2.xsd b/cachestore/cloud/src/main/resources/schema/infinispan-cachestore-cloud-config-5.2.xsd
index 1952501ab629..896874f92542 100644
--- a/cachestore/cloud/src/main/resources/schema/infinispan-cachestore-cloud-config-5.2.xsd
+++ b/cachestore/cloud/src/main/resources/schema/infinispan-cachestore-cloud-config-5.2.xsd
@@ -1,24 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!--
-  ~ Copyright 2012 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" version="1.0" targetNamespace="urn:infinispan:config:cloud:5.2" xmlns:tns="urn:infinispan:config:cloud:5.2" xmlns:config="urn:infinispan:config:5.2" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import namespace="urn:infinispan:config:5.2" schemaLocation="http://www.infinispan.org/schemas/infinispan-config-5.2.xsd" />
 
diff --git a/cachestore/cloud/src/main/resources/schema/infinispan-cachestore-cloud-config-5.3.xsd b/cachestore/cloud/src/main/resources/schema/infinispan-cachestore-cloud-config-5.3.xsd
index 3c6b21af337a..7bb52557062b 100644
--- a/cachestore/cloud/src/main/resources/schema/infinispan-cachestore-cloud-config-5.3.xsd
+++ b/cachestore/cloud/src/main/resources/schema/infinispan-cachestore-cloud-config-5.3.xsd
@@ -1,24 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!--
-  ~ Copyright 2012 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" version="1.0"
            targetNamespace="urn:infinispan:config:cloud:5.3"
            xmlns:tns="urn:infinispan:config:cloud:5.3"
diff --git a/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/CloudCacheStoreTest.java b/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/CloudCacheStoreTest.java
index 29cdb05a8562..96f7bb5ba939 100644
--- a/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/CloudCacheStoreTest.java
+++ b/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/CloudCacheStoreTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.cloud;
 
 import org.infinispan.CacheImpl;
diff --git a/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/CloudCacheStoreVamTest.java b/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/CloudCacheStoreVamTest.java
index 9d9384ed8079..8e68ad19f04c 100644
--- a/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/CloudCacheStoreVamTest.java
+++ b/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/CloudCacheStoreVamTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.cloud;
 
 import org.infinispan.loaders.CacheLoaderException;
diff --git a/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/configuration/ConfigurationTest.java b/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/configuration/ConfigurationTest.java
index 2fab35e3847e..e820d78ca499 100644
--- a/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/configuration/ConfigurationTest.java
+++ b/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/configuration/ConfigurationTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.cloud.configuration;
 
 import org.infinispan.configuration.cache.Configuration;
diff --git a/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/configuration/XmlFileParsingTest.java b/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/configuration/XmlFileParsingTest.java
index 3a0f992fcbdc..da5dc3ac9cc2 100644
--- a/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/configuration/XmlFileParsingTest.java
+++ b/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/configuration/XmlFileParsingTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.cloud.configuration;
 
 import static org.infinispan.test.TestingUtil.INFINISPAN_START_TAG;
diff --git a/cachestore/hbase/pom.xml b/cachestore/hbase/pom.xml
index a3aeb49aa7c8..54a13073d17d 100644
--- a/cachestore/hbase/pom.xml
+++ b/cachestore/hbase/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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>
diff --git a/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/HBaseCacheStore.java b/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/HBaseCacheStore.java
index 40c8a35c29e4..400878295f6a 100644
--- a/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/HBaseCacheStore.java
+++ b/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/HBaseCacheStore.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.hbase;
 
 import java.io.IOException;
diff --git a/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/HBaseCacheStoreConfig.java b/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/HBaseCacheStoreConfig.java
index b6a49fe5e8b0..d44bc0749b51 100644
--- a/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/HBaseCacheStoreConfig.java
+++ b/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/HBaseCacheStoreConfig.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.hbase;
 
 import org.infinispan.loaders.LockSupportCacheStoreConfig;
diff --git a/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/HBaseException.java b/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/HBaseException.java
index 2e5742ff5b4e..5222b32e1501 100644
--- a/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/HBaseException.java
+++ b/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/HBaseException.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.hbase;
 
 /**
diff --git a/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/HBaseFacade.java b/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/HBaseFacade.java
index ad72b0b098b8..15caf2b2a256 100644
--- a/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/HBaseFacade.java
+++ b/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/HBaseFacade.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.hbase;
 
 import java.io.IOException;
diff --git a/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/configuration/Attribute.java b/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/configuration/Attribute.java
index 540c45dcde85..d35379ca7c7a 100644
--- a/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/configuration/Attribute.java
+++ b/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/configuration/Attribute.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.hbase.configuration;
 
 import java.util.HashMap;
diff --git a/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/configuration/Element.java b/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/configuration/Element.java
index 08433fbc211b..8f9f0554834f 100644
--- a/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/configuration/Element.java
+++ b/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/configuration/Element.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.loaders.hbase.configuration;
 
 import java.util.HashMap;
diff --git a/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/configuration/HBaseCacheStoreConfiguration.java b/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/configuration/HBaseCacheStoreConfiguration.java
index 45d6c1817357..22cf0a469517 100644
--- a/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/configuration/HBaseCacheStoreConfiguration.java
+++ b/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/configuration/HBaseCacheStoreConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.hbase.configuration;
 
 import org.infinispan.configuration.cache.AbstractStoreConfiguration;
diff --git a/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/configuration/HBaseCacheStoreConfigurationBuilder.java b/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/configuration/HBaseCacheStoreConfigurationBuilder.java
index 415f3500b2e5..fe06a7369fc3 100644
--- a/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/configuration/HBaseCacheStoreConfigurationBuilder.java
+++ b/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/configuration/HBaseCacheStoreConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.hbase.configuration;
 
 import org.infinispan.configuration.cache.AbstractStoreConfigurationBuilder;
diff --git a/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/configuration/HBaseCacheStoreConfigurationParser52.java b/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/configuration/HBaseCacheStoreConfigurationParser52.java
index 87b964edf232..81b72a2bde6d 100644
--- a/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/configuration/HBaseCacheStoreConfigurationParser52.java
+++ b/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/configuration/HBaseCacheStoreConfigurationParser52.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.hbase.configuration;
 
 import static org.infinispan.commons.util.StringPropertyReplacer.replaceProperties;
diff --git a/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/configuration/HBaseCacheStoreConfigurationParser53.java b/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/configuration/HBaseCacheStoreConfigurationParser53.java
index 6af41f63e1c4..ceb730597cce 100644
--- a/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/configuration/HBaseCacheStoreConfigurationParser53.java
+++ b/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/configuration/HBaseCacheStoreConfigurationParser53.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.hbase.configuration;
 
 import static org.infinispan.commons.util.StringPropertyReplacer.replaceProperties;
diff --git a/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/logging/Log.java b/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/logging/Log.java
index ce0f20c4c0a1..37f26a51cd31 100644
--- a/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/logging/Log.java
+++ b/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/logging/Log.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.loaders.hbase.logging;
 
 import org.jboss.logging.Cause;
diff --git a/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/package-info.java b/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/package-info.java
index 9582ad914a2a..b7d53e79b1f9 100644
--- a/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/package-info.java
+++ b/cachestore/hbase/src/main/java/org/infinispan/loaders/hbase/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * This package contains a {@link org.infinispan.loaders.CacheStore} implementation based on
  * persisting to HBase.
diff --git a/cachestore/hbase/src/main/resources/schema/infinispan-cachestore-hbase-config-5.2.xsd b/cachestore/hbase/src/main/resources/schema/infinispan-cachestore-hbase-config-5.2.xsd
index 194b4e7749f1..ec13d96cb7b9 100644
--- a/cachestore/hbase/src/main/resources/schema/infinispan-cachestore-hbase-config-5.2.xsd
+++ b/cachestore/hbase/src/main/resources/schema/infinispan-cachestore-hbase-config-5.2.xsd
@@ -1,24 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!--
-  ~ Copyright 2012 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" version="1.0" targetNamespace="urn:infinispan:config:hbase:5.2" xmlns:tns="urn:infinispan:config:hbase:5.2" xmlns:config="urn:infinispan:config:5.2" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import namespace="urn:infinispan:config:5.2" schemaLocation="http://www.infinispan.org/schemas/infinispan-config-5.2.xsd" />
 
diff --git a/cachestore/hbase/src/main/resources/schema/infinispan-cachestore-hbase-config-5.3.xsd b/cachestore/hbase/src/main/resources/schema/infinispan-cachestore-hbase-config-5.3.xsd
index a0ec86c9acee..84af108fac73 100644
--- a/cachestore/hbase/src/main/resources/schema/infinispan-cachestore-hbase-config-5.3.xsd
+++ b/cachestore/hbase/src/main/resources/schema/infinispan-cachestore-hbase-config-5.3.xsd
@@ -1,24 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!--
-  ~ Copyright 2012 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" version="1.0"
            targetNamespace="urn:infinispan:config:hbase:5.3"
            xmlns:tns="urn:infinispan:config:hbase:5.3"
diff --git a/cachestore/hbase/src/test/java/org/infinispan/loaders/hbase/HBaseCacheStoreConfigTest.java b/cachestore/hbase/src/test/java/org/infinispan/loaders/hbase/HBaseCacheStoreConfigTest.java
index 07eaec936926..92765bbce629 100644
--- a/cachestore/hbase/src/test/java/org/infinispan/loaders/hbase/HBaseCacheStoreConfigTest.java
+++ b/cachestore/hbase/src/test/java/org/infinispan/loaders/hbase/HBaseCacheStoreConfigTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.hbase;
 
 import org.infinispan.loaders.CacheLoaderException;
diff --git a/cachestore/hbase/src/test/java/org/infinispan/loaders/hbase/HBaseCacheStoreStandaloneTest.java b/cachestore/hbase/src/test/java/org/infinispan/loaders/hbase/HBaseCacheStoreStandaloneTest.java
index 5677a654ce5a..810e69332a47 100644
--- a/cachestore/hbase/src/test/java/org/infinispan/loaders/hbase/HBaseCacheStoreStandaloneTest.java
+++ b/cachestore/hbase/src/test/java/org/infinispan/loaders/hbase/HBaseCacheStoreStandaloneTest.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.hbase;
 
 import java.io.Serializable;
diff --git a/cachestore/hbase/src/test/java/org/infinispan/loaders/hbase/HBaseCacheStoreTest.java b/cachestore/hbase/src/test/java/org/infinispan/loaders/hbase/HBaseCacheStoreTest.java
index 8ab47622f0b8..125be991da7c 100644
--- a/cachestore/hbase/src/test/java/org/infinispan/loaders/hbase/HBaseCacheStoreTest.java
+++ b/cachestore/hbase/src/test/java/org/infinispan/loaders/hbase/HBaseCacheStoreTest.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.hbase;
 
 import org.infinispan.loaders.BaseCacheStoreTest;
diff --git a/cachestore/hbase/src/test/java/org/infinispan/loaders/hbase/HBaseFacadeTest.java b/cachestore/hbase/src/test/java/org/infinispan/loaders/hbase/HBaseFacadeTest.java
index 2ced0ee490b4..f42de7aaadde 100644
--- a/cachestore/hbase/src/test/java/org/infinispan/loaders/hbase/HBaseFacadeTest.java
+++ b/cachestore/hbase/src/test/java/org/infinispan/loaders/hbase/HBaseFacadeTest.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.hbase;
 
 import java.util.ArrayList;
diff --git a/cachestore/hbase/src/test/java/org/infinispan/loaders/hbase/configuration/ConfigurationTest.java b/cachestore/hbase/src/test/java/org/infinispan/loaders/hbase/configuration/ConfigurationTest.java
index d9d803c9d862..fb1dc3310c51 100644
--- a/cachestore/hbase/src/test/java/org/infinispan/loaders/hbase/configuration/ConfigurationTest.java
+++ b/cachestore/hbase/src/test/java/org/infinispan/loaders/hbase/configuration/ConfigurationTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.hbase.configuration;
 
 import org.infinispan.configuration.cache.Configuration;
diff --git a/cachestore/hbase/src/test/java/org/infinispan/loaders/hbase/configuration/XmlFileParsingTest.java b/cachestore/hbase/src/test/java/org/infinispan/loaders/hbase/configuration/XmlFileParsingTest.java
index d71993cfe607..6625bc364675 100644
--- a/cachestore/hbase/src/test/java/org/infinispan/loaders/hbase/configuration/XmlFileParsingTest.java
+++ b/cachestore/hbase/src/test/java/org/infinispan/loaders/hbase/configuration/XmlFileParsingTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.hbase.configuration;
 
 import static org.infinispan.test.TestingUtil.INFINISPAN_START_TAG;
diff --git a/cachestore/hbase/src/test/resources/log4j.properties b/cachestore/hbase/src/test/resources/log4j.properties
index 2f3c1a4f25fc..eeaf0b7822fc 100644
--- a/cachestore/hbase/src/test/resources/log4j.properties
+++ b/cachestore/hbase/src/test/resources/log4j.properties
@@ -1,27 +1,3 @@
-#
-# JBoss, Home of Professional Open Source
-# Copyright 2010 Red Hat Inc. and/or its affiliates and other
-# contributors as indicated by the @author tags. All rights reserved.
-# See the copyright.txt in the distribution for a full listing of
-# individual contributors.
-#
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
-log4j.rootCategory=INFO, STDOUT
-
 log4j.appender.STDOUT = org.apache.log4j.ConsoleAppender
 log4j.appender.STDOUT.layout = org.apache.log4j.PatternLayout
 log4j.appender.STDOUT.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss} %c{1} [%p] %m%n
diff --git a/cachestore/jdbc/pom.xml b/cachestore/jdbc/pom.xml
index bc7243abd517..427607ea5392 100644
--- a/cachestore/jdbc/pom.xml
+++ b/cachestore/jdbc/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/AbstractJdbcCacheStoreConfig.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/AbstractJdbcCacheStoreConfig.java
index 793ab3fc312a..b2017ca4c03a 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/AbstractJdbcCacheStoreConfig.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/AbstractJdbcCacheStoreConfig.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc;
 
 import org.infinispan.loaders.LockSupportCacheStoreConfig;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/AbstractNonDelegatingJdbcCacheStoreConfig.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/AbstractNonDelegatingJdbcCacheStoreConfig.java
index 00e260f51a81..5389d46b123b 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/AbstractNonDelegatingJdbcCacheStoreConfig.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/AbstractNonDelegatingJdbcCacheStoreConfig.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc;
 
 import org.infinispan.loaders.jdbc.connectionfactory.ConnectionFactoryConfig;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/DataManipulationHelper.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/DataManipulationHelper.java
index 1c4fccd2faa8..5ab0c3efffd7 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/DataManipulationHelper.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/DataManipulationHelper.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc;
 
 import java.io.IOException;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/DatabaseType.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/DatabaseType.java
index f4a8db1a97f7..eb782e34cfdf 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/DatabaseType.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/DatabaseType.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc;
 
 /**
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/JdbcUtil.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/JdbcUtil.java
index 258b2a20a028..2ee6cf238dc7 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/JdbcUtil.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/JdbcUtil.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc;
 
 import org.infinispan.commons.io.ByteBuffer;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/TableManipulation.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/TableManipulation.java
index dca26941c074..95cad15abd66 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/TableManipulation.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/TableManipulation.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc;
 
 import org.infinispan.commons.CacheConfigurationException;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/TableName.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/TableName.java
index 04f5444507f5..a47c618c4b36 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/TableName.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/TableName.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc;
 
 import java.io.Serializable;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStore.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStore.java
index 50667e46495d..a60bb1d8155a 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStore.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStore.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.binary;
 
 import org.infinispan.Cache;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreConfig.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreConfig.java
index 7307672172ea..5e4457cc8690 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreConfig.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreConfig.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.binary;
 
 import org.infinispan.loaders.jdbc.AbstractNonDelegatingJdbcCacheStoreConfig;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/package-info.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/package-info.java
index 311d87b398a6..24edba6b580d 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/package-info.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * This JDBC CacheStore implementation is optimized for storing binary (non-String)
  * keys in the cache.
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/AbstractJdbcCacheStoreConfiguration.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/AbstractJdbcCacheStoreConfiguration.java
index 8c3738e7c864..5a21b2a009fc 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/AbstractJdbcCacheStoreConfiguration.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/AbstractJdbcCacheStoreConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import org.infinispan.configuration.cache.AbstractLockSupportStoreConfiguration;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/AbstractJdbcCacheStoreConfigurationBuilder.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/AbstractJdbcCacheStoreConfigurationBuilder.java
index 59c8c90ea4ab..caab36bcc41a 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/AbstractJdbcCacheStoreConfigurationBuilder.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/AbstractJdbcCacheStoreConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import java.lang.reflect.Constructor;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/AbstractJdbcCacheStoreConfigurationChildBuilder.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/AbstractJdbcCacheStoreConfigurationChildBuilder.java
index 46ac61341967..ec4d8db0a910 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/AbstractJdbcCacheStoreConfigurationChildBuilder.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/AbstractJdbcCacheStoreConfigurationChildBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import org.infinispan.configuration.cache.AbstractLockSupportStoreConfigurationChildBuilder;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/Attribute.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/Attribute.java
index 57e1743bbadf..81f113d692d7 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/Attribute.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/Attribute.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import java.util.HashMap;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/ConnectionFactoryConfiguration.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/ConnectionFactoryConfiguration.java
index b4a75676c1cf..df1b84b589bb 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/ConnectionFactoryConfiguration.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/ConnectionFactoryConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import org.infinispan.loaders.jdbc.connectionfactory.ConnectionFactory;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/ConnectionFactoryConfigurationBuilder.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/ConnectionFactoryConfigurationBuilder.java
index 3a1923708a09..565c23efeed2 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/ConnectionFactoryConfigurationBuilder.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/ConnectionFactoryConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/Element.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/Element.java
index ce48c6658da0..71200aa8bde3 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/Element.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/Element.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.loaders.jdbc.configuration;
 
 import java.util.HashMap;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcBinaryCacheStoreConfiguration.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcBinaryCacheStoreConfiguration.java
index 504cde197774..d4b9ee905be1 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcBinaryCacheStoreConfiguration.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcBinaryCacheStoreConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import org.infinispan.configuration.cache.AsyncStoreConfiguration;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcBinaryCacheStoreConfigurationBuilder.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcBinaryCacheStoreConfigurationBuilder.java
index 540db6f45045..ede6983bc121 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcBinaryCacheStoreConfigurationBuilder.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcBinaryCacheStoreConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import org.infinispan.configuration.cache.LoadersConfigurationBuilder;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcCacheStoreConfigurationChildBuilder.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcCacheStoreConfigurationChildBuilder.java
index d9e9ec49b4c8..0e7f8eefed84 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcCacheStoreConfigurationChildBuilder.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcCacheStoreConfigurationChildBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import org.infinispan.configuration.cache.LockSupportStoreConfigurationChildBuilder;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcCacheStoreConfigurationParser52.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcCacheStoreConfigurationParser52.java
index cd8750b06ea5..5697a249564e 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcCacheStoreConfigurationParser52.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcCacheStoreConfigurationParser52.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import static org.infinispan.commons.util.StringPropertyReplacer.replaceProperties;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcCacheStoreConfigurationParser53.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcCacheStoreConfigurationParser53.java
index 9a37e6638f1e..19476e8447a6 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcCacheStoreConfigurationParser53.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcCacheStoreConfigurationParser53.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import static org.infinispan.commons.util.StringPropertyReplacer.replaceProperties;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcMixedCacheStoreConfiguration.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcMixedCacheStoreConfiguration.java
index 990d218057fa..fa57deb059e3 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcMixedCacheStoreConfiguration.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcMixedCacheStoreConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import org.infinispan.configuration.cache.AsyncStoreConfiguration;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcMixedCacheStoreConfigurationBuilder.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcMixedCacheStoreConfigurationBuilder.java
index 50ee4ee64e5a..a4b4569bff38 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcMixedCacheStoreConfigurationBuilder.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcMixedCacheStoreConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import org.infinispan.configuration.cache.LoadersConfigurationBuilder;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcMixedCacheStoreConfigurationChildBuilder.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcMixedCacheStoreConfigurationChildBuilder.java
index 44af5d09d40e..ee213f70004f 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcMixedCacheStoreConfigurationChildBuilder.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcMixedCacheStoreConfigurationChildBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import org.infinispan.loaders.jdbc.configuration.JdbcMixedCacheStoreConfigurationBuilder.MixedTableManipulationConfigurationBuilder;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcStringBasedCacheStoreConfiguration.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcStringBasedCacheStoreConfiguration.java
index 2f053a4ca42a..98f8148b3a77 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcStringBasedCacheStoreConfiguration.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcStringBasedCacheStoreConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import org.infinispan.configuration.cache.AsyncStoreConfiguration;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcStringBasedCacheStoreConfigurationBuilder.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcStringBasedCacheStoreConfigurationBuilder.java
index 810c39b9cbb7..3292f00e34a6 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcStringBasedCacheStoreConfigurationBuilder.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcStringBasedCacheStoreConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import org.infinispan.configuration.cache.LoadersConfigurationBuilder;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/LegacyConnectionFactoryAdaptor.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/LegacyConnectionFactoryAdaptor.java
index df811e4f5cb8..e33b55877c3a 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/LegacyConnectionFactoryAdaptor.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/LegacyConnectionFactoryAdaptor.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import org.infinispan.loaders.jdbc.AbstractJdbcCacheStoreConfig;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/ManagedConnectionFactoryConfiguration.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/ManagedConnectionFactoryConfiguration.java
index f7d04dd201c2..30a0fdcec16b 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/ManagedConnectionFactoryConfiguration.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/ManagedConnectionFactoryConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import org.infinispan.commons.configuration.BuiltBy;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/ManagedConnectionFactoryConfigurationBuilder.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/ManagedConnectionFactoryConfigurationBuilder.java
index 2e2b437d4cb7..56f1d1799e42 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/ManagedConnectionFactoryConfigurationBuilder.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/ManagedConnectionFactoryConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import org.infinispan.commons.CacheConfigurationException;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/PooledConnectionFactoryConfiguration.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/PooledConnectionFactoryConfiguration.java
index 20f6692b298e..f53d1082f80f 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/PooledConnectionFactoryConfiguration.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/PooledConnectionFactoryConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import org.infinispan.commons.configuration.BuiltBy;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/PooledConnectionFactoryConfigurationBuilder.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/PooledConnectionFactoryConfigurationBuilder.java
index cebf0f7ccbf2..6b46553a17dc 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/PooledConnectionFactoryConfigurationBuilder.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/PooledConnectionFactoryConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import java.sql.Driver;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/SimpleConnectionFactoryConfiguration.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/SimpleConnectionFactoryConfiguration.java
index da607cc9ffb9..7f77cdbfce74 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/SimpleConnectionFactoryConfiguration.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/SimpleConnectionFactoryConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/SimpleConnectionFactoryConfigurationBuilder.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/SimpleConnectionFactoryConfigurationBuilder.java
index 8de4e36de497..00ce7364dd57 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/SimpleConnectionFactoryConfigurationBuilder.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/SimpleConnectionFactoryConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import java.sql.Driver;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/TableManipulationConfiguration.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/TableManipulationConfiguration.java
index 0cf5adf6d778..a581159f71ed 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/TableManipulationConfiguration.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/TableManipulationConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import org.infinispan.loaders.jdbc.DatabaseType;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/TableManipulationConfigurationBuilder.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/TableManipulationConfigurationBuilder.java
index 4a726c923d01..0e7f5a6e6f59 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/TableManipulationConfigurationBuilder.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/TableManipulationConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/ConnectionFactory.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/ConnectionFactory.java
index 8223b5556313..198db30b6fa6 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/ConnectionFactory.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/ConnectionFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.connectionfactory;
 
 import org.infinispan.loaders.CacheLoaderException;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/ConnectionFactoryConfig.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/ConnectionFactoryConfig.java
index 7810b8381ab7..9c9fbf164e61 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/ConnectionFactoryConfig.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/ConnectionFactoryConfig.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.connectionfactory;
 
 /**
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/ManagedConnectionFactory.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/ManagedConnectionFactory.java
index 2d0e60343c06..7867a08533f9 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/ManagedConnectionFactory.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/ManagedConnectionFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.connectionfactory;
 
 import org.infinispan.loaders.CacheLoaderException;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/PooledConnectionFactory.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/PooledConnectionFactory.java
index d533357d3541..29395293ea4a 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/PooledConnectionFactory.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/PooledConnectionFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.connectionfactory;
 
 import com.mchange.v2.c3p0.ComboPooledDataSource;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/SimpleConnectionFactory.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/SimpleConnectionFactory.java
index b7b9977ade83..bacc7a1d3d50 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/SimpleConnectionFactory.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/SimpleConnectionFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.connectionfactory;
 
 import org.infinispan.loaders.CacheLoaderException;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/package-info.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/package-info.java
index 9c9ad749252a..d6ad34644eac 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/package-info.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Connection factories for use with the JDBC Cache Store.  Simple connection factories delegate
  * to a data source if used within a Java EE environment, otherwise C3P0 pooling is used if
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/logging/Log.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/logging/Log.java
index 4328a74c393a..15828861a488 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/logging/Log.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/logging/Log.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.loaders.jdbc.logging;
 
 import static org.jboss.logging.Logger.Level.ERROR;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStore.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStore.java
index 768bfda32c41..818554e91c95 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStore.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStore.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.mixed;
 
 import org.infinispan.Cache;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreConfig.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreConfig.java
index 2996ec0ef8b1..ab0f8f8f838c 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreConfig.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreConfig.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.mixed;
 
 import org.infinispan.loaders.LockSupportCacheStoreConfig;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/package-info.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/package-info.java
index b6eebf0dcca6..e9ed0a29ff48 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/package-info.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * This is a delegating CacheStore implementation that delegates either to a binary
  * or String based JDBC cache store depending on the key used.
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/package-info.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/package-info.java
index 7d98e12ff941..0969c5d30402 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/package-info.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * This package contains a {@link org.infinispan.loaders.CacheStore} implementation based on
  * a JDBC database connection.
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStore.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStore.java
index 3c4dd5737585..6edf64c8e3c2 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStore.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStore.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.stringbased;
 
 import org.infinispan.Cache;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreConfig.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreConfig.java
index b6518b626af7..3ee47617a81f 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreConfig.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreConfig.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.stringbased;
 
 import org.infinispan.loaders.jdbc.AbstractNonDelegatingJdbcCacheStoreConfig;
diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/package-info.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/package-info.java
index f2584407265a..12a45867c700 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/package-info.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * This JDBC CacheStore implementation is optimized for storing String
  * keys in the cache.  If you can guarantee that your application would only use
diff --git a/cachestore/jdbc/src/main/resources/schema/infinispan-cachestore-jdbc-config-5.2.xsd b/cachestore/jdbc/src/main/resources/schema/infinispan-cachestore-jdbc-config-5.2.xsd
index 1ceaecd87684..e18065ff492e 100644
--- a/cachestore/jdbc/src/main/resources/schema/infinispan-cachestore-jdbc-config-5.2.xsd
+++ b/cachestore/jdbc/src/main/resources/schema/infinispan-cachestore-jdbc-config-5.2.xsd
@@ -1,24 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!--
-  ~ Copyright 2012 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" version="1.0" targetNamespace="urn:infinispan:config:jdbc:5.2" xmlns:tns="urn:infinispan:config:jdbc:5.2" xmlns:config="urn:infinispan:config:5.2" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import namespace="urn:infinispan:config:5.2" schemaLocation="http://www.infinispan.org/schemas/infinispan-config-5.2.xsd" />
 
diff --git a/cachestore/jdbc/src/main/resources/schema/infinispan-cachestore-jdbc-config-5.3.xsd b/cachestore/jdbc/src/main/resources/schema/infinispan-cachestore-jdbc-config-5.3.xsd
index 7f60e0fd0143..67e2c8640ee8 100644
--- a/cachestore/jdbc/src/main/resources/schema/infinispan-cachestore-jdbc-config-5.3.xsd
+++ b/cachestore/jdbc/src/main/resources/schema/infinispan-cachestore-jdbc-config-5.3.xsd
@@ -1,24 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!--
-  ~ Copyright 2012 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" version="1.0"
            targetNamespace="urn:infinispan:config:jdbc:5.3"
            xmlns:tns="urn:infinispan:config:jdbc:5.3"
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/ManagedConnectionFactoryTest.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/ManagedConnectionFactoryTest.java
index 29692af75743..ed6b1b9b3992 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/ManagedConnectionFactoryTest.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/ManagedConnectionFactoryTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc;
 
 import org.infinispan.loaders.BaseCacheStoreTest;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/PooledConnectionFactoryTest.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/PooledConnectionFactoryTest.java
index e27a688c3fbd..999fb74e3996 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/PooledConnectionFactoryTest.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/PooledConnectionFactoryTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc;
 
 import org.infinispan.loaders.CacheLoaderException;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/TableManipulationTest.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/TableManipulationTest.java
index 7edec6912cda..08b8d828ecf6 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/TableManipulationTest.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/TableManipulationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc;
 
 import static org.mockito.Mockito.mock;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/TableNameUniquenessTest.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/TableNameUniquenessTest.java
index bc5eb0351d29..30a5d2aa6524 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/TableNameUniquenessTest.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/TableNameUniquenessTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc;
 
 import org.infinispan.Cache;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/binary/BinaryStoreWithManagedConnectionTest.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/binary/BinaryStoreWithManagedConnectionTest.java
index 41e99f08216c..c31597166f1f 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/binary/BinaryStoreWithManagedConnectionTest.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/binary/BinaryStoreWithManagedConnectionTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.binary;
 
 import org.infinispan.Cache;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreFunctionalTest.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreFunctionalTest.java
index badd63a9392b..ac92f2f7cdf8 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreFunctionalTest.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.binary;
 
 import org.infinispan.loaders.BaseCacheStoreFunctionalTest;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreTest.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreTest.java
index b92d6a7c7630..af3b8c8aea39 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreTest.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.binary;
 
 import static org.mockito.Mockito.mock;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreVamTest.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreVamTest.java
index 0261793ea238..c638f4ff4b62 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreVamTest.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreVamTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.binary;
 
 import org.infinispan.loaders.CacheLoaderException;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/configuration/ConfigurationTest.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/configuration/ConfigurationTest.java
index 74d5d899be96..08733fd81019 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/configuration/ConfigurationTest.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/configuration/ConfigurationTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import org.h2.Driver;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/configuration/DummyKey2StringMapper.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/configuration/DummyKey2StringMapper.java
index 5b82a6ff9a8b..928952540523 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/configuration/DummyKey2StringMapper.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/configuration/DummyKey2StringMapper.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import org.infinispan.loaders.keymappers.DefaultTwoWayKey2StringMapper;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/configuration/XmlFileParsingTest.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/configuration/XmlFileParsingTest.java
index d9f2b993cdf9..35aecbd55d9e 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/configuration/XmlFileParsingTest.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/configuration/XmlFileParsingTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.configuration;
 
 import static org.infinispan.test.TestingUtil.INFINISPAN_START_TAG;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStore2Test.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStore2Test.java
index 50c03d32270d..06ec1d0efb34 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStore2Test.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStore2Test.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.mixed;
 
 import static org.mockito.Mockito.mock;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreConfigTest.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreConfigTest.java
index 40ed61a406d9..77828eaed68e 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreConfigTest.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreConfigTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.mixed;
 
 import org.infinispan.loaders.LockSupportCacheStoreConfig;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreFunctionalTest.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreFunctionalTest.java
index af4a75fc5c78..5fcfa0147503 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreFunctionalTest.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.mixed;
 
 import org.infinispan.loaders.BaseCacheStoreFunctionalTest;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreTest.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreTest.java
index cb79c53a0f1b..6d68db5ff3c2 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreTest.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.mixed;
 
 import java.io.ByteArrayInputStream;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreVam2Test.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreVam2Test.java
index 68884e1e09ea..0388c7521753 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreVam2Test.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreVam2Test.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.mixed;
 
 import org.infinispan.loaders.CacheLoaderException;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreVamTest.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreVamTest.java
index 01469650fcb2..acde2c5397d4 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreVamTest.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreVamTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.mixed;
 
 import org.infinispan.loaders.CacheLoaderException;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/MixedStoreWithManagedConnectionTest.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/MixedStoreWithManagedConnectionTest.java
index be0b988c7b59..936acc1bc832 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/MixedStoreWithManagedConnectionTest.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/MixedStoreWithManagedConnectionTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.mixed;
 
 import org.infinispan.Cache;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreAltMapperTest.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreAltMapperTest.java
index 65b0bf7b8310..d20e68e9990c 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreAltMapperTest.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreAltMapperTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.stringbased;
 
 import java.util.Collections;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreFunctionalTest.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreFunctionalTest.java
index 409abc6f16fb..8312e409aa8e 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreFunctionalTest.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.stringbased;
 
 import org.infinispan.loaders.BaseCacheStoreFunctionalTest;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreTest.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreTest.java
index cc8167dd81e9..30926f571a61 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreTest.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.stringbased;
 
 import static org.mockito.Mockito.mock;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreVamAltMapperTest.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreVamAltMapperTest.java
index 67cff6dde6ad..66374ed71747 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreVamAltMapperTest.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreVamAltMapperTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.stringbased;
 
 import org.infinispan.loaders.CacheLoaderException;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreVamTest.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreVamTest.java
index bf07a605abbf..a09b0ee695ea 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreVamTest.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreVamTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.stringbased;
 
 import org.infinispan.loaders.CacheLoaderException;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/NonStringKeyPreloadTest.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/NonStringKeyPreloadTest.java
index ae6584ca316f..d8dde5a4fd86 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/NonStringKeyPreloadTest.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/NonStringKeyPreloadTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.stringbased;
 
 import static junit.framework.Assert.assertEquals;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/NonStringKeyStateTransferTest.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/NonStringKeyStateTransferTest.java
index da8c4b024584..2c6bcc8634c3 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/NonStringKeyStateTransferTest.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/NonStringKeyStateTransferTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.stringbased;
 
 import org.infinispan.Cache;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/Person.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/Person.java
index 785eeef9a463..7e452ff9b8bc 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/Person.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/Person.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.stringbased;
 
 import java.io.Serializable;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/PersonKey2StringMapper.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/PersonKey2StringMapper.java
index be977f71955c..4c6cfdbade0c 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/PersonKey2StringMapper.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/PersonKey2StringMapper.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.stringbased;
 
 import org.infinispan.loaders.keymappers.Key2StringMapper;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/StringStoreWithManagedConnectionTest.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/StringStoreWithManagedConnectionTest.java
index 527b681d6816..55141c2bf6bd 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/StringStoreWithManagedConnectionTest.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/StringStoreWithManagedConnectionTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.stringbased;
 
 import org.infinispan.Cache;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/TwoWayPersonKey2StringMapper.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/TwoWayPersonKey2StringMapper.java
index 9377c97de1cc..aa763663d176 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/TwoWayPersonKey2StringMapper.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/TwoWayPersonKey2StringMapper.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbc.stringbased;
 
 import org.infinispan.loaders.keymappers.TwoWayKey2StringMapper;
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/test/fwk/UnitTestDatabaseManager.java b/cachestore/jdbc/src/test/java/org/infinispan/test/fwk/UnitTestDatabaseManager.java
index 7f92b709fdd9..7a97d4e3977d 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/test/fwk/UnitTestDatabaseManager.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/test/fwk/UnitTestDatabaseManager.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.test.fwk;
 
 import static org.testng.Assert.assertEquals;
diff --git a/cachestore/jdbc/src/test/resources/c3p0.properties b/cachestore/jdbc/src/test/resources/c3p0.properties
index d59c2c0d6ca2..7bc3eb00c82b 100644
--- a/cachestore/jdbc/src/test/resources/c3p0.properties
+++ b/cachestore/jdbc/src/test/resources/c3p0.properties
@@ -1,25 +1,2 @@
-#
-# JBoss, Home of Professional Open Source
-# Copyright 2009 Red Hat Inc. and/or its affiliates and other
-# contributors as indicated by the @author tags. All rights reserved.
-# See the copyright.txt in the distribution for a full listing of
-# individual contributors.
-#
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
-
 #c3p0.preferredTestQuery=SELECT * FROM INFORMATION_SCHEMA.SYSTEM_TABLES
 #c3p0.testConnectionOnCheckout=true
\ No newline at end of file
diff --git a/cachestore/jdbc/src/test/resources/configs/binary.xml b/cachestore/jdbc/src/test/resources/configs/binary.xml
index 99df8119de57..06b4cf5bfb98 100644
--- a/cachestore/jdbc/src/test/resources/configs/binary.xml
+++ b/cachestore/jdbc/src/test/resources/configs/binary.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <infinispan>
 
    <global>
diff --git a/cachestore/jdbc/src/test/resources/configs/managed/binary-managed-connection-factory.xml b/cachestore/jdbc/src/test/resources/configs/managed/binary-managed-connection-factory.xml
index 3630cd8ad6fb..195445b050e2 100644
--- a/cachestore/jdbc/src/test/resources/configs/managed/binary-managed-connection-factory.xml
+++ b/cachestore/jdbc/src/test/resources/configs/managed/binary-managed-connection-factory.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <infinispan>
 
    <global>
diff --git a/cachestore/jdbc/src/test/resources/configs/managed/mixed-managed-connection-factory.xml b/cachestore/jdbc/src/test/resources/configs/managed/mixed-managed-connection-factory.xml
index ffa3b2a81001..84d939fa740d 100644
--- a/cachestore/jdbc/src/test/resources/configs/managed/mixed-managed-connection-factory.xml
+++ b/cachestore/jdbc/src/test/resources/configs/managed/mixed-managed-connection-factory.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <infinispan>
 
    <global>
diff --git a/cachestore/jdbc/src/test/resources/configs/managed/str-managed-connection-factory.xml b/cachestore/jdbc/src/test/resources/configs/managed/str-managed-connection-factory.xml
index 22d6b36b500a..c48ebc3dd792 100644
--- a/cachestore/jdbc/src/test/resources/configs/managed/str-managed-connection-factory.xml
+++ b/cachestore/jdbc/src/test/resources/configs/managed/str-managed-connection-factory.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <infinispan>
 
    <global>
diff --git a/cachestore/jdbc/src/test/resources/configs/mixed.xml b/cachestore/jdbc/src/test/resources/configs/mixed.xml
index 03b905831932..e56daf42d4c0 100644
--- a/cachestore/jdbc/src/test/resources/configs/mixed.xml
+++ b/cachestore/jdbc/src/test/resources/configs/mixed.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <infinispan>
 
    <global>
diff --git a/cachestore/jdbc/src/test/resources/configs/string-based.xml b/cachestore/jdbc/src/test/resources/configs/string-based.xml
index 6943ae9fbbf1..d36484b6b954 100644
--- a/cachestore/jdbc/src/test/resources/configs/string-based.xml
+++ b/cachestore/jdbc/src/test/resources/configs/string-based.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <infinispan>
 
    <global>
diff --git a/cachestore/jdbm/pom.xml b/cachestore/jdbm/pom.xml
index 250d05a25990..b483db220e0c 100755
--- a/cachestore/jdbm/pom.xml
+++ b/cachestore/jdbm/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
diff --git a/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmCacheStore.java b/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmCacheStore.java
index 168c6b0a9426..54b129efe159 100644
--- a/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmCacheStore.java
+++ b/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmCacheStore.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbm;
 
 import jdbm.RecordManager;
diff --git a/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmCacheStoreConfig.java b/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmCacheStoreConfig.java
index 4558cd3e12f3..67a83b373293 100644
--- a/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmCacheStoreConfig.java
+++ b/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmCacheStoreConfig.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbm;
 
 import java.util.Comparator;
diff --git a/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmSerializer.java b/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmSerializer.java
index 64731cd300c2..d2a52f5e75fa 100644
--- a/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmSerializer.java
+++ b/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmSerializer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbm;
 
 import java.io.IOException;
diff --git a/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/NaturalComparator.java b/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/NaturalComparator.java
index 5ee82f089d1b..1fdb51aa9a18 100644
--- a/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/NaturalComparator.java
+++ b/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/NaturalComparator.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbm;
 
 import java.io.Serializable;
diff --git a/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/configuration/Attribute.java b/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/configuration/Attribute.java
index 31c84bb61bf5..d540b0559295 100644
--- a/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/configuration/Attribute.java
+++ b/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/configuration/Attribute.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbm.configuration;
 
 import java.util.HashMap;
diff --git a/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/configuration/Element.java b/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/configuration/Element.java
index eedcb3d878b2..cb6bf184f130 100644
--- a/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/configuration/Element.java
+++ b/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/configuration/Element.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.loaders.jdbm.configuration;
 
 import java.util.HashMap;
diff --git a/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/configuration/JdbmCacheStoreConfiguration.java b/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/configuration/JdbmCacheStoreConfiguration.java
index 51004fbc71da..d6be033c5964 100644
--- a/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/configuration/JdbmCacheStoreConfiguration.java
+++ b/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/configuration/JdbmCacheStoreConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbm.configuration;
 
 import org.infinispan.configuration.cache.AbstractStoreConfiguration;
diff --git a/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/configuration/JdbmCacheStoreConfigurationBuilder.java b/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/configuration/JdbmCacheStoreConfigurationBuilder.java
index 27aa75cad40e..6d92ebc0ca2d 100644
--- a/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/configuration/JdbmCacheStoreConfigurationBuilder.java
+++ b/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/configuration/JdbmCacheStoreConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbm.configuration;
 
 import org.infinispan.configuration.cache.AbstractStoreConfigurationBuilder;
diff --git a/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/configuration/JdbmCacheStoreConfigurationParser52.java b/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/configuration/JdbmCacheStoreConfigurationParser52.java
index 19763a0c683a..9b2445828fa2 100644
--- a/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/configuration/JdbmCacheStoreConfigurationParser52.java
+++ b/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/configuration/JdbmCacheStoreConfigurationParser52.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbm.configuration;
 
 import static org.infinispan.commons.util.StringPropertyReplacer.replaceProperties;
diff --git a/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/configuration/JdbmCacheStoreConfigurationParser53.java b/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/configuration/JdbmCacheStoreConfigurationParser53.java
index ca337ae6a7e1..e10ceeea13b5 100644
--- a/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/configuration/JdbmCacheStoreConfigurationParser53.java
+++ b/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/configuration/JdbmCacheStoreConfigurationParser53.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbm.configuration;
 
 import static org.infinispan.commons.util.StringPropertyReplacer.replaceProperties;
diff --git a/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/logging/Log.java b/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/logging/Log.java
index a3bbede22c05..6ae67945ad5e 100644
--- a/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/logging/Log.java
+++ b/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/logging/Log.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.loaders.jdbm.logging;
 
 import org.jboss.logging.LogMessage;
diff --git a/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/package-info.java b/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/package-info.java
index 4d2ddb902558..00edcec99f4b 100644
--- a/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/package-info.java
+++ b/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * This package contains a {@link org.infinispan.loaders.CacheStore} implementation based on
  * persisting to JDBM.
diff --git a/cachestore/jdbm/src/main/resources/schema/infinispan-cachestore-jdbm-config-5.2.xsd b/cachestore/jdbm/src/main/resources/schema/infinispan-cachestore-jdbm-config-5.2.xsd
index f8569146172f..c459f05265cb 100644
--- a/cachestore/jdbm/src/main/resources/schema/infinispan-cachestore-jdbm-config-5.2.xsd
+++ b/cachestore/jdbm/src/main/resources/schema/infinispan-cachestore-jdbm-config-5.2.xsd
@@ -1,24 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!--
-  ~ Copyright 2012 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" version="1.0" targetNamespace="urn:infinispan:config:jdbm:5.2" xmlns:tns="urn:infinispan:config:jdbm:5.2" xmlns:config="urn:infinispan:config:5.2" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import namespace="urn:infinispan:config:5.2" schemaLocation="http://www.infinispan.org/schemas/infinispan-config-5.2.xsd" />
 
diff --git a/cachestore/jdbm/src/main/resources/schema/infinispan-cachestore-jdbm-config-5.3.xsd b/cachestore/jdbm/src/main/resources/schema/infinispan-cachestore-jdbm-config-5.3.xsd
index 632df365a315..1c92a618c328 100644
--- a/cachestore/jdbm/src/main/resources/schema/infinispan-cachestore-jdbm-config-5.3.xsd
+++ b/cachestore/jdbm/src/main/resources/schema/infinispan-cachestore-jdbm-config-5.3.xsd
@@ -1,24 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!--
-  ~ Copyright 2012 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" version="1.0"
            targetNamespace="urn:infinispan:config:jdbm:5.3"
            xmlns:tns="urn:infinispan:config:jdbm:5.3"
diff --git a/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/JdbmCacheStoreFunctionalTest.java b/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/JdbmCacheStoreFunctionalTest.java
index 7be1a2112f8a..7fa30dfd8636 100644
--- a/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/JdbmCacheStoreFunctionalTest.java
+++ b/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/JdbmCacheStoreFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbm;
 
 import java.io.File;
diff --git a/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/JdbmCacheStoreTest.java b/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/JdbmCacheStoreTest.java
index 1606f56456fc..9e3b4b5876cd 100644
--- a/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/JdbmCacheStoreTest.java
+++ b/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/JdbmCacheStoreTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbm;
 
 import java.io.File;
diff --git a/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/JdbmCacheStoreVamTest.java b/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/JdbmCacheStoreVamTest.java
index e4429bea5bbf..abcc44cd060d 100644
--- a/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/JdbmCacheStoreVamTest.java
+++ b/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/JdbmCacheStoreVamTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbm;
 
 import org.infinispan.loaders.CacheLoaderException;
diff --git a/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/configuration/ConfigurationTest.java b/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/configuration/ConfigurationTest.java
index 5633b4946069..81b055792804 100644
--- a/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/configuration/ConfigurationTest.java
+++ b/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/configuration/ConfigurationTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jdbm.configuration;
 
 import org.infinispan.configuration.cache.Configuration;
diff --git a/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/configuration/XmlFileParsingTest.java b/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/configuration/XmlFileParsingTest.java
index 0670f4685fc1..1396d0903646 100644
--- a/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/configuration/XmlFileParsingTest.java
+++ b/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/configuration/XmlFileParsingTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jdbm.configuration;
 
 import static org.infinispan.test.TestingUtil.INFINISPAN_START_TAG;
diff --git a/cachestore/jpa/pom.xml b/cachestore/jpa/pom.xml
index 2564546c3cf0..00a422ac8c5f 100644
--- a/cachestore/jpa/pom.xml
+++ b/cachestore/jpa/pom.xml
@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2013 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
 <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>
diff --git a/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/EntityManagerFactoryRegistry.java b/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/EntityManagerFactoryRegistry.java
index 5653e8435ce9..8a9a86b408f5 100644
--- a/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/EntityManagerFactoryRegistry.java
+++ b/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/EntityManagerFactoryRegistry.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- * 
- */
 package org.infinispan.loaders.jpa;
 
 import java.util.HashMap;
diff --git a/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/JpaCacheLoaderException.java b/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/JpaCacheLoaderException.java
index 34e0416f053e..9375ee4fd2f6 100644
--- a/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/JpaCacheLoaderException.java
+++ b/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/JpaCacheLoaderException.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- * 
- */
 package org.infinispan.loaders.jpa;
 
 import org.infinispan.loaders.CacheLoaderException;
diff --git a/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/JpaCacheStore.java b/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/JpaCacheStore.java
index 8fec93f90192..ce289b8b46db 100644
--- a/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/JpaCacheStore.java
+++ b/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/JpaCacheStore.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- *
- */
 package org.infinispan.loaders.jpa;
 
 import java.io.IOException;
diff --git a/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/JpaCacheStoreConfig.java b/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/JpaCacheStoreConfig.java
index 6b218f962a5e..f999b7030861 100644
--- a/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/JpaCacheStoreConfig.java
+++ b/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/JpaCacheStoreConfig.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- *
- */
 package org.infinispan.loaders.jpa;
 
 import java.util.Properties;
diff --git a/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/JpaCacheStoreLifecycleManager.java b/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/JpaCacheStoreLifecycleManager.java
index 7351243d2c94..4163fce9e6f8 100644
--- a/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/JpaCacheStoreLifecycleManager.java
+++ b/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/JpaCacheStoreLifecycleManager.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jpa;
 
 import org.infinispan.configuration.global.GlobalConfiguration;
diff --git a/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/configuration/Attribute.java b/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/configuration/Attribute.java
index 9691d817f0b0..1210fa75d063 100644
--- a/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/configuration/Attribute.java
+++ b/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/configuration/Attribute.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jpa.configuration;
 
 import java.util.HashMap;
diff --git a/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/configuration/Element.java b/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/configuration/Element.java
index 8b6905555e33..dc8a8f10fbe1 100644
--- a/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/configuration/Element.java
+++ b/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/configuration/Element.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.loaders.jpa.configuration;
 
 import java.util.HashMap;
diff --git a/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/configuration/JpaCacheStoreConfiguration.java b/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/configuration/JpaCacheStoreConfiguration.java
index 10274265ce13..1da88a3e54ea 100644
--- a/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/configuration/JpaCacheStoreConfiguration.java
+++ b/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/configuration/JpaCacheStoreConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jpa.configuration;
 
 import org.infinispan.configuration.cache.AbstractLockSupportStoreConfiguration;
diff --git a/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/configuration/JpaCacheStoreConfigurationBuilder.java b/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/configuration/JpaCacheStoreConfigurationBuilder.java
index f67c961fa458..8a891f44528a 100644
--- a/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/configuration/JpaCacheStoreConfigurationBuilder.java
+++ b/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/configuration/JpaCacheStoreConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jpa.configuration;
 
 import org.infinispan.configuration.cache.AbstractLockSupportStoreConfigurationBuilder;
diff --git a/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/configuration/JpaCacheStoreConfigurationParser53.java b/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/configuration/JpaCacheStoreConfigurationParser53.java
index 402519dd9fb0..65c8b56b93c3 100644
--- a/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/configuration/JpaCacheStoreConfigurationParser53.java
+++ b/cachestore/jpa/src/main/java/org/infinispan/loaders/jpa/configuration/JpaCacheStoreConfigurationParser53.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.jpa.configuration;
 
 import javax.xml.stream.XMLStreamConstants;
diff --git a/cachestore/jpa/src/main/resources/schema/infinispan-cachestore-jpa-config-5.3.xsd b/cachestore/jpa/src/main/resources/schema/infinispan-cachestore-jpa-config-5.3.xsd
index 979f29799b1d..0ceb983f368a 100644
--- a/cachestore/jpa/src/main/resources/schema/infinispan-cachestore-jpa-config-5.3.xsd
+++ b/cachestore/jpa/src/main/resources/schema/infinispan-cachestore-jpa-config-5.3.xsd
@@ -1,24 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!--
-  ~ Copyright 2013 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <xs:schema attributeFormDefault="unqualified"
 	elementFormDefault="qualified" version="1.0" targetNamespace="urn:infinispan:config:jpa:5.3"
 	xmlns:tns="urn:infinispan:config:jpa:5.3" xmlns:config="urn:infinispan:config:5.3"
diff --git a/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/BaseJpaCacheStoreTest.java b/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/BaseJpaCacheStoreTest.java
index 212f33738b31..6470da7ef7b7 100644
--- a/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/BaseJpaCacheStoreTest.java
+++ b/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/BaseJpaCacheStoreTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.jpa;
 
 import static org.mockito.Mockito.mock;
diff --git a/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/JpaCacheStoreUserEntityTest.java b/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/JpaCacheStoreUserEntityTest.java
index 359b0d8b7f73..ba6d63798c2c 100644
--- a/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/JpaCacheStoreUserEntityTest.java
+++ b/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/JpaCacheStoreUserEntityTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- * 
- */
 package org.infinispan.loaders.jpa;
 
 import org.hibernate.ejb.HibernateEntityManagerFactory;
diff --git a/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/JpaCacheStoreVehicleEntityTest.java b/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/JpaCacheStoreVehicleEntityTest.java
index 136583c90026..57447e4e2b2e 100644
--- a/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/JpaCacheStoreVehicleEntityTest.java
+++ b/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/JpaCacheStoreVehicleEntityTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- * 
- */
 package org.infinispan.loaders.jpa;
 
 import org.hibernate.ejb.HibernateEntityManagerFactory;
diff --git a/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/TestObject.java b/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/TestObject.java
index 72a428e992a8..005a74d136e5 100644
--- a/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/TestObject.java
+++ b/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/TestObject.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- * 
- */
 package org.infinispan.loaders.jpa;
 
 /**
diff --git a/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/config/ConfigurationTest.java b/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/config/ConfigurationTest.java
index 7c05b2435ebb..bbd97462b5b7 100644
--- a/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/config/ConfigurationTest.java
+++ b/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/config/ConfigurationTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- * 
- */
 package org.infinispan.loaders.jpa.config;
 
 import java.io.IOException;
diff --git a/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/entity/Document.java b/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/entity/Document.java
index 6303c4ab51c7..8a2a8ec83c4d 100644
--- a/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/entity/Document.java
+++ b/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/entity/Document.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- * 
- */
 package org.infinispan.loaders.jpa.entity;
 
 import java.io.Serializable;
diff --git a/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/entity/User.java b/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/entity/User.java
index 6fd01155ade9..ff148c215d65 100644
--- a/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/entity/User.java
+++ b/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/entity/User.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- * 
- */
 package org.infinispan.loaders.jpa.entity;
 
 import java.io.Serializable;
diff --git a/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/entity/Vehicle.java b/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/entity/Vehicle.java
index 6b5c9417f702..fbfeed017bdc 100644
--- a/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/entity/Vehicle.java
+++ b/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/entity/Vehicle.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- * 
- */
 package org.infinispan.loaders.jpa.entity;
 
 import java.io.Serializable;
diff --git a/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/entity/VehicleId.java b/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/entity/VehicleId.java
index be8180860841..8dce88029a0b 100644
--- a/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/entity/VehicleId.java
+++ b/cachestore/jpa/src/test/java/org/infinispan/loaders/jpa/entity/VehicleId.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- * 
- */
 package org.infinispan.loaders.jpa.entity;
 
 import java.io.Serializable;
diff --git a/cachestore/jpa/src/test/resources/META-INF/persistence.xml b/cachestore/jpa/src/test/resources/META-INF/persistence.xml
index fe8718e9b556..5f39b927cffa 100644
--- a/cachestore/jpa/src/test/resources/META-INF/persistence.xml
+++ b/cachestore/jpa/src/test/resources/META-INF/persistence.xml
@@ -1,18 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- ~ JBoss, Home of Professional Open Source ~ Copyright 2009 Red Hat Inc. 
-	and/or its affiliates and other ~ contributors as indicated by the @author 
-	tags. All rights reserved. ~ See the copyright.txt in the distribution for 
-	a full listing of ~ individual contributors. ~ ~ This is free software; you 
-	can redistribute it and/or modify it ~ under the terms of the GNU Lesser 
-	General Public License as ~ published by the Free Software Foundation; either 
-	version 2.1 of ~ the License, or (at your option) any later version. ~ ~ 
-	This software is distributed in the hope that it will be useful, ~ but WITHOUT 
-	ANY WARRANTY; without even the implied warranty of ~ MERCHANTABILITY or FITNESS 
-	FOR A PARTICULAR PURPOSE. See the GNU ~ Lesser General Public License for 
-	more details. ~ ~ You should have received a copy of the GNU Lesser General 
-	Public ~ License along with this software; if not, write to the Free ~ Software 
-	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ 02110-1301 USA, 
-	or see the FSF site: http://www.fsf.org. -->
 <persistence xmlns="http://java.sun.com/xml/ns/persistence"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
diff --git a/cachestore/jpa/src/test/resources/config/jpa-config-53.xml b/cachestore/jpa/src/test/resources/config/jpa-config-53.xml
index 4714f8600eb1..d77ba0399179 100644
--- a/cachestore/jpa/src/test/resources/config/jpa-config-53.xml
+++ b/cachestore/jpa/src/test/resources/config/jpa-config-53.xml
@@ -1,18 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- ~ JBoss, Home of Professional Open Source ~ Copyright 2009 Red Hat Inc. 
-	and/or its affiliates and other ~ contributors as indicated by the @author 
-	tags. All rights reserved. ~ See the copyright.txt in the distribution for 
-	a full listing of ~ individual contributors. ~ ~ This is free software; you 
-	can redistribute it and/or modify it ~ under the terms of the GNU Lesser 
-	General Public License as ~ published by the Free Software Foundation; either 
-	version 2.1 of ~ the License, or (at your option) any later version. ~ ~ 
-	This software is distributed in the hope that it will be useful, ~ but WITHOUT 
-	ANY WARRANTY; without even the implied warranty of ~ MERCHANTABILITY or FITNESS 
-	FOR A PARTICULAR PURPOSE. See the GNU ~ Lesser General Public License for 
-	more details. ~ ~ You should have received a copy of the GNU Lesser General 
-	Public ~ License along with this software; if not, write to the Free ~ Software 
-	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ 02110-1301 USA, 
-	or see the FSF site: http://www.fsf.org. -->
 <infinispan>
 
 	<global>
diff --git a/cachestore/jpa/src/test/resources/config/jpa-config-legacy.xml b/cachestore/jpa/src/test/resources/config/jpa-config-legacy.xml
index a115248755b0..c8a2d962649d 100644
--- a/cachestore/jpa/src/test/resources/config/jpa-config-legacy.xml
+++ b/cachestore/jpa/src/test/resources/config/jpa-config-legacy.xml
@@ -1,18 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- ~ JBoss, Home of Professional Open Source ~ Copyright 2009 Red Hat Inc. 
-	and/or its affiliates and other ~ contributors as indicated by the @author 
-	tags. All rights reserved. ~ See the copyright.txt in the distribution for 
-	a full listing of ~ individual contributors. ~ ~ This is free software; you 
-	can redistribute it and/or modify it ~ under the terms of the GNU Lesser 
-	General Public License as ~ published by the Free Software Foundation; either 
-	version 2.1 of ~ the License, or (at your option) any later version. ~ ~ 
-	This software is distributed in the hope that it will be useful, ~ but WITHOUT 
-	ANY WARRANTY; without even the implied warranty of ~ MERCHANTABILITY or FITNESS 
-	FOR A PARTICULAR PURPOSE. See the GNU ~ Lesser General Public License for 
-	more details. ~ ~ You should have received a copy of the GNU Lesser General 
-	Public ~ License along with this software; if not, write to the Free ~ Software 
-	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ 02110-1301 USA, 
-	or see the FSF site: http://www.fsf.org. -->
 <infinispan>
 
 	<global>
diff --git a/cachestore/leveldb/pom.xml b/cachestore/leveldb/pom.xml
index 4dccab64d668..6b21dab53132 100644
--- a/cachestore/leveldb/pom.xml
+++ b/cachestore/leveldb/pom.xml
@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2013 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
 <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>
diff --git a/cachestore/leveldb/src/main/java/org/infinispan/loaders/leveldb/configuration/Attribute.java b/cachestore/leveldb/src/main/java/org/infinispan/loaders/leveldb/configuration/Attribute.java
index 06df78c92a60..2f20dca05507 100644
--- a/cachestore/leveldb/src/main/java/org/infinispan/loaders/leveldb/configuration/Attribute.java
+++ b/cachestore/leveldb/src/main/java/org/infinispan/loaders/leveldb/configuration/Attribute.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.leveldb.configuration;
 
 import java.util.HashMap;
diff --git a/cachestore/leveldb/src/main/java/org/infinispan/loaders/leveldb/configuration/Element.java b/cachestore/leveldb/src/main/java/org/infinispan/loaders/leveldb/configuration/Element.java
index e1631fafa657..b415adc1c922 100644
--- a/cachestore/leveldb/src/main/java/org/infinispan/loaders/leveldb/configuration/Element.java
+++ b/cachestore/leveldb/src/main/java/org/infinispan/loaders/leveldb/configuration/Element.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.loaders.leveldb.configuration;
 
 import java.util.HashMap;
diff --git a/cachestore/leveldb/src/main/java/org/infinispan/loaders/leveldb/configuration/LevelDBCacheStoreConfiguration.java b/cachestore/leveldb/src/main/java/org/infinispan/loaders/leveldb/configuration/LevelDBCacheStoreConfiguration.java
index f8520124bbf0..6dab408cc006 100644
--- a/cachestore/leveldb/src/main/java/org/infinispan/loaders/leveldb/configuration/LevelDBCacheStoreConfiguration.java
+++ b/cachestore/leveldb/src/main/java/org/infinispan/loaders/leveldb/configuration/LevelDBCacheStoreConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.leveldb.configuration;
 
 import org.infinispan.configuration.cache.AbstractLockSupportStoreConfiguration;
diff --git a/cachestore/leveldb/src/main/java/org/infinispan/loaders/leveldb/configuration/LevelDBCacheStoreConfigurationBuilder.java b/cachestore/leveldb/src/main/java/org/infinispan/loaders/leveldb/configuration/LevelDBCacheStoreConfigurationBuilder.java
index 773bd62a644e..ddf9bbc78133 100644
--- a/cachestore/leveldb/src/main/java/org/infinispan/loaders/leveldb/configuration/LevelDBCacheStoreConfigurationBuilder.java
+++ b/cachestore/leveldb/src/main/java/org/infinispan/loaders/leveldb/configuration/LevelDBCacheStoreConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.leveldb.configuration;
 
 import org.infinispan.configuration.cache.AbstractLockSupportStoreConfigurationBuilder;
diff --git a/cachestore/leveldb/src/main/java/org/infinispan/loaders/leveldb/configuration/LevelDBCacheStoreConfigurationParser52.java b/cachestore/leveldb/src/main/java/org/infinispan/loaders/leveldb/configuration/LevelDBCacheStoreConfigurationParser52.java
index 76a935ed88b5..059f8fdde17b 100644
--- a/cachestore/leveldb/src/main/java/org/infinispan/loaders/leveldb/configuration/LevelDBCacheStoreConfigurationParser52.java
+++ b/cachestore/leveldb/src/main/java/org/infinispan/loaders/leveldb/configuration/LevelDBCacheStoreConfigurationParser52.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.leveldb.configuration;
 
 import javax.xml.stream.XMLStreamConstants;
diff --git a/cachestore/leveldb/src/main/java/org/infinispan/loaders/leveldb/configuration/LevelDBCacheStoreConfigurationParser53.java b/cachestore/leveldb/src/main/java/org/infinispan/loaders/leveldb/configuration/LevelDBCacheStoreConfigurationParser53.java
index 6c43f09b6eb7..c4128224856f 100644
--- a/cachestore/leveldb/src/main/java/org/infinispan/loaders/leveldb/configuration/LevelDBCacheStoreConfigurationParser53.java
+++ b/cachestore/leveldb/src/main/java/org/infinispan/loaders/leveldb/configuration/LevelDBCacheStoreConfigurationParser53.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.leveldb.configuration;
 
 import javax.xml.stream.XMLStreamConstants;
diff --git a/cachestore/leveldb/src/main/resources/schema/infinispan-cachestore-leveldb-config-5.2.xsd b/cachestore/leveldb/src/main/resources/schema/infinispan-cachestore-leveldb-config-5.2.xsd
index 09c3df7bf5c2..aa429657ef60 100644
--- a/cachestore/leveldb/src/main/resources/schema/infinispan-cachestore-leveldb-config-5.2.xsd
+++ b/cachestore/leveldb/src/main/resources/schema/infinispan-cachestore-leveldb-config-5.2.xsd
@@ -1,24 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!--
-  ~ Copyright 2013 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <xs:schema attributeFormDefault="unqualified"
 	elementFormDefault="qualified" version="1.0" targetNamespace="urn:infinispan:config:leveldb:5.2"
 	xmlns:tns="urn:infinispan:config:leveldb:5.2" xmlns:config="urn:infinispan:config:5.2"
diff --git a/cachestore/leveldb/src/main/resources/schema/infinispan-cachestore-leveldb-config-5.3.xsd b/cachestore/leveldb/src/main/resources/schema/infinispan-cachestore-leveldb-config-5.3.xsd
index 1a8d913703f5..69d0fb31bbaa 100644
--- a/cachestore/leveldb/src/main/resources/schema/infinispan-cachestore-leveldb-config-5.3.xsd
+++ b/cachestore/leveldb/src/main/resources/schema/infinispan-cachestore-leveldb-config-5.3.xsd
@@ -1,24 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!--
-  ~ Copyright 2013 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <xs:schema attributeFormDefault="unqualified"
    elementFormDefault="qualified" version="1.0" targetNamespace="urn:infinispan:config:leveldb:5.3"
    xmlns:tns="urn:infinispan:config:leveldb:5.3" xmlns:config="urn:infinispan:config:5.3"
diff --git a/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/JavaLevelDBCacheStoreFunctionalTest.java b/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/JavaLevelDBCacheStoreFunctionalTest.java
index 43fd59559cff..9f98fc37c9d6 100644
--- a/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/JavaLevelDBCacheStoreFunctionalTest.java
+++ b/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/JavaLevelDBCacheStoreFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.leveldb;
 
 import org.infinispan.loaders.CacheLoaderException;
diff --git a/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/JavaLevelDBCacheStoreTest.java b/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/JavaLevelDBCacheStoreTest.java
index 0a655095c14f..d13103663197 100644
--- a/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/JavaLevelDBCacheStoreTest.java
+++ b/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/JavaLevelDBCacheStoreTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.leveldb;
 
 import org.infinispan.loaders.CacheLoaderException;
diff --git a/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/JniLevelDBCacheStoreFunctionalTest.java b/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/JniLevelDBCacheStoreFunctionalTest.java
index b7a2f78c2953..f544e86a2b3f 100644
--- a/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/JniLevelDBCacheStoreFunctionalTest.java
+++ b/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/JniLevelDBCacheStoreFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.leveldb;
 
 import org.infinispan.loaders.CacheLoaderException;
diff --git a/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/JniLevelDBCacheStoreTest.java b/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/JniLevelDBCacheStoreTest.java
index 018c567ce9b8..368717ff2425 100644
--- a/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/JniLevelDBCacheStoreTest.java
+++ b/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/JniLevelDBCacheStoreTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.leveldb;
 
 import org.infinispan.loaders.CacheLoaderException;
diff --git a/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/LevelDBCacheStoreFunctionalTest.java b/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/LevelDBCacheStoreFunctionalTest.java
index cb17e30e3048..025235fa78b7 100644
--- a/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/LevelDBCacheStoreFunctionalTest.java
+++ b/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/LevelDBCacheStoreFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.leveldb;
 
 import java.io.File;
diff --git a/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/LevelDBCacheStoreTest.java b/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/LevelDBCacheStoreTest.java
index 79916fabc482..7c8dc75a61df 100644
--- a/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/LevelDBCacheStoreTest.java
+++ b/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/LevelDBCacheStoreTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.leveldb;
 
 import java.io.File;
diff --git a/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/config/ConfigurationTest.java b/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/config/ConfigurationTest.java
index bfdd41e7f318..df3c77d29a26 100644
--- a/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/config/ConfigurationTest.java
+++ b/cachestore/leveldb/src/test/java/org/infinispan/loaders/leveldb/config/ConfigurationTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- * 
- */
 package org.infinispan.loaders.leveldb.config;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/cachestore/leveldb/src/test/resources/config/leveldb-config-52-auto.xml b/cachestore/leveldb/src/test/resources/config/leveldb-config-52-auto.xml
index 93f94c08c367..6082cacfb40f 100644
--- a/cachestore/leveldb/src/test/resources/config/leveldb-config-52-auto.xml
+++ b/cachestore/leveldb/src/test/resources/config/leveldb-config-52-auto.xml
@@ -1,18 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- ~ JBoss, Home of Professional Open Source ~ Copyright 2009 Red Hat Inc. 
-	and/or its affiliates and other ~ contributors as indicated by the @author 
-	tags. All rights reserved. ~ See the copyright.txt in the distribution for 
-	a full listing of ~ individual contributors. ~ ~ This is free software; you 
-	can redistribute it and/or modify it ~ under the terms of the GNU Lesser 
-	General Public License as ~ published by the Free Software Foundation; either 
-	version 2.1 of ~ the License, or (at your option) any later version. ~ ~ 
-	This software is distributed in the hope that it will be useful, ~ but WITHOUT 
-	ANY WARRANTY; without even the implied warranty of ~ MERCHANTABILITY or FITNESS 
-	FOR A PARTICULAR PURPOSE. See the GNU ~ Lesser General Public License for 
-	more details. ~ ~ You should have received a copy of the GNU Lesser General 
-	Public ~ License along with this software; if not, write to the Free ~ Software 
-	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ 02110-1301 USA, 
-	or see the FSF site: http://www.fsf.org. -->
 <infinispan>
 
 	<global>
diff --git a/cachestore/leveldb/src/test/resources/config/leveldb-config-52-java.xml b/cachestore/leveldb/src/test/resources/config/leveldb-config-52-java.xml
index 16253b812890..f8a1ca9ea358 100644
--- a/cachestore/leveldb/src/test/resources/config/leveldb-config-52-java.xml
+++ b/cachestore/leveldb/src/test/resources/config/leveldb-config-52-java.xml
@@ -1,18 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- ~ JBoss, Home of Professional Open Source ~ Copyright 2009 Red Hat Inc. 
-	and/or its affiliates and other ~ contributors as indicated by the @author 
-	tags. All rights reserved. ~ See the copyright.txt in the distribution for 
-	a full listing of ~ individual contributors. ~ ~ This is free software; you 
-	can redistribute it and/or modify it ~ under the terms of the GNU Lesser 
-	General Public License as ~ published by the Free Software Foundation; either 
-	version 2.1 of ~ the License, or (at your option) any later version. ~ ~ 
-	This software is distributed in the hope that it will be useful, ~ but WITHOUT 
-	ANY WARRANTY; without even the implied warranty of ~ MERCHANTABILITY or FITNESS 
-	FOR A PARTICULAR PURPOSE. See the GNU ~ Lesser General Public License for 
-	more details. ~ ~ You should have received a copy of the GNU Lesser General 
-	Public ~ License along with this software; if not, write to the Free ~ Software 
-	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ 02110-1301 USA, 
-	or see the FSF site: http://www.fsf.org. -->
 <infinispan>
 
 	<global>
diff --git a/cachestore/leveldb/src/test/resources/config/leveldb-config-52-jni.xml b/cachestore/leveldb/src/test/resources/config/leveldb-config-52-jni.xml
index 5f7017921fc9..249aa46be0e0 100644
--- a/cachestore/leveldb/src/test/resources/config/leveldb-config-52-jni.xml
+++ b/cachestore/leveldb/src/test/resources/config/leveldb-config-52-jni.xml
@@ -1,18 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- ~ JBoss, Home of Professional Open Source ~ Copyright 2009 Red Hat Inc. 
-	and/or its affiliates and other ~ contributors as indicated by the @author 
-	tags. All rights reserved. ~ See the copyright.txt in the distribution for 
-	a full listing of ~ individual contributors. ~ ~ This is free software; you 
-	can redistribute it and/or modify it ~ under the terms of the GNU Lesser 
-	General Public License as ~ published by the Free Software Foundation; either 
-	version 2.1 of ~ the License, or (at your option) any later version. ~ ~ 
-	This software is distributed in the hope that it will be useful, ~ but WITHOUT 
-	ANY WARRANTY; without even the implied warranty of ~ MERCHANTABILITY or FITNESS 
-	FOR A PARTICULAR PURPOSE. See the GNU ~ Lesser General Public License for 
-	more details. ~ ~ You should have received a copy of the GNU Lesser General 
-	Public ~ License along with this software; if not, write to the Free ~ Software 
-	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ 02110-1301 USA, 
-	or see the FSF site: http://www.fsf.org. -->
 <infinispan>
 
 	<global>
diff --git a/cachestore/leveldb/src/test/resources/config/leveldb-config-legacy-auto.xml b/cachestore/leveldb/src/test/resources/config/leveldb-config-legacy-auto.xml
index 7ae2b6d936c0..03cffc2f9d8f 100644
--- a/cachestore/leveldb/src/test/resources/config/leveldb-config-legacy-auto.xml
+++ b/cachestore/leveldb/src/test/resources/config/leveldb-config-legacy-auto.xml
@@ -1,18 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- ~ JBoss, Home of Professional Open Source ~ Copyright 2009 Red Hat Inc. 
-	and/or its affiliates and other ~ contributors as indicated by the @author 
-	tags. All rights reserved. ~ See the copyright.txt in the distribution for 
-	a full listing of ~ individual contributors. ~ ~ This is free software; you 
-	can redistribute it and/or modify it ~ under the terms of the GNU Lesser 
-	General Public License as ~ published by the Free Software Foundation; either 
-	version 2.1 of ~ the License, or (at your option) any later version. ~ ~ 
-	This software is distributed in the hope that it will be useful, ~ but WITHOUT 
-	ANY WARRANTY; without even the implied warranty of ~ MERCHANTABILITY or FITNESS 
-	FOR A PARTICULAR PURPOSE. See the GNU ~ Lesser General Public License for 
-	more details. ~ ~ You should have received a copy of the GNU Lesser General 
-	Public ~ License along with this software; if not, write to the Free ~ Software 
-	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ 02110-1301 USA, 
-	or see the FSF site: http://www.fsf.org. -->
 <infinispan>
 
 	<global>
diff --git a/cachestore/leveldb/src/test/resources/config/leveldb-config-legacy-java.xml b/cachestore/leveldb/src/test/resources/config/leveldb-config-legacy-java.xml
index 057a1abba694..67a01cc6edc1 100644
--- a/cachestore/leveldb/src/test/resources/config/leveldb-config-legacy-java.xml
+++ b/cachestore/leveldb/src/test/resources/config/leveldb-config-legacy-java.xml
@@ -1,18 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- ~ JBoss, Home of Professional Open Source ~ Copyright 2009 Red Hat Inc. 
-	and/or its affiliates and other ~ contributors as indicated by the @author 
-	tags. All rights reserved. ~ See the copyright.txt in the distribution for 
-	a full listing of ~ individual contributors. ~ ~ This is free software; you 
-	can redistribute it and/or modify it ~ under the terms of the GNU Lesser 
-	General Public License as ~ published by the Free Software Foundation; either 
-	version 2.1 of ~ the License, or (at your option) any later version. ~ ~ 
-	This software is distributed in the hope that it will be useful, ~ but WITHOUT 
-	ANY WARRANTY; without even the implied warranty of ~ MERCHANTABILITY or FITNESS 
-	FOR A PARTICULAR PURPOSE. See the GNU ~ Lesser General Public License for 
-	more details. ~ ~ You should have received a copy of the GNU Lesser General 
-	Public ~ License along with this software; if not, write to the Free ~ Software 
-	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ 02110-1301 USA, 
-	or see the FSF site: http://www.fsf.org. -->
 <infinispan>
 
 	<global>
diff --git a/cachestore/leveldb/src/test/resources/config/leveldb-config-legacy-jni.xml b/cachestore/leveldb/src/test/resources/config/leveldb-config-legacy-jni.xml
index 057a1abba694..67a01cc6edc1 100644
--- a/cachestore/leveldb/src/test/resources/config/leveldb-config-legacy-jni.xml
+++ b/cachestore/leveldb/src/test/resources/config/leveldb-config-legacy-jni.xml
@@ -1,18 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- ~ JBoss, Home of Professional Open Source ~ Copyright 2009 Red Hat Inc. 
-	and/or its affiliates and other ~ contributors as indicated by the @author 
-	tags. All rights reserved. ~ See the copyright.txt in the distribution for 
-	a full listing of ~ individual contributors. ~ ~ This is free software; you 
-	can redistribute it and/or modify it ~ under the terms of the GNU Lesser 
-	General Public License as ~ published by the Free Software Foundation; either 
-	version 2.1 of ~ the License, or (at your option) any later version. ~ ~ 
-	This software is distributed in the hope that it will be useful, ~ but WITHOUT 
-	ANY WARRANTY; without even the implied warranty of ~ MERCHANTABILITY or FITNESS 
-	FOR A PARTICULAR PURPOSE. See the GNU ~ Lesser General Public License for 
-	more details. ~ ~ You should have received a copy of the GNU Lesser General 
-	Public ~ License along with this software; if not, write to the Free ~ Software 
-	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ 02110-1301 USA, 
-	or see the FSF site: http://www.fsf.org. -->
 <infinispan>
 
 	<global>
diff --git a/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/MongoDBCacheStore.java b/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/MongoDBCacheStore.java
index 0c74f1d08e0e..c530e83d5aa2 100644
--- a/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/MongoDBCacheStore.java
+++ b/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/MongoDBCacheStore.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.mongodb;
 
 import com.mongodb.*;
diff --git a/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/MongoDBCacheStoreConfig.java b/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/MongoDBCacheStoreConfig.java
index a5cb9866ff60..a1930c9aa680 100644
--- a/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/MongoDBCacheStoreConfig.java
+++ b/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/MongoDBCacheStoreConfig.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.loaders.mongodb;
 
 import org.infinispan.loaders.LockSupportCacheStoreConfig;
diff --git a/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/configuration/Attribute.java b/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/configuration/Attribute.java
index 8ff8f34c45bf..0e516df7ab9e 100644
--- a/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/configuration/Attribute.java
+++ b/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/configuration/Attribute.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.loaders.mongodb.configuration;
 
 import java.util.HashMap;
diff --git a/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/configuration/Element.java b/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/configuration/Element.java
index 4f0b0a48a34a..ea044bb60d7d 100644
--- a/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/configuration/Element.java
+++ b/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/configuration/Element.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.loaders.mongodb.configuration;
 
 import java.util.HashMap;
diff --git a/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/configuration/MongoDBCacheStoreConfiguration.java b/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/configuration/MongoDBCacheStoreConfiguration.java
index 48f7af5971fe..02eaea28b2d2 100644
--- a/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/configuration/MongoDBCacheStoreConfiguration.java
+++ b/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/configuration/MongoDBCacheStoreConfiguration.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.loaders.mongodb.configuration;
 
 import org.infinispan.configuration.cache.AbstractStoreConfiguration;
diff --git a/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/configuration/MongoDBCacheStoreConfigurationBuilder.java b/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/configuration/MongoDBCacheStoreConfigurationBuilder.java
index d148dccf149b..7eea47d6c7bc 100644
--- a/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/configuration/MongoDBCacheStoreConfigurationBuilder.java
+++ b/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/configuration/MongoDBCacheStoreConfigurationBuilder.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.loaders.mongodb.configuration;
 
 import org.infinispan.configuration.cache.AbstractStoreConfigurationBuilder;
diff --git a/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/configuration/MongoDBCacheStoreConfigurationParser53.java b/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/configuration/MongoDBCacheStoreConfigurationParser53.java
index 35c973a91d50..a3cdcb4f00c0 100644
--- a/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/configuration/MongoDBCacheStoreConfigurationParser53.java
+++ b/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/configuration/MongoDBCacheStoreConfigurationParser53.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.loaders.mongodb.configuration;
 
 import static org.infinispan.commons.util.StringPropertyReplacer.replaceProperties;
diff --git a/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/logging/Log.java b/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/logging/Log.java
index 5367a5d13404..d2545079a3fe 100644
--- a/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/logging/Log.java
+++ b/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/logging/Log.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.loaders.mongodb.logging;
 
 import com.mongodb.MongoException;
diff --git a/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/package-info.java b/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/package-info.java
index 5a0a2acb887e..223a992b78d8 100644
--- a/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/package-info.java
+++ b/cachestore/mongodb/src/main/java/org/infinispan/loaders/mongodb/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * This package contains a {@link org.infinispan.loaders.CacheStore} implementation based on
  * persisting to MongoDB
diff --git a/cachestore/mongodb/src/main/resources/schema/mongodb-cachestore-config-5.3.xsd b/cachestore/mongodb/src/main/resources/schema/mongodb-cachestore-config-5.3.xsd
index 2f7161f6f1ee..25132fb6102e 100644
--- a/cachestore/mongodb/src/main/resources/schema/mongodb-cachestore-config-5.3.xsd
+++ b/cachestore/mongodb/src/main/resources/schema/mongodb-cachestore-config-5.3.xsd
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-
 <xs:schema attributeFormDefault="unqualified"
            elementFormDefault="qualified"
            version="1.0"
diff --git a/cachestore/mongodb/src/test/java/org/infinispan/loaders/mongodb/MongoDBCacheStoreTest.java b/cachestore/mongodb/src/test/java/org/infinispan/loaders/mongodb/MongoDBCacheStoreTest.java
index 9a154ad38ddc..8650f694204f 100644
--- a/cachestore/mongodb/src/test/java/org/infinispan/loaders/mongodb/MongoDBCacheStoreTest.java
+++ b/cachestore/mongodb/src/test/java/org/infinispan/loaders/mongodb/MongoDBCacheStoreTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.loaders.mongodb;
 
 import org.infinispan.loaders.BaseCacheStoreTest;
diff --git a/cachestore/mongodb/src/test/java/org/infinispan/loaders/mongodb/configuration/ConfigurationTest.java b/cachestore/mongodb/src/test/java/org/infinispan/loaders/mongodb/configuration/ConfigurationTest.java
index 16d0a609ccc7..1e568f2b9bb6 100644
--- a/cachestore/mongodb/src/test/java/org/infinispan/loaders/mongodb/configuration/ConfigurationTest.java
+++ b/cachestore/mongodb/src/test/java/org/infinispan/loaders/mongodb/configuration/ConfigurationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.mongodb.configuration;
 
 import org.infinispan.configuration.cache.Configuration;
diff --git a/cachestore/mongodb/src/test/java/org/infinispan/loaders/mongodb/configuration/XmlFileParsingTest.java b/cachestore/mongodb/src/test/java/org/infinispan/loaders/mongodb/configuration/XmlFileParsingTest.java
index 7f7bc47735b6..1bc44791718e 100644
--- a/cachestore/mongodb/src/test/java/org/infinispan/loaders/mongodb/configuration/XmlFileParsingTest.java
+++ b/cachestore/mongodb/src/test/java/org/infinispan/loaders/mongodb/configuration/XmlFileParsingTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.loaders.mongodb.configuration;
 
 import org.infinispan.configuration.cache.CacheLoaderConfiguration;
diff --git a/cachestore/pom.xml b/cachestore/pom.xml
index 08987da7a201..e0122ce9ef8e 100644
--- a/cachestore/pom.xml
+++ b/cachestore/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
diff --git a/cachestore/remote/pom.xml b/cachestore/remote/pom.xml
index a7238b83788d..6f192dadad0b 100644
--- a/cachestore/remote/pom.xml
+++ b/cachestore/remote/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
diff --git a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/RemoteCacheStore.java b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/RemoteCacheStore.java
index b981b55efe21..4e90bafab52b 100644
--- a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/RemoteCacheStore.java
+++ b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/RemoteCacheStore.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.remote;
 
 import net.jcip.annotations.ThreadSafe;
diff --git a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/RemoteCacheStoreConfig.java b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/RemoteCacheStoreConfig.java
index 30b91a7e3b96..94fb3afc7ac1 100644
--- a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/RemoteCacheStoreConfig.java
+++ b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/RemoteCacheStoreConfig.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.remote;
 
 import java.io.IOException;
diff --git a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/AbstractRemoteCacheStoreConfigurationChildBuilder.java b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/AbstractRemoteCacheStoreConfigurationChildBuilder.java
index 535e5ba98875..ee0b0d9cdc8f 100644
--- a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/AbstractRemoteCacheStoreConfigurationChildBuilder.java
+++ b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/AbstractRemoteCacheStoreConfigurationChildBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.remote.configuration;
 
 import org.infinispan.client.hotrod.impl.transport.TransportFactory;
diff --git a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/Attribute.java b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/Attribute.java
index 743d374c7f7d..d764e45d35a6 100644
--- a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/Attribute.java
+++ b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/Attribute.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.remote.configuration;
 
 import java.util.HashMap;
diff --git a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/ConnectionPoolConfiguration.java b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/ConnectionPoolConfiguration.java
index 770ea35d09f1..b85a9e037017 100644
--- a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/ConnectionPoolConfiguration.java
+++ b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/ConnectionPoolConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.remote.configuration;
 
 public class ConnectionPoolConfiguration {
diff --git a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/ConnectionPoolConfigurationBuilder.java b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/ConnectionPoolConfigurationBuilder.java
index 9a29d2b694aa..69bc0bf11663 100644
--- a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/ConnectionPoolConfigurationBuilder.java
+++ b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/ConnectionPoolConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.remote.configuration;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/Element.java b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/Element.java
index 463b919df3d8..06c2132a3964 100644
--- a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/Element.java
+++ b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/Element.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.loaders.remote.configuration;
 
 import java.util.HashMap;
diff --git a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/ExecutorFactoryConfiguration.java b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/ExecutorFactoryConfiguration.java
index d2e6a1f8efa7..8aad88228540 100644
--- a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/ExecutorFactoryConfiguration.java
+++ b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/ExecutorFactoryConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.loaders.remote.configuration;
 
 import org.infinispan.commons.configuration.AbstractTypedPropertiesConfiguration;
diff --git a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/ExecutorFactoryConfigurationBuilder.java b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/ExecutorFactoryConfigurationBuilder.java
index 6adb18d6e690..8253f9c13a38 100644
--- a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/ExecutorFactoryConfigurationBuilder.java
+++ b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/ExecutorFactoryConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.loaders.remote.configuration;
 
 import java.util.Properties;
diff --git a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/ExhaustedAction.java b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/ExhaustedAction.java
index fb4dec64d187..1d8c70fd5ebc 100644
--- a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/ExhaustedAction.java
+++ b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/ExhaustedAction.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.remote.configuration;
 
 public enum ExhaustedAction {
diff --git a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteCacheStoreConfiguration.java b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteCacheStoreConfiguration.java
index 650e809784bf..13f15404d6b8 100644
--- a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteCacheStoreConfiguration.java
+++ b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteCacheStoreConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.remote.configuration;
 
 import java.util.Collections;
diff --git a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteCacheStoreConfigurationBuilder.java b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteCacheStoreConfigurationBuilder.java
index 0e36866549e2..dbac84dabd5f 100644
--- a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteCacheStoreConfigurationBuilder.java
+++ b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteCacheStoreConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.remote.configuration;
 
 import java.util.ArrayList;
diff --git a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteCacheStoreConfigurationChildBuilder.java b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteCacheStoreConfigurationChildBuilder.java
index 8e185b71c1a4..9a1ac3c7084a 100644
--- a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteCacheStoreConfigurationChildBuilder.java
+++ b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteCacheStoreConfigurationChildBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.remote.configuration;
 
 import org.infinispan.client.hotrod.RemoteCacheManager;
diff --git a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteCacheStoreConfigurationParser52.java b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteCacheStoreConfigurationParser52.java
index b4cf0de152b3..6b7c2262c976 100644
--- a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteCacheStoreConfigurationParser52.java
+++ b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteCacheStoreConfigurationParser52.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.remote.configuration;
 
 import static org.infinispan.commons.util.StringPropertyReplacer.replaceProperties;
diff --git a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteCacheStoreConfigurationParser53.java b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteCacheStoreConfigurationParser53.java
index 208e57e61d67..c625b3bc6df2 100644
--- a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteCacheStoreConfigurationParser53.java
+++ b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteCacheStoreConfigurationParser53.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.remote.configuration;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteServerConfiguration.java b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteServerConfiguration.java
index fce65eb5e3a1..deccf24d5712 100644
--- a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteServerConfiguration.java
+++ b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteServerConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.remote.configuration;
 
 public class RemoteServerConfiguration {
diff --git a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteServerConfigurationBuilder.java b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteServerConfigurationBuilder.java
index c2ea5f44b919..c5e7822a34f5 100644
--- a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteServerConfigurationBuilder.java
+++ b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/configuration/RemoteServerConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.remote.configuration;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/logging/Log.java b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/logging/Log.java
index ea9c43a0e26d..0ceb5b4649ba 100644
--- a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/logging/Log.java
+++ b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/logging/Log.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.loaders.remote.logging;
 
 import org.infinispan.commons.CacheConfigurationException;
diff --git a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/wrapper/DefaultEntryWrapper.java b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/wrapper/DefaultEntryWrapper.java
index e10b2cc10ee8..0c132e91aae5 100644
--- a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/wrapper/DefaultEntryWrapper.java
+++ b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/wrapper/DefaultEntryWrapper.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.remote.wrapper;
 
 import org.infinispan.client.hotrod.MetadataValue;
diff --git a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/wrapper/EntryWrapper.java b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/wrapper/EntryWrapper.java
index 40b6f16bb2a9..27efad495f85 100644
--- a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/wrapper/EntryWrapper.java
+++ b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/wrapper/EntryWrapper.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.remote.wrapper;
 
 import org.infinispan.client.hotrod.MetadataValue;
diff --git a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/wrapper/HotRodEntryMarshaller.java b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/wrapper/HotRodEntryMarshaller.java
index 70483fd3e141..6714e8f671d3 100644
--- a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/wrapper/HotRodEntryMarshaller.java
+++ b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/wrapper/HotRodEntryMarshaller.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.remote.wrapper;
 
 import java.io.IOException;
diff --git a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/wrapper/HotRodEntryWrapper.java b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/wrapper/HotRodEntryWrapper.java
index 2e3b2319038b..efa67b78c43d 100644
--- a/cachestore/remote/src/main/java/org/infinispan/loaders/remote/wrapper/HotRodEntryWrapper.java
+++ b/cachestore/remote/src/main/java/org/infinispan/loaders/remote/wrapper/HotRodEntryWrapper.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.remote.wrapper;
 
 import org.infinispan.client.hotrod.MetadataValue;
diff --git a/cachestore/remote/src/main/resources/schema/infinispan-cachestore-remote-config-5.2.xsd b/cachestore/remote/src/main/resources/schema/infinispan-cachestore-remote-config-5.2.xsd
index 6c039cfce8c4..b90041c85aca 100644
--- a/cachestore/remote/src/main/resources/schema/infinispan-cachestore-remote-config-5.2.xsd
+++ b/cachestore/remote/src/main/resources/schema/infinispan-cachestore-remote-config-5.2.xsd
@@ -1,24 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!--
-  ~ Copyright 2012 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" version="1.0" targetNamespace="urn:infinispan:config:remote:5.2" xmlns:tns="urn:infinispan:config:remote:5.2" xmlns:config="urn:infinispan:config:5.2" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import namespace="urn:infinispan:config:5.2" schemaLocation="http://www.infinispan.org/schemas/infinispan-config-5.2.xsd" />
 
diff --git a/cachestore/remote/src/main/resources/schema/infinispan-cachestore-remote-config-5.3.xsd b/cachestore/remote/src/main/resources/schema/infinispan-cachestore-remote-config-5.3.xsd
index 2688bc6b2124..48ba5e219293 100644
--- a/cachestore/remote/src/main/resources/schema/infinispan-cachestore-remote-config-5.3.xsd
+++ b/cachestore/remote/src/main/resources/schema/infinispan-cachestore-remote-config-5.3.xsd
@@ -1,24 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!--
-  ~ Copyright 2012 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" version="1.0"
            targetNamespace="urn:infinispan:config:remote:5.3"
            xmlns:tns="urn:infinispan:config:remote:5.3"
diff --git a/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreConfigTest.java b/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreConfigTest.java
index 38eb0f9a7dc8..d4a7d51bd21d 100644
--- a/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreConfigTest.java
+++ b/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreConfigTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.remote;
 
 import org.infinispan.Cache;
diff --git a/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreFunctionalTest.java b/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreFunctionalTest.java
index ff14568a3e04..ebcff5106319 100644
--- a/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreFunctionalTest.java
+++ b/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.remote;
 
 import org.infinispan.client.hotrod.TestHelper;
diff --git a/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreMixedAccessTest.java b/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreMixedAccessTest.java
index 57612775b72d..8121e99aade0 100644
--- a/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreMixedAccessTest.java
+++ b/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreMixedAccessTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.remote;
 
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
diff --git a/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreRawValuesTest.java b/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreRawValuesTest.java
index f2759e5c01e9..9ec98cfce0d3 100644
--- a/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreRawValuesTest.java
+++ b/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreRawValuesTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.remote;
 
 import java.util.Properties;
diff --git a/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreTest.java b/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreTest.java
index d0fad8e95ecb..67b1de614988 100644
--- a/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreTest.java
+++ b/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.remote;
 
 import org.infinispan.client.hotrod.TestHelper;
diff --git a/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreWrapperTest.java b/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreWrapperTest.java
index aa1905c43b94..63e5e85226aa 100644
--- a/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreWrapperTest.java
+++ b/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreWrapperTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.remote;
 
 import org.infinispan.Cache;
diff --git a/cachestore/remote/src/test/java/org/infinispan/loaders/remote/configuration/ConfigurationTest.java b/cachestore/remote/src/test/java/org/infinispan/loaders/remote/configuration/ConfigurationTest.java
index 6f47ef7b66bc..c84838b76613 100644
--- a/cachestore/remote/src/test/java/org/infinispan/loaders/remote/configuration/ConfigurationTest.java
+++ b/cachestore/remote/src/test/java/org/infinispan/loaders/remote/configuration/ConfigurationTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.remote.configuration;
 
 import org.infinispan.client.hotrod.impl.ConfigurationProperties;
diff --git a/cachestore/remote/src/test/java/org/infinispan/loaders/remote/configuration/XmlFileParsingTest.java b/cachestore/remote/src/test/java/org/infinispan/loaders/remote/configuration/XmlFileParsingTest.java
index 7a9bd303c858..54ccdb36d49c 100644
--- a/cachestore/remote/src/test/java/org/infinispan/loaders/remote/configuration/XmlFileParsingTest.java
+++ b/cachestore/remote/src/test/java/org/infinispan/loaders/remote/configuration/XmlFileParsingTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.remote.configuration;
 
 import static org.infinispan.test.TestingUtil.INFINISPAN_START_TAG;
diff --git a/cachestore/remote/src/test/resources/remote-cl-config.xml b/cachestore/remote/src/test/resources/remote-cl-config.xml
index 049c2607e0f7..180ab6e46dcb 100644
--- a/cachestore/remote/src/test/resources/remote-cl-config.xml
+++ b/cachestore/remote/src/test/resources/remote-cl-config.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <infinispan
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="urn:infinispan:config:5.3 http://www.infinispan.org/schemas/infinispan-config-5.3.xsd
diff --git a/cdi/extension/pom.xml b/cdi/extension/pom.xml
index a45fbd42ca16..afeee86a186f 100644
--- a/cdi/extension/pom.xml
+++ b/cdi/extension/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/AdvancedCacheProducer.java b/cdi/extension/src/main/java/org/infinispan/cdi/AdvancedCacheProducer.java
index ffe95c43ccc1..fa9e886f8218 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/AdvancedCacheProducer.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/AdvancedCacheProducer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi;
 
 import org.infinispan.AdvancedCache;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/BeanManagerController.java b/cdi/extension/src/main/java/org/infinispan/cdi/BeanManagerController.java
index 3641b304960e..1552b72f438f 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/BeanManagerController.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/BeanManagerController.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.cdi;
 
 import java.security.AccessController;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/ConfigureCache.java b/cdi/extension/src/main/java/org/infinispan/cdi/ConfigureCache.java
index 41d4cbcdf8dc..8a5ff54060ab 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/ConfigureCache.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/ConfigureCache.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi;
 
 import org.infinispan.configuration.cache.Configuration;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/ContextInputCache.java b/cdi/extension/src/main/java/org/infinispan/cdi/ContextInputCache.java
index 2e46c28cab9d..853321ddf81d 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/ContextInputCache.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/ContextInputCache.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.cdi;
 
 import org.infinispan.Cache;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/DefaultEmbeddedCacheConfigurationProducer.java b/cdi/extension/src/main/java/org/infinispan/cdi/DefaultEmbeddedCacheConfigurationProducer.java
index b871cb2c659b..62ee0a172a43 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/DefaultEmbeddedCacheConfigurationProducer.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/DefaultEmbeddedCacheConfigurationProducer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi;
 
 import org.infinispan.cdi.util.logging.Log;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/DefaultEmbeddedCacheManagerProducer.java b/cdi/extension/src/main/java/org/infinispan/cdi/DefaultEmbeddedCacheManagerProducer.java
index 046a548eb2dd..cd65b6e3f531 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/DefaultEmbeddedCacheManagerProducer.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/DefaultEmbeddedCacheManagerProducer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi;
 
 import org.infinispan.cdi.util.logging.Log;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/DefaultRemoteCacheManagerProducer.java b/cdi/extension/src/main/java/org/infinispan/cdi/DefaultRemoteCacheManagerProducer.java
index da2e142b473d..0abd64ad9e62 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/DefaultRemoteCacheManagerProducer.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/DefaultRemoteCacheManagerProducer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi;
 
 import org.infinispan.client.hotrod.RemoteCacheManager;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/InfinispanExtension.java b/cdi/extension/src/main/java/org/infinispan/cdi/InfinispanExtension.java
index 96361fe229ba..eea4941aea47 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/InfinispanExtension.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/InfinispanExtension.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi;
 
 import static org.jboss.solder.bean.Beans.getQualifiers;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/InjectedCacheResolver.java b/cdi/extension/src/main/java/org/infinispan/cdi/InjectedCacheResolver.java
index a61cc7ec0fa1..bc043384d494 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/InjectedCacheResolver.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/InjectedCacheResolver.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.cdi;
 
 import org.infinispan.configuration.global.GlobalConfiguration;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/Input.java b/cdi/extension/src/main/java/org/infinispan/cdi/Input.java
index 592200b74698..f355d6182169 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/Input.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/Input.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi;
 
 import javax.inject.Qualifier;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/InputLiteral.java b/cdi/extension/src/main/java/org/infinispan/cdi/InputLiteral.java
index d258a59fa8ae..e3e04e345f78 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/InputLiteral.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/InputLiteral.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.cdi;
 
 import javax.enterprise.inject.Default;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/OverrideDefault.java b/cdi/extension/src/main/java/org/infinispan/cdi/OverrideDefault.java
index 6acd97ef9915..bffccf0efb11 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/OverrideDefault.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/OverrideDefault.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi;
 
 import javax.inject.Qualifier;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/Remote.java b/cdi/extension/src/main/java/org/infinispan/cdi/Remote.java
index 7e87ba6e320d..721d55231903 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/Remote.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/Remote.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi;
 
 import javax.enterprise.util.Nonbinding;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/RemoteCacheProducer.java b/cdi/extension/src/main/java/org/infinispan/cdi/RemoteCacheProducer.java
index 4e75f0daa185..ef40e3b7956d 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/RemoteCacheProducer.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/RemoteCacheProducer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi;
 
 import org.infinispan.client.hotrod.RemoteCache;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/event/AbstractEventBridge.java b/cdi/extension/src/main/java/org/infinispan/cdi/event/AbstractEventBridge.java
index bd0588908288..709f8b43d132 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/event/AbstractEventBridge.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/event/AbstractEventBridge.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.event;
 
 import javax.enterprise.event.Event;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/AbstractAdapter.java b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/AbstractAdapter.java
index 1b24b6011ad8..f3983d406911 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/AbstractAdapter.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/AbstractAdapter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.event.cache;
 
 import javax.enterprise.event.Event;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryActivatedAdapter.java b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryActivatedAdapter.java
index e260d378cd8f..db56015ffe35 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryActivatedAdapter.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryActivatedAdapter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.event.cache;
 
 import org.infinispan.Cache;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryCreatedAdapter.java b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryCreatedAdapter.java
index da07b2fd267a..bc2ade5088c2 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryCreatedAdapter.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryCreatedAdapter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.event.cache;
 
 import org.infinispan.Cache;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryEvictedAdapter.java b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryEvictedAdapter.java
index 3db6d04c2990..fbd0161e2708 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryEvictedAdapter.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryEvictedAdapter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.event.cache;
 
 import org.infinispan.Cache;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryInvalidatedAdapter.java b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryInvalidatedAdapter.java
index c4a1f46b90ea..f400d31f7fe5 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryInvalidatedAdapter.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryInvalidatedAdapter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.event.cache;
 
 import org.infinispan.Cache;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryLoadedAdapter.java b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryLoadedAdapter.java
index 6933bf8617fb..8a9c538d35d2 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryLoadedAdapter.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryLoadedAdapter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.event.cache;
 
 import org.infinispan.Cache;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryModifiedAdapter.java b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryModifiedAdapter.java
index 75d65d15575a..714aadb35b35 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryModifiedAdapter.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryModifiedAdapter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.event.cache;
 
 import org.infinispan.Cache;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryPassivatedAdapter.java b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryPassivatedAdapter.java
index 262b29067b2f..0153d5b8b916 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryPassivatedAdapter.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryPassivatedAdapter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.event.cache;
 
 import org.infinispan.Cache;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryRemovedAdapter.java b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryRemovedAdapter.java
index e81416e9cabc..b20a5c038577 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryRemovedAdapter.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryRemovedAdapter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.event.cache;
 
 import org.infinispan.Cache;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryVisitedAdapter.java b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryVisitedAdapter.java
index e87e502bfe8a..7c7ab85c8abb 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryVisitedAdapter.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEntryVisitedAdapter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.event.cache;
 
 import org.infinispan.Cache;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEventBridge.java b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEventBridge.java
index d5f3ef0047eb..16c1a3dc1882 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEventBridge.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/CacheEventBridge.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.event.cache;
 
 import org.infinispan.cdi.event.AbstractEventBridge;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/TransactionCompletedAdapter.java b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/TransactionCompletedAdapter.java
index 856b05b609d7..4e485e42f451 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/TransactionCompletedAdapter.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/TransactionCompletedAdapter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.event.cache;
 
 import org.infinispan.Cache;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/TransactionRegisteredAdapter.java b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/TransactionRegisteredAdapter.java
index 1d18140bf90c..eed1e5607358 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/TransactionRegisteredAdapter.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/TransactionRegisteredAdapter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.event.cache;
 
 import org.infinispan.Cache;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/package-info.java b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/package-info.java
index 11248e619acf..e5a919dbdd77 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/package-info.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/event/cache/package-info.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 /**
  * This package contains the adapters making the bridge between Infinispan cache events and CDI.
  */
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/event/cachemanager/AbstractAdapter.java b/cdi/extension/src/main/java/org/infinispan/cdi/event/cachemanager/AbstractAdapter.java
index 3763d8333152..5a4a2dc376bd 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/event/cachemanager/AbstractAdapter.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/event/cachemanager/AbstractAdapter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.event.cachemanager;
 
 import javax.enterprise.event.Event;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/event/cachemanager/CacheManagerEventBridge.java b/cdi/extension/src/main/java/org/infinispan/cdi/event/cachemanager/CacheManagerEventBridge.java
index 0598b33c52d8..d32b7710a386 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/event/cachemanager/CacheManagerEventBridge.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/event/cachemanager/CacheManagerEventBridge.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.event.cachemanager;
 
 import org.infinispan.cdi.event.AbstractEventBridge;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/event/cachemanager/CacheStartedAdapter.java b/cdi/extension/src/main/java/org/infinispan/cdi/event/cachemanager/CacheStartedAdapter.java
index bd9cda58416e..9e7693a04ef4 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/event/cachemanager/CacheStartedAdapter.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/event/cachemanager/CacheStartedAdapter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.event.cachemanager;
 
 import org.infinispan.manager.EmbeddedCacheManager;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/event/cachemanager/CacheStoppedAdapter.java b/cdi/extension/src/main/java/org/infinispan/cdi/event/cachemanager/CacheStoppedAdapter.java
index b3212db77b42..3cf0118c06d4 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/event/cachemanager/CacheStoppedAdapter.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/event/cachemanager/CacheStoppedAdapter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.event.cachemanager;
 
 import org.infinispan.manager.EmbeddedCacheManager;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/event/cachemanager/ViewChangedAdapter.java b/cdi/extension/src/main/java/org/infinispan/cdi/event/cachemanager/ViewChangedAdapter.java
index ef8434729c4b..32197ed7fbba 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/event/cachemanager/ViewChangedAdapter.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/event/cachemanager/ViewChangedAdapter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.event.cachemanager;
 
 import org.infinispan.manager.EmbeddedCacheManager;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/event/cachemanager/package-info.java b/cdi/extension/src/main/java/org/infinispan/cdi/event/cachemanager/package-info.java
index fa4be2c829df..90b41788e1b1 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/event/cachemanager/package-info.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/event/cachemanager/package-info.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 /**
  * This package contains the adapters making the bridge between Infinispan cache manager events and CDI.
  */
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/event/package-info.java b/cdi/extension/src/main/java/org/infinispan/cdi/event/package-info.java
index 71b3ca956a6a..29062ab51448 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/event/package-info.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/event/package-info.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 /**
  * This package contains the event bridge implementation between Infinispan and CDI.
  */
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/package-info.java b/cdi/extension/src/main/java/org/infinispan/cdi/package-info.java
index e859ad26f2f8..f7e167f867e0 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/package-info.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/package-info.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 /**
  * This is the Infinispan CDI module. This package contains the CDI extension implementation, the mechanism allowing
  * to inject and configure an Infinispan cache. For further details see the
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/util/Contracts.java b/cdi/extension/src/main/java/org/infinispan/cdi/util/Contracts.java
index 41da4ed3963f..82a486e65c60 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/util/Contracts.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/util/Contracts.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.util;
 
 /**
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/util/Version.java b/cdi/extension/src/main/java/org/infinispan/cdi/util/Version.java
index 94a8f1b0cade..93ca7f74102f 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/util/Version.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/util/Version.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.util;
 
 /**
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/util/logging/Log.java b/cdi/extension/src/main/java/org/infinispan/cdi/util/logging/Log.java
index 9479b7bc16f2..4b18b8ba4eda 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/util/logging/Log.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/util/logging/Log.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.util.logging;
 
 import org.infinispan.manager.EmbeddedCacheManager;
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/util/logging/package-info.java b/cdi/extension/src/main/java/org/infinispan/cdi/util/logging/package-info.java
index 5ebc9db9c129..cd5b5e45c7b2 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/util/logging/package-info.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/util/logging/package-info.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 /**
  * This package contains the logging classes.
  */
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/util/package-info.java b/cdi/extension/src/main/java/org/infinispan/cdi/util/package-info.java
index cdd2a4e09627..2d08b6f32964 100644
--- a/cdi/extension/src/main/java/org/infinispan/cdi/util/package-info.java
+++ b/cdi/extension/src/main/java/org/infinispan/cdi/util/package-info.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 /**
  * This package contains utility classes.
  */
diff --git a/cdi/extension/src/main/resources/META-INF/beans.xml b/cdi/extension/src/main/resources/META-INF/beans.xml
index 9828fd4d092c..6044e2ba5086 100644
--- a/cdi/extension/src/main/resources/META-INF/beans.xml
+++ b/cdi/extension/src/main/resources/META-INF/beans.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2011 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <beans xmlns="http://java.sun.com/xml/ns/javaee"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"/>
diff --git a/cdi/extension/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/cdi/extension/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
index 9ecee18c8e29..748b37f1d6fe 100644
--- a/cdi/extension/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
+++ b/cdi/extension/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
@@ -1,23 +1 @@
-#
-# JBoss, Home of Professional Open Source
-# Copyright 2011 Red Hat Inc. and/or its affiliates and other
-# contributors as indicated by the @author tags. All rights reserved.
-# See the copyright.txt in the distribution for a full listing of
-# individual contributors.
-#
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
 org.infinispan.cdi.InfinispanExtension
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/DefaultTestEmbeddedCacheManagerProducer.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/DefaultTestEmbeddedCacheManagerProducer.java
index 904dfbb5604b..0d176207674c 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/DefaultTestEmbeddedCacheManagerProducer.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/DefaultTestEmbeddedCacheManagerProducer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test;
 
 import org.infinispan.cdi.OverrideDefault;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/ServiceLoaderTest.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/ServiceLoaderTest.java
index 20614a60e93f..bdd6e4b67c1e 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/ServiceLoaderTest.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/ServiceLoaderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cdi.test;
 
 import java.util.ServiceLoader;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/DefaultCacheTest.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/DefaultCacheTest.java
index 77f3ed0a096a..b25dee54cbdd 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/DefaultCacheTest.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/DefaultCacheTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cache.embedded;
 
 import org.infinispan.AdvancedCache;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/configured/Config.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/configured/Config.java
index e736739ba7fd..edcf0c5f50e7 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/configured/Config.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/configured/Config.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cache.embedded.configured;
 
 import org.infinispan.cdi.ConfigureCache;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/configured/ConfiguredCacheTest.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/configured/ConfiguredCacheTest.java
index 663a866b2243..ab60beb2f750 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/configured/ConfiguredCacheTest.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/configured/ConfiguredCacheTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cache.embedded.configured;
 
 import org.infinispan.AdvancedCache;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/configured/Small.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/configured/Small.java
index 1dd0f62468ca..d86034b1c3c3 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/configured/Small.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/configured/Small.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cache.embedded.configured;
 
 import javax.inject.Qualifier;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/configured/Tiny.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/configured/Tiny.java
index 901075e023c9..c2b10669afde 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/configured/Tiny.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/configured/Tiny.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cache.embedded.configured;
 
 import javax.inject.Qualifier;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/specific/Config.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/specific/Config.java
index 9b1703267e74..62a67611079c 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/specific/Config.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/specific/Config.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cache.embedded.specific;
 
 import org.infinispan.cdi.ConfigureCache;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/specific/Large.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/specific/Large.java
index 7fd4144f2cd6..f83736b765d3 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/specific/Large.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/specific/Large.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cache.embedded.specific;
 
 import javax.inject.Qualifier;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/specific/Small.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/specific/Small.java
index de5240d60a22..73b6d090e7cb 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/specific/Small.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/specific/Small.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cache.embedded.specific;
 
 import javax.inject.Qualifier;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/specific/SpecificCacheManagerTest.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/specific/SpecificCacheManagerTest.java
index 203bdb65073a..aa279c66587f 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/specific/SpecificCacheManagerTest.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/embedded/specific/SpecificCacheManagerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cache.embedded.specific;
 
 import org.infinispan.Cache;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/remote/DefaultCacheTest.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/remote/DefaultCacheTest.java
index 4ddc930fc8b6..6d9fd42d9153 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/remote/DefaultCacheTest.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/remote/DefaultCacheTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cache.remote;
 
 import org.infinispan.api.BasicCache;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/remote/NamedCacheTest.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/remote/NamedCacheTest.java
index 2d4f5a44697b..503aa32ebbfc 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/remote/NamedCacheTest.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/remote/NamedCacheTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cache.remote;
 
 import org.infinispan.api.BasicCache;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/remote/Small.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/remote/Small.java
index 67fcd3925991..5971a08b90bb 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/remote/Small.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/remote/Small.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cache.remote;
 
 import org.infinispan.cdi.Remote;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/remote/SpecificCacheManagerTest.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/remote/SpecificCacheManagerTest.java
index ce145f153c21..4b1d5defa0a1 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/remote/SpecificCacheManagerTest.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cache/remote/SpecificCacheManagerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cache.remote;
 
 import org.infinispan.api.BasicCache;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/DefaultConfigurationTest.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/DefaultConfigurationTest.java
index 44e097f2c5b7..c776a579edba 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/DefaultConfigurationTest.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/DefaultConfigurationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cachemanager.embedded;
 
 import org.infinispan.Cache;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/external/Config.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/external/Config.java
index 5fecb7352e85..3fd483bb568a 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/external/Config.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/external/Config.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cachemanager.embedded.external;
 
 import org.infinispan.cdi.ConfigureCache;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/external/ExternalCacheContainerTest.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/external/ExternalCacheContainerTest.java
index afb5d05e8db1..347b227473e1 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/external/ExternalCacheContainerTest.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/external/ExternalCacheContainerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cachemanager.embedded.external;
 
 import org.infinispan.AdvancedCache;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/external/Large.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/external/Large.java
index e58f32f748ce..314facce16ab 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/external/Large.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/external/Large.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cachemanager.embedded.external;
 
 import javax.inject.Qualifier;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/external/Quick.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/external/Quick.java
index e95eb480f9b9..8f2872f47f36 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/external/Quick.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/external/Quick.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cachemanager.embedded.external;
 
 import javax.inject.Qualifier;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/programmatic/Config.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/programmatic/Config.java
index 3432d5f49137..fff4a129f2ff 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/programmatic/Config.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/programmatic/Config.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cachemanager.embedded.programmatic;
 
 import org.infinispan.cdi.ConfigureCache;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/programmatic/ProgrammaticCacheContainerTest.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/programmatic/ProgrammaticCacheContainerTest.java
index 379109eb0e9c..b0de58614afc 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/programmatic/ProgrammaticCacheContainerTest.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/programmatic/ProgrammaticCacheContainerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cachemanager.embedded.programmatic;
 
 import org.infinispan.AdvancedCache;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/programmatic/Small.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/programmatic/Small.java
index 1fb88cf9f641..d6dfe221ceec 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/programmatic/Small.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/programmatic/Small.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cachemanager.embedded.programmatic;
 
 import javax.inject.Qualifier;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/programmatic/SmallCacheObservers.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/programmatic/SmallCacheObservers.java
index f12f0a4f9880..15f842795e74 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/programmatic/SmallCacheObservers.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/programmatic/SmallCacheObservers.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cachemanager.embedded.programmatic;
 
 import org.infinispan.notifications.cachemanagerlistener.event.CacheStartedEvent;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/registration/CacheRegistrationTest.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/registration/CacheRegistrationTest.java
index 888290e82f34..6be18cf8fdcc 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/registration/CacheRegistrationTest.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/registration/CacheRegistrationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cachemanager.embedded.registration;
 
 import static org.infinispan.cdi.test.testutil.Deployments.baseDeployment;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/registration/Config.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/registration/Config.java
index 1e56445e8702..217f8d33abda 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/registration/Config.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/registration/Config.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cachemanager.embedded.registration;
 
 import org.infinispan.cdi.ConfigureCache;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/registration/Large.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/registration/Large.java
index c977e74d71c1..5ac39614e75f 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/registration/Large.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/registration/Large.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cachemanager.embedded.registration;
 
 import javax.inject.Qualifier;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/registration/Small.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/registration/Small.java
index 147be27dd8a5..7f9263b8c4e1 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/registration/Small.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/registration/Small.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cachemanager.embedded.registration;
 
 import javax.inject.Qualifier;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/registration/VeryLarge.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/registration/VeryLarge.java
index 914adccb578e..d61bf0ee81b3 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/registration/VeryLarge.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/registration/VeryLarge.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cachemanager.embedded.registration;
 
 import javax.inject.Qualifier;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/xml/Config.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/xml/Config.java
index ddbc099da486..4f371ee4e261 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/xml/Config.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/xml/Config.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cachemanager.embedded.xml;
 
 import org.infinispan.cdi.ConfigureCache;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/xml/Quick.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/xml/Quick.java
index 46a291ef9583..e47f1c1a22cc 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/xml/Quick.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/xml/Quick.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cachemanager.embedded.xml;
 
 import javax.inject.Qualifier;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/xml/VeryLarge.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/xml/VeryLarge.java
index ca675b3175ed..ec588fd54f60 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/xml/VeryLarge.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/xml/VeryLarge.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cachemanager.embedded.xml;
 
 import javax.inject.Qualifier;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/xml/XMLConfiguredCacheContainerTest.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/xml/XMLConfiguredCacheContainerTest.java
index 3ce209135fb2..7e24959d26a3 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/xml/XMLConfiguredCacheContainerTest.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/embedded/xml/XMLConfiguredCacheContainerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cachemanager.embedded.xml;
 
 import org.infinispan.AdvancedCache;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/remote/DefaultCacheManagerOverrideTest.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/remote/DefaultCacheManagerOverrideTest.java
index 3aa91bb5124a..bcff8ae8df5e 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/remote/DefaultCacheManagerOverrideTest.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/remote/DefaultCacheManagerOverrideTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cachemanager.remote;
 
 import org.infinispan.client.hotrod.RemoteCacheManager;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/remote/DefaultCacheManagerTest.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/remote/DefaultCacheManagerTest.java
index 9e84cd2fe470..41c522b17e0e 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/remote/DefaultCacheManagerTest.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/cachemanager/remote/DefaultCacheManagerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.cachemanager.remote;
 
 import org.infinispan.client.hotrod.RemoteCacheManager;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/distexec/DistributedExecutorCDITest.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/distexec/DistributedExecutorCDITest.java
index b52bc7968a5c..fb2102cdc8ba 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/distexec/DistributedExecutorCDITest.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/distexec/DistributedExecutorCDITest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.distexec;
 
 import static org.infinispan.cdi.test.testutil.Deployments.baseDeployment;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/distexec/MultipleCacheManagersArquillianTest.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/distexec/MultipleCacheManagersArquillianTest.java
index 03bf9683b9c6..1c2a2ab604ec 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/distexec/MultipleCacheManagersArquillianTest.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/distexec/MultipleCacheManagersArquillianTest.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.cdi.test.distexec;
 
 import java.lang.reflect.Method;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/distexec/WordCountMapReduceCDITest.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/distexec/WordCountMapReduceCDITest.java
index 42eaff99ec3c..020024518d9a 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/distexec/WordCountMapReduceCDITest.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/distexec/WordCountMapReduceCDITest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.distexec;
 
 import static org.infinispan.cdi.test.testutil.Deployments.baseDeployment;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/event/Cache1.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/event/Cache1.java
index 9cd59fb25782..028f207208a1 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/event/Cache1.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/event/Cache1.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.event;
 
 import javax.inject.Qualifier;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/event/Cache1Observers.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/event/Cache1Observers.java
index d6ca0761127e..1a93715b18b3 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/event/Cache1Observers.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/event/Cache1Observers.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.event;
 
 import org.infinispan.notifications.cachelistener.event.CacheEntryCreatedEvent;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/event/Cache2.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/event/Cache2.java
index c2f992d4fb92..86d092ae2684 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/event/Cache2.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/event/Cache2.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.event;
 
 import javax.inject.Qualifier;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/event/Cache2Observers.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/event/Cache2Observers.java
index 6a0db361d00e..5e80f95fdb4e 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/event/Cache2Observers.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/event/Cache2Observers.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.event;
 
 import org.infinispan.notifications.cachemanagerlistener.event.CacheStartedEvent;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/event/CacheEventTest.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/event/CacheEventTest.java
index 1cf2975c1f63..8f2d955e3b8c 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/event/CacheEventTest.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/event/CacheEventTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.event;
 
 import org.infinispan.AdvancedCache;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/event/Config.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/event/Config.java
index 95abc5956264..d8bde5c91725 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/event/Config.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/event/Config.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.event;
 
 import org.infinispan.cdi.ConfigureCache;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/CachePutInterceptorTest.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/CachePutInterceptorTest.java
index a08db1f082e4..04a4034359ee 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/CachePutInterceptorTest.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/CachePutInterceptorTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.interceptor;
 
 import org.infinispan.Cache;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/CacheRemoveAllInterceptorTest.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/CacheRemoveAllInterceptorTest.java
index 2e143f981b5b..0d5f89d3d882 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/CacheRemoveAllInterceptorTest.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/CacheRemoveAllInterceptorTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.interceptor;
 
 import org.infinispan.Cache;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/CacheRemoveEntryInterceptorTest.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/CacheRemoveEntryInterceptorTest.java
index d375ffd209ba..4353c45ea30a 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/CacheRemoveEntryInterceptorTest.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/CacheRemoveEntryInterceptorTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.interceptor;
 
 import org.infinispan.Cache;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/CacheResultInterceptorTest.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/CacheResultInterceptorTest.java
index a2409ddbb782..944b4030bf7c 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/CacheResultInterceptorTest.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/CacheResultInterceptorTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.interceptor;
 
 import org.infinispan.Cache;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/config/Config.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/config/Config.java
index 15aaf4dd3f76..c2fe0489854d 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/config/Config.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/config/Config.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.interceptor.config;
 
 import org.infinispan.cdi.ConfigureCache;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/config/Custom.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/config/Custom.java
index d36c022d9e6e..8f055d9500fb 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/config/Custom.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/config/Custom.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.interceptor.config;
 
 import javax.inject.Qualifier;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/config/Small.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/config/Small.java
index 08ff17624788..6c68b2be322b 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/config/Small.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/config/Small.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.interceptor.config;
 
 import javax.inject.Qualifier;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/service/CachePutService.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/service/CachePutService.java
index c326ffde22a9..72b3e4916073 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/service/CachePutService.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/service/CachePutService.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.interceptor.service;
 
 import javax.cache.annotation.CacheKey;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/service/CacheRemoveAllService.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/service/CacheRemoveAllService.java
index c7ed5b0df143..57ed77c714af 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/service/CacheRemoveAllService.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/service/CacheRemoveAllService.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.interceptor.service;
 
 import javax.cache.annotation.CacheRemoveAll;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/service/CacheRemoveEntryService.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/service/CacheRemoveEntryService.java
index 5296eb21b18f..e1b696820780 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/service/CacheRemoveEntryService.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/service/CacheRemoveEntryService.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.interceptor.service;
 
 import javax.cache.annotation.CacheKey;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/service/CacheResultService.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/service/CacheResultService.java
index 9adbed55d984..990a007411b0 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/service/CacheResultService.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/service/CacheResultService.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.interceptor.service;
 
 import javax.cache.annotation.CacheKey;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/service/CustomCacheKey.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/service/CustomCacheKey.java
index 782bde10addf..d5f784dbceaa 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/service/CustomCacheKey.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/service/CustomCacheKey.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.interceptor.service;
 
 import javax.cache.annotation.GeneratedCacheKey;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/service/CustomCacheKeyGenerator.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/service/CustomCacheKeyGenerator.java
index e1d2af6a2533..3493475a4fcc 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/service/CustomCacheKeyGenerator.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/interceptor/service/CustomCacheKeyGenerator.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.interceptor.service;
 
 import javax.cache.annotation.CacheKeyGenerator;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/testutil/Deployments.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/testutil/Deployments.java
index daadcd9b8a81..67a64586f024 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/testutil/Deployments.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/testutil/Deployments.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.testutil;
 
 import org.infinispan.cdi.ConfigureCache;
diff --git a/cdi/extension/src/test/java/org/infinispan/cdi/test/util/ContractsTest.java b/cdi/extension/src/test/java/org/infinispan/cdi/test/util/ContractsTest.java
index 4b95c0448f21..63f68730998b 100644
--- a/cdi/extension/src/test/java/org/infinispan/cdi/test/util/ContractsTest.java
+++ b/cdi/extension/src/test/java/org/infinispan/cdi/test/util/ContractsTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.cdi.test.util;
 
 import org.testng.annotations.Test;
diff --git a/cdi/extension/src/test/resources/beans.xml b/cdi/extension/src/test/resources/beans.xml
index c9b9ec9e31c4..650409b49c02 100644
--- a/cdi/extension/src/test/resources/beans.xml
+++ b/cdi/extension/src/test/resources/beans.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2011 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <beans xmlns="http://java.sun.com/xml/ns/javaee"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
diff --git a/cdi/extension/src/test/resources/infinispan.xml b/cdi/extension/src/test/resources/infinispan.xml
index 492ebc09062b..d0dc9aadb432 100644
--- a/cdi/extension/src/test/resources/infinispan.xml
+++ b/cdi/extension/src/test/resources/infinispan.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2011 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <infinispan xmlns="urn:infinispan:config:5.3"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
             xsi:schemaLocation="urn:infinispan:config:5.3 http://docs.jboss.org/infinispan/schemas/infinispan-config-5.3.xsd">
diff --git a/cli/cli-client/pom.xml b/cli/cli-client/pom.xml
index 9a1965bfede1..a37175c3025d 100644
--- a/cli/cli-client/pom.xml
+++ b/cli/cli-client/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-   ~ JBoss, Home of Professional Open Source
-   ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-   ~ contributors as indicated by the @author tags. All rights reserved.
-   ~ See the copyright.txt in the distribution for a full listing of
-   ~ individual contributors.
-   ~
-   ~ This is free software; you can redistribute it and/or modify it
-   ~ under the terms of the GNU Lesser General Public License as
-   ~ published by the Free Software Foundation; either version 2.1 of
-   ~ the License, or (at your option) any later version.
-   ~
-   ~ This software is distributed in the hope that it will be useful,
-   ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   ~ Lesser General Public License for more details.
-   ~
-   ~ You should have received a copy of the GNU Lesser General Public
-   ~ License along with this software; if not, write to the Free
-   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
 <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>
    <parent>
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/CommandBuffer.java b/cli/cli-client/src/main/java/org/infinispan/cli/CommandBuffer.java
index 4a85722de6b6..803c21b504d5 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/CommandBuffer.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/CommandBuffer.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli;
 
 public interface CommandBuffer {
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/CommandRegistry.java b/cli/cli-client/src/main/java/org/infinispan/cli/CommandRegistry.java
index 5907ceb4dbd6..757cd017bb20 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/CommandRegistry.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/CommandRegistry.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli;
 
 import java.util.Collections;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/Config.java b/cli/cli-client/src/main/java/org/infinispan/cli/Config.java
index dbc3c3d8823c..ac68094f9bb3 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/Config.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/Config.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli;
 
 public interface Config {
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/Context.java b/cli/cli-client/src/main/java/org/infinispan/cli/Context.java
index c4a9d6d13925..d53d1e247f38 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/Context.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/Context.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli;
 
 import org.infinispan.cli.connection.Connection;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/Main.java b/cli/cli-client/src/main/java/org/infinispan/cli/Main.java
index 8c5eb80e1c79..4a6f3b276495 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/Main.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/Main.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli;
 
 import org.infinispan.cli.shell.Shell;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/AbstractCommand.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/AbstractCommand.java
index 230380e61348..750c03bdf93a 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/AbstractCommand.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/AbstractCommand.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands;
 
 import java.util.Collections;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/Argument.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/Argument.java
index 956137d4e596..f9e3b132e5c3 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/Argument.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/Argument.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands;
 
 public interface Argument {
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/Command.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/Command.java
index 5b42ca2c899b..4d8ad815d36f 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/Command.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/Command.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands;
 
 import java.util.List;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/Parameter.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/Parameter.java
index 46a91989ae56..de7c4e6a5e6f 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/Parameter.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/Parameter.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands;
 
 public class Parameter implements Argument {
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/ProcessedCommand.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/ProcessedCommand.java
index 87b29bd47fdc..eccfce62c075 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/ProcessedCommand.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/ProcessedCommand.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands;
 
 import java.util.ArrayList;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/ServerCommand.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/ServerCommand.java
index a1bf8321ae51..a2ea749f4294 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/ServerCommand.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/ServerCommand.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands;
 
 public interface ServerCommand extends Command {
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/client/Connect.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/client/Connect.java
index f3e490fb03b3..a3799a1ca1f1 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/client/Connect.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/client/Connect.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.client;
 
 import java.util.List;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/client/Container.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/client/Container.java
index bb6fc99baeb7..00f767cec25f 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/client/Container.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/client/Container.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.client;
 
 import java.util.List;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/client/Disconnect.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/client/Disconnect.java
index 2ff75bcdf0d2..755882b8743b 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/client/Disconnect.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/client/Disconnect.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.client;
 
 import org.infinispan.cli.Context;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/client/Help.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/client/Help.java
index 328325fbf5be..b5a65993ab0b 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/client/Help.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/client/Help.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.client;
 
 import java.io.IOException;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/client/Quit.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/client/Quit.java
index 096a50bca2d3..13d7a359534d 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/client/Quit.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/client/Quit.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.client;
 
 import org.infinispan.cli.Context;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Abort.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Abort.java
index 9b82c0c4cb47..cfde9cc04e17 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Abort.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Abort.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.server;
 
 public class Abort extends AbstractServerCommand {
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/AbstractServerCommand.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/AbstractServerCommand.java
index 85be3070d86f..81b787b17f42 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/AbstractServerCommand.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/AbstractServerCommand.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.server;
 
 import org.infinispan.cli.CommandBuffer;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Begin.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Begin.java
index fb859006e822..94bc4a5679f0 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Begin.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Begin.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.server;
 
 public class Begin extends AbstractServerCommand {
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Cache.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Cache.java
index 56be2aaa2a03..ae5dbcb854b8 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Cache.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Cache.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.server;
 
 import java.util.List;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Clear.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Clear.java
index 970aecd0668c..cfa4223017d5 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Clear.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Clear.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.server;
 
 public class Clear extends AbstractServerCommand {
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Commit.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Commit.java
index 7773afc0bbb1..6960c33f8ab7 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Commit.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Commit.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.server;
 
 public class Commit extends AbstractServerCommand {
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Create.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Create.java
index 8472dca1564b..580e1f4c658e 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Create.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Create.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.server;
 
 import java.util.List;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Encoding.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Encoding.java
index 14f12d8c1979..d1a72f03f957 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Encoding.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Encoding.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.server;
 
 import java.util.Arrays;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/End.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/End.java
index 1c297532b49a..28fde4bfff90 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/End.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/End.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.server;
 
 public class End extends AbstractServerCommand {
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Evict.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Evict.java
index 0511c41def34..5534f9b633c9 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Evict.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Evict.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.server;
 
 public class Evict extends AbstractServerCommand {
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Get.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Get.java
index 6b234f8ec9ec..4cd4936e34c9 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Get.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Get.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.server;
 
 import java.util.Arrays;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Info.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Info.java
index 138825d887dc..40042140eb3a 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Info.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Info.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.server;
 
 import java.util.List;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Locate.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Locate.java
index dd655dee672d..503dbc8adbb8 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Locate.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Locate.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.server;
 
 import java.util.Arrays;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Ping.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Ping.java
index 33ce6a8b33a7..bc0e46ebc32d 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Ping.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Ping.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.server;
 
 import org.infinispan.cli.CommandBuffer;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Put.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Put.java
index d6b6f679f577..f438098e8c18 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Put.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Put.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.server;
 
 import java.util.Arrays;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Remove.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Remove.java
index 5ac9d2fd6560..57e6875b1061 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Remove.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Remove.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.server;
 
 public class Remove extends AbstractServerCommand {
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Replace.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Replace.java
index ae88b69e7464..9956be405456 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Replace.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Replace.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.server;
 
 import java.util.Arrays;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Rollback.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Rollback.java
index 13ab2e5a23b1..445a3f50b64f 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Rollback.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Rollback.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.server;
 
 public class Rollback extends AbstractServerCommand {
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Site.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Site.java
index 109f66732624..a3a7ef27a2e0 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Site.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Site.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.server;
 
 import java.util.Arrays;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Start.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Start.java
index a47e25c573b7..b56dda80abf6 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Start.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Start.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.server;
 
 public class Start extends AbstractServerCommand {
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Stats.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Stats.java
index c502bc56d48a..10deb482a6d3 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Stats.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Stats.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.server;
 
 import java.util.Arrays;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Upgrade.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Upgrade.java
index c65113ee55d2..2bba982eb3b5 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Upgrade.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Upgrade.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.server;
 
 import java.util.Arrays;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Version.java b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Version.java
index 7d785feeb607..0065c6b30d15 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Version.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/commands/server/Version.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.commands.server;
 
 import org.infinispan.cli.Context;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/connection/Connection.java b/cli/cli-client/src/main/java/org/infinispan/cli/connection/Connection.java
index a83e7c2d8c55..7e90b62a7390 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/connection/Connection.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/connection/Connection.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.connection;
 
 import java.io.Closeable;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/connection/ConnectionFactory.java b/cli/cli-client/src/main/java/org/infinispan/cli/connection/ConnectionFactory.java
index f790689dd0fb..b269f1147b0c 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/connection/ConnectionFactory.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/connection/ConnectionFactory.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.connection;
 
 import java.util.ServiceLoader;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/connection/Connector.java b/cli/cli-client/src/main/java/org/infinispan/cli/connection/Connector.java
index 00083b24d361..38e414e7eef0 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/connection/Connector.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/connection/Connector.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.connection;
 
 /**
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/AbstractJMXUrl.java b/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/AbstractJMXUrl.java
index 65ee78b0b957..ba58d0ff46ed 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/AbstractJMXUrl.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/AbstractJMXUrl.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.connection.jmx;
 
 import java.util.HashMap;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/JMXConnection.java b/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/JMXConnection.java
index 7d87d773a092..4c38861cf2a3 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/JMXConnection.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/JMXConnection.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.connection.jmx;
 
 import java.io.IOException;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/JMXUrl.java b/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/JMXUrl.java
index 9dad0d76dca6..cab72e60973c 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/JMXUrl.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/JMXUrl.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.connection.jmx;
 
 import java.util.Map;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/remoting/JMXRemotingConnector.java b/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/remoting/JMXRemotingConnector.java
index 1aa4b43afeb6..54fc2b383d4f 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/remoting/JMXRemotingConnector.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/remoting/JMXRemotingConnector.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.connection.jmx.remoting;
 
 import org.infinispan.cli.connection.Connection;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/remoting/JMXRemotingUrl.java b/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/remoting/JMXRemotingUrl.java
index 0093eefd7caa..9670dd87ada7 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/remoting/JMXRemotingUrl.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/remoting/JMXRemotingUrl.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.connection.jmx.remoting;
 
 import static org.infinispan.cli.util.Utils.nullIfEmpty;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/rmi/JMXRMIConnector.java b/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/rmi/JMXRMIConnector.java
index a832ddb2709e..2168a5ce9b32 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/rmi/JMXRMIConnector.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/rmi/JMXRMIConnector.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.connection.jmx.rmi;
 
 import org.infinispan.cli.connection.Connection;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/rmi/JMXRMIUrl.java b/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/rmi/JMXRMIUrl.java
index b7717a7a18d3..5f29afa25f12 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/rmi/JMXRMIUrl.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/connection/jmx/rmi/JMXRMIUrl.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.connection.jmx.rmi;
 
 import static org.infinispan.cli.util.Utils.nullIfEmpty;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/impl/CommandBufferImpl.java b/cli/cli-client/src/main/java/org/infinispan/cli/impl/CommandBufferImpl.java
index 0ad9259b64bb..0f050dad9efd 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/impl/CommandBufferImpl.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/impl/CommandBufferImpl.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.impl;
 
 import org.infinispan.cli.CommandBuffer;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/impl/ContextImpl.java b/cli/cli-client/src/main/java/org/infinispan/cli/impl/ContextImpl.java
index 0ba2280b834d..d68acce53a17 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/impl/ContextImpl.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/impl/ContextImpl.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.impl;
 
 import java.io.IOException;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/io/ConsoleIOAdapter.java b/cli/cli-client/src/main/java/org/infinispan/cli/io/ConsoleIOAdapter.java
index 14675b94b2f5..30d4148ab258 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/io/ConsoleIOAdapter.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/io/ConsoleIOAdapter.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.io;
 
 import java.io.IOException;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/io/IOAdapter.java b/cli/cli-client/src/main/java/org/infinispan/cli/io/IOAdapter.java
index aefaf6506981..712f675743c4 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/io/IOAdapter.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/io/IOAdapter.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.io;
 
 import java.io.IOException;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/io/StreamIOAdapter.java b/cli/cli-client/src/main/java/org/infinispan/cli/io/StreamIOAdapter.java
index b2159c08dc7b..47cce8500089 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/io/StreamIOAdapter.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/io/StreamIOAdapter.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.io;
 
 import java.io.BufferedReader;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/shell/Color.java b/cli/cli-client/src/main/java/org/infinispan/cli/shell/Color.java
index 033fd184d13c..7cfad06f798a 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/shell/Color.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/shell/Color.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.shell;
 
 /**
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/shell/Completer.java b/cli/cli-client/src/main/java/org/infinispan/cli/shell/Completer.java
index faae6bd0f119..7a6bf4f80b21 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/shell/Completer.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/shell/Completer.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.shell;
 
 import java.util.Collection;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/shell/ConfigImpl.java b/cli/cli-client/src/main/java/org/infinispan/cli/shell/ConfigImpl.java
index 5f722cc1f23c..3b969767e507 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/shell/ConfigImpl.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/shell/ConfigImpl.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.shell;
 
 import java.io.BufferedReader;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/shell/Man2Ansi.java b/cli/cli-client/src/main/java/org/infinispan/cli/shell/Man2Ansi.java
index 20b8477ff7a2..ea26d40e60c9 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/shell/Man2Ansi.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/shell/Man2Ansi.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.shell;
 
 import java.io.BufferedReader;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/shell/Prompt.java b/cli/cli-client/src/main/java/org/infinispan/cli/shell/Prompt.java
index 6a581daf8f5a..7a9dbc66a676 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/shell/Prompt.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/shell/Prompt.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.shell;
 
 import java.text.SimpleDateFormat;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/shell/Shell.java b/cli/cli-client/src/main/java/org/infinispan/cli/shell/Shell.java
index 9dd65b931af8..4fb77492efc1 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/shell/Shell.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/shell/Shell.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.shell;
 
 import java.io.IOException;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/shell/ShellImpl.java b/cli/cli-client/src/main/java/org/infinispan/cli/shell/ShellImpl.java
index b06ddf97bc7c..57ec4eea2408 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/shell/ShellImpl.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/shell/ShellImpl.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.shell;
 
 import gnu.getopt.Getopt;
@@ -265,8 +247,8 @@ private void help() {
 
    private void version() {
       System.out.println("ispn-cli " + Version.class.getPackage().getImplementationVersion());
-      System.out.println("Copyright (C) 2012 Red Hat Inc. and/or its affiliates and other contributors");
-      System.out.println("License GNU Lesser General Public License, v. 2.1. http://www.gnu.org/licenses/lgpl-2.1.txt");
+      System.out.println("Copyright (C) 2009-2013 Red Hat Inc. and/or its affiliates and other contributors");
+      System.out.println("License Apache License, v. 2.0. http://www.apache.org/licenses/LICENSE-2.0");
       System.exit(0);
    }
 
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/shell/ShellMode.java b/cli/cli-client/src/main/java/org/infinispan/cli/shell/ShellMode.java
index 2f636079c71f..f319141461f3 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/shell/ShellMode.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/shell/ShellMode.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.shell;
 
 public enum ShellMode {
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/util/SystemUtils.java b/cli/cli-client/src/main/java/org/infinispan/cli/util/SystemUtils.java
index 391c9dd14e49..e92301846141 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/util/SystemUtils.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/util/SystemUtils.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.util;
 
 import java.io.File;
diff --git a/cli/cli-client/src/main/java/org/infinispan/cli/util/Utils.java b/cli/cli-client/src/main/java/org/infinispan/cli/util/Utils.java
index 5140ead9d691..13c744fbfd08 100644
--- a/cli/cli-client/src/main/java/org/infinispan/cli/util/Utils.java
+++ b/cli/cli-client/src/main/java/org/infinispan/cli/util/Utils.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.util;
 
 public class Utils {
diff --git a/cli/cli-client/src/test/java/org/infinispan/cli/BatchingTest.java b/cli/cli-client/src/test/java/org/infinispan/cli/BatchingTest.java
index 253ada316764..38198e470fd6 100644
--- a/cli/cli-client/src/test/java/org/infinispan/cli/BatchingTest.java
+++ b/cli/cli-client/src/test/java/org/infinispan/cli/BatchingTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli;
 
 import java.io.ByteArrayInputStream;
diff --git a/cli/cli-client/src/test/java/org/infinispan/cli/JMXRMIUrlTest.java b/cli/cli-client/src/test/java/org/infinispan/cli/JMXRMIUrlTest.java
index f25f6e9dff1b..a1f31fd7cac9 100644
--- a/cli/cli-client/src/test/java/org/infinispan/cli/JMXRMIUrlTest.java
+++ b/cli/cli-client/src/test/java/org/infinispan/cli/JMXRMIUrlTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/cli/cli-client/src/test/java/org/infinispan/cli/JMXRemotingUrlTest.java b/cli/cli-client/src/test/java/org/infinispan/cli/JMXRemotingUrlTest.java
index 89efe7668f76..2ddb43c23716 100644
--- a/cli/cli-client/src/test/java/org/infinispan/cli/JMXRemotingUrlTest.java
+++ b/cli/cli-client/src/test/java/org/infinispan/cli/JMXRemotingUrlTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/cli/cli-client/src/test/java/org/infinispan/cli/Man2AnsiTest.java b/cli/cli-client/src/test/java/org/infinispan/cli/Man2AnsiTest.java
index 42b2e0bc592d..b5a253f206c7 100644
--- a/cli/cli-client/src/test/java/org/infinispan/cli/Man2AnsiTest.java
+++ b/cli/cli-client/src/test/java/org/infinispan/cli/Man2AnsiTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli;
 
 import java.util.regex.Matcher;
diff --git a/cli/cli-client/src/test/java/org/infinispan/cli/ProcessedCommandTest.java b/cli/cli-client/src/test/java/org/infinispan/cli/ProcessedCommandTest.java
index 1e5d06e99882..fafbfe9fa005 100644
--- a/cli/cli-client/src/test/java/org/infinispan/cli/ProcessedCommandTest.java
+++ b/cli/cli-client/src/test/java/org/infinispan/cli/ProcessedCommandTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli;
 
 import org.infinispan.cli.commands.ProcessedCommand;
diff --git a/cli/cli-server/pom.xml b/cli/cli-server/pom.xml
index 0c3a6086022d..f54b4766ce49 100644
--- a/cli/cli-server/pom.xml
+++ b/cli/cli-server/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-   ~ JBoss, Home of Professional Open Source
-   ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-   ~ contributors as indicated by the @author tags. All rights reserved.
-   ~ See the copyright.txt in the distribution for a full listing of
-   ~ individual contributors.
-   ~
-   ~ This is free software; you can redistribute it and/or modify it
-   ~ under the terms of the GNU Lesser General Public License as
-   ~ published by the Free Software Foundation; either version 2.1 of
-   ~ the License, or (at your option) any later version.
-   ~
-   ~ This software is distributed in the hope that it will be useful,
-   ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   ~ Lesser General Public License for more details.
-   ~
-   ~ You should have received a copy of the GNU Lesser General Public
-   ~ License along with this software; if not, write to the Free
-   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
 <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>
    <parent>
diff --git a/cli/cli-server/src/main/antlr3/org/infinispan/cli/interpreter/IspnQL.g b/cli/cli-server/src/main/antlr3/org/infinispan/cli/interpreter/IspnQL.g
index 9e579360df41..cfb99c297b1d 100644
--- a/cli/cli-server/src/main/antlr3/org/infinispan/cli/interpreter/IspnQL.g
+++ b/cli/cli-server/src/main/antlr3/org/infinispan/cli/interpreter/IspnQL.g
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 grammar IspnQL;
 
 options {
@@ -25,24 +7,6 @@ options {
 }
 
 @header {
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter;
 
 import java.io.IOException;
@@ -84,24 +48,6 @@ import static org.infinispan.cli.interpreter.utils.ParserSupport.*;
 }
 
 @lexer::header {
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter;
 
 import static org.infinispan.cli.interpreter.utils.ParserSupport.*;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/Interpreter.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/Interpreter.java
index fd753eac4183..457937a43d85 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/Interpreter.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/Interpreter.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter;
 
 import java.io.PrintWriter;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/InterpreterMetadataFileFinder.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/InterpreterMetadataFileFinder.java
index 913479581187..18065dfea73a 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/InterpreterMetadataFileFinder.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/InterpreterMetadataFileFinder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter;
 
 import org.infinispan.factories.components.ModuleMetadataFileFinder;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/LifecycleCallbacks.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/LifecycleCallbacks.java
index b89bca7838bd..5c0235b9e6dc 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/LifecycleCallbacks.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/LifecycleCallbacks.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter;
 
 import javax.management.MBeanServer;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/ParseException.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/ParseException.java
index b6f3383acfa4..ddf1b67d5482 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/ParseException.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/ParseException.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter;
 
 import java.util.List;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/Codec.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/Codec.java
index 0f9a462d2b68..8a3634c4a6dc 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/Codec.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/Codec.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.codec;
 
 public interface Codec {
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/CodecException.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/CodecException.java
index ef004bc38dd1..c99f4abac754 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/CodecException.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/CodecException.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.codec;
 
 import org.infinispan.cli.interpreter.result.StatementException;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/CodecRegistry.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/CodecRegistry.java
index 02679dc9a9cd..ddc8ad085068 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/CodecRegistry.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/CodecRegistry.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.codec;
 
 import java.util.Collection;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/HotRodCodec.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/HotRodCodec.java
index 48eb8921182d..4d6ac411d994 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/HotRodCodec.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/HotRodCodec.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.codec;
 
 import org.infinispan.cli.interpreter.logging.Log;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/MemcachedCodec.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/MemcachedCodec.java
index 0fd477dcd475..7ac8847087b4 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/MemcachedCodec.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/MemcachedCodec.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.codec;
 
 import java.nio.charset.Charset;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/NoneCodec.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/NoneCodec.java
index acc5032fd9d5..8408bf9dac00 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/NoneCodec.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/NoneCodec.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.codec;
 
 /**
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/RestCodec.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/RestCodec.java
index be84e9234d0b..a82dd4377b43 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/RestCodec.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/codec/RestCodec.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.codec;
 
 import org.infinispan.cli.interpreter.logging.Log;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/logging/Log.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/logging/Log.java
index 7740267bc6fb..9e26d9920587 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/logging/Log.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/logging/Log.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.logging;
 
 import static org.jboss.logging.Logger.Level.ERROR;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/logging/Messages.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/logging/Messages.java
index 3e102598fdd0..3f08dab50be8 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/logging/Messages.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/logging/Messages.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.logging;
 
 import org.jboss.logging.Message;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/result/EmptyResult.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/result/EmptyResult.java
index d94ea7d85f80..fe2a6a1703db 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/result/EmptyResult.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/result/EmptyResult.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.result;
 
 /**
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/result/JsonResult.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/result/JsonResult.java
index efb88603fffa..7b29d1706831 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/result/JsonResult.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/result/JsonResult.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.result;
 
 import org.codehaus.jackson.annotate.JsonTypeInfo;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/result/Result.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/result/Result.java
index 88e2b90f9c64..dd6932dc8284 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/result/Result.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/result/Result.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.result;
 
 public interface Result {
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/result/ResultKeys.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/result/ResultKeys.java
index 56dc9d38579f..4218b0b554ae 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/result/ResultKeys.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/result/ResultKeys.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.result;
 
 /**
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/result/StatementException.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/result/StatementException.java
index 1b7b115a0f74..4ddb33f4150e 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/result/StatementException.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/result/StatementException.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.result;
 
 public class StatementException extends Exception {
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/result/StringResult.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/result/StringResult.java
index 2b2378454603..a52841b8ea83 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/result/StringResult.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/result/StringResult.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.result;
 
 /**
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/session/Session.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/session/Session.java
index bcc23a1e7904..2450f1845abf 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/session/Session.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/session/Session.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.session;
 
 import java.util.Collection;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/session/SessionImpl.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/session/SessionImpl.java
index b39af1ac6260..673f55dbf41a 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/session/SessionImpl.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/session/SessionImpl.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.session;
 
 import java.util.Collection;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/AbstractTransactionStatement.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/AbstractTransactionStatement.java
index 0fb6b4b1ee87..9d7ad63b8d00 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/AbstractTransactionStatement.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/AbstractTransactionStatement.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 import javax.transaction.TransactionManager;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/BeginTransactionStatement.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/BeginTransactionStatement.java
index 9ecacdb2cb82..067ebe20de50 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/BeginTransactionStatement.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/BeginTransactionStatement.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 import javax.transaction.NotSupportedException;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/CacheStatement.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/CacheStatement.java
index c5fa4bd2db92..acdf4fac1b1f 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/CacheStatement.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/CacheStatement.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 import org.infinispan.Cache;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/ClearStatement.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/ClearStatement.java
index c8b7acea3a22..56242f4fad5f 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/ClearStatement.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/ClearStatement.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 import org.infinispan.Cache;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/CommitTransactionStatement.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/CommitTransactionStatement.java
index 0065255aa0b7..5cc88b04ba95 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/CommitTransactionStatement.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/CommitTransactionStatement.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 import javax.transaction.TransactionManager;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/CreateStatement.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/CreateStatement.java
index 24bac5afe01a..da8780e1ee41 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/CreateStatement.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/CreateStatement.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 import org.infinispan.cli.interpreter.result.EmptyResult;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/EncodingStatement.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/EncodingStatement.java
index c475ee6caaf5..40e25c5786e0 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/EncodingStatement.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/EncodingStatement.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 import java.util.Collection;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/EndBatchStatement.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/EndBatchStatement.java
index 511ed4fd9703..8444882d669c 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/EndBatchStatement.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/EndBatchStatement.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 import org.infinispan.Cache;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/EvictStatement.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/EvictStatement.java
index 317ab9221f2c..f53a872bc46e 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/EvictStatement.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/EvictStatement.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 import org.infinispan.Cache;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/ExpirationData.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/ExpirationData.java
index 51c0af50d0c1..41f7262a57fc 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/ExpirationData.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/ExpirationData.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 /**
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/GetStatement.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/GetStatement.java
index 1c149ba24cc2..2598725ecf1b 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/GetStatement.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/GetStatement.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 import java.util.List;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/InfoStatement.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/InfoStatement.java
index 3407bdcc0a3c..2f587e5517e8 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/InfoStatement.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/InfoStatement.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 import org.infinispan.Cache;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/KeyData.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/KeyData.java
index 33af43ad817a..28054fb583a3 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/KeyData.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/KeyData.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 public class KeyData {
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/LocateStatement.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/LocateStatement.java
index ee9df3232aca..d8df0964d746 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/LocateStatement.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/LocateStatement.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 import java.util.List;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/Option.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/Option.java
index 318d00e4da45..e0df02cfbbaf 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/Option.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/Option.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 import org.infinispan.cli.interpreter.logging.Log;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/PingStatement.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/PingStatement.java
index e5f91e67d8d5..6bf2560ab165 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/PingStatement.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/PingStatement.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 import org.infinispan.cli.interpreter.result.EmptyResult;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/PutStatement.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/PutStatement.java
index af252881c7fa..0429595a59e8 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/PutStatement.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/PutStatement.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 import java.util.List;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/RemoveStatement.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/RemoveStatement.java
index 3ff5d17e8616..e5273d789c40 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/RemoveStatement.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/RemoveStatement.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 import org.infinispan.Cache;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/ReplaceStatement.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/ReplaceStatement.java
index 896124945b17..cc25ebd753ba 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/ReplaceStatement.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/ReplaceStatement.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 import java.util.List;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/RollbackTransactionStatement.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/RollbackTransactionStatement.java
index 9db304888b9a..e22c36cabd83 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/RollbackTransactionStatement.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/RollbackTransactionStatement.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 import javax.transaction.TransactionManager;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/SiteData.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/SiteData.java
index c5f37df140e7..8b763ab07c70 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/SiteData.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/SiteData.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 public class SiteData {
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/SiteStatement.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/SiteStatement.java
index ceada5c06169..97d0629d9ca5 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/SiteStatement.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/SiteStatement.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 import java.util.List;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/StartBatchStatement.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/StartBatchStatement.java
index afe5d10d1dbd..bc33b46c5ed8 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/StartBatchStatement.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/StartBatchStatement.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 import org.infinispan.Cache;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/Statement.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/Statement.java
index 5f0e2026560b..6fa3e59674b3 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/Statement.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/Statement.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 import org.infinispan.cli.interpreter.result.Result;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/StatsStatement.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/StatsStatement.java
index 476e2e86b983..96e4c312fa02 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/StatsStatement.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/StatsStatement.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 import java.io.PrintWriter;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/UpgradeStatement.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/UpgradeStatement.java
index b51f8d323266..2b7972c1f122 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/UpgradeStatement.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/UpgradeStatement.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 import java.util.ArrayList;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/VersionStatement.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/VersionStatement.java
index d9001df43a78..525545350b92 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/VersionStatement.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/statement/VersionStatement.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.statement;
 
 import org.infinispan.Version;
diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/utils/ParserSupport.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/utils/ParserSupport.java
index 9ba20e43437b..944bf6ea005a 100644
--- a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/utils/ParserSupport.java
+++ b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/utils/ParserSupport.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter.utils;
 
 import java.util.HashMap;
diff --git a/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/ClusteredCLITest.java b/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/ClusteredCLITest.java
index 783830fd0fc5..8a2ecd0642bc 100644
--- a/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/ClusteredCLITest.java
+++ b/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/ClusteredCLITest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/HotRodEncodingTest.java b/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/HotRodEncodingTest.java
index 4823ae8b670f..b2d24d34b5fe 100644
--- a/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/HotRodEncodingTest.java
+++ b/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/HotRodEncodingTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter;
 
 import java.util.Map;
diff --git a/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/InterpreterTest.java b/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/InterpreterTest.java
index d77fe859b83f..8f7aa1154328 100644
--- a/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/InterpreterTest.java
+++ b/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/InterpreterTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/JSONTest.java b/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/JSONTest.java
index ed960fcfda00..f7737ca7ea84 100644
--- a/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/JSONTest.java
+++ b/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/JSONTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter;
 
 import java.io.IOException;
diff --git a/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/MemcachedEncodingTest.java b/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/MemcachedEncodingTest.java
index 15c6db641423..fedfaf20f1da 100644
--- a/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/MemcachedEncodingTest.java
+++ b/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/MemcachedEncodingTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/MyClass.java b/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/MyClass.java
index d4da01d2be29..83db40e1016d 100644
--- a/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/MyClass.java
+++ b/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/MyClass.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter;
 
 public class MyClass {
diff --git a/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/SessionTest.java b/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/SessionTest.java
index 53838ca67f7f..30f53d2b5ba1 100644
--- a/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/SessionTest.java
+++ b/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/SessionTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License f  or more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter;
 
 import java.util.Map;
diff --git a/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/SiteStatementTest.java b/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/SiteStatementTest.java
index 5abb920c251e..4c54f2f3a8e3 100644
--- a/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/SiteStatementTest.java
+++ b/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/SiteStatementTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- *  Copyright 2012 Red Hat Inc. and/or its affiliates and other
- *  contributors as indicated by the @author tags. All rights reserved
- *  See the copyright.txt in the distribution for a full listing of
- *  individual contributors.
- *
- *  This is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU Lesser General Public License as
- *  published by the Free Software Foundation; either version 2.1 of
- *  the License, or (at your option) any later version.
- *
- *  This software is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this software; if not, write to the Free
- *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- *  02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.cli.interpreter;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/UpgradeTest.java b/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/UpgradeTest.java
index bffc5079f55d..7a8a9ce9a7df 100644
--- a/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/UpgradeTest.java
+++ b/cli/cli-server/src/test/java/org/infinispan/cli/interpreter/UpgradeTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.cli.interpreter;
 
 import java.util.Map;
diff --git a/client/hotrod-client/pom.xml b/client/hotrod-client/pom.xml
index c7cdfcce81e7..89725a42a09d 100644
--- a/client/hotrod-client/pom.xml
+++ b/client/hotrod-client/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/Flag.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/Flag.java
index c3b88edf49bb..0c5ce058acc8 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/Flag.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/Flag.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import java.util.Map;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/MetadataValue.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/MetadataValue.java
index dd93af575b0b..effaca5cec10 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/MetadataValue.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/MetadataValue.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 /**
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCache.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCache.java
index 28b9287a44e0..60cb9675b39f 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCache.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCache.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import java.util.Collection;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCacheManager.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCacheManager.java
index 13618283cf90..c3fac707cb2b 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCacheManager.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCacheManager.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import java.io.IOException;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/ServerStatistics.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/ServerStatistics.java
index fb4c34f2f740..70af1d4c9497 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/ServerStatistics.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/ServerStatistics.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import java.util.Map;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/Version.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/Version.java
index 751359f5a270..09ff1a83962d 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/Version.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/Version.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 /**
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/VersionedValue.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/VersionedValue.java
index 4ea33c3084c6..35379610ec74 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/VersionedValue.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/VersionedValue.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 /**
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/AbstractConfigurationChildBuilder.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/AbstractConfigurationChildBuilder.java
index dd6807629094..98ef43cab5e5 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/AbstractConfigurationChildBuilder.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/AbstractConfigurationChildBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.client.hotrod.configuration;
 
 import java.util.Properties;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/Configuration.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/Configuration.java
index c18825cbdff8..555071b9d469 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/Configuration.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/Configuration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.client.hotrod.configuration;
 
 import java.lang.ref.WeakReference;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConfigurationBuilder.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConfigurationBuilder.java
index 0e3c2e44d37d..7696ae7c7f41 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConfigurationBuilder.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.client.hotrod.configuration;
 
 import java.lang.ref.WeakReference;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConfigurationChildBuilder.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConfigurationChildBuilder.java
index 56173946f501..8883b393fda1 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConfigurationChildBuilder.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConfigurationChildBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.client.hotrod.configuration;
 
 import java.util.Properties;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConnectionPoolConfiguration.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConnectionPoolConfiguration.java
index a2f411559024..9c7be10894a5 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConnectionPoolConfiguration.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConnectionPoolConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.client.hotrod.configuration;
 
 /**
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConnectionPoolConfigurationBuilder.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConnectionPoolConfigurationBuilder.java
index 1053631452ec..55e4f0bc35ea 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConnectionPoolConfigurationBuilder.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConnectionPoolConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.client.hotrod.configuration;
 
 import java.util.NoSuchElementException;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ExecutorFactoryConfiguration.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ExecutorFactoryConfiguration.java
index 5b9444de4601..f0148f5ba7ec 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ExecutorFactoryConfiguration.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ExecutorFactoryConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.client.hotrod.configuration;
 
 import org.infinispan.commons.configuration.AbstractTypedPropertiesConfiguration;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ExecutorFactoryConfigurationBuilder.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ExecutorFactoryConfigurationBuilder.java
index 43affea7cc2a..2d0d1008d4cb 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ExecutorFactoryConfigurationBuilder.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ExecutorFactoryConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.client.hotrod.configuration;
 
 import java.util.Properties;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ExhaustedAction.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ExhaustedAction.java
index b3955a696f1f..7da344f167ca 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ExhaustedAction.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ExhaustedAction.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.client.hotrod.configuration;
 
 /**
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ServerConfiguration.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ServerConfiguration.java
index aed99cd67c01..c510e63704c8 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ServerConfiguration.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ServerConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.client.hotrod.configuration;
 
 /**
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ServerConfigurationBuilder.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ServerConfigurationBuilder.java
index 9382724a2c9d..018a66b59372 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ServerConfigurationBuilder.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ServerConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.client.hotrod.configuration;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/SslConfiguration.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/SslConfiguration.java
index 449f95cca161..0031a1a0ad46 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/SslConfiguration.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/SslConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.client.hotrod.configuration;
 
 import java.util.Arrays;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/SslConfigurationBuilder.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/SslConfigurationBuilder.java
index 92eba9659fb5..06ad138dbe05 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/SslConfigurationBuilder.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/SslConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.client.hotrod.configuration;
 
 import javax.net.ssl.KeyManager;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/HotRodClientException.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/HotRodClientException.java
index 858d5d18338a..1fabb3870b14 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/HotRodClientException.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/HotRodClientException.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.exceptions;
 
 /**
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/HotRodTimeoutException.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/HotRodTimeoutException.java
index 91948e08c192..fe00461ee8f3 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/HotRodTimeoutException.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/HotRodTimeoutException.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.exceptions;
 
 /**
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/InvalidResponseException.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/InvalidResponseException.java
index 7a0bbd4eff06..e84423677a73 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/InvalidResponseException.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/InvalidResponseException.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.exceptions;
 
 /**
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/RemoteCacheManagerNotStartedException.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/RemoteCacheManagerNotStartedException.java
index c47939ce7161..ec1ebb9867a4 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/RemoteCacheManagerNotStartedException.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/RemoteCacheManagerNotStartedException.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.exceptions;
 
 /**
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/RemoteNodeSuspectException.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/RemoteNodeSuspectException.java
index 2b8f8aa19d33..3524506e98d4 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/RemoteNodeSuspectException.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/RemoteNodeSuspectException.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.client.hotrod.exceptions;
 
 /**
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/TransportException.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/TransportException.java
index 5b226a1bea79..6c33799a9536 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/TransportException.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/TransportException.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.exceptions;
 
 import java.net.SocketAddress;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/ConfigurationProperties.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/ConfigurationProperties.java
index d5b75e6bd966..ef8b411f7d8f 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/ConfigurationProperties.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/ConfigurationProperties.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl;
 
 import java.net.InetSocketAddress;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/MetadataValueImpl.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/MetadataValueImpl.java
index 796cd30c44d6..1687f128c75c 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/MetadataValueImpl.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/MetadataValueImpl.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.client.hotrod.impl;
 
 import org.infinispan.client.hotrod.MetadataValue;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/RemoteCacheImpl.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/RemoteCacheImpl.java
index 78376599a059..75d97561c6bb 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/RemoteCacheImpl.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/RemoteCacheImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/RemoteCacheSupport.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/RemoteCacheSupport.java
index 07092041fcea..ac1760cbcc1f 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/RemoteCacheSupport.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/RemoteCacheSupport.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/ServerStatisticsImpl.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/ServerStatisticsImpl.java
index 87ffab423e71..bf807164621c 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/ServerStatisticsImpl.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/ServerStatisticsImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl;
 
 import org.infinispan.client.hotrod.ServerStatistics;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/TypedProperties.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/TypedProperties.java
index ec9a692093a8..192225f12939 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/TypedProperties.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/TypedProperties.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl;
 
 import java.util.Properties;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/VersionedOperationResponse.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/VersionedOperationResponse.java
index 9ccafdf04837..a05431b7695a 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/VersionedOperationResponse.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/VersionedOperationResponse.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl;
 
 /**
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/VersionedValueImpl.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/VersionedValueImpl.java
index 01405a98a5e4..993220d836b2 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/VersionedValueImpl.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/VersionedValueImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl;
 
 import org.infinispan.client.hotrod.VersionedValue;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/async/DefaultAsyncExecutorFactory.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/async/DefaultAsyncExecutorFactory.java
index edee567811c6..f26ea23c5c7c 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/async/DefaultAsyncExecutorFactory.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/async/DefaultAsyncExecutorFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.async;
 
 import org.infinispan.client.hotrod.impl.ConfigurationProperties;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/async/NotifyingFutureImpl.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/async/NotifyingFutureImpl.java
index 27ec3e45938b..4a3be11883c4 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/async/NotifyingFutureImpl.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/async/NotifyingFutureImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.async;
 
 import org.infinispan.commons.util.concurrent.FutureListener;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHash.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHash.java
index 268976163cd8..3661c833428e 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHash.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHash.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.consistenthash;
 
 import java.net.SocketAddress;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHashFactory.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHashFactory.java
index ea73fbe6a822..6808ceb2cba1 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHashFactory.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHashFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.consistenthash;
 
 
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHashV1.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHashV1.java
index 8dfde7151e48..a2a3d85e6dca 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHashV1.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHashV1.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.consistenthash;
 
 import java.net.SocketAddress;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHashV2.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHashV2.java
index e744fde1be89..31dc7a5e1895 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHashV2.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHashV2.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.consistenthash;
 
 import org.infinispan.commons.hash.MurmurHash3;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/AbstractKeyOperation.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/AbstractKeyOperation.java
index a7f2ee83eca6..61aa7251115e 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/AbstractKeyOperation.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/AbstractKeyOperation.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.operations;
 
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/AbstractKeyValueOperation.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/AbstractKeyValueOperation.java
index 56ca31b7a391..d4e8433f90e0 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/AbstractKeyValueOperation.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/AbstractKeyValueOperation.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.operations;
 
 import net.jcip.annotations.Immutable;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/BulkGetKeysOperation.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/BulkGetKeysOperation.java
index 20f6145a9b50..982e9d0c556b 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/BulkGetKeysOperation.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/BulkGetKeysOperation.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.operations;
 
 import java.util.HashSet;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/BulkGetOperation.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/BulkGetOperation.java
index 309ae29c7130..834085b1cfb8 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/BulkGetOperation.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/BulkGetOperation.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.operations;
 
 import org.infinispan.client.hotrod.Flag;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/ClearOperation.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/ClearOperation.java
index b241e64b7398..5ded52d17432 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/ClearOperation.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/ClearOperation.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.operations;
 
 import net.jcip.annotations.Immutable;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/ContainsKeyOperation.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/ContainsKeyOperation.java
index d41f6611483f..e13f0a26d56f 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/ContainsKeyOperation.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/ContainsKeyOperation.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.operations;
 
 import net.jcip.annotations.Immutable;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/FaultTolerantPingOperation.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/FaultTolerantPingOperation.java
index c64bd2ebd8c8..d466401f4ef0 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/FaultTolerantPingOperation.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/FaultTolerantPingOperation.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.client.hotrod.impl.operations;
 
 import org.infinispan.client.hotrod.Flag;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/GetOperation.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/GetOperation.java
index cb5210ace2bd..474ec760ab99 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/GetOperation.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/GetOperation.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.operations;
 
 import net.jcip.annotations.Immutable;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/GetWithMetadataOperation.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/GetWithMetadataOperation.java
index 824b5ebde9fc..1405ba1a5373 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/GetWithMetadataOperation.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/GetWithMetadataOperation.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.operations;
 
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/GetWithVersionOperation.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/GetWithVersionOperation.java
index dd6ecac34d41..b458f9691ee5 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/GetWithVersionOperation.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/GetWithVersionOperation.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.operations;
 
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/HotRodOperation.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/HotRodOperation.java
index 962f464bc400..11483ad83e34 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/HotRodOperation.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/HotRodOperation.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.operations;
 
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/OperationsFactory.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/OperationsFactory.java
index 70bff5ced4bc..23b5959fdedd 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/OperationsFactory.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/OperationsFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.operations;
 
 import net.jcip.annotations.Immutable;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/PingOperation.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/PingOperation.java
index f906f6c1a20b..e9b3d70766d2 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/PingOperation.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/PingOperation.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.operations;
 
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/PutIfAbsentOperation.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/PutIfAbsentOperation.java
index eb5c0f7d5d10..1c15a2cc1488 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/PutIfAbsentOperation.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/PutIfAbsentOperation.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.operations;
 
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/PutOperation.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/PutOperation.java
index d3b5e8f87a3e..0e28776edf75 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/PutOperation.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/PutOperation.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.operations;
 
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/RemoveIfUnmodifiedOperation.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/RemoveIfUnmodifiedOperation.java
index e0b911bcc201..8b65d64cb540 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/RemoveIfUnmodifiedOperation.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/RemoveIfUnmodifiedOperation.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.operations;
 
 import net.jcip.annotations.Immutable;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/RemoveOperation.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/RemoveOperation.java
index 2c77c9858e0e..6ed08f6facdb 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/RemoveOperation.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/RemoveOperation.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.operations;
 
 import net.jcip.annotations.Immutable;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/ReplaceIfUnmodifiedOperation.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/ReplaceIfUnmodifiedOperation.java
index ae9462034248..3fe69ec64915 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/ReplaceIfUnmodifiedOperation.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/ReplaceIfUnmodifiedOperation.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.operations;
 
 import org.infinispan.client.hotrod.Flag;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/ReplaceOperation.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/ReplaceOperation.java
index 27d73be8e2f1..41080b79c4e4 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/ReplaceOperation.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/ReplaceOperation.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.operations;
 
 import net.jcip.annotations.Immutable;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/RetryOnFailureOperation.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/RetryOnFailureOperation.java
index c24adf298485..5abb3351927e 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/RetryOnFailureOperation.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/RetryOnFailureOperation.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.operations;
 
 import net.jcip.annotations.Immutable;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/StatsOperation.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/StatsOperation.java
index 0cc366a4a7d5..4958f1aac441 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/StatsOperation.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/StatsOperation.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.operations;
 
 import net.jcip.annotations.Immutable;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/Codec.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/Codec.java
index 7dbac2ad5fda..a106db520f7c 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/Codec.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/Codec.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.client.hotrod.impl.protocol;
 
 import org.infinispan.client.hotrod.impl.transport.Transport;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/Codec10.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/Codec10.java
index f42cfcad69bf..a51a93f67c7c 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/Codec10.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/Codec10.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.client.hotrod.impl.protocol;
 
 import static org.infinispan.commons.util.Util.hexDump;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/Codec11.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/Codec11.java
index d7fc74a4a454..f29282e34b45 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/Codec11.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/Codec11.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.client.hotrod.impl.protocol;
 
 import java.net.InetSocketAddress;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/Codec12.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/Codec12.java
index 7c1d88f155a8..1dfdc2d2635d 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/Codec12.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/Codec12.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.client.hotrod.impl.protocol;
 
 import org.infinispan.client.hotrod.Flag;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/CodecFactory.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/CodecFactory.java
index 120d617f59d4..84ec0e649fc4 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/CodecFactory.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/CodecFactory.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.client.hotrod.impl.protocol;
 
 import java.util.HashMap;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HeaderParams.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HeaderParams.java
index 8629124fd9ec..8e95ba5d32dd 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HeaderParams.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HeaderParams.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.client.hotrod.impl.protocol;
 
 import org.infinispan.client.hotrod.Flag;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodConstants.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodConstants.java
index bf3de71206e9..94e8919307d0 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodConstants.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodConstants.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.protocol;
 
 import java.nio.charset.Charset;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/AbstractTransport.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/AbstractTransport.java
index 84a190b8b2a4..b28d76650661 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/AbstractTransport.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/AbstractTransport.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.transport;
 
 import org.infinispan.client.hotrod.impl.protocol.HotRodConstants;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/Transport.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/Transport.java
index 66f612afb785..9a21d8fde293 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/Transport.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/Transport.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.transport;
 
 import java.net.SocketAddress;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/TransportFactory.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/TransportFactory.java
index 6d8437e1b630..c263cf4a1302 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/TransportFactory.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/TransportFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.transport;
 
 import java.net.SocketAddress;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/PropsKeyedObjectPoolFactory.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/PropsKeyedObjectPoolFactory.java
index 933a83048374..19733185fd1f 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/PropsKeyedObjectPoolFactory.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/PropsKeyedObjectPoolFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.transport.tcp;
 
 import org.apache.commons.pool.KeyedPoolableObjectFactory;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/RequestBalancingStrategy.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/RequestBalancingStrategy.java
index 2b7ddcd5ea34..7a01cb764b44 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/RequestBalancingStrategy.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/RequestBalancingStrategy.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.transport.tcp;
 
 import net.jcip.annotations.ThreadSafe;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/RoundRobinBalancingStrategy.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/RoundRobinBalancingStrategy.java
index 7a17371188e6..fe84777dde4f 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/RoundRobinBalancingStrategy.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/RoundRobinBalancingStrategy.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.transport.tcp;
 
 import java.net.InetSocketAddress;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TcpTransport.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TcpTransport.java
index 998237f255fe..3c39f4cc3d05 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TcpTransport.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TcpTransport.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.transport.tcp;
 
 import static org.infinispan.commons.io.UnsignedNumeric.readUnsignedInt;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TcpTransportFactory.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TcpTransportFactory.java
index 30f84929f79c..22152c484ce4 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TcpTransportFactory.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TcpTransportFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.transport.tcp;
 
 import java.net.InetSocketAddress;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TransportObjectFactory.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TransportObjectFactory.java
index d0cbe89a1777..68bb783d4e49 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TransportObjectFactory.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TransportObjectFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.impl.transport.tcp;
 
 import java.net.SocketAddress;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/logging/Log.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/logging/Log.java
index a724b9a1a490..b9bb509770ae 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/logging/Log.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/logging/Log.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.client.hotrod.logging;
 
 import org.infinispan.client.hotrod.exceptions.HotRodClientException;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/logging/LogFactory.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/logging/LogFactory.java
index d473254b7dbe..28540f5b969d 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/logging/LogFactory.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/logging/LogFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.logging;
 
 import org.jboss.logging.Logger;
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/marshall/ApacheAvroMarshaller.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/marshall/ApacheAvroMarshaller.java
index 33e633197cd9..171c1df9068f 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/marshall/ApacheAvroMarshaller.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/marshall/ApacheAvroMarshaller.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.marshall;
 
 import org.apache.avro.Schema;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/BaseBulkGetKeysTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/BaseBulkGetKeysTest.java
index b3d38bd0fbdc..feca0421b613 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/BaseBulkGetKeysTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/BaseBulkGetKeysTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import static org.infinispan.client.hotrod.test.HotRodClientTestingUtil.killRemoteCacheManager;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/BulkGetKeysDistTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/BulkGetKeysDistTest.java
index bf6d3a81dfab..01943833f3b7 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/BulkGetKeysDistTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/BulkGetKeysDistTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import java.util.Set;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/BulkGetKeysReplTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/BulkGetKeysReplTest.java
index f7e76e17f2b0..9d2b4cf7274a 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/BulkGetKeysReplTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/BulkGetKeysReplTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/BulkGetKeysSimpleTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/BulkGetKeysSimpleTest.java
index bd09184d88b5..ed7e6683ebc7 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/BulkGetKeysSimpleTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/BulkGetKeysSimpleTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/BulkGetSimpleTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/BulkGetSimpleTest.java
index 67b998b05cf2..620fdfb1be03 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/BulkGetSimpleTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/BulkGetSimpleTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.manager.EmbeddedCacheManager;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CSAIntegrationTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CSAIntegrationTest.java
index 28a1d3105eb5..684f29643f67 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CSAIntegrationTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CSAIntegrationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.Cache;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CacheContainerTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CacheContainerTest.java
index 21c7fe540105..c53d25d531d6 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CacheContainerTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CacheContainerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.api.BasicCache;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CacheManagerNotStartedTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CacheManagerNotStartedTest.java
index b0a2187f6fe3..e33a2d77ab74 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CacheManagerNotStartedTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CacheManagerNotStartedTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.client.hotrod.exceptions.RemoteCacheManagerNotStartedException;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CacheManagerStoppedTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CacheManagerStoppedTest.java
index 2a30af7000e1..b5798afcf5fb 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CacheManagerStoppedTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CacheManagerStoppedTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.client.hotrod.exceptions.RemoteCacheManagerNotStartedException;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ClientAsymmetricClusterTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ClientAsymmetricClusterTest.java
index 242c80458934..f8afad5619e1 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ClientAsymmetricClusterTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ClientAsymmetricClusterTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.client.hotrod;
 
 import org.infinispan.client.hotrod.exceptions.HotRodClientException;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ClientConnectionPoolingTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ClientConnectionPoolingTest.java
index a7bebe22aa51..594b13e7d76f 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ClientConnectionPoolingTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ClientConnectionPoolingTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.apache.commons.pool.impl.GenericKeyedObjectPool;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ClientSocketReadTimeoutTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ClientSocketReadTimeoutTest.java
index 2130e5a2ba8d..0693e6f8f655 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ClientSocketReadTimeoutTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ClientSocketReadTimeoutTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.client.hotrod;
 
 import org.infinispan.Cache;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ConfigurationTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ConfigurationTest.java
index e796dac46313..369fb8b1da39 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ConfigurationTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ConfigurationTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.client.hotrod;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ConsistentHashFactoryTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ConsistentHashFactoryTest.java
index fd3236bf75e9..5c15f91cb5ec 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ConsistentHashFactoryTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ConsistentHashFactoryTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ConsistentHashPerformanceTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ConsistentHashPerformanceTest.java
index c9f7c1e9c0bc..49a2ae9597e3 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ConsistentHashPerformanceTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ConsistentHashPerformanceTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.client.hotrod.impl.consistenthash.ConsistentHash;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ConsistentHashV1IntegrationTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ConsistentHashV1IntegrationTest.java
index aac93727f80d..33ff151b4e13 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ConsistentHashV1IntegrationTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ConsistentHashV1IntegrationTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.client.hotrod;
 
 import org.infinispan.affinity.KeyAffinityService;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ConsistentHashV1Test.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ConsistentHashV1Test.java
index a44e23fb3c84..ae5f82346a7d 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ConsistentHashV1Test.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ConsistentHashV1Test.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.client.hotrod;
 
 import org.infinispan.client.hotrod.impl.consistenthash.ConsistentHashV1;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/DefaultExpirationTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/DefaultExpirationTest.java
index 3c83533b8f20..a65c2186fd27 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/DefaultExpirationTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/DefaultExpirationTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.client.hotrod;
 
 import org.testng.annotations.Test;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/DistTopologyChangeTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/DistTopologyChangeTest.java
index d300b290f70f..7e2629d538e8 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/DistTopologyChangeTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/DistTopologyChangeTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/DroppedConnectionsTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/DroppedConnectionsTest.java
index 9760b7e8894a..e733d343f21f 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/DroppedConnectionsTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/DroppedConnectionsTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.apache.commons.pool.impl.GenericKeyedObjectPool;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ForceReturnValueTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ForceReturnValueTest.java
index e83716103f48..58978ca914e9 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ForceReturnValueTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ForceReturnValueTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.manager.EmbeddedCacheManager;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ForceReturnValuesTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ForceReturnValuesTest.java
index c72df0d75af6..443d2871de49 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ForceReturnValuesTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ForceReturnValuesTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.client.hotrod;
 
 import org.infinispan.client.hotrod.test.HotRodClientTestingUtil;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HeavyLoadConnectionPoolingTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HeavyLoadConnectionPoolingTest.java
index 39ec9e31ac84..b55cace6d738 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HeavyLoadConnectionPoolingTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HeavyLoadConnectionPoolingTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.apache.commons.pool.impl.GenericKeyedObjectPool;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HitsAwareCacheManagersTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HitsAwareCacheManagersTest.java
index 73dcaf39737c..2d455db81383 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HitsAwareCacheManagersTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HitsAwareCacheManagersTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.Cache;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRod10CSAIntegrationTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRod10CSAIntegrationTest.java
index 4cef02a0a299..caa319db820f 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRod10CSAIntegrationTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRod10CSAIntegrationTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.client.hotrod;
 
 import org.testng.annotations.Test;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodAsyncReplicationTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodAsyncReplicationTest.java
index 70a26ba14e2d..441f4f11a53b 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodAsyncReplicationTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodAsyncReplicationTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.client.hotrod;
 
 import org.infinispan.client.hotrod.test.MultiHotRodServersTest;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodIntegrationTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodIntegrationTest.java
index 812ac1a99ac8..1e9604a9ea28 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodIntegrationTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodIntegrationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.client.hotrod.test.HotRodClientTestingUtil;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodServerStartStopTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodServerStartStopTest.java
index 037f9e526911..d5834ec4d02f 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodServerStartStopTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodServerStartStopTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodStatisticsTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodStatisticsTest.java
index cf2de7b4a6bb..e523402fd163 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodStatisticsTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodStatisticsTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/PingOnStartupTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/PingOnStartupTest.java
index 15caaf375f17..72a0bac1204d 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/PingOnStartupTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/PingOnStartupTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.client.hotrod.impl.transport.tcp.TcpTransportFactory;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RemoteAsyncAPITest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RemoteAsyncAPITest.java
index 3aa12aa7eae9..33fefc4a48a6 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RemoteAsyncAPITest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RemoteAsyncAPITest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.manager.EmbeddedCacheManager;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RemoteCacheManagerTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RemoteCacheManagerTest.java
index 7b90c9d78e78..9cc5360e5aef 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RemoteCacheManagerTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RemoteCacheManagerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import static org.testng.AssertJUnit.assertTrue;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ReplTopologyChangeTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ReplTopologyChangeTest.java
index e513ae6a6a77..ea8dc9a3fce0 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ReplTopologyChangeTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ReplTopologyChangeTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.client.hotrod.impl.transport.tcp.TcpTransportFactory;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RoundRobinBalancingIntegrationTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RoundRobinBalancingIntegrationTest.java
index 0048bf8ca732..aa1d80372923 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RoundRobinBalancingIntegrationTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RoundRobinBalancingIntegrationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.Cache;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RoundRobinBalancingStrategyTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RoundRobinBalancingStrategyTest.java
index 65c2022304d5..c1bac511638f 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RoundRobinBalancingStrategyTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RoundRobinBalancingStrategyTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.client.hotrod.impl.transport.tcp.RoundRobinBalancingStrategy;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ServerErrorTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ServerErrorTest.java
index bb82a1c8be4b..4d0c6cf4b9e0 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ServerErrorTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ServerErrorTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.client.hotrod;
 
 import org.infinispan.client.hotrod.exceptions.HotRodClientException;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ServerRestartTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ServerRestartTest.java
index 0a0d328965c5..2450d56f7df9 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ServerRestartTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ServerRestartTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ServerShutdownTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ServerShutdownTest.java
index 3181b3d6297c..c9890362edb8 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ServerShutdownTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ServerShutdownTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.client.hotrod.test.RemoteCacheManagerCallable;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/SocketTimeoutErrorTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/SocketTimeoutErrorTest.java
index 17d34876dcda..f2f6742e8501 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/SocketTimeoutErrorTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/SocketTimeoutErrorTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.client.hotrod;
 
 import static org.infinispan.client.hotrod.test.HotRodClientTestingUtil.killRemoteCacheManager;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/SomeAsyncExecutorFactory.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/SomeAsyncExecutorFactory.java
index 8a39a41b0ed5..64c7a14324ba 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/SomeAsyncExecutorFactory.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/SomeAsyncExecutorFactory.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.client.hotrod.impl.async.DefaultAsyncExecutorFactory;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/SomeCustomConsistentHashV1.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/SomeCustomConsistentHashV1.java
index ad75c6b782fe..e052a85189c0 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/SomeCustomConsistentHashV1.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/SomeCustomConsistentHashV1.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.client.hotrod.impl.consistenthash.ConsistentHashV1;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/SomeRequestBalancingStrategy.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/SomeRequestBalancingStrategy.java
index 96fc93d4a076..72f94ecd9984 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/SomeRequestBalancingStrategy.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/SomeRequestBalancingStrategy.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.client.hotrod.impl.transport.tcp.RoundRobinBalancingStrategy;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/SomeTransportfactory.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/SomeTransportfactory.java
index 7dd98bdca064..450f4b32868d 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/SomeTransportfactory.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/SomeTransportfactory.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.client.hotrod.impl.transport.tcp.TcpTransportFactory;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/SslTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/SslTest.java
index d296873d8a07..ab6849e44d7e 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/SslTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/SslTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.client.hotrod;
 
 import java.net.SocketTimeoutException;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/TestHelper.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/TestHelper.java
index 639c015b6831..3a7f8a1220eb 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/TestHelper.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/TestHelper.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.manager.EmbeddedCacheManager;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/WorkerThread.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/WorkerThread.java
index b55688445ebb..9f1b4f42197f 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/WorkerThread.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/WorkerThread.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod;
 
 import org.infinispan.util.logging.Log;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/marshall/ApacheAvroMarshallerTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/marshall/ApacheAvroMarshallerTest.java
index a440ef876ecf..cc1a53daf381 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/marshall/ApacheAvroMarshallerTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/marshall/ApacheAvroMarshallerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.marshall;
 
 import org.testng.annotations.Test;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/AbstractRetryTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/AbstractRetryTest.java
index 489a4832683a..426b56d4f693 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/AbstractRetryTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/AbstractRetryTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.retry;
 
 import org.infinispan.client.hotrod.HitsAwareCacheManagersTest;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/DistributionRetryTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/DistributionRetryTest.java
index 60f2e5fc6403..06655e7a4a30 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/DistributionRetryTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/DistributionRetryTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.retry;
 
 import org.infinispan.Cache;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/ReplicationRetryTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/ReplicationRetryTest.java
index 6a933b60a75c..8691a39fb708 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/ReplicationRetryTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/ReplicationRetryTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.client.hotrod.retry;
 
 import static org.testng.Assert.assertEquals;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/ServerFailureRetryTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/ServerFailureRetryTest.java
index 4eca94efea56..434ac57426fe 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/ServerFailureRetryTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/ServerFailureRetryTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.client.hotrod.retry;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/stress/ClientConsistentHashPerfTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/stress/ClientConsistentHashPerfTest.java
index fd6c8cf95361..3b8a1029cd9f 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/stress/ClientConsistentHashPerfTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/stress/ClientConsistentHashPerfTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.client.hotrod.stress;
 
 import java.io.UnsupportedEncodingException;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/test/HotRodClientTestingUtil.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/test/HotRodClientTestingUtil.java
index 16e369830be1..6be9e73a5996 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/test/HotRodClientTestingUtil.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/test/HotRodClientTestingUtil.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.client.hotrod.test;
 
 import org.infinispan.client.hotrod.RemoteCacheManager;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/test/RemoteCacheManagerCallable.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/test/RemoteCacheManagerCallable.java
index 928328e04a29..92951347c4f4 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/test/RemoteCacheManagerCallable.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/test/RemoteCacheManagerCallable.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.client.hotrod.test;
 
 import org.infinispan.client.hotrod.RemoteCacheManager;
diff --git a/client/hotrod-client/src/test/resources/empty-config.properties b/client/hotrod-client/src/test/resources/empty-config.properties
index 467d00c2a8a9..792d6005489e 100644
--- a/client/hotrod-client/src/test/resources/empty-config.properties
+++ b/client/hotrod-client/src/test/resources/empty-config.properties
@@ -1,22 +1 @@
 #
-# JBoss, Home of Professional Open Source
-# Copyright 2010 Red Hat Inc. and/or its affiliates and other
-# contributors as indicated by the @author tags. All rights reserved.
-# See the copyright.txt in the distribution for a full listing of
-# individual contributors.
-#
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
diff --git a/client/hotrod-client/src/test/resources/hotrod-client.properties b/client/hotrod-client/src/test/resources/hotrod-client.properties
index 29aafe88d3f7..bbe0cc2778df 100644
--- a/client/hotrod-client/src/test/resources/hotrod-client.properties
+++ b/client/hotrod-client/src/test/resources/hotrod-client.properties
@@ -1,26 +1,3 @@
-#
-# JBoss, Home of Professional Open Source
-# Copyright 2010 Red Hat Inc. and/or its affiliates and other
-# contributors as indicated by the @author tags. All rights reserved.
-# See the copyright.txt in the distribution for a full listing of
-# individual contributors.
-#
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
-
 # hopefully this port is available
 infinispan.client.hotrod.transport_factory = org.infinispan.client.hotrod.impl.transport.tcp.TcpTransportFactory
 infinispan.client.hotrod.server_list = 127.0.0.1:11222
diff --git a/commons/src/main/java/org/infinispan/commons/CacheConfigurationException.java b/commons/src/main/java/org/infinispan/commons/CacheConfigurationException.java
index d68ab5cd6861..6376c25913f7 100644
--- a/commons/src/main/java/org/infinispan/commons/CacheConfigurationException.java
+++ b/commons/src/main/java/org/infinispan/commons/CacheConfigurationException.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons;
 
 import java.util.ArrayList;
diff --git a/commons/src/main/java/org/infinispan/commons/CacheException.java b/commons/src/main/java/org/infinispan/commons/CacheException.java
index b42e203ec471..758922bfd018 100644
--- a/commons/src/main/java/org/infinispan/commons/CacheException.java
+++ b/commons/src/main/java/org/infinispan/commons/CacheException.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons;
 
 /**
diff --git a/commons/src/main/java/org/infinispan/commons/configuration/AbstractTypedPropertiesConfiguration.java b/commons/src/main/java/org/infinispan/commons/configuration/AbstractTypedPropertiesConfiguration.java
index a490ff36d9a1..9d9d09459b8c 100644
--- a/commons/src/main/java/org/infinispan/commons/configuration/AbstractTypedPropertiesConfiguration.java
+++ b/commons/src/main/java/org/infinispan/commons/configuration/AbstractTypedPropertiesConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.commons.configuration;
 
 import static org.infinispan.commons.util.Immutables.immutableTypedProperties;
diff --git a/commons/src/main/java/org/infinispan/commons/configuration/Builder.java b/commons/src/main/java/org/infinispan/commons/configuration/Builder.java
index df13d5aa658a..1ad15c599111 100644
--- a/commons/src/main/java/org/infinispan/commons/configuration/Builder.java
+++ b/commons/src/main/java/org/infinispan/commons/configuration/Builder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.commons.configuration;
 
 /**
diff --git a/commons/src/main/java/org/infinispan/commons/configuration/BuiltBy.java b/commons/src/main/java/org/infinispan/commons/configuration/BuiltBy.java
index 4cd303962a7f..9828505ea810 100644
--- a/commons/src/main/java/org/infinispan/commons/configuration/BuiltBy.java
+++ b/commons/src/main/java/org/infinispan/commons/configuration/BuiltBy.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.commons.configuration;
 
 import java.lang.annotation.Retention;
diff --git a/commons/src/main/java/org/infinispan/commons/configuration/ConfigurationUtils.java b/commons/src/main/java/org/infinispan/commons/configuration/ConfigurationUtils.java
index da5fafe7a678..0cee7c3345b3 100644
--- a/commons/src/main/java/org/infinispan/commons/configuration/ConfigurationUtils.java
+++ b/commons/src/main/java/org/infinispan/commons/configuration/ConfigurationUtils.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.commons.configuration;
 
 import org.infinispan.commons.CacheConfigurationException;
diff --git a/commons/src/main/java/org/infinispan/commons/equivalence/AnyEquivalence.java b/commons/src/main/java/org/infinispan/commons/equivalence/AnyEquivalence.java
index dadacc6ea4e5..e30263e99328 100644
--- a/commons/src/main/java/org/infinispan/commons/equivalence/AnyEquivalence.java
+++ b/commons/src/main/java/org/infinispan/commons/equivalence/AnyEquivalence.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commons.equivalence;
 
 /**
diff --git a/commons/src/main/java/org/infinispan/commons/equivalence/ByteArrayEquivalence.java b/commons/src/main/java/org/infinispan/commons/equivalence/ByteArrayEquivalence.java
index 1f3a4e5429a8..4d231f181179 100644
--- a/commons/src/main/java/org/infinispan/commons/equivalence/ByteArrayEquivalence.java
+++ b/commons/src/main/java/org/infinispan/commons/equivalence/ByteArrayEquivalence.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commons.equivalence;
 
 import java.util.Arrays;
diff --git a/commons/src/main/java/org/infinispan/commons/equivalence/Equivalence.java b/commons/src/main/java/org/infinispan/commons/equivalence/Equivalence.java
index 5f9adcb547b4..4600082a6be5 100644
--- a/commons/src/main/java/org/infinispan/commons/equivalence/Equivalence.java
+++ b/commons/src/main/java/org/infinispan/commons/equivalence/Equivalence.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commons.equivalence;
 
 import java.io.Serializable;
diff --git a/commons/src/main/java/org/infinispan/commons/equivalence/EquivalentHashMap.java b/commons/src/main/java/org/infinispan/commons/equivalence/EquivalentHashMap.java
index bc8a7dd5c37d..4670d5b8faa0 100644
--- a/commons/src/main/java/org/infinispan/commons/equivalence/EquivalentHashMap.java
+++ b/commons/src/main/java/org/infinispan/commons/equivalence/EquivalentHashMap.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commons.equivalence;
 
 import java.util.AbstractCollection;
diff --git a/commons/src/main/java/org/infinispan/commons/equivalence/EquivalentHashSet.java b/commons/src/main/java/org/infinispan/commons/equivalence/EquivalentHashSet.java
index 83cbba041496..5af20744014b 100644
--- a/commons/src/main/java/org/infinispan/commons/equivalence/EquivalentHashSet.java
+++ b/commons/src/main/java/org/infinispan/commons/equivalence/EquivalentHashSet.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commons.equivalence;
 
 import java.util.AbstractSet;
diff --git a/commons/src/main/java/org/infinispan/commons/executors/ExecutorFactory.java b/commons/src/main/java/org/infinispan/commons/executors/ExecutorFactory.java
index 6c65b6046459..83a66d7d7ae0 100644
--- a/commons/src/main/java/org/infinispan/commons/executors/ExecutorFactory.java
+++ b/commons/src/main/java/org/infinispan/commons/executors/ExecutorFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.executors;
 
 import java.util.Properties;
diff --git a/commons/src/main/java/org/infinispan/commons/hash/Hash.java b/commons/src/main/java/org/infinispan/commons/hash/Hash.java
index 60b1441071bb..d63292c30d65 100644
--- a/commons/src/main/java/org/infinispan/commons/hash/Hash.java
+++ b/commons/src/main/java/org/infinispan/commons/hash/Hash.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commons.hash;
 
 /**
diff --git a/commons/src/main/java/org/infinispan/commons/hash/MurmurHash2.java b/commons/src/main/java/org/infinispan/commons/hash/MurmurHash2.java
index 1eef4b20e3db..d562de9fbb73 100644
--- a/commons/src/main/java/org/infinispan/commons/hash/MurmurHash2.java
+++ b/commons/src/main/java/org/infinispan/commons/hash/MurmurHash2.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.hash;
 
 import net.jcip.annotations.Immutable;
diff --git a/commons/src/main/java/org/infinispan/commons/hash/MurmurHash2Compat.java b/commons/src/main/java/org/infinispan/commons/hash/MurmurHash2Compat.java
index 0d04701dd9c4..0c93998eab56 100644
--- a/commons/src/main/java/org/infinispan/commons/hash/MurmurHash2Compat.java
+++ b/commons/src/main/java/org/infinispan/commons/hash/MurmurHash2Compat.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.hash;
 
 import net.jcip.annotations.Immutable;
diff --git a/commons/src/main/java/org/infinispan/commons/hash/MurmurHash3.java b/commons/src/main/java/org/infinispan/commons/hash/MurmurHash3.java
index d8ba4bd69b0c..d2a18103575d 100644
--- a/commons/src/main/java/org/infinispan/commons/hash/MurmurHash3.java
+++ b/commons/src/main/java/org/infinispan/commons/hash/MurmurHash3.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commons.hash;
 
 import net.jcip.annotations.Immutable;
diff --git a/commons/src/main/java/org/infinispan/commons/io/ByteBuffer.java b/commons/src/main/java/org/infinispan/commons/io/ByteBuffer.java
index 3c68e1f36df6..fbc18fe4442a 100644
--- a/commons/src/main/java/org/infinispan/commons/io/ByteBuffer.java
+++ b/commons/src/main/java/org/infinispan/commons/io/ByteBuffer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.io;
 
 import java.io.ByteArrayInputStream;
diff --git a/commons/src/main/java/org/infinispan/commons/io/ExposedByteArrayOutputStream.java b/commons/src/main/java/org/infinispan/commons/io/ExposedByteArrayOutputStream.java
index 0171492ffe74..7758c6d3aa8b 100644
--- a/commons/src/main/java/org/infinispan/commons/io/ExposedByteArrayOutputStream.java
+++ b/commons/src/main/java/org/infinispan/commons/io/ExposedByteArrayOutputStream.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.io;
 
 import net.jcip.annotations.NotThreadSafe;
diff --git a/commons/src/main/java/org/infinispan/commons/io/UnsignedNumeric.java b/commons/src/main/java/org/infinispan/commons/io/UnsignedNumeric.java
index 8e3df535fbbd..ed3f52aaf235 100644
--- a/commons/src/main/java/org/infinispan/commons/io/UnsignedNumeric.java
+++ b/commons/src/main/java/org/infinispan/commons/io/UnsignedNumeric.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.io;
 
 import java.io.IOException;
diff --git a/commons/src/main/java/org/infinispan/commons/logging/BasicLogFactory.java b/commons/src/main/java/org/infinispan/commons/logging/BasicLogFactory.java
index 093db50009e3..9be97c8d5965 100644
--- a/commons/src/main/java/org/infinispan/commons/logging/BasicLogFactory.java
+++ b/commons/src/main/java/org/infinispan/commons/logging/BasicLogFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.logging;
 
 import org.infinispan.commons.logging.Log;
diff --git a/commons/src/main/java/org/infinispan/commons/logging/Log.java b/commons/src/main/java/org/infinispan/commons/logging/Log.java
index 9515311ff24d..3fd95964c1dc 100644
--- a/commons/src/main/java/org/infinispan/commons/logging/Log.java
+++ b/commons/src/main/java/org/infinispan/commons/logging/Log.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.logging;
 
 import static org.jboss.logging.Logger.Level.ERROR;
diff --git a/commons/src/main/java/org/infinispan/commons/logging/LogFactory.java b/commons/src/main/java/org/infinispan/commons/logging/LogFactory.java
index 366c7aa9d340..ecc0125ca6d7 100644
--- a/commons/src/main/java/org/infinispan/commons/logging/LogFactory.java
+++ b/commons/src/main/java/org/infinispan/commons/logging/LogFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.logging;
 
 import org.jboss.logging.Logger;
diff --git a/commons/src/main/java/org/infinispan/commons/marshall/AbstractDelegatingMarshaller.java b/commons/src/main/java/org/infinispan/commons/marshall/AbstractDelegatingMarshaller.java
index 30126ee26c70..e04ef11776fa 100644
--- a/commons/src/main/java/org/infinispan/commons/marshall/AbstractDelegatingMarshaller.java
+++ b/commons/src/main/java/org/infinispan/commons/marshall/AbstractDelegatingMarshaller.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.commons.marshall;
 
 import org.infinispan.commons.io.ByteBuffer;
diff --git a/commons/src/main/java/org/infinispan/commons/marshall/AbstractExternalizer.java b/commons/src/main/java/org/infinispan/commons/marshall/AbstractExternalizer.java
index afcd6851a79d..9dd8b3675ef1 100644
--- a/commons/src/main/java/org/infinispan/commons/marshall/AbstractExternalizer.java
+++ b/commons/src/main/java/org/infinispan/commons/marshall/AbstractExternalizer.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commons.marshall;
 
 /**
diff --git a/commons/src/main/java/org/infinispan/commons/marshall/AbstractMarshaller.java b/commons/src/main/java/org/infinispan/commons/marshall/AbstractMarshaller.java
index 45a971ceff75..937e8a3732d8 100644
--- a/commons/src/main/java/org/infinispan/commons/marshall/AbstractMarshaller.java
+++ b/commons/src/main/java/org/infinispan/commons/marshall/AbstractMarshaller.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.marshall;
 
 import org.infinispan.commons.io.ByteBuffer;
diff --git a/commons/src/main/java/org/infinispan/commons/marshall/AdaptiveBufferSizePredictor.java b/commons/src/main/java/org/infinispan/commons/marshall/AdaptiveBufferSizePredictor.java
index d3811b34289f..50b7a808df81 100644
--- a/commons/src/main/java/org/infinispan/commons/marshall/AdaptiveBufferSizePredictor.java
+++ b/commons/src/main/java/org/infinispan/commons/marshall/AdaptiveBufferSizePredictor.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commons.marshall;
 
 import org.infinispan.commons.logging.Log;
diff --git a/commons/src/main/java/org/infinispan/commons/marshall/AdvancedExternalizer.java b/commons/src/main/java/org/infinispan/commons/marshall/AdvancedExternalizer.java
index c8f013f12b89..3887a9ee4aac 100644
--- a/commons/src/main/java/org/infinispan/commons/marshall/AdvancedExternalizer.java
+++ b/commons/src/main/java/org/infinispan/commons/marshall/AdvancedExternalizer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.marshall;
 
 import java.util.Set;
diff --git a/commons/src/main/java/org/infinispan/commons/marshall/BufferSizePredictor.java b/commons/src/main/java/org/infinispan/commons/marshall/BufferSizePredictor.java
index 210de3416441..fdd28b0f2f3a 100644
--- a/commons/src/main/java/org/infinispan/commons/marshall/BufferSizePredictor.java
+++ b/commons/src/main/java/org/infinispan/commons/marshall/BufferSizePredictor.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commons.marshall;
 
 /**
diff --git a/commons/src/main/java/org/infinispan/commons/marshall/Externalizer.java b/commons/src/main/java/org/infinispan/commons/marshall/Externalizer.java
index 00fee71ab1a1..9efb9b8f1a3e 100644
--- a/commons/src/main/java/org/infinispan/commons/marshall/Externalizer.java
+++ b/commons/src/main/java/org/infinispan/commons/marshall/Externalizer.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commons.marshall;
 
 import java.io.IOException;
diff --git a/commons/src/main/java/org/infinispan/commons/marshall/JavaSerializationMarshaller.java b/commons/src/main/java/org/infinispan/commons/marshall/JavaSerializationMarshaller.java
index 66c1fcc3a5e4..06d4695354bf 100644
--- a/commons/src/main/java/org/infinispan/commons/marshall/JavaSerializationMarshaller.java
+++ b/commons/src/main/java/org/infinispan/commons/marshall/JavaSerializationMarshaller.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commons.marshall;
 
 import org.infinispan.commons.io.ByteBuffer;
diff --git a/commons/src/main/java/org/infinispan/commons/marshall/MarshallUtil.java b/commons/src/main/java/org/infinispan/commons/marshall/MarshallUtil.java
index 875a36667a3f..05ba1db73a75 100644
--- a/commons/src/main/java/org/infinispan/commons/marshall/MarshallUtil.java
+++ b/commons/src/main/java/org/infinispan/commons/marshall/MarshallUtil.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.marshall;
 
 import net.jcip.annotations.Immutable;
diff --git a/commons/src/main/java/org/infinispan/commons/marshall/MarshallableTypeHints.java b/commons/src/main/java/org/infinispan/commons/marshall/MarshallableTypeHints.java
index 7dcd56f84d8e..c7a1576c25ed 100644
--- a/commons/src/main/java/org/infinispan/commons/marshall/MarshallableTypeHints.java
+++ b/commons/src/main/java/org/infinispan/commons/marshall/MarshallableTypeHints.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.commons.marshall;
 
 import org.infinispan.commons.util.CollectionFactory;
diff --git a/commons/src/main/java/org/infinispan/commons/marshall/Marshaller.java b/commons/src/main/java/org/infinispan/commons/marshall/Marshaller.java
index a3386a6e22e5..7f54f652cc93 100644
--- a/commons/src/main/java/org/infinispan/commons/marshall/Marshaller.java
+++ b/commons/src/main/java/org/infinispan/commons/marshall/Marshaller.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.marshall;
 
 import net.jcip.annotations.ThreadSafe;
diff --git a/commons/src/main/java/org/infinispan/commons/marshall/NotSerializableException.java b/commons/src/main/java/org/infinispan/commons/marshall/NotSerializableException.java
index 4c4a61df5dcd..3a22d2191130 100644
--- a/commons/src/main/java/org/infinispan/commons/marshall/NotSerializableException.java
+++ b/commons/src/main/java/org/infinispan/commons/marshall/NotSerializableException.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.marshall;
 
 import org.infinispan.commons.CacheException;
diff --git a/commons/src/main/java/org/infinispan/commons/marshall/SerializeWith.java b/commons/src/main/java/org/infinispan/commons/marshall/SerializeWith.java
index d775af20d0b4..e0b3b9429a67 100644
--- a/commons/src/main/java/org/infinispan/commons/marshall/SerializeWith.java
+++ b/commons/src/main/java/org/infinispan/commons/marshall/SerializeWith.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commons.marshall;
 
 import java.lang.annotation.Documented;
diff --git a/commons/src/main/java/org/infinispan/commons/marshall/StreamingMarshaller.java b/commons/src/main/java/org/infinispan/commons/marshall/StreamingMarshaller.java
index 2eb2d73c8e39..f0b767ba5a41 100644
--- a/commons/src/main/java/org/infinispan/commons/marshall/StreamingMarshaller.java
+++ b/commons/src/main/java/org/infinispan/commons/marshall/StreamingMarshaller.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.marshall;
 
 import net.jcip.annotations.ThreadSafe;
diff --git a/commons/src/main/java/org/infinispan/commons/marshall/jboss/AbstractJBossMarshaller.java b/commons/src/main/java/org/infinispan/commons/marshall/jboss/AbstractJBossMarshaller.java
index 2a0f47c05b62..54eeebb9ea23 100644
--- a/commons/src/main/java/org/infinispan/commons/marshall/jboss/AbstractJBossMarshaller.java
+++ b/commons/src/main/java/org/infinispan/commons/marshall/jboss/AbstractJBossMarshaller.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.commons.marshall.jboss;
 
 import org.infinispan.commons.io.ByteBuffer;
diff --git a/commons/src/main/java/org/infinispan/commons/marshall/jboss/DefaultContextClassResolver.java b/commons/src/main/java/org/infinispan/commons/marshall/jboss/DefaultContextClassResolver.java
index 6ab1d4856451..e93a0e4c5554 100644
--- a/commons/src/main/java/org/infinispan/commons/marshall/jboss/DefaultContextClassResolver.java
+++ b/commons/src/main/java/org/infinispan/commons/marshall/jboss/DefaultContextClassResolver.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.commons.marshall.jboss;
 
 import org.jboss.marshalling.ContextClassResolver;
diff --git a/commons/src/main/java/org/infinispan/commons/marshall/jboss/ExtendedRiverMarshaller.java b/commons/src/main/java/org/infinispan/commons/marshall/jboss/ExtendedRiverMarshaller.java
index 037479094f35..54ea87ef3eb7 100644
--- a/commons/src/main/java/org/infinispan/commons/marshall/jboss/ExtendedRiverMarshaller.java
+++ b/commons/src/main/java/org/infinispan/commons/marshall/jboss/ExtendedRiverMarshaller.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.commons.marshall.jboss;
 
 import org.jboss.marshalling.MarshallingConfiguration;
diff --git a/commons/src/main/java/org/infinispan/commons/marshall/jboss/ExtendedRiverUnmarshaller.java b/commons/src/main/java/org/infinispan/commons/marshall/jboss/ExtendedRiverUnmarshaller.java
index 5a05af2ef5ca..a47ad3f4f5ef 100644
--- a/commons/src/main/java/org/infinispan/commons/marshall/jboss/ExtendedRiverUnmarshaller.java
+++ b/commons/src/main/java/org/infinispan/commons/marshall/jboss/ExtendedRiverUnmarshaller.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.commons.marshall.jboss;
 
 import java.io.IOException;
diff --git a/commons/src/main/java/org/infinispan/commons/marshall/jboss/GenericJBossMarshaller.java b/commons/src/main/java/org/infinispan/commons/marshall/jboss/GenericJBossMarshaller.java
index 75fbe6bbf3ae..4cbdc516decb 100644
--- a/commons/src/main/java/org/infinispan/commons/marshall/jboss/GenericJBossMarshaller.java
+++ b/commons/src/main/java/org/infinispan/commons/marshall/jboss/GenericJBossMarshaller.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.marshall.jboss;
 
 /**
diff --git a/commons/src/main/java/org/infinispan/commons/marshall/jboss/JBossExternalizerAdapter.java b/commons/src/main/java/org/infinispan/commons/marshall/jboss/JBossExternalizerAdapter.java
index b32c90080ced..ecefee84cd1e 100644
--- a/commons/src/main/java/org/infinispan/commons/marshall/jboss/JBossExternalizerAdapter.java
+++ b/commons/src/main/java/org/infinispan/commons/marshall/jboss/JBossExternalizerAdapter.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commons.marshall.jboss;
 
 import org.infinispan.commons.marshall.Externalizer;
diff --git a/commons/src/main/java/org/infinispan/commons/marshall/jboss/JBossMarshallerFactory.java b/commons/src/main/java/org/infinispan/commons/marshall/jboss/JBossMarshallerFactory.java
index 61147106d188..c6082fb1ab81 100644
--- a/commons/src/main/java/org/infinispan/commons/marshall/jboss/JBossMarshallerFactory.java
+++ b/commons/src/main/java/org/infinispan/commons/marshall/jboss/JBossMarshallerFactory.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.commons.marshall.jboss;
 
 import org.jboss.marshalling.AbstractMarshallerFactory;
diff --git a/commons/src/main/java/org/infinispan/commons/marshall/jboss/RiverCloseListener.java b/commons/src/main/java/org/infinispan/commons/marshall/jboss/RiverCloseListener.java
index 637f4e997e86..453f2c7e7569 100644
--- a/commons/src/main/java/org/infinispan/commons/marshall/jboss/RiverCloseListener.java
+++ b/commons/src/main/java/org/infinispan/commons/marshall/jboss/RiverCloseListener.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.commons.marshall.jboss;
 
 /**
diff --git a/commons/src/main/java/org/infinispan/commons/marshall/jboss/SerializeWithExtFactory.java b/commons/src/main/java/org/infinispan/commons/marshall/jboss/SerializeWithExtFactory.java
index 7b3e27170b20..475510481181 100644
--- a/commons/src/main/java/org/infinispan/commons/marshall/jboss/SerializeWithExtFactory.java
+++ b/commons/src/main/java/org/infinispan/commons/marshall/jboss/SerializeWithExtFactory.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commons.marshall.jboss;
 
 import org.infinispan.commons.marshall.SerializeWith;
diff --git a/commons/src/main/java/org/infinispan/commons/marshall/jboss/package-info.java b/commons/src/main/java/org/infinispan/commons/marshall/jboss/package-info.java
index 3f0c3bb6798e..a15059512718 100644
--- a/commons/src/main/java/org/infinispan/commons/marshall/jboss/package-info.java
+++ b/commons/src/main/java/org/infinispan/commons/marshall/jboss/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Hooks to bridge Infinispan's marshalling APIs with JBoss Marshalling internals.
  */
diff --git a/commons/src/main/java/org/infinispan/commons/marshall/package-info.java b/commons/src/main/java/org/infinispan/commons/marshall/package-info.java
index 031596efa39e..ec0bbfadbfca 100644
--- a/commons/src/main/java/org/infinispan/commons/marshall/package-info.java
+++ b/commons/src/main/java/org/infinispan/commons/marshall/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Provides Infinispan-specific input and output streams, buffers and related utilities.
  */
diff --git a/commons/src/main/java/org/infinispan/commons/util/AbstractFileLookup.java b/commons/src/main/java/org/infinispan/commons/util/AbstractFileLookup.java
index dd4d5b44124c..a23f86acf826 100644
--- a/commons/src/main/java/org/infinispan/commons/util/AbstractFileLookup.java
+++ b/commons/src/main/java/org/infinispan/commons/util/AbstractFileLookup.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.util;
 
 import java.io.File;
diff --git a/commons/src/main/java/org/infinispan/commons/util/AbstractMap.java b/commons/src/main/java/org/infinispan/commons/util/AbstractMap.java
index 46075b7f9329..5acd736e090f 100644
--- a/commons/src/main/java/org/infinispan/commons/util/AbstractMap.java
+++ b/commons/src/main/java/org/infinispan/commons/util/AbstractMap.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.util;
 
 import java.util.Collection;
diff --git a/commons/src/main/java/org/infinispan/commons/util/Base64.java b/commons/src/main/java/org/infinispan/commons/util/Base64.java
index ca3bb34b761b..426529bd41de 100644
--- a/commons/src/main/java/org/infinispan/commons/util/Base64.java
+++ b/commons/src/main/java/org/infinispan/commons/util/Base64.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commons.util;
 
 import org.infinispan.commons.logging.Log;
diff --git a/commons/src/main/java/org/infinispan/commons/util/BeanUtils.java b/commons/src/main/java/org/infinispan/commons/util/BeanUtils.java
index 74d0c0a4f54b..79a8e0ee47d7 100644
--- a/commons/src/main/java/org/infinispan/commons/util/BeanUtils.java
+++ b/commons/src/main/java/org/infinispan/commons/util/BeanUtils.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.util;
 
 import java.lang.reflect.Method;
diff --git a/commons/src/main/java/org/infinispan/commons/util/ByRef.java b/commons/src/main/java/org/infinispan/commons/util/ByRef.java
index d5051bf2ff06..1ef3a92aa023 100644
--- a/commons/src/main/java/org/infinispan/commons/util/ByRef.java
+++ b/commons/src/main/java/org/infinispan/commons/util/ByRef.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.commons.util;
 
 /**
diff --git a/commons/src/main/java/org/infinispan/commons/util/ClassFinder.java b/commons/src/main/java/org/infinispan/commons/util/ClassFinder.java
index 95a69a456963..b52ff5c87578 100644
--- a/commons/src/main/java/org/infinispan/commons/util/ClassFinder.java
+++ b/commons/src/main/java/org/infinispan/commons/util/ClassFinder.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.util;
 
 import org.infinispan.commons.logging.Log;
diff --git a/commons/src/main/java/org/infinispan/commons/util/CollectionFactory.java b/commons/src/main/java/org/infinispan/commons/util/CollectionFactory.java
index 527710cc4a7b..dca48372ffb1 100644
--- a/commons/src/main/java/org/infinispan/commons/util/CollectionFactory.java
+++ b/commons/src/main/java/org/infinispan/commons/util/CollectionFactory.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.commons.util;
 
 import org.infinispan.commons.equivalence.AnyEquivalence;
diff --git a/commons/src/main/java/org/infinispan/commons/util/EnumerationList.java b/commons/src/main/java/org/infinispan/commons/util/EnumerationList.java
index 25b4efbd331b..d5b057c904fe 100644
--- a/commons/src/main/java/org/infinispan/commons/util/EnumerationList.java
+++ b/commons/src/main/java/org/infinispan/commons/util/EnumerationList.java
@@ -1,19 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat, Inc., and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this 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 org.infinispan.commons.util;
 
 import java.util.Enumeration;
diff --git a/commons/src/main/java/org/infinispan/commons/util/FastCopyHashMap.java b/commons/src/main/java/org/infinispan/commons/util/FastCopyHashMap.java
index 61d26c1fac46..541b83531365 100644
--- a/commons/src/main/java/org/infinispan/commons/util/FastCopyHashMap.java
+++ b/commons/src/main/java/org/infinispan/commons/util/FastCopyHashMap.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.util;
 
 import org.infinispan.commons.logging.Log;
diff --git a/commons/src/main/java/org/infinispan/commons/util/FileLookupFactory.java b/commons/src/main/java/org/infinispan/commons/util/FileLookupFactory.java
index f0a16849c539..d149bd07cf53 100644
--- a/commons/src/main/java/org/infinispan/commons/util/FileLookupFactory.java
+++ b/commons/src/main/java/org/infinispan/commons/util/FileLookupFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.util;
 
 import java.io.IOException;
diff --git a/commons/src/main/java/org/infinispan/commons/util/ForwardingList.java b/commons/src/main/java/org/infinispan/commons/util/ForwardingList.java
index 1226e8ac9c45..19112b324fb8 100644
--- a/commons/src/main/java/org/infinispan/commons/util/ForwardingList.java
+++ b/commons/src/main/java/org/infinispan/commons/util/ForwardingList.java
@@ -1,19 +1,3 @@
-/*
- * Copyright (C) 2007 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this 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 org.infinispan.commons.util;
 
 import java.util.Collection;
diff --git a/commons/src/main/java/org/infinispan/commons/util/ImmutableListCopy.java b/commons/src/main/java/org/infinispan/commons/util/ImmutableListCopy.java
index 2e88823339b2..ed1ff9c45cf5 100644
--- a/commons/src/main/java/org/infinispan/commons/util/ImmutableListCopy.java
+++ b/commons/src/main/java/org/infinispan/commons/util/ImmutableListCopy.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.util;
 
 import net.jcip.annotations.Immutable;
diff --git a/commons/src/main/java/org/infinispan/commons/util/Immutables.java b/commons/src/main/java/org/infinispan/commons/util/Immutables.java
index fc0bdb45b0b5..85918d150ef2 100644
--- a/commons/src/main/java/org/infinispan/commons/util/Immutables.java
+++ b/commons/src/main/java/org/infinispan/commons/util/Immutables.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.util;
 
 import java.io.IOException;
diff --git a/commons/src/main/java/org/infinispan/commons/util/InfinispanCollections.java b/commons/src/main/java/org/infinispan/commons/util/InfinispanCollections.java
index 11e01267eb71..e1792c679ac2 100644
--- a/commons/src/main/java/org/infinispan/commons/util/InfinispanCollections.java
+++ b/commons/src/main/java/org/infinispan/commons/util/InfinispanCollections.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.util;
 
 import org.infinispan.commons.marshall.AbstractExternalizer;
diff --git a/commons/src/main/java/org/infinispan/commons/util/LegacyKeySupportSystemProperties.java b/commons/src/main/java/org/infinispan/commons/util/LegacyKeySupportSystemProperties.java
index 70998adbe92b..7f4180486e63 100644
--- a/commons/src/main/java/org/infinispan/commons/util/LegacyKeySupportSystemProperties.java
+++ b/commons/src/main/java/org/infinispan/commons/util/LegacyKeySupportSystemProperties.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.util;
 
 import org.infinispan.commons.logging.Log;
diff --git a/commons/src/main/java/org/infinispan/commons/util/ObjectDuplicator.java b/commons/src/main/java/org/infinispan/commons/util/ObjectDuplicator.java
index 31877d2488a8..5c91013b1f9b 100644
--- a/commons/src/main/java/org/infinispan/commons/util/ObjectDuplicator.java
+++ b/commons/src/main/java/org/infinispan/commons/util/ObjectDuplicator.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.util;
 
 import java.util.Collection;
diff --git a/commons/src/main/java/org/infinispan/commons/util/Proxies.java b/commons/src/main/java/org/infinispan/commons/util/Proxies.java
index 8f58c44d15ca..7e5d0412098f 100644
--- a/commons/src/main/java/org/infinispan/commons/util/Proxies.java
+++ b/commons/src/main/java/org/infinispan/commons/util/Proxies.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.util;
 
 import org.infinispan.commons.logging.Log;
diff --git a/commons/src/main/java/org/infinispan/commons/util/ReflectionUtil.java b/commons/src/main/java/org/infinispan/commons/util/ReflectionUtil.java
index cc144f4f9865..23fa53943102 100644
--- a/commons/src/main/java/org/infinispan/commons/util/ReflectionUtil.java
+++ b/commons/src/main/java/org/infinispan/commons/util/ReflectionUtil.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.util;
 
 import org.infinispan.commons.CacheException;
diff --git a/commons/src/main/java/org/infinispan/commons/util/ReversibleOrderedSet.java b/commons/src/main/java/org/infinispan/commons/util/ReversibleOrderedSet.java
index 2a01cbcce693..844b08189296 100644
--- a/commons/src/main/java/org/infinispan/commons/util/ReversibleOrderedSet.java
+++ b/commons/src/main/java/org/infinispan/commons/util/ReversibleOrderedSet.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.util;
 
 import java.util.Iterator;
diff --git a/commons/src/main/java/org/infinispan/commons/util/SimpleImmutableEntry.java b/commons/src/main/java/org/infinispan/commons/util/SimpleImmutableEntry.java
index 8163f6a0d466..c4f1e78db566 100644
--- a/commons/src/main/java/org/infinispan/commons/util/SimpleImmutableEntry.java
+++ b/commons/src/main/java/org/infinispan/commons/util/SimpleImmutableEntry.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.util;
 
 import java.io.Serializable;
diff --git a/commons/src/main/java/org/infinispan/commons/util/SslContextFactory.java b/commons/src/main/java/org/infinispan/commons/util/SslContextFactory.java
index 78f9f4ddda1e..9c6bf6122264 100644
--- a/commons/src/main/java/org/infinispan/commons/util/SslContextFactory.java
+++ b/commons/src/main/java/org/infinispan/commons/util/SslContextFactory.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.commons.util;
 
 import java.io.BufferedInputStream;
diff --git a/commons/src/main/java/org/infinispan/commons/util/StringPropertyReplacer.java b/commons/src/main/java/org/infinispan/commons/util/StringPropertyReplacer.java
index ce31187b179e..f06c7e85f77e 100644
--- a/commons/src/main/java/org/infinispan/commons/util/StringPropertyReplacer.java
+++ b/commons/src/main/java/org/infinispan/commons/util/StringPropertyReplacer.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commons.util;
 
 import java.io.File;
diff --git a/commons/src/main/java/org/infinispan/commons/util/SysPropertyActions.java b/commons/src/main/java/org/infinispan/commons/util/SysPropertyActions.java
index 7fa2b132ea88..fd6b91a9f5e4 100644
--- a/commons/src/main/java/org/infinispan/commons/util/SysPropertyActions.java
+++ b/commons/src/main/java/org/infinispan/commons/util/SysPropertyActions.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commons.util;
 
 import java.security.AccessController;
diff --git a/commons/src/main/java/org/infinispan/commons/util/TimSort.java b/commons/src/main/java/org/infinispan/commons/util/TimSort.java
index 14068160075f..0073031bfffb 100644
--- a/commons/src/main/java/org/infinispan/commons/util/TimSort.java
+++ b/commons/src/main/java/org/infinispan/commons/util/TimSort.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commons.util;
 
 import java.util.Arrays;
diff --git a/commons/src/main/java/org/infinispan/commons/util/TypedProperties.java b/commons/src/main/java/org/infinispan/commons/util/TypedProperties.java
index 6e7e0904775a..8d49bb299076 100644
--- a/commons/src/main/java/org/infinispan/commons/util/TypedProperties.java
+++ b/commons/src/main/java/org/infinispan/commons/util/TypedProperties.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.util;
 
 import org.infinispan.commons.logging.Log;
diff --git a/commons/src/main/java/org/infinispan/commons/util/Util.java b/commons/src/main/java/org/infinispan/commons/util/Util.java
index 361ae9c9ff9a..af3472e5b7d2 100644
--- a/commons/src/main/java/org/infinispan/commons/util/Util.java
+++ b/commons/src/main/java/org/infinispan/commons/util/Util.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.util;
 
 import org.infinispan.commons.CacheConfigurationException;
diff --git a/commons/src/main/java/org/infinispan/commons/util/WeakValueHashMap.java b/commons/src/main/java/org/infinispan/commons/util/WeakValueHashMap.java
index 73754a147fcc..1d1abd8fc777 100644
--- a/commons/src/main/java/org/infinispan/commons/util/WeakValueHashMap.java
+++ b/commons/src/main/java/org/infinispan/commons/util/WeakValueHashMap.java
@@ -1,24 +1,3 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
 package org.infinispan.commons.util;
 
 import java.lang.ref.ReferenceQueue;
diff --git a/commons/src/main/java/org/infinispan/commons/util/concurrent/FutureListener.java b/commons/src/main/java/org/infinispan/commons/util/concurrent/FutureListener.java
index d79f80962f6d..68e1a251a577 100644
--- a/commons/src/main/java/org/infinispan/commons/util/concurrent/FutureListener.java
+++ b/commons/src/main/java/org/infinispan/commons/util/concurrent/FutureListener.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.util.concurrent;
 
 import java.util.concurrent.Future;
diff --git a/commons/src/main/java/org/infinispan/commons/util/concurrent/NotifyingFuture.java b/commons/src/main/java/org/infinispan/commons/util/concurrent/NotifyingFuture.java
index cea4014448c4..a2ab6d309cf9 100644
--- a/commons/src/main/java/org/infinispan/commons/util/concurrent/NotifyingFuture.java
+++ b/commons/src/main/java/org/infinispan/commons/util/concurrent/NotifyingFuture.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commons.util.concurrent;
 
 import java.util.concurrent.Future;
diff --git a/commons/src/main/java/org/infinispan/commons/util/concurrent/jdk8backported/EquivalentConcurrentHashMapV8.java b/commons/src/main/java/org/infinispan/commons/util/concurrent/jdk8backported/EquivalentConcurrentHashMapV8.java
index a8ef92e4fa63..b21a79bfb98f 100644
--- a/commons/src/main/java/org/infinispan/commons/util/concurrent/jdk8backported/EquivalentConcurrentHashMapV8.java
+++ b/commons/src/main/java/org/infinispan/commons/util/concurrent/jdk8backported/EquivalentConcurrentHashMapV8.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 // Revision 1.100
 // With added tree node walk up fixes in
 // http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/src/main/java/util/concurrent/ConcurrentHashMap.java?r1=1.216&r2=1.217
diff --git a/core/pom.xml b/core/pom.xml
index 88d76b73b7b5..394f7480145b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
diff --git a/core/src/main/java/org/infinispan/AbstractDelegatingAdvancedCache.java b/core/src/main/java/org/infinispan/AbstractDelegatingAdvancedCache.java
index 4f508a3807fa..b4f7e32abf9f 100644
--- a/core/src/main/java/org/infinispan/AbstractDelegatingAdvancedCache.java
+++ b/core/src/main/java/org/infinispan/AbstractDelegatingAdvancedCache.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan;
 
 import org.infinispan.atomic.Delta;
diff --git a/core/src/main/java/org/infinispan/AbstractDelegatingCache.java b/core/src/main/java/org/infinispan/AbstractDelegatingCache.java
index 9760a738dac8..6c35eddb0bf2 100644
--- a/core/src/main/java/org/infinispan/AbstractDelegatingCache.java
+++ b/core/src/main/java/org/infinispan/AbstractDelegatingCache.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/main/java/org/infinispan/AdvancedCache.java b/core/src/main/java/org/infinispan/AdvancedCache.java
index 72c4e4061df1..4bcb7314f3c8 100644
--- a/core/src/main/java/org/infinispan/AdvancedCache.java
+++ b/core/src/main/java/org/infinispan/AdvancedCache.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan;
 
 import org.infinispan.atomic.Delta;
diff --git a/core/src/main/java/org/infinispan/Cache.java b/core/src/main/java/org/infinispan/Cache.java
index 1e0adedea1f2..46c21c3c3364 100644
--- a/core/src/main/java/org/infinispan/Cache.java
+++ b/core/src/main/java/org/infinispan/Cache.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan;
 
 import org.infinispan.api.BasicCache;
diff --git a/core/src/main/java/org/infinispan/CacheImpl.java b/core/src/main/java/org/infinispan/CacheImpl.java
index 95689fcf9cac..f60cdf3275da 100644
--- a/core/src/main/java/org/infinispan/CacheImpl.java
+++ b/core/src/main/java/org/infinispan/CacheImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan;
 
 import org.infinispan.atomic.Delta;
diff --git a/core/src/main/java/org/infinispan/CacheSupport.java b/core/src/main/java/org/infinispan/CacheSupport.java
index b8512607b601..8d36e1d6456b 100644
--- a/core/src/main/java/org/infinispan/CacheSupport.java
+++ b/core/src/main/java/org/infinispan/CacheSupport.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan;
 
 import org.infinispan.api.BasicCache;
diff --git a/core/src/main/java/org/infinispan/DecoratedCache.java b/core/src/main/java/org/infinispan/DecoratedCache.java
index 8b8281b7905f..52334de87eef 100644
--- a/core/src/main/java/org/infinispan/DecoratedCache.java
+++ b/core/src/main/java/org/infinispan/DecoratedCache.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
diff --git a/core/src/main/java/org/infinispan/InvalidCacheUsageException.java b/core/src/main/java/org/infinispan/InvalidCacheUsageException.java
index 33f088e8edf7..6c3baf2e9c59 100644
--- a/core/src/main/java/org/infinispan/InvalidCacheUsageException.java
+++ b/core/src/main/java/org/infinispan/InvalidCacheUsageException.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/main/java/org/infinispan/Version.java b/core/src/main/java/org/infinispan/Version.java
index a58cbdbae09b..432ecd1cfc92 100644
--- a/core/src/main/java/org/infinispan/Version.java
+++ b/core/src/main/java/org/infinispan/Version.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan;
 
 import net.jcip.annotations.Immutable;
diff --git a/core/src/main/java/org/infinispan/affinity/KeyAffinityService.java b/core/src/main/java/org/infinispan/affinity/KeyAffinityService.java
index 64ff5f08228d..9f79e0c344e0 100644
--- a/core/src/main/java/org/infinispan/affinity/KeyAffinityService.java
+++ b/core/src/main/java/org/infinispan/affinity/KeyAffinityService.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.affinity;
 
 import org.infinispan.lifecycle.Lifecycle;
diff --git a/core/src/main/java/org/infinispan/affinity/KeyAffinityServiceFactory.java b/core/src/main/java/org/infinispan/affinity/KeyAffinityServiceFactory.java
index a0278484633e..89b85c947449 100644
--- a/core/src/main/java/org/infinispan/affinity/KeyAffinityServiceFactory.java
+++ b/core/src/main/java/org/infinispan/affinity/KeyAffinityServiceFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.affinity;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/affinity/KeyAffinityServiceImpl.java b/core/src/main/java/org/infinispan/affinity/KeyAffinityServiceImpl.java
index 71b5ab6f9b3b..e420ff83ca9e 100644
--- a/core/src/main/java/org/infinispan/affinity/KeyAffinityServiceImpl.java
+++ b/core/src/main/java/org/infinispan/affinity/KeyAffinityServiceImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.affinity;
 
 import net.jcip.annotations.GuardedBy;
diff --git a/core/src/main/java/org/infinispan/affinity/KeyGenerator.java b/core/src/main/java/org/infinispan/affinity/KeyGenerator.java
index a8c0c6839909..9dfdc21dfa1e 100644
--- a/core/src/main/java/org/infinispan/affinity/KeyGenerator.java
+++ b/core/src/main/java/org/infinispan/affinity/KeyGenerator.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.affinity;
 
 /**
diff --git a/core/src/main/java/org/infinispan/affinity/ListenerRegistration.java b/core/src/main/java/org/infinispan/affinity/ListenerRegistration.java
index a1b44b478a8c..a489538e1730 100644
--- a/core/src/main/java/org/infinispan/affinity/ListenerRegistration.java
+++ b/core/src/main/java/org/infinispan/affinity/ListenerRegistration.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.affinity;
 
 import org.infinispan.notifications.Listener;
diff --git a/core/src/main/java/org/infinispan/affinity/RndKeyGenerator.java b/core/src/main/java/org/infinispan/affinity/RndKeyGenerator.java
index b438ad5d4afa..1a2ecbad4bba 100644
--- a/core/src/main/java/org/infinispan/affinity/RndKeyGenerator.java
+++ b/core/src/main/java/org/infinispan/affinity/RndKeyGenerator.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.affinity;
 
 import java.util.Random;
diff --git a/core/src/main/java/org/infinispan/api/BasicCache.java b/core/src/main/java/org/infinispan/api/BasicCache.java
index e1f91b37dd8f..f44d0c558626 100644
--- a/core/src/main/java/org/infinispan/api/BasicCache.java
+++ b/core/src/main/java/org/infinispan/api/BasicCache.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api;
 
 import org.infinispan.lifecycle.Lifecycle;
diff --git a/core/src/main/java/org/infinispan/api/BasicCacheContainer.java b/core/src/main/java/org/infinispan/api/BasicCacheContainer.java
index 09c67107ec68..0009c6d3d997 100644
--- a/core/src/main/java/org/infinispan/api/BasicCacheContainer.java
+++ b/core/src/main/java/org/infinispan/api/BasicCacheContainer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api;
 
 import org.infinispan.lifecycle.Lifecycle;
diff --git a/core/src/main/java/org/infinispan/api/package-info.java b/core/src/main/java/org/infinispan/api/package-info.java
index 96367953eb38..45421a62dbed 100644
--- a/core/src/main/java/org/infinispan/api/package-info.java
+++ b/core/src/main/java/org/infinispan/api/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * API package
  */
diff --git a/core/src/main/java/org/infinispan/atomic/AtomicHashMap.java b/core/src/main/java/org/infinispan/atomic/AtomicHashMap.java
index 0edcb382142f..1b68b4b6937b 100644
--- a/core/src/main/java/org/infinispan/atomic/AtomicHashMap.java
+++ b/core/src/main/java/org/infinispan/atomic/AtomicHashMap.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 import net.jcip.annotations.NotThreadSafe;
diff --git a/core/src/main/java/org/infinispan/atomic/AtomicHashMapDelta.java b/core/src/main/java/org/infinispan/atomic/AtomicHashMapDelta.java
index 9183ef1de61f..7c35b6a8affd 100644
--- a/core/src/main/java/org/infinispan/atomic/AtomicHashMapDelta.java
+++ b/core/src/main/java/org/infinispan/atomic/AtomicHashMapDelta.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 import org.infinispan.commons.marshall.AbstractExternalizer;
diff --git a/core/src/main/java/org/infinispan/atomic/AtomicHashMapProxy.java b/core/src/main/java/org/infinispan/atomic/AtomicHashMapProxy.java
index e8caa5263c20..a495e1521236 100644
--- a/core/src/main/java/org/infinispan/atomic/AtomicHashMapProxy.java
+++ b/core/src/main/java/org/infinispan/atomic/AtomicHashMapProxy.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/main/java/org/infinispan/atomic/AtomicMap.java b/core/src/main/java/org/infinispan/atomic/AtomicMap.java
index 07b55c6af9b3..7cb3380780f7 100644
--- a/core/src/main/java/org/infinispan/atomic/AtomicMap.java
+++ b/core/src/main/java/org/infinispan/atomic/AtomicMap.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 import java.util.Map;
diff --git a/core/src/main/java/org/infinispan/atomic/AtomicMapLookup.java b/core/src/main/java/org/infinispan/atomic/AtomicMapLookup.java
index 56e84b348bf7..19be930f0183 100644
--- a/core/src/main/java/org/infinispan/atomic/AtomicMapLookup.java
+++ b/core/src/main/java/org/infinispan/atomic/AtomicMapLookup.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/main/java/org/infinispan/atomic/ClearOperation.java b/core/src/main/java/org/infinispan/atomic/ClearOperation.java
index 44a5400fdca1..1d972a1af381 100644
--- a/core/src/main/java/org/infinispan/atomic/ClearOperation.java
+++ b/core/src/main/java/org/infinispan/atomic/ClearOperation.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 import org.infinispan.commons.marshall.AbstractExternalizer;
diff --git a/core/src/main/java/org/infinispan/atomic/Delta.java b/core/src/main/java/org/infinispan/atomic/Delta.java
index f119a207f6bb..3679eb5ab74b 100644
--- a/core/src/main/java/org/infinispan/atomic/Delta.java
+++ b/core/src/main/java/org/infinispan/atomic/Delta.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 /**
diff --git a/core/src/main/java/org/infinispan/atomic/DeltaAware.java b/core/src/main/java/org/infinispan/atomic/DeltaAware.java
index 4c08715bcf48..694441a6192c 100644
--- a/core/src/main/java/org/infinispan/atomic/DeltaAware.java
+++ b/core/src/main/java/org/infinispan/atomic/DeltaAware.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 /**
diff --git a/core/src/main/java/org/infinispan/atomic/DeltaCompositeKey.java b/core/src/main/java/org/infinispan/atomic/DeltaCompositeKey.java
index f4396bdf915a..304117de6245 100644
--- a/core/src/main/java/org/infinispan/atomic/DeltaCompositeKey.java
+++ b/core/src/main/java/org/infinispan/atomic/DeltaCompositeKey.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.atomic;
 
 import org.infinispan.commons.marshall.AbstractExternalizer;
diff --git a/core/src/main/java/org/infinispan/atomic/FineGrainedAtomicHashMapProxy.java b/core/src/main/java/org/infinispan/atomic/FineGrainedAtomicHashMapProxy.java
index 76783ce9db19..6d0c02685b3d 100644
--- a/core/src/main/java/org/infinispan/atomic/FineGrainedAtomicHashMapProxy.java
+++ b/core/src/main/java/org/infinispan/atomic/FineGrainedAtomicHashMapProxy.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/main/java/org/infinispan/atomic/FineGrainedAtomicMap.java b/core/src/main/java/org/infinispan/atomic/FineGrainedAtomicMap.java
index f7e527a6a4d4..1ce717f92e92 100644
--- a/core/src/main/java/org/infinispan/atomic/FineGrainedAtomicMap.java
+++ b/core/src/main/java/org/infinispan/atomic/FineGrainedAtomicMap.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 import java.util.Map;
diff --git a/core/src/main/java/org/infinispan/atomic/NullDelta.java b/core/src/main/java/org/infinispan/atomic/NullDelta.java
index 5188b3b69406..a8e7cd64688a 100644
--- a/core/src/main/java/org/infinispan/atomic/NullDelta.java
+++ b/core/src/main/java/org/infinispan/atomic/NullDelta.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 import org.infinispan.atomic.AtomicHashMap;
diff --git a/core/src/main/java/org/infinispan/atomic/Operation.java b/core/src/main/java/org/infinispan/atomic/Operation.java
index a736d92fd8bf..fbe538379e0e 100644
--- a/core/src/main/java/org/infinispan/atomic/Operation.java
+++ b/core/src/main/java/org/infinispan/atomic/Operation.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 import java.util.Map;
diff --git a/core/src/main/java/org/infinispan/atomic/PutOperation.java b/core/src/main/java/org/infinispan/atomic/PutOperation.java
index df24a7d245ed..863f48e530b5 100644
--- a/core/src/main/java/org/infinispan/atomic/PutOperation.java
+++ b/core/src/main/java/org/infinispan/atomic/PutOperation.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 import java.io.IOException;
diff --git a/core/src/main/java/org/infinispan/atomic/RemoveOperation.java b/core/src/main/java/org/infinispan/atomic/RemoveOperation.java
index 5c3552399d87..298d3ff1582e 100644
--- a/core/src/main/java/org/infinispan/atomic/RemoveOperation.java
+++ b/core/src/main/java/org/infinispan/atomic/RemoveOperation.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 import java.io.IOException;
diff --git a/core/src/main/java/org/infinispan/atomic/package-info.java b/core/src/main/java/org/infinispan/atomic/package-info.java
index cb65922cd2b8..5fb167e94240 100644
--- a/core/src/main/java/org/infinispan/atomic/package-info.java
+++ b/core/src/main/java/org/infinispan/atomic/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * This package contains the {@link AtomicMap} interfaces and API that Infinispan exposes as building
  * blocks in creating other public interfaces such as the Tree API. 
diff --git a/core/src/main/java/org/infinispan/batch/AutoBatchSupport.java b/core/src/main/java/org/infinispan/batch/AutoBatchSupport.java
index 5bed077ddc01..755682ded3e6 100644
--- a/core/src/main/java/org/infinispan/batch/AutoBatchSupport.java
+++ b/core/src/main/java/org/infinispan/batch/AutoBatchSupport.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.batch;
 
 import net.jcip.annotations.NotThreadSafe;
diff --git a/core/src/main/java/org/infinispan/batch/BatchContainer.java b/core/src/main/java/org/infinispan/batch/BatchContainer.java
index 7ccc9a311065..90c4c060db86 100644
--- a/core/src/main/java/org/infinispan/batch/BatchContainer.java
+++ b/core/src/main/java/org/infinispan/batch/BatchContainer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.batch;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/main/java/org/infinispan/batch/package-info.java b/core/src/main/java/org/infinispan/batch/package-info.java
index 02e50a42fa50..ae00620d2d9e 100644
--- a/core/src/main/java/org/infinispan/batch/package-info.java
+++ b/core/src/main/java/org/infinispan/batch/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Support for batching calls using the {@link org.infinispan.Cache#startBatch()} and {@link org.infinispan.Cache#endBatch(boolean)}
  * API.
diff --git a/core/src/main/java/org/infinispan/commands/AbstractFlagAffectedCommand.java b/core/src/main/java/org/infinispan/commands/AbstractFlagAffectedCommand.java
index 0678fa5e7812..0b2a3c26fb8a 100644
--- a/core/src/main/java/org/infinispan/commands/AbstractFlagAffectedCommand.java
+++ b/core/src/main/java/org/infinispan/commands/AbstractFlagAffectedCommand.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.commands;
 
 import org.infinispan.context.Flag;
diff --git a/core/src/main/java/org/infinispan/commands/AbstractVisitor.java b/core/src/main/java/org/infinispan/commands/AbstractVisitor.java
index 328bf4ee9918..873801edee77 100644
--- a/core/src/main/java/org/infinispan/commands/AbstractVisitor.java
+++ b/core/src/main/java/org/infinispan/commands/AbstractVisitor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands;
 
 import org.infinispan.commands.control.LockControlCommand;
diff --git a/core/src/main/java/org/infinispan/commands/CancelCommand.java b/core/src/main/java/org/infinispan/commands/CancelCommand.java
index e10aa4b770c8..f56dcb482119 100644
--- a/core/src/main/java/org/infinispan/commands/CancelCommand.java
+++ b/core/src/main/java/org/infinispan/commands/CancelCommand.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commands;
 
 import java.util.UUID;
diff --git a/core/src/main/java/org/infinispan/commands/CancellableCommand.java b/core/src/main/java/org/infinispan/commands/CancellableCommand.java
index 46aee576f7ba..e07a612cf0fc 100644
--- a/core/src/main/java/org/infinispan/commands/CancellableCommand.java
+++ b/core/src/main/java/org/infinispan/commands/CancellableCommand.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.commands;
 
 import java.util.UUID;
diff --git a/core/src/main/java/org/infinispan/commands/CancellationService.java b/core/src/main/java/org/infinispan/commands/CancellationService.java
index df3fd71820c2..c5a89afea18f 100644
--- a/core/src/main/java/org/infinispan/commands/CancellationService.java
+++ b/core/src/main/java/org/infinispan/commands/CancellationService.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.commands;
 
 import java.util.UUID;
diff --git a/core/src/main/java/org/infinispan/commands/CancellationServiceImpl.java b/core/src/main/java/org/infinispan/commands/CancellationServiceImpl.java
index 81d70bc4cc53..ab2ebd5e6494 100644
--- a/core/src/main/java/org/infinispan/commands/CancellationServiceImpl.java
+++ b/core/src/main/java/org/infinispan/commands/CancellationServiceImpl.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.commands;
 
 import java.util.Map;
diff --git a/core/src/main/java/org/infinispan/commands/CommandsFactory.java b/core/src/main/java/org/infinispan/commands/CommandsFactory.java
index f3e8e9250227..abef5507c325 100644
--- a/core/src/main/java/org/infinispan/commands/CommandsFactory.java
+++ b/core/src/main/java/org/infinispan/commands/CommandsFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands;
 
 import org.infinispan.metadata.Metadata;
diff --git a/core/src/main/java/org/infinispan/commands/CommandsFactoryImpl.java b/core/src/main/java/org/infinispan/commands/CommandsFactoryImpl.java
index 257e2535121a..986d8cc296f8 100644
--- a/core/src/main/java/org/infinispan/commands/CommandsFactoryImpl.java
+++ b/core/src/main/java/org/infinispan/commands/CommandsFactoryImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/commands/CreateCacheCommand.java b/core/src/main/java/org/infinispan/commands/CreateCacheCommand.java
index 9169a119980b..e0dc10f62afe 100644
--- a/core/src/main/java/org/infinispan/commands/CreateCacheCommand.java
+++ b/core/src/main/java/org/infinispan/commands/CreateCacheCommand.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commands;
 
 import java.util.concurrent.TimeUnit;
diff --git a/core/src/main/java/org/infinispan/commands/DataCommand.java b/core/src/main/java/org/infinispan/commands/DataCommand.java
index d0b18f9eb6a2..353deae0dd5c 100644
--- a/core/src/main/java/org/infinispan/commands/DataCommand.java
+++ b/core/src/main/java/org/infinispan/commands/DataCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands;
 
 
diff --git a/core/src/main/java/org/infinispan/commands/FlagAffectedCommand.java b/core/src/main/java/org/infinispan/commands/FlagAffectedCommand.java
index 444f9fb9c6c1..523a820d595d 100644
--- a/core/src/main/java/org/infinispan/commands/FlagAffectedCommand.java
+++ b/core/src/main/java/org/infinispan/commands/FlagAffectedCommand.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commands;
 
 import java.util.Set;
diff --git a/core/src/main/java/org/infinispan/commands/LocalCommand.java b/core/src/main/java/org/infinispan/commands/LocalCommand.java
index c67ed1a06f77..bccf735b70a6 100644
--- a/core/src/main/java/org/infinispan/commands/LocalCommand.java
+++ b/core/src/main/java/org/infinispan/commands/LocalCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands;
 
 /**
diff --git a/core/src/main/java/org/infinispan/commands/MetadataAwareCommand.java b/core/src/main/java/org/infinispan/commands/MetadataAwareCommand.java
index f1e52c809805..5c6260e66451 100644
--- a/core/src/main/java/org/infinispan/commands/MetadataAwareCommand.java
+++ b/core/src/main/java/org/infinispan/commands/MetadataAwareCommand.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commands;
 
 import org.infinispan.metadata.Metadata;
diff --git a/core/src/main/java/org/infinispan/commands/RemoteCommandsFactory.java b/core/src/main/java/org/infinispan/commands/RemoteCommandsFactory.java
index c2545fbc2f30..a9c617636486 100644
--- a/core/src/main/java/org/infinispan/commands/RemoteCommandsFactory.java
+++ b/core/src/main/java/org/infinispan/commands/RemoteCommandsFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands;
 
 import org.infinispan.commands.control.LockControlCommand;
diff --git a/core/src/main/java/org/infinispan/commands/RemoveCacheCommand.java b/core/src/main/java/org/infinispan/commands/RemoveCacheCommand.java
index 72822c9c78ea..e236f855f9c2 100644
--- a/core/src/main/java/org/infinispan/commands/RemoveCacheCommand.java
+++ b/core/src/main/java/org/infinispan/commands/RemoveCacheCommand.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commands;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/commands/ReplicableCommand.java b/core/src/main/java/org/infinispan/commands/ReplicableCommand.java
index 581d45f9c30d..b0b3ff7ca8cc 100644
--- a/core/src/main/java/org/infinispan/commands/ReplicableCommand.java
+++ b/core/src/main/java/org/infinispan/commands/ReplicableCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands;
 
 import org.infinispan.context.InvocationContext;
diff --git a/core/src/main/java/org/infinispan/commands/TopologyAffectedCommand.java b/core/src/main/java/org/infinispan/commands/TopologyAffectedCommand.java
index 22d2d48cb210..db627d7d76ba 100644
--- a/core/src/main/java/org/infinispan/commands/TopologyAffectedCommand.java
+++ b/core/src/main/java/org/infinispan/commands/TopologyAffectedCommand.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.commands;
 
 /**
diff --git a/core/src/main/java/org/infinispan/commands/VisitableCommand.java b/core/src/main/java/org/infinispan/commands/VisitableCommand.java
index d72a90d1e1dc..8d73da9a7323 100644
--- a/core/src/main/java/org/infinispan/commands/VisitableCommand.java
+++ b/core/src/main/java/org/infinispan/commands/VisitableCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands;
 
 import org.infinispan.commands.write.InvalidateCommand;
diff --git a/core/src/main/java/org/infinispan/commands/Visitor.java b/core/src/main/java/org/infinispan/commands/Visitor.java
index 40bb95292b62..1c2c94242756 100644
--- a/core/src/main/java/org/infinispan/commands/Visitor.java
+++ b/core/src/main/java/org/infinispan/commands/Visitor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands;
 
 import org.infinispan.commands.control.LockControlCommand;
diff --git a/core/src/main/java/org/infinispan/commands/control/LockControlCommand.java b/core/src/main/java/org/infinispan/commands/control/LockControlCommand.java
index bc5f3277ee38..20eaa1b229b8 100644
--- a/core/src/main/java/org/infinispan/commands/control/LockControlCommand.java
+++ b/core/src/main/java/org/infinispan/commands/control/LockControlCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.control;
 
 import org.infinispan.commands.FlagAffectedCommand;
diff --git a/core/src/main/java/org/infinispan/commands/module/ExtendedModuleCommandFactory.java b/core/src/main/java/org/infinispan/commands/module/ExtendedModuleCommandFactory.java
index a0bb1f28a3ee..0624a57cec4e 100644
--- a/core/src/main/java/org/infinispan/commands/module/ExtendedModuleCommandFactory.java
+++ b/core/src/main/java/org/infinispan/commands/module/ExtendedModuleCommandFactory.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.commands.module;
 
 import org.infinispan.commands.remote.CacheRpcCommand;
diff --git a/core/src/main/java/org/infinispan/commands/module/ModuleCommandExtensions.java b/core/src/main/java/org/infinispan/commands/module/ModuleCommandExtensions.java
index 7dcbc55bca74..5178cee45928 100644
--- a/core/src/main/java/org/infinispan/commands/module/ModuleCommandExtensions.java
+++ b/core/src/main/java/org/infinispan/commands/module/ModuleCommandExtensions.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.commands.module;
 
 /**
diff --git a/core/src/main/java/org/infinispan/commands/module/ModuleCommandFactory.java b/core/src/main/java/org/infinispan/commands/module/ModuleCommandFactory.java
index 521bd628d826..57191ff17f89 100644
--- a/core/src/main/java/org/infinispan/commands/module/ModuleCommandFactory.java
+++ b/core/src/main/java/org/infinispan/commands/module/ModuleCommandFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.module;
 
 import org.infinispan.commands.ReplicableCommand;
diff --git a/core/src/main/java/org/infinispan/commands/module/ModuleCommandInitializer.java b/core/src/main/java/org/infinispan/commands/module/ModuleCommandInitializer.java
index 5405ffa9c554..886d39e26d8c 100644
--- a/core/src/main/java/org/infinispan/commands/module/ModuleCommandInitializer.java
+++ b/core/src/main/java/org/infinispan/commands/module/ModuleCommandInitializer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.module;
 
 import org.infinispan.commands.ReplicableCommand;
diff --git a/core/src/main/java/org/infinispan/commands/package-info.java b/core/src/main/java/org/infinispan/commands/package-info.java
index f32e4c6335cb..e268d851b7d5 100644
--- a/core/src/main/java/org/infinispan/commands/package-info.java
+++ b/core/src/main/java/org/infinispan/commands/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Commands that operate on the cache, either locally or remotely.  This package contains the entire command object
  * model including interfaces and abstract classes.  Your starting point is probably {@link ReplicableCommand}, which
diff --git a/core/src/main/java/org/infinispan/commands/read/AbstractDataCommand.java b/core/src/main/java/org/infinispan/commands/read/AbstractDataCommand.java
index 6df316403aea..5818301f213d 100644
--- a/core/src/main/java/org/infinispan/commands/read/AbstractDataCommand.java
+++ b/core/src/main/java/org/infinispan/commands/read/AbstractDataCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.read;
 
 import org.infinispan.commands.AbstractFlagAffectedCommand;
diff --git a/core/src/main/java/org/infinispan/commands/read/AbstractLocalCommand.java b/core/src/main/java/org/infinispan/commands/read/AbstractLocalCommand.java
index 383a5c039565..8c6410161d88 100644
--- a/core/src/main/java/org/infinispan/commands/read/AbstractLocalCommand.java
+++ b/core/src/main/java/org/infinispan/commands/read/AbstractLocalCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.read;
 
 import org.infinispan.commands.LocalCommand;
diff --git a/core/src/main/java/org/infinispan/commands/read/DistributedExecuteCommand.java b/core/src/main/java/org/infinispan/commands/read/DistributedExecuteCommand.java
index 588c5868af01..b757aaa45411 100644
--- a/core/src/main/java/org/infinispan/commands/read/DistributedExecuteCommand.java
+++ b/core/src/main/java/org/infinispan/commands/read/DistributedExecuteCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.read;
 
 import java.util.Collection;
diff --git a/core/src/main/java/org/infinispan/commands/read/EntrySetCommand.java b/core/src/main/java/org/infinispan/commands/read/EntrySetCommand.java
index 62ab48a37f9c..6abe0001ec4a 100644
--- a/core/src/main/java/org/infinispan/commands/read/EntrySetCommand.java
+++ b/core/src/main/java/org/infinispan/commands/read/EntrySetCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.read;
 
 import org.infinispan.commands.VisitableCommand;
diff --git a/core/src/main/java/org/infinispan/commands/read/GetKeyValueCommand.java b/core/src/main/java/org/infinispan/commands/read/GetKeyValueCommand.java
index 8e3d822f6888..9d4ee2cb5cce 100644
--- a/core/src/main/java/org/infinispan/commands/read/GetKeyValueCommand.java
+++ b/core/src/main/java/org/infinispan/commands/read/GetKeyValueCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.read;
 
 import org.infinispan.commands.Visitor;
diff --git a/core/src/main/java/org/infinispan/commands/read/KeySetCommand.java b/core/src/main/java/org/infinispan/commands/read/KeySetCommand.java
index da263f81b38e..3f5e1e8c3087 100644
--- a/core/src/main/java/org/infinispan/commands/read/KeySetCommand.java
+++ b/core/src/main/java/org/infinispan/commands/read/KeySetCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.read;
 
 import org.infinispan.commands.VisitableCommand;
diff --git a/core/src/main/java/org/infinispan/commands/read/MapCombineCommand.java b/core/src/main/java/org/infinispan/commands/read/MapCombineCommand.java
index 40ebf92b231b..21d4c0a92406 100644
--- a/core/src/main/java/org/infinispan/commands/read/MapCombineCommand.java
+++ b/core/src/main/java/org/infinispan/commands/read/MapCombineCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.read;
 
 import java.util.Collection;
diff --git a/core/src/main/java/org/infinispan/commands/read/ReduceCommand.java b/core/src/main/java/org/infinispan/commands/read/ReduceCommand.java
index d84ea7c936db..7e8d753c71e9 100644
--- a/core/src/main/java/org/infinispan/commands/read/ReduceCommand.java
+++ b/core/src/main/java/org/infinispan/commands/read/ReduceCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.read;
 
 import java.util.Collection;
diff --git a/core/src/main/java/org/infinispan/commands/read/SizeCommand.java b/core/src/main/java/org/infinispan/commands/read/SizeCommand.java
index 73f955771003..b38fd77e4c48 100644
--- a/core/src/main/java/org/infinispan/commands/read/SizeCommand.java
+++ b/core/src/main/java/org/infinispan/commands/read/SizeCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.read;
 
 import org.infinispan.commands.VisitableCommand;
diff --git a/core/src/main/java/org/infinispan/commands/read/ValuesCommand.java b/core/src/main/java/org/infinispan/commands/read/ValuesCommand.java
index 20ed5461b571..eb3c00676483 100644
--- a/core/src/main/java/org/infinispan/commands/read/ValuesCommand.java
+++ b/core/src/main/java/org/infinispan/commands/read/ValuesCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.read;
 
 import org.infinispan.commands.VisitableCommand;
diff --git a/core/src/main/java/org/infinispan/commands/remote/BaseRpcCommand.java b/core/src/main/java/org/infinispan/commands/remote/BaseRpcCommand.java
index 19c89d3f14ba..7a56dd56c814 100644
--- a/core/src/main/java/org/infinispan/commands/remote/BaseRpcCommand.java
+++ b/core/src/main/java/org/infinispan/commands/remote/BaseRpcCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.remote;
 
 import org.infinispan.remoting.transport.Address;
diff --git a/core/src/main/java/org/infinispan/commands/remote/BaseRpcInvokingCommand.java b/core/src/main/java/org/infinispan/commands/remote/BaseRpcInvokingCommand.java
index d80b85245696..aca4e4d827c9 100644
--- a/core/src/main/java/org/infinispan/commands/remote/BaseRpcInvokingCommand.java
+++ b/core/src/main/java/org/infinispan/commands/remote/BaseRpcInvokingCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.remote;
 
 import org.infinispan.commands.ReplicableCommand;
diff --git a/core/src/main/java/org/infinispan/commands/remote/CacheRpcCommand.java b/core/src/main/java/org/infinispan/commands/remote/CacheRpcCommand.java
index 0bc69d9991e7..e37c207273c3 100644
--- a/core/src/main/java/org/infinispan/commands/remote/CacheRpcCommand.java
+++ b/core/src/main/java/org/infinispan/commands/remote/CacheRpcCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.remote;
 
 import org.infinispan.commands.ReplicableCommand;
diff --git a/core/src/main/java/org/infinispan/commands/remote/ClusteredGetCommand.java b/core/src/main/java/org/infinispan/commands/remote/ClusteredGetCommand.java
index 53db11c25616..03343871f7ac 100644
--- a/core/src/main/java/org/infinispan/commands/remote/ClusteredGetCommand.java
+++ b/core/src/main/java/org/infinispan/commands/remote/ClusteredGetCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.remote;
 
 import org.infinispan.commands.CommandsFactory;
diff --git a/core/src/main/java/org/infinispan/commands/remote/MultipleRpcCommand.java b/core/src/main/java/org/infinispan/commands/remote/MultipleRpcCommand.java
index f09c5e7197c2..3fd5be467900 100644
--- a/core/src/main/java/org/infinispan/commands/remote/MultipleRpcCommand.java
+++ b/core/src/main/java/org/infinispan/commands/remote/MultipleRpcCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.remote;
 
 import org.infinispan.commands.ReplicableCommand;
diff --git a/core/src/main/java/org/infinispan/commands/remote/SingleRpcCommand.java b/core/src/main/java/org/infinispan/commands/remote/SingleRpcCommand.java
index cbe8383cca2e..d32763e87241 100644
--- a/core/src/main/java/org/infinispan/commands/remote/SingleRpcCommand.java
+++ b/core/src/main/java/org/infinispan/commands/remote/SingleRpcCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.remote;
 
 import org.infinispan.commands.ReplicableCommand;
diff --git a/core/src/main/java/org/infinispan/commands/remote/package-info.java b/core/src/main/java/org/infinispan/commands/remote/package-info.java
index 9aff06221975..2b82382b598c 100644
--- a/core/src/main/java/org/infinispan/commands/remote/package-info.java
+++ b/core/src/main/java/org/infinispan/commands/remote/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Meta-commands that wrap other commands for remote execution.  Commands in this package typically expose information
  * such as cache name, so that the target invocation environment is able to determine which cache to dispatch the
diff --git a/core/src/main/java/org/infinispan/commands/remote/recovery/CompleteTransactionCommand.java b/core/src/main/java/org/infinispan/commands/remote/recovery/CompleteTransactionCommand.java
index d5bee3537949..fe4f76b35b47 100644
--- a/core/src/main/java/org/infinispan/commands/remote/recovery/CompleteTransactionCommand.java
+++ b/core/src/main/java/org/infinispan/commands/remote/recovery/CompleteTransactionCommand.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commands.remote.recovery;
 
 import org.infinispan.context.InvocationContext;
diff --git a/core/src/main/java/org/infinispan/commands/remote/recovery/GetInDoubtTransactionsCommand.java b/core/src/main/java/org/infinispan/commands/remote/recovery/GetInDoubtTransactionsCommand.java
index 935e2ef73895..de3a34bb2583 100644
--- a/core/src/main/java/org/infinispan/commands/remote/recovery/GetInDoubtTransactionsCommand.java
+++ b/core/src/main/java/org/infinispan/commands/remote/recovery/GetInDoubtTransactionsCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.remote.recovery;
 
 import org.infinispan.commons.util.Util;
diff --git a/core/src/main/java/org/infinispan/commands/remote/recovery/GetInDoubtTxInfoCommand.java b/core/src/main/java/org/infinispan/commands/remote/recovery/GetInDoubtTxInfoCommand.java
index e0e8857f3f33..aef508269a8f 100644
--- a/core/src/main/java/org/infinispan/commands/remote/recovery/GetInDoubtTxInfoCommand.java
+++ b/core/src/main/java/org/infinispan/commands/remote/recovery/GetInDoubtTxInfoCommand.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commands.remote.recovery;
 
 import org.infinispan.commons.util.Util;
diff --git a/core/src/main/java/org/infinispan/commands/remote/recovery/RecoveryCommand.java b/core/src/main/java/org/infinispan/commands/remote/recovery/RecoveryCommand.java
index b0f2176b8ad3..7b92a5e9ab25 100644
--- a/core/src/main/java/org/infinispan/commands/remote/recovery/RecoveryCommand.java
+++ b/core/src/main/java/org/infinispan/commands/remote/recovery/RecoveryCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.remote.recovery;
 
 import org.infinispan.commands.remote.BaseRpcCommand;
diff --git a/core/src/main/java/org/infinispan/commands/remote/recovery/TxCompletionNotificationCommand.java b/core/src/main/java/org/infinispan/commands/remote/recovery/TxCompletionNotificationCommand.java
index bba160138818..3070b4714fb7 100644
--- a/core/src/main/java/org/infinispan/commands/remote/recovery/TxCompletionNotificationCommand.java
+++ b/core/src/main/java/org/infinispan/commands/remote/recovery/TxCompletionNotificationCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.remote.recovery;
 
 import org.infinispan.commands.TopologyAffectedCommand;
diff --git a/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java b/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java
index 03a7dd3fca95..4c481ed4c18d 100644
--- a/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java
+++ b/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.tx;
 
 import org.infinispan.context.InvocationContext;
diff --git a/core/src/main/java/org/infinispan/commands/tx/CommitCommand.java b/core/src/main/java/org/infinispan/commands/tx/CommitCommand.java
index d98b147c3a76..64bf4e3a67a0 100644
--- a/core/src/main/java/org/infinispan/commands/tx/CommitCommand.java
+++ b/core/src/main/java/org/infinispan/commands/tx/CommitCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.tx;
 
 import org.infinispan.commands.Visitor;
diff --git a/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java b/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java
index 4b3a4fe56cf2..7074b2009a53 100644
--- a/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java
+++ b/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.tx;
 
 import org.infinispan.commands.Visitor;
diff --git a/core/src/main/java/org/infinispan/commands/tx/RollbackCommand.java b/core/src/main/java/org/infinispan/commands/tx/RollbackCommand.java
index 76104a92a35e..49e3b6eb33d4 100644
--- a/core/src/main/java/org/infinispan/commands/tx/RollbackCommand.java
+++ b/core/src/main/java/org/infinispan/commands/tx/RollbackCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.tx;
 
 import org.infinispan.commands.Visitor;
diff --git a/core/src/main/java/org/infinispan/commands/tx/TransactionBoundaryCommand.java b/core/src/main/java/org/infinispan/commands/tx/TransactionBoundaryCommand.java
index 4df4af87296a..74aac24cd3d1 100644
--- a/core/src/main/java/org/infinispan/commands/tx/TransactionBoundaryCommand.java
+++ b/core/src/main/java/org/infinispan/commands/tx/TransactionBoundaryCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.tx;
 
 import org.infinispan.commands.TopologyAffectedCommand;
diff --git a/core/src/main/java/org/infinispan/commands/tx/VersionedCommitCommand.java b/core/src/main/java/org/infinispan/commands/tx/VersionedCommitCommand.java
index 4d9d4e680afd..197d004f0d50 100644
--- a/core/src/main/java/org/infinispan/commands/tx/VersionedCommitCommand.java
+++ b/core/src/main/java/org/infinispan/commands/tx/VersionedCommitCommand.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.commands.tx;
 
 import org.infinispan.container.versioning.EntryVersionsMap;
diff --git a/core/src/main/java/org/infinispan/commands/tx/VersionedPrepareCommand.java b/core/src/main/java/org/infinispan/commands/tx/VersionedPrepareCommand.java
index a64593aa9100..928b7b7665a8 100644
--- a/core/src/main/java/org/infinispan/commands/tx/VersionedPrepareCommand.java
+++ b/core/src/main/java/org/infinispan/commands/tx/VersionedPrepareCommand.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.commands.tx;
 
 import org.infinispan.commands.write.WriteCommand;
diff --git a/core/src/main/java/org/infinispan/commands/tx/package-info.java b/core/src/main/java/org/infinispan/commands/tx/package-info.java
index 0e1322272912..30f34e12f267 100644
--- a/core/src/main/java/org/infinispan/commands/tx/package-info.java
+++ b/core/src/main/java/org/infinispan/commands/tx/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Commands that represent transactional lifecycle transitions.
  *
diff --git a/core/src/main/java/org/infinispan/commands/tx/totalorder/TotalOrderCommitCommand.java b/core/src/main/java/org/infinispan/commands/tx/totalorder/TotalOrderCommitCommand.java
index db95148a5d80..d1af3b56cc16 100644
--- a/core/src/main/java/org/infinispan/commands/tx/totalorder/TotalOrderCommitCommand.java
+++ b/core/src/main/java/org/infinispan/commands/tx/totalorder/TotalOrderCommitCommand.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.commands.tx.totalorder;
 
 import org.infinispan.commands.tx.CommitCommand;
diff --git a/core/src/main/java/org/infinispan/commands/tx/totalorder/TotalOrderNonVersionedPrepareCommand.java b/core/src/main/java/org/infinispan/commands/tx/totalorder/TotalOrderNonVersionedPrepareCommand.java
index 1e7437dc3268..9b0cd7b979d7 100644
--- a/core/src/main/java/org/infinispan/commands/tx/totalorder/TotalOrderNonVersionedPrepareCommand.java
+++ b/core/src/main/java/org/infinispan/commands/tx/totalorder/TotalOrderNonVersionedPrepareCommand.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.commands.tx.totalorder;
 
 import org.infinispan.commands.tx.PrepareCommand;
diff --git a/core/src/main/java/org/infinispan/commands/tx/totalorder/TotalOrderPrepareCommand.java b/core/src/main/java/org/infinispan/commands/tx/totalorder/TotalOrderPrepareCommand.java
index cb60320d2c5e..6999ae23857c 100644
--- a/core/src/main/java/org/infinispan/commands/tx/totalorder/TotalOrderPrepareCommand.java
+++ b/core/src/main/java/org/infinispan/commands/tx/totalorder/TotalOrderPrepareCommand.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.commands.tx.totalorder;
 
 import org.infinispan.commands.tx.TransactionBoundaryCommand;
diff --git a/core/src/main/java/org/infinispan/commands/tx/totalorder/TotalOrderRollbackCommand.java b/core/src/main/java/org/infinispan/commands/tx/totalorder/TotalOrderRollbackCommand.java
index dda64262f9d4..00b88e9efc74 100644
--- a/core/src/main/java/org/infinispan/commands/tx/totalorder/TotalOrderRollbackCommand.java
+++ b/core/src/main/java/org/infinispan/commands/tx/totalorder/TotalOrderRollbackCommand.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.commands.tx.totalorder;
 
 import org.infinispan.commands.tx.RollbackCommand;
diff --git a/core/src/main/java/org/infinispan/commands/tx/totalorder/TotalOrderVersionedCommitCommand.java b/core/src/main/java/org/infinispan/commands/tx/totalorder/TotalOrderVersionedCommitCommand.java
index d4f9aa777cd6..166dfb42f9c9 100644
--- a/core/src/main/java/org/infinispan/commands/tx/totalorder/TotalOrderVersionedCommitCommand.java
+++ b/core/src/main/java/org/infinispan/commands/tx/totalorder/TotalOrderVersionedCommitCommand.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.commands.tx.totalorder;
 
 import org.infinispan.commands.tx.VersionedCommitCommand;
diff --git a/core/src/main/java/org/infinispan/commands/tx/totalorder/TotalOrderVersionedPrepareCommand.java b/core/src/main/java/org/infinispan/commands/tx/totalorder/TotalOrderVersionedPrepareCommand.java
index 3421e2d75790..352bd383be31 100644
--- a/core/src/main/java/org/infinispan/commands/tx/totalorder/TotalOrderVersionedPrepareCommand.java
+++ b/core/src/main/java/org/infinispan/commands/tx/totalorder/TotalOrderVersionedPrepareCommand.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.commands.tx.totalorder;
 
 import org.infinispan.commands.tx.VersionedPrepareCommand;
diff --git a/core/src/main/java/org/infinispan/commands/write/AbstractDataWriteCommand.java b/core/src/main/java/org/infinispan/commands/write/AbstractDataWriteCommand.java
index 56e35400e2f3..5e1f355745f0 100644
--- a/core/src/main/java/org/infinispan/commands/write/AbstractDataWriteCommand.java
+++ b/core/src/main/java/org/infinispan/commands/write/AbstractDataWriteCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.write;
 
 import org.infinispan.commands.read.AbstractDataCommand;
diff --git a/core/src/main/java/org/infinispan/commands/write/ApplyDeltaCommand.java b/core/src/main/java/org/infinispan/commands/write/ApplyDeltaCommand.java
index d9ffbe624bb1..135320005a0d 100644
--- a/core/src/main/java/org/infinispan/commands/write/ApplyDeltaCommand.java
+++ b/core/src/main/java/org/infinispan/commands/write/ApplyDeltaCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.write;
 
 import java.util.*;
diff --git a/core/src/main/java/org/infinispan/commands/write/ClearCommand.java b/core/src/main/java/org/infinispan/commands/write/ClearCommand.java
index cbe6809b1f53..bd31b53734dc 100644
--- a/core/src/main/java/org/infinispan/commands/write/ClearCommand.java
+++ b/core/src/main/java/org/infinispan/commands/write/ClearCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.write;
 
 import org.infinispan.commands.AbstractFlagAffectedCommand;
diff --git a/core/src/main/java/org/infinispan/commands/write/DataWriteCommand.java b/core/src/main/java/org/infinispan/commands/write/DataWriteCommand.java
index fea361fb3f2a..9ab7b9d263f2 100644
--- a/core/src/main/java/org/infinispan/commands/write/DataWriteCommand.java
+++ b/core/src/main/java/org/infinispan/commands/write/DataWriteCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.write;
 
 import org.infinispan.commands.DataCommand;
diff --git a/core/src/main/java/org/infinispan/commands/write/EvictCommand.java b/core/src/main/java/org/infinispan/commands/write/EvictCommand.java
index 86468d6f020d..004a10f28923 100644
--- a/core/src/main/java/org/infinispan/commands/write/EvictCommand.java
+++ b/core/src/main/java/org/infinispan/commands/write/EvictCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.write;
 
 import org.infinispan.commands.LocalCommand;
diff --git a/core/src/main/java/org/infinispan/commands/write/InvalidateCommand.java b/core/src/main/java/org/infinispan/commands/write/InvalidateCommand.java
index 0021bae1699f..24bebbd1a58f 100644
--- a/core/src/main/java/org/infinispan/commands/write/InvalidateCommand.java
+++ b/core/src/main/java/org/infinispan/commands/write/InvalidateCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.write;
 
 import org.infinispan.commands.Visitor;
diff --git a/core/src/main/java/org/infinispan/commands/write/InvalidateL1Command.java b/core/src/main/java/org/infinispan/commands/write/InvalidateL1Command.java
index 69784306058a..9d888220436b 100644
--- a/core/src/main/java/org/infinispan/commands/write/InvalidateL1Command.java
+++ b/core/src/main/java/org/infinispan/commands/write/InvalidateL1Command.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.write;
 
 import java.util.Arrays;
diff --git a/core/src/main/java/org/infinispan/commands/write/PutKeyValueCommand.java b/core/src/main/java/org/infinispan/commands/write/PutKeyValueCommand.java
index 1105e595bb79..e3473bea6bd2 100644
--- a/core/src/main/java/org/infinispan/commands/write/PutKeyValueCommand.java
+++ b/core/src/main/java/org/infinispan/commands/write/PutKeyValueCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.write;
 
 import org.infinispan.metadata.Metadata;
diff --git a/core/src/main/java/org/infinispan/commands/write/PutMapCommand.java b/core/src/main/java/org/infinispan/commands/write/PutMapCommand.java
index 522a7c5bf93f..89fa75a78020 100644
--- a/core/src/main/java/org/infinispan/commands/write/PutMapCommand.java
+++ b/core/src/main/java/org/infinispan/commands/write/PutMapCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.write;
 
 import org.infinispan.metadata.Metadata;
diff --git a/core/src/main/java/org/infinispan/commands/write/RemoveCommand.java b/core/src/main/java/org/infinispan/commands/write/RemoveCommand.java
index e5265eda137f..a974015c9d81 100644
--- a/core/src/main/java/org/infinispan/commands/write/RemoveCommand.java
+++ b/core/src/main/java/org/infinispan/commands/write/RemoveCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.write;
 
 import org.infinispan.commands.Visitor;
diff --git a/core/src/main/java/org/infinispan/commands/write/ReplaceCommand.java b/core/src/main/java/org/infinispan/commands/write/ReplaceCommand.java
index dd6d62d94b39..f7d916cc56a5 100644
--- a/core/src/main/java/org/infinispan/commands/write/ReplaceCommand.java
+++ b/core/src/main/java/org/infinispan/commands/write/ReplaceCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.write;
 
 import org.infinispan.metadata.Metadata;
diff --git a/core/src/main/java/org/infinispan/commands/write/WriteCommand.java b/core/src/main/java/org/infinispan/commands/write/WriteCommand.java
index 9a9847cbef80..aa52f9fd4843 100644
--- a/core/src/main/java/org/infinispan/commands/write/WriteCommand.java
+++ b/core/src/main/java/org/infinispan/commands/write/WriteCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands.write;
 
 import org.infinispan.commands.FlagAffectedCommand;
diff --git a/core/src/main/java/org/infinispan/commands/write/package-info.java b/core/src/main/java/org/infinispan/commands/write/package-info.java
index f3e3da4445ab..afe669eb2396 100644
--- a/core/src/main/java/org/infinispan/commands/write/package-info.java
+++ b/core/src/main/java/org/infinispan/commands/write/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Commands that alter the state of the cache.
  *
diff --git a/core/src/main/java/org/infinispan/compat/TypeConverter.java b/core/src/main/java/org/infinispan/compat/TypeConverter.java
index 868fdf456d9c..65a3207ebd4b 100644
--- a/core/src/main/java/org/infinispan/compat/TypeConverter.java
+++ b/core/src/main/java/org/infinispan/compat/TypeConverter.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.compat;
 
 import org.infinispan.commons.marshall.Marshaller;
diff --git a/core/src/main/java/org/infinispan/config/AbstractConfigurationBean.java b/core/src/main/java/org/infinispan/config/AbstractConfigurationBean.java
index 56332c2ec20f..19629c638dcb 100644
--- a/core/src/main/java/org/infinispan/config/AbstractConfigurationBean.java
+++ b/core/src/main/java/org/infinispan/config/AbstractConfigurationBean.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import org.infinispan.commons.CacheConfigurationException;
diff --git a/core/src/main/java/org/infinispan/config/AbstractConfigurationBeanVisitor.java b/core/src/main/java/org/infinispan/config/AbstractConfigurationBeanVisitor.java
index cb26faff6db1..f1c81c98e415 100644
--- a/core/src/main/java/org/infinispan/config/AbstractConfigurationBeanVisitor.java
+++ b/core/src/main/java/org/infinispan/config/AbstractConfigurationBeanVisitor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import org.infinispan.config.Configuration.AsyncType;
diff --git a/core/src/main/java/org/infinispan/config/AbstractNamedCacheConfigurationBean.java b/core/src/main/java/org/infinispan/config/AbstractNamedCacheConfigurationBean.java
index 3863b09d527e..795611341dcf 100644
--- a/core/src/main/java/org/infinispan/config/AbstractNamedCacheConfigurationBean.java
+++ b/core/src/main/java/org/infinispan/config/AbstractNamedCacheConfigurationBean.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import org.infinispan.factories.ComponentRegistry;
diff --git a/core/src/main/java/org/infinispan/config/AdvancedExternalizerConfig.java b/core/src/main/java/org/infinispan/config/AdvancedExternalizerConfig.java
index 3875bf531bb4..6390d9527a6e 100644
--- a/core/src/main/java/org/infinispan/config/AdvancedExternalizerConfig.java
+++ b/core/src/main/java/org/infinispan/config/AdvancedExternalizerConfig.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.config;
 
 import org.infinispan.marshall.AdvancedExternalizer;
diff --git a/core/src/main/java/org/infinispan/config/CacheLoaderManagerConfig.java b/core/src/main/java/org/infinispan/config/CacheLoaderManagerConfig.java
index 4d36de903c08..e7752ddce610 100644
--- a/core/src/main/java/org/infinispan/config/CacheLoaderManagerConfig.java
+++ b/core/src/main/java/org/infinispan/config/CacheLoaderManagerConfig.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import org.infinispan.commons.util.Util;
diff --git a/core/src/main/java/org/infinispan/config/CloneableConfigurationComponent.java b/core/src/main/java/org/infinispan/config/CloneableConfigurationComponent.java
index 2eb709d3d7ad..51fab295282a 100644
--- a/core/src/main/java/org/infinispan/config/CloneableConfigurationComponent.java
+++ b/core/src/main/java/org/infinispan/config/CloneableConfigurationComponent.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import java.io.Serializable;
diff --git a/core/src/main/java/org/infinispan/config/Configuration.java b/core/src/main/java/org/infinispan/config/Configuration.java
index 91d3d67b195a..e65de10efec4 100644
--- a/core/src/main/java/org/infinispan/config/Configuration.java
+++ b/core/src/main/java/org/infinispan/config/Configuration.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import org.infinispan.commons.CacheConfigurationException;
diff --git a/core/src/main/java/org/infinispan/config/ConfigurationBeanVisitor.java b/core/src/main/java/org/infinispan/config/ConfigurationBeanVisitor.java
index b3775f1c216c..e9cedb329acf 100644
--- a/core/src/main/java/org/infinispan/config/ConfigurationBeanVisitor.java
+++ b/core/src/main/java/org/infinispan/config/ConfigurationBeanVisitor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import org.infinispan.config.Configuration.*;
diff --git a/core/src/main/java/org/infinispan/config/ConfigurationDoc.java b/core/src/main/java/org/infinispan/config/ConfigurationDoc.java
index 0af2319a535e..a340768e8d2c 100644
--- a/core/src/main/java/org/infinispan/config/ConfigurationDoc.java
+++ b/core/src/main/java/org/infinispan/config/ConfigurationDoc.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/org/infinispan/config/ConfigurationDocRef.java b/core/src/main/java/org/infinispan/config/ConfigurationDocRef.java
index 57b6ba021c4b..3ee26d15c479 100644
--- a/core/src/main/java/org/infinispan/config/ConfigurationDocRef.java
+++ b/core/src/main/java/org/infinispan/config/ConfigurationDocRef.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/org/infinispan/config/ConfigurationDocs.java b/core/src/main/java/org/infinispan/config/ConfigurationDocs.java
index 18778ffc673e..b74eab0adf6b 100644
--- a/core/src/main/java/org/infinispan/config/ConfigurationDocs.java
+++ b/core/src/main/java/org/infinispan/config/ConfigurationDocs.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/org/infinispan/config/ConfigurationRegistry.java b/core/src/main/java/org/infinispan/config/ConfigurationRegistry.java
index e6fd2070c3a8..03fe83c3908d 100755
--- a/core/src/main/java/org/infinispan/config/ConfigurationRegistry.java
+++ b/core/src/main/java/org/infinispan/config/ConfigurationRegistry.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import java.util.Set;
diff --git a/core/src/main/java/org/infinispan/config/ConfigurationValidatingVisitor.java b/core/src/main/java/org/infinispan/config/ConfigurationValidatingVisitor.java
index bc763baa4a9d..0f18c6953f7d 100644
--- a/core/src/main/java/org/infinispan/config/ConfigurationValidatingVisitor.java
+++ b/core/src/main/java/org/infinispan/config/ConfigurationValidatingVisitor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import org.infinispan.commons.CacheConfigurationException;
diff --git a/core/src/main/java/org/infinispan/config/CustomInterceptorConfig.java b/core/src/main/java/org/infinispan/config/CustomInterceptorConfig.java
index ccaf6ff70153..f6e8bd025b1d 100644
--- a/core/src/main/java/org/infinispan/config/CustomInterceptorConfig.java
+++ b/core/src/main/java/org/infinispan/config/CustomInterceptorConfig.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import org.infinispan.commons.util.TypedProperties;
diff --git a/core/src/main/java/org/infinispan/config/DelegatingConfigurationVisitor.java b/core/src/main/java/org/infinispan/config/DelegatingConfigurationVisitor.java
index 7eb381ab10c9..3982a9ab0450 100644
--- a/core/src/main/java/org/infinispan/config/DelegatingConfigurationVisitor.java
+++ b/core/src/main/java/org/infinispan/config/DelegatingConfigurationVisitor.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.config;
 
 import org.infinispan.config.Configuration.*;
diff --git a/core/src/main/java/org/infinispan/config/DuplicateCacheNameException.java b/core/src/main/java/org/infinispan/config/DuplicateCacheNameException.java
index cb0cfa66d414..0c111baba686 100644
--- a/core/src/main/java/org/infinispan/config/DuplicateCacheNameException.java
+++ b/core/src/main/java/org/infinispan/config/DuplicateCacheNameException.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import org.infinispan.commons.CacheConfigurationException;
diff --git a/core/src/main/java/org/infinispan/config/Dynamic.java b/core/src/main/java/org/infinispan/config/Dynamic.java
index 9f338e971ae7..919152e23c63 100644
--- a/core/src/main/java/org/infinispan/config/Dynamic.java
+++ b/core/src/main/java/org/infinispan/config/Dynamic.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import java.lang.annotation.Documented;
diff --git a/core/src/main/java/org/infinispan/config/FluentConfiguration.java b/core/src/main/java/org/infinispan/config/FluentConfiguration.java
index da7cfcdfd57b..a4c85c53993c 100644
--- a/core/src/main/java/org/infinispan/config/FluentConfiguration.java
+++ b/core/src/main/java/org/infinispan/config/FluentConfiguration.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.config;
 
 import org.infinispan.commons.hash.Hash;
diff --git a/core/src/main/java/org/infinispan/config/FluentGlobalConfiguration.java b/core/src/main/java/org/infinispan/config/FluentGlobalConfiguration.java
index f0a72d9905cc..76f7bd1cd724 100644
--- a/core/src/main/java/org/infinispan/config/FluentGlobalConfiguration.java
+++ b/core/src/main/java/org/infinispan/config/FluentGlobalConfiguration.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.config;
 
 import org.infinispan.commons.executors.ExecutorFactory;
diff --git a/core/src/main/java/org/infinispan/config/GlobalConfiguration.java b/core/src/main/java/org/infinispan/config/GlobalConfiguration.java
index ae4ef18080d1..5e65f0b607e5 100644
--- a/core/src/main/java/org/infinispan/config/GlobalConfiguration.java
+++ b/core/src/main/java/org/infinispan/config/GlobalConfiguration.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import org.infinispan.Version;
diff --git a/core/src/main/java/org/infinispan/config/InfinispanConfiguration.java b/core/src/main/java/org/infinispan/config/InfinispanConfiguration.java
index 26e69de7f586..72eb1548c36d 100644
--- a/core/src/main/java/org/infinispan/config/InfinispanConfiguration.java
+++ b/core/src/main/java/org/infinispan/config/InfinispanConfiguration.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import org.infinispan.Version;
diff --git a/core/src/main/java/org/infinispan/config/JAXBUnmarshallable.java b/core/src/main/java/org/infinispan/config/JAXBUnmarshallable.java
index 50fd8f7c696e..27d3597ed299 100644
--- a/core/src/main/java/org/infinispan/config/JAXBUnmarshallable.java
+++ b/core/src/main/java/org/infinispan/config/JAXBUnmarshallable.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 /**
diff --git a/core/src/main/java/org/infinispan/config/OverrideConfigurationVisitor.java b/core/src/main/java/org/infinispan/config/OverrideConfigurationVisitor.java
index 9d62879cb72f..55bffd22ec2e 100644
--- a/core/src/main/java/org/infinispan/config/OverrideConfigurationVisitor.java
+++ b/core/src/main/java/org/infinispan/config/OverrideConfigurationVisitor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/main/java/org/infinispan/config/TimeoutConfigurationValidatingVisitor.java b/core/src/main/java/org/infinispan/config/TimeoutConfigurationValidatingVisitor.java
index b3710a16496b..b8e4774548db 100644
--- a/core/src/main/java/org/infinispan/config/TimeoutConfigurationValidatingVisitor.java
+++ b/core/src/main/java/org/infinispan/config/TimeoutConfigurationValidatingVisitor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import org.infinispan.config.Configuration.CacheMode;
diff --git a/core/src/main/java/org/infinispan/config/TypedPropertiesAdapter.java b/core/src/main/java/org/infinispan/config/TypedPropertiesAdapter.java
index 772193db7952..ed77ad067cb2 100644
--- a/core/src/main/java/org/infinispan/config/TypedPropertiesAdapter.java
+++ b/core/src/main/java/org/infinispan/config/TypedPropertiesAdapter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import java.util.Set;
diff --git a/core/src/main/java/org/infinispan/config/package-info.java b/core/src/main/java/org/infinispan/config/package-info.java
index d39bc1930317..cd5e515274cf 100644
--- a/core/src/main/java/org/infinispan/config/package-info.java
+++ b/core/src/main/java/org/infinispan/config/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Cache configuration beans and parsers.
  * Need @XmlSchema annotation in order to classify all JAXB created schema elements in appropriate XML namespace
diff --git a/core/src/main/java/org/infinispan/config/parsing/ConfigFilesConvertor.java b/core/src/main/java/org/infinispan/config/parsing/ConfigFilesConvertor.java
index acc34f26543c..ae4f11d510a2 100644
--- a/core/src/main/java/org/infinispan/config/parsing/ConfigFilesConvertor.java
+++ b/core/src/main/java/org/infinispan/config/parsing/ConfigFilesConvertor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config.parsing;
 
 import org.infinispan.commons.util.FileLookupFactory;
diff --git a/core/src/main/java/org/infinispan/config/parsing/NamespaceFilter.java b/core/src/main/java/org/infinispan/config/parsing/NamespaceFilter.java
index e84cd491cb0d..8e6a3ed9109c 100644
--- a/core/src/main/java/org/infinispan/config/parsing/NamespaceFilter.java
+++ b/core/src/main/java/org/infinispan/config/parsing/NamespaceFilter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config.parsing;
 
 import org.infinispan.Version;
diff --git a/core/src/main/java/org/infinispan/config/parsing/XmlConfigHelper.java b/core/src/main/java/org/infinispan/config/parsing/XmlConfigHelper.java
index d27281b66b09..3ece517684d1 100644
--- a/core/src/main/java/org/infinispan/config/parsing/XmlConfigHelper.java
+++ b/core/src/main/java/org/infinispan/config/parsing/XmlConfigHelper.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config.parsing;
 
 import org.infinispan.commons.util.BeanUtils;
diff --git a/core/src/main/java/org/infinispan/config/parsing/XmlConfigurationParser.java b/core/src/main/java/org/infinispan/config/parsing/XmlConfigurationParser.java
index cab4474a0e2f..2b293ac36e15 100644
--- a/core/src/main/java/org/infinispan/config/parsing/XmlConfigurationParser.java
+++ b/core/src/main/java/org/infinispan/config/parsing/XmlConfigurationParser.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config.parsing;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/AbstractClusteringConfigurationChildBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/AbstractClusteringConfigurationChildBuilder.java
index 372e92dc05f0..d2d7327dbf48 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/AbstractClusteringConfigurationChildBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/AbstractClusteringConfigurationChildBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 abstract class AbstractClusteringConfigurationChildBuilder extends AbstractConfigurationChildBuilder implements ClusteringConfigurationChildBuilder {
diff --git a/core/src/main/java/org/infinispan/configuration/cache/AbstractConfigurationChildBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/AbstractConfigurationChildBuilder.java
index f1ba5bb417f8..919772da0e32 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/AbstractConfigurationChildBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/AbstractConfigurationChildBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 abstract class AbstractConfigurationChildBuilder implements ConfigurationChildBuilder {
diff --git a/core/src/main/java/org/infinispan/configuration/cache/AbstractCustomInterceptorsConfigurationChildBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/AbstractCustomInterceptorsConfigurationChildBuilder.java
index 297b79c9fd8c..d35e922e3af1 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/AbstractCustomInterceptorsConfigurationChildBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/AbstractCustomInterceptorsConfigurationChildBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 public abstract class AbstractCustomInterceptorsConfigurationChildBuilder extends AbstractConfigurationChildBuilder {
diff --git a/core/src/main/java/org/infinispan/configuration/cache/AbstractLoaderConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/AbstractLoaderConfiguration.java
index d5be504cb4e8..2f3f1f78f12c 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/AbstractLoaderConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/AbstractLoaderConfiguration.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.configuration.AbstractTypedPropertiesConfiguration;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/AbstractLoaderConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/AbstractLoaderConfigurationBuilder.java
index af0bf72c51e4..ac6de9aa1c40 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/AbstractLoaderConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/AbstractLoaderConfigurationBuilder.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.configuration.cache;
 
 import java.util.Properties;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/AbstractLoaderConfigurationChildBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/AbstractLoaderConfigurationChildBuilder.java
index daa9da240cc1..5b3fa9c73c6a 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/AbstractLoaderConfigurationChildBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/AbstractLoaderConfigurationChildBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import java.util.Properties;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/AbstractLoadersConfigurationChildBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/AbstractLoadersConfigurationChildBuilder.java
index 6202ff5c456e..68da37559fbd 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/AbstractLoadersConfigurationChildBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/AbstractLoadersConfigurationChildBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/cache/AbstractLockSupportStoreConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/AbstractLockSupportStoreConfiguration.java
index f0a9601aab9c..5741b47c2318 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/AbstractLockSupportStoreConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/AbstractLockSupportStoreConfiguration.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.util.TypedProperties;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/AbstractLockSupportStoreConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/AbstractLockSupportStoreConfigurationBuilder.java
index 209673ec5d41..fc8aa30a0307 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/AbstractLockSupportStoreConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/AbstractLockSupportStoreConfigurationBuilder.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.configuration.cache;
 
 import java.util.concurrent.TimeUnit;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/AbstractLockSupportStoreConfigurationChildBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/AbstractLockSupportStoreConfigurationChildBuilder.java
index 742c378179ac..d5a33fc8b676 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/AbstractLockSupportStoreConfigurationChildBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/AbstractLockSupportStoreConfigurationChildBuilder.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.configuration.cache;
 
 import java.util.concurrent.TimeUnit;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/AbstractModuleConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/AbstractModuleConfigurationBuilder.java
index 850745876ea2..d3d5ec3d081b 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/AbstractModuleConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/AbstractModuleConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.configuration.cache;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/cache/AbstractStoreConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/AbstractStoreConfiguration.java
index ef75d630becc..b910977d015a 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/AbstractStoreConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/AbstractStoreConfiguration.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.util.TypedProperties;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/AbstractStoreConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/AbstractStoreConfigurationBuilder.java
index 0e7113a6866f..90302a508c5a 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/AbstractStoreConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/AbstractStoreConfigurationBuilder.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.configuration.cache;
 
 import org.infinispan.util.logging.Log;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/AbstractStoreConfigurationChildBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/AbstractStoreConfigurationChildBuilder.java
index 27c85fd2444c..76cddfc50574 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/AbstractStoreConfigurationChildBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/AbstractStoreConfigurationChildBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/cache/AbstractTransportConfigurationChildBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/AbstractTransportConfigurationChildBuilder.java
index fa8399e985d5..e6a3826dea4b 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/AbstractTransportConfigurationChildBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/AbstractTransportConfigurationChildBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 public abstract class AbstractTransportConfigurationChildBuilder extends AbstractConfigurationChildBuilder implements TransactionConfigurationChildBuilder {
diff --git a/core/src/main/java/org/infinispan/configuration/cache/AsyncConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/AsyncConfiguration.java
index e778e179bf10..eacf6275b5c2 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/AsyncConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/AsyncConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.remoting.ReplicationQueue;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/AsyncConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/AsyncConfigurationBuilder.java
index cc7d8f2b95e5..e4feff91d998 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/AsyncConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/AsyncConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import java.util.concurrent.TimeUnit;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/AsyncStoreConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/AsyncStoreConfiguration.java
index 682b560c2f4f..009b9ddd6d89 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/AsyncStoreConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/AsyncStoreConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/cache/AsyncStoreConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/AsyncStoreConfigurationBuilder.java
index 12af08cd3f5f..029b73cda498 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/AsyncStoreConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/AsyncStoreConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import java.util.concurrent.TimeUnit;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/BackupConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/BackupConfiguration.java
index 05a36e1b183b..459ab9ddc75c 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/BackupConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/BackupConfiguration.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.configuration.cache;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/cache/BackupConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/BackupConfigurationBuilder.java
index 2fe29f9d180c..12b7c278f716 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/BackupConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/BackupConfigurationBuilder.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/BackupFailurePolicy.java b/core/src/main/java/org/infinispan/configuration/cache/BackupFailurePolicy.java
index 9903264af833..a77ac5fe1c8f 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/BackupFailurePolicy.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/BackupFailurePolicy.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.configuration.cache;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/cache/BackupForBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/BackupForBuilder.java
index f1fec0ce19ad..e16b33f02179 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/BackupForBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/BackupForBuilder.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.configuration.cache;
 
 import org.infinispan.api.BasicCacheContainer;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/BackupForConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/BackupForConfiguration.java
index 574669c8b0b9..164127e8e19f 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/BackupForConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/BackupForConfiguration.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.configuration.cache;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/cache/CacheLoaderConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/CacheLoaderConfiguration.java
index 8742896b5d6c..1cbc1a5dd2fd 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/CacheLoaderConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/CacheLoaderConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.configuration.cache;
 
 import java.util.Properties;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/CacheLoaderConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/CacheLoaderConfigurationBuilder.java
index aa663d3bde06..dee1def64102 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/CacheLoaderConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/CacheLoaderConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/CacheMode.java b/core/src/main/java/org/infinispan/configuration/cache/CacheMode.java
index 7929a582f877..aa4895f0a4b3 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/CacheMode.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/CacheMode.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/cache/CacheStoreConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/CacheStoreConfiguration.java
index 22bdac830859..46411c9e146b 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/CacheStoreConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/CacheStoreConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.configuration.cache;
 
 public interface CacheStoreConfiguration extends CacheLoaderConfiguration {
diff --git a/core/src/main/java/org/infinispan/configuration/cache/CacheStoreConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/CacheStoreConfigurationBuilder.java
index 90cae77da2d7..64b45ea63c97 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/CacheStoreConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/CacheStoreConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.configuration.cache;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/cache/ClusterCacheLoaderConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/ClusterCacheLoaderConfiguration.java
index 4fda18d579ae..72d4dee3f27d 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/ClusterCacheLoaderConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/ClusterCacheLoaderConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.configuration.BuiltBy;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/ClusterCacheLoaderConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/ClusterCacheLoaderConfigurationBuilder.java
index 7a748cc74b42..be7030fd080a 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/ClusterCacheLoaderConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/ClusterCacheLoaderConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.configuration.cache;
 
 import java.util.Properties;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/ClusteringConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/ClusteringConfiguration.java
index 978217142f1f..c4db7c95b283 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/ClusteringConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/ClusteringConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/cache/ClusteringConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/ClusteringConfigurationBuilder.java
index f126619f19c8..c4cfd8789846 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/ClusteringConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/ClusteringConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/ClusteringConfigurationChildBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/ClusteringConfigurationChildBuilder.java
index 24896d1de7bc..af69e68397ed 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/ClusteringConfigurationChildBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/ClusteringConfigurationChildBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 public interface ClusteringConfigurationChildBuilder extends ConfigurationChildBuilder {
diff --git a/core/src/main/java/org/infinispan/configuration/cache/CompatibilityModeConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/CompatibilityModeConfiguration.java
index 3218dbf93fbe..48f3a23427fb 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/CompatibilityModeConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/CompatibilityModeConfiguration.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.marshall.Marshaller;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/CompatibilityModeConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/CompatibilityModeConfigurationBuilder.java
index 23300b8884c1..5d12ad7edfe3 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/CompatibilityModeConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/CompatibilityModeConfigurationBuilder.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/Configuration.java b/core/src/main/java/org/infinispan/configuration/cache/Configuration.java
index 8f6e8223d86d..88a67b00827a 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/Configuration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/Configuration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import java.lang.ref.WeakReference;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/ConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/ConfigurationBuilder.java
index cb6171210fa0..5d02ba1850af 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/ConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/ConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import static java.util.Arrays.asList;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/ConfigurationChildBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/ConfigurationChildBuilder.java
index dccb58e201d7..035d24aec176 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/ConfigurationChildBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/ConfigurationChildBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 public interface ConfigurationChildBuilder {
diff --git a/core/src/main/java/org/infinispan/configuration/cache/Configurations.java b/core/src/main/java/org/infinispan/configuration/cache/Configurations.java
index bdf6c8e2f909..444fb4ebb7f8 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/Configurations.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/Configurations.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.configuration.cache;
 
 import org.infinispan.transaction.LockingMode;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/CustomInterceptorsConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/CustomInterceptorsConfiguration.java
index 33501bfd3220..3e9de60ba378 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/CustomInterceptorsConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/CustomInterceptorsConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.util.InfinispanCollections;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/CustomInterceptorsConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/CustomInterceptorsConfigurationBuilder.java
index c0def2c6b6c9..b96419400742 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/CustomInterceptorsConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/CustomInterceptorsConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import java.util.ArrayList;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/DataContainerConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/DataContainerConfiguration.java
index 6abd0d488269..c234d7f09bd6 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/DataContainerConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/DataContainerConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.configuration.AbstractTypedPropertiesConfiguration;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/DataContainerConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/DataContainerConfigurationBuilder.java
index 2afa82fe4f7a..1da8a07ebef8 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/DataContainerConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/DataContainerConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import java.util.Properties;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/DeadlockDetectionConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/DeadlockDetectionConfiguration.java
index beb1928eacfc..efbca14acfbb 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/DeadlockDetectionConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/DeadlockDetectionConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/cache/DeadlockDetectionConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/DeadlockDetectionConfigurationBuilder.java
index f8a9dc9332ac..0df8b1369782 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/DeadlockDetectionConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/DeadlockDetectionConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import java.util.concurrent.TimeUnit;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/EvictionConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/EvictionConfiguration.java
index bcf6521e524e..9b983a70642a 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/EvictionConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/EvictionConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.eviction.EvictionStrategy;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/EvictionConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/EvictionConfigurationBuilder.java
index 73db1f65094c..47de666a85fd 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/EvictionConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/EvictionConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/ExpirationConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/ExpirationConfiguration.java
index c65e78d911a1..8cab1f797874 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/ExpirationConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/ExpirationConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/cache/ExpirationConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/ExpirationConfigurationBuilder.java
index cbc0a4796f9d..fc6a1d3c4d83 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/ExpirationConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/ExpirationConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import java.util.concurrent.TimeUnit;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/FileCacheStoreConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/FileCacheStoreConfiguration.java
index d0cdd687963d..e5dc14a0c049 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/FileCacheStoreConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/FileCacheStoreConfiguration.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.configuration.BuiltBy;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/FileCacheStoreConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/FileCacheStoreConfigurationBuilder.java
index faef4c7ccab9..94f68730e720 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/FileCacheStoreConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/FileCacheStoreConfigurationBuilder.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.configuration.cache;
 
 import java.beans.PropertyEditorSupport;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/GroupsConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/GroupsConfiguration.java
index bfa17f76fd57..61a56aa224ae 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/GroupsConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/GroupsConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import java.util.List;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/GroupsConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/GroupsConfigurationBuilder.java
index 545075fa275c..02e489e3235c 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/GroupsConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/GroupsConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/HashConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/HashConfiguration.java
index 4079f323627d..545786411e83 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/HashConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/HashConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.hash.Hash;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/HashConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/HashConfigurationBuilder.java
index 43dfe09a8a90..9f418987fd25 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/HashConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/HashConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/IndexingConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/IndexingConfiguration.java
index 2a0bdde312ba..ace41b3303b3 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/IndexingConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/IndexingConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.configuration.AbstractTypedPropertiesConfiguration;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/IndexingConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/IndexingConfigurationBuilder.java
index 3e1417c58893..f6d38d5f3607 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/IndexingConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/IndexingConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import java.util.Map;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/InterceptorConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/InterceptorConfiguration.java
index c49a478ee50f..b17e182b3bcd 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/InterceptorConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/InterceptorConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.configuration.AbstractTypedPropertiesConfiguration;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/InterceptorConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/InterceptorConfigurationBuilder.java
index 754bfa91a833..347b58a1e48c 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/InterceptorConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/InterceptorConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import java.util.Properties;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/InvocationBatchingConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/InvocationBatchingConfiguration.java
index 181f4298fa1d..875f96aaf080 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/InvocationBatchingConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/InvocationBatchingConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 public class InvocationBatchingConfiguration {
diff --git a/core/src/main/java/org/infinispan/configuration/cache/InvocationBatchingConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/InvocationBatchingConfigurationBuilder.java
index d9dcc13a082e..f5cd838dafd1 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/InvocationBatchingConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/InvocationBatchingConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import static org.infinispan.transaction.TransactionMode.NON_TRANSACTIONAL;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/JMXStatisticsConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/JMXStatisticsConfiguration.java
index adeaa16af1d1..daa0e4089c43 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/JMXStatisticsConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/JMXStatisticsConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/cache/JMXStatisticsConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/JMXStatisticsConfigurationBuilder.java
index bcfd4befd93b..1e303fd4f689 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/JMXStatisticsConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/JMXStatisticsConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/L1Configuration.java b/core/src/main/java/org/infinispan/configuration/cache/L1Configuration.java
index 25adc7a1479a..bf52685c611b 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/L1Configuration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/L1Configuration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/cache/L1ConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/L1ConfigurationBuilder.java
index 9749b511369b..8e834e51124b 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/L1ConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/L1ConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/LegacyConfigurationAdaptor.java b/core/src/main/java/org/infinispan/configuration/cache/LegacyConfigurationAdaptor.java
index 200293d08025..1e900a17ea5d 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/LegacyConfigurationAdaptor.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/LegacyConfigurationAdaptor.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import java.util.Properties;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/LegacyLoaderAdapter.java b/core/src/main/java/org/infinispan/configuration/cache/LegacyLoaderAdapter.java
index f16243d49f68..f4d5027efd79 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/LegacyLoaderAdapter.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/LegacyLoaderAdapter.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.loaders.CacheLoaderConfig;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/LegacyLoaderConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/LegacyLoaderConfiguration.java
index 6e7fc8961caf..15609110e2ec 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/LegacyLoaderConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/LegacyLoaderConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.configuration.BuiltBy;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/LegacyLoaderConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/LegacyLoaderConfigurationBuilder.java
index 078507370774..dbeb5e486004 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/LegacyLoaderConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/LegacyLoaderConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import java.util.Properties;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/LegacyStoreConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/LegacyStoreConfiguration.java
index 6b6d5902738b..c351b356416c 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/LegacyStoreConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/LegacyStoreConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.configuration.BuiltBy;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/LegacyStoreConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/LegacyStoreConfigurationBuilder.java
index 09152280eef4..7374788df061 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/LegacyStoreConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/LegacyStoreConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.util.TypedProperties;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/LoaderConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/LoaderConfiguration.java
index 8d7dcbfe46c8..d88c6f4344c3 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/LoaderConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/LoaderConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.configuration.BuiltBy;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/LoaderConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/LoaderConfigurationBuilder.java
index d037d1176f2f..8156e287156d 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/LoaderConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/LoaderConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.util.TypedProperties;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/LoaderConfigurationChildBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/LoaderConfigurationChildBuilder.java
index cd16da51e646..8f87ea89b88f 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/LoaderConfigurationChildBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/LoaderConfigurationChildBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.configuration.cache;
 
 import java.util.Properties;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/LoadersConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/LoadersConfiguration.java
index 2bad6e4e6f6e..9d3509f55e5a 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/LoadersConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/LoadersConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import java.util.List;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/LoadersConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/LoadersConfigurationBuilder.java
index 19337690bd20..dd14938d90a3 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/LoadersConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/LoadersConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import java.lang.reflect.Constructor;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/LoadersConfigurationChildBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/LoadersConfigurationChildBuilder.java
index f286b752b198..35871d33f5e7 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/LoadersConfigurationChildBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/LoadersConfigurationChildBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 public interface LoadersConfigurationChildBuilder extends ConfigurationChildBuilder {
diff --git a/core/src/main/java/org/infinispan/configuration/cache/LockSupportStoreConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/LockSupportStoreConfiguration.java
index 7632d20fda2f..0b2ae87423fc 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/LockSupportStoreConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/LockSupportStoreConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.configuration.cache;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/cache/LockSupportStoreConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/LockSupportStoreConfigurationBuilder.java
index 9c8ede70f749..2e8a3609d66b 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/LockSupportStoreConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/LockSupportStoreConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.configuration.cache;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/cache/LockSupportStoreConfigurationChildBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/LockSupportStoreConfigurationChildBuilder.java
index ce8aaefacf16..e8de950b2a12 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/LockSupportStoreConfigurationChildBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/LockSupportStoreConfigurationChildBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.configuration.cache;
 
 import java.util.concurrent.TimeUnit;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/LockingConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/LockingConfiguration.java
index 49e39efd4cb6..facea0bcd88a 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/LockingConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/LockingConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.util.concurrent.IsolationLevel;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/LockingConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/LockingConfigurationBuilder.java
index 7f535f797d9c..22e98acfc878 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/LockingConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/LockingConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/RecoveryConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/RecoveryConfiguration.java
index df0c2fb316d6..5531e9b2df13 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/RecoveryConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/RecoveryConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/cache/RecoveryConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/RecoveryConfigurationBuilder.java
index 9c3fda731e5b..e3f780aaed29 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/RecoveryConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/RecoveryConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/SingletonStoreConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/SingletonStoreConfiguration.java
index 13688105f3d8..4888662e2336 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/SingletonStoreConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/SingletonStoreConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/cache/SingletonStoreConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/SingletonStoreConfigurationBuilder.java
index e6c6584188bc..6e65e379322c 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/SingletonStoreConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/SingletonStoreConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import java.util.concurrent.TimeUnit;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/SitesConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/SitesConfiguration.java
index fa695e8d34e9..003294b2ec7d 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/SitesConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/SitesConfiguration.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.configuration.cache;
 
 import java.util.ArrayList;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/SitesConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/SitesConfigurationBuilder.java
index 69612ab88090..e0db29dba32e 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/SitesConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/SitesConfigurationBuilder.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/StateTransferConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/StateTransferConfiguration.java
index ad55bce9bc9c..8094f1f90bc2 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/StateTransferConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/StateTransferConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/cache/StateTransferConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/StateTransferConfigurationBuilder.java
index 22941d02b054..1f9dd79c28a7 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/StateTransferConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/StateTransferConfigurationBuilder.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/StoreAsBinaryConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/StoreAsBinaryConfiguration.java
index a4a963cc23e0..3180c1be055c 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/StoreAsBinaryConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/StoreAsBinaryConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/cache/StoreAsBinaryConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/StoreAsBinaryConfigurationBuilder.java
index 655178fc491e..c92a3d70a592 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/StoreAsBinaryConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/StoreAsBinaryConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/StoreConfigurationChildBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/StoreConfigurationChildBuilder.java
index d49c99170e59..aee3b8f10c8b 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/StoreConfigurationChildBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/StoreConfigurationChildBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 public interface StoreConfigurationChildBuilder<S> extends LoaderConfigurationChildBuilder<S> {
diff --git a/core/src/main/java/org/infinispan/configuration/cache/SyncConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/SyncConfiguration.java
index c784a0f3cb59..8c1bd0d380ff 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/SyncConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/SyncConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/cache/SyncConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/SyncConfigurationBuilder.java
index 49512024bea3..ec61999716a6 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/SyncConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/SyncConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import java.util.concurrent.TimeUnit;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/TakeOfflineConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/TakeOfflineConfiguration.java
index ad3dc9759634..699aaf563075 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/TakeOfflineConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/TakeOfflineConfiguration.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.configuration.cache;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/cache/TakeOfflineConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/TakeOfflineConfigurationBuilder.java
index ea4020f8cfe3..1d0117ca7b38 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/TakeOfflineConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/TakeOfflineConfigurationBuilder.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/TransactionConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/TransactionConfiguration.java
index 1591a911c2b9..424fd7f2ece1 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/TransactionConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/TransactionConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.transaction.LockingMode;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/TransactionConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/TransactionConfigurationBuilder.java
index ff10eb7ae947..e97c9106a3cb 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/TransactionConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/TransactionConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.CacheConfigurationException;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/TransactionConfigurationChildBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/TransactionConfigurationChildBuilder.java
index 8bc1ff37fd7a..f7cfa8698fa8 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/TransactionConfigurationChildBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/TransactionConfigurationChildBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 public interface TransactionConfigurationChildBuilder extends ConfigurationChildBuilder {
diff --git a/core/src/main/java/org/infinispan/configuration/cache/UnsafeConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/UnsafeConfiguration.java
index a15145c56667..3daf00e73ede 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/UnsafeConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/UnsafeConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/cache/UnsafeConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/UnsafeConfigurationBuilder.java
index 05e6cfd41cea..cb2f2afe2db7 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/UnsafeConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/UnsafeConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/VersioningConfiguration.java b/core/src/main/java/org/infinispan/configuration/cache/VersioningConfiguration.java
index 629b3c7852e6..20cad92914d0 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/VersioningConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/VersioningConfiguration.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.configuration.cache;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/cache/VersioningConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/cache/VersioningConfigurationBuilder.java
index 928cf0d72b84..1185a42ae813 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/VersioningConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/VersioningConfigurationBuilder.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.configuration.cache;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/core/src/main/java/org/infinispan/configuration/cache/VersioningScheme.java b/core/src/main/java/org/infinispan/configuration/cache/VersioningScheme.java
index 326b4e78ae79..18f6a2924be8 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/VersioningScheme.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/VersioningScheme.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.configuration.cache;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/cache/package-info.java b/core/src/main/java/org/infinispan/configuration/cache/package-info.java
index 8430497fdcff..a42278a2e7a5 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/package-info.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Classes related to eviction.
  * Need @XmlSchema annotation for EvictionStrategy.java
diff --git a/core/src/main/java/org/infinispan/configuration/global/AbstractGlobalConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/global/AbstractGlobalConfigurationBuilder.java
index e8afd08e9222..ab7dc44b374d 100644
--- a/core/src/main/java/org/infinispan/configuration/global/AbstractGlobalConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/global/AbstractGlobalConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.global;
 
 abstract class AbstractGlobalConfigurationBuilder<T> implements GlobalConfigurationChildBuilder {
diff --git a/core/src/main/java/org/infinispan/configuration/global/AbstractGlobalModuleConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/global/AbstractGlobalModuleConfigurationBuilder.java
index b05bd698e0ec..ab00a39fdb80 100644
--- a/core/src/main/java/org/infinispan/configuration/global/AbstractGlobalModuleConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/global/AbstractGlobalModuleConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.configuration.global;
 
 public abstract class AbstractGlobalModuleConfigurationBuilder<T> extends AbstractGlobalConfigurationBuilder<T> {
diff --git a/core/src/main/java/org/infinispan/configuration/global/ExecutorFactoryConfiguration.java b/core/src/main/java/org/infinispan/configuration/global/ExecutorFactoryConfiguration.java
index 641088aff0d6..2c0df49996f6 100644
--- a/core/src/main/java/org/infinispan/configuration/global/ExecutorFactoryConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/global/ExecutorFactoryConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.global;
 
 import org.infinispan.commons.configuration.AbstractTypedPropertiesConfiguration;
diff --git a/core/src/main/java/org/infinispan/configuration/global/ExecutorFactoryConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/global/ExecutorFactoryConfigurationBuilder.java
index 9ae86836c469..651b8a8e9a02 100644
--- a/core/src/main/java/org/infinispan/configuration/global/ExecutorFactoryConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/global/ExecutorFactoryConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.global;
 
 import java.util.Properties;
diff --git a/core/src/main/java/org/infinispan/configuration/global/GlobalConfiguration.java b/core/src/main/java/org/infinispan/configuration/global/GlobalConfiguration.java
index 2e492f83e053..b3790dbd6cc5 100644
--- a/core/src/main/java/org/infinispan/configuration/global/GlobalConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/global/GlobalConfiguration.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.configuration.global;
 
 import java.lang.ref.WeakReference;
diff --git a/core/src/main/java/org/infinispan/configuration/global/GlobalConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/global/GlobalConfigurationBuilder.java
index a66369fe7110..6cb43a61a750 100644
--- a/core/src/main/java/org/infinispan/configuration/global/GlobalConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/global/GlobalConfigurationBuilder.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.configuration.global;
 
 import java.lang.ref.WeakReference;
diff --git a/core/src/main/java/org/infinispan/configuration/global/GlobalConfigurationChildBuilder.java b/core/src/main/java/org/infinispan/configuration/global/GlobalConfigurationChildBuilder.java
index ac7baa40c5c1..8614e8ce80d0 100644
--- a/core/src/main/java/org/infinispan/configuration/global/GlobalConfigurationChildBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/global/GlobalConfigurationChildBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.global;
 
 public interface GlobalConfigurationChildBuilder {
diff --git a/core/src/main/java/org/infinispan/configuration/global/GlobalJmxStatisticsConfiguration.java b/core/src/main/java/org/infinispan/configuration/global/GlobalJmxStatisticsConfiguration.java
index f51091cbee35..fcc684f91b7b 100644
--- a/core/src/main/java/org/infinispan/configuration/global/GlobalJmxStatisticsConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/global/GlobalJmxStatisticsConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.global;
 
 import org.infinispan.commons.util.TypedProperties;
diff --git a/core/src/main/java/org/infinispan/configuration/global/GlobalJmxStatisticsConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/global/GlobalJmxStatisticsConfigurationBuilder.java
index 2ab031de4a41..b9d9b1dfe5f1 100644
--- a/core/src/main/java/org/infinispan/configuration/global/GlobalJmxStatisticsConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/global/GlobalJmxStatisticsConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.global;
 
 import java.util.Properties;
diff --git a/core/src/main/java/org/infinispan/configuration/global/LegacyGlobalConfigurationAdaptor.java b/core/src/main/java/org/infinispan/configuration/global/LegacyGlobalConfigurationAdaptor.java
index 01faeb84c767..3a05d027aadc 100644
--- a/core/src/main/java/org/infinispan/configuration/global/LegacyGlobalConfigurationAdaptor.java
+++ b/core/src/main/java/org/infinispan/configuration/global/LegacyGlobalConfigurationAdaptor.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.global;
 
 import org.infinispan.config.AdvancedExternalizerConfig;
diff --git a/core/src/main/java/org/infinispan/configuration/global/ScheduledExecutorFactoryConfiguration.java b/core/src/main/java/org/infinispan/configuration/global/ScheduledExecutorFactoryConfiguration.java
index fcf3909f18de..8aa46a0ba235 100644
--- a/core/src/main/java/org/infinispan/configuration/global/ScheduledExecutorFactoryConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/global/ScheduledExecutorFactoryConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.global;
 
 import org.infinispan.commons.configuration.AbstractTypedPropertiesConfiguration;
diff --git a/core/src/main/java/org/infinispan/configuration/global/ScheduledExecutorFactoryConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/global/ScheduledExecutorFactoryConfigurationBuilder.java
index b98e080cf00a..32b62b737b88 100644
--- a/core/src/main/java/org/infinispan/configuration/global/ScheduledExecutorFactoryConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/global/ScheduledExecutorFactoryConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.global;
 
 import java.util.Properties;
diff --git a/core/src/main/java/org/infinispan/configuration/global/SerializationConfiguration.java b/core/src/main/java/org/infinispan/configuration/global/SerializationConfiguration.java
index acc661d0c802..3a9e836a7c24 100644
--- a/core/src/main/java/org/infinispan/configuration/global/SerializationConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/global/SerializationConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.global;
 
 import java.util.Map;
diff --git a/core/src/main/java/org/infinispan/configuration/global/SerializationConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/global/SerializationConfigurationBuilder.java
index 37eeffa60fd9..9e5a2df345c3 100644
--- a/core/src/main/java/org/infinispan/configuration/global/SerializationConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/global/SerializationConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.global;
 
 import org.infinispan.Version;
diff --git a/core/src/main/java/org/infinispan/configuration/global/ShutdownConfiguration.java b/core/src/main/java/org/infinispan/configuration/global/ShutdownConfiguration.java
index 5ea68a45d7fb..15d1d5cecc28 100644
--- a/core/src/main/java/org/infinispan/configuration/global/ShutdownConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/global/ShutdownConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.global;
 
 public class ShutdownConfiguration {
diff --git a/core/src/main/java/org/infinispan/configuration/global/ShutdownConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/global/ShutdownConfigurationBuilder.java
index f07e64ba5246..05f689cb38c4 100644
--- a/core/src/main/java/org/infinispan/configuration/global/ShutdownConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/global/ShutdownConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.global;
 
 public class ShutdownConfigurationBuilder extends AbstractGlobalConfigurationBuilder<ShutdownConfiguration> {
diff --git a/core/src/main/java/org/infinispan/configuration/global/ShutdownHookBehavior.java b/core/src/main/java/org/infinispan/configuration/global/ShutdownHookBehavior.java
index b0c9a7ae8f9d..6667fae5c137 100644
--- a/core/src/main/java/org/infinispan/configuration/global/ShutdownHookBehavior.java
+++ b/core/src/main/java/org/infinispan/configuration/global/ShutdownHookBehavior.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.global;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/global/SiteConfiguration.java b/core/src/main/java/org/infinispan/configuration/global/SiteConfiguration.java
index e28c790c7e1d..0c72d81c5167 100644
--- a/core/src/main/java/org/infinispan/configuration/global/SiteConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/global/SiteConfiguration.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.configuration.global;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/global/SiteConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/global/SiteConfigurationBuilder.java
index e2ee43108b04..c6f9cbd40702 100644
--- a/core/src/main/java/org/infinispan/configuration/global/SiteConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/global/SiteConfigurationBuilder.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.configuration.global;
 
 /**
diff --git a/core/src/main/java/org/infinispan/configuration/global/TransportConfiguration.java b/core/src/main/java/org/infinispan/configuration/global/TransportConfiguration.java
index bbacf00c23ae..7b445dbd3872 100644
--- a/core/src/main/java/org/infinispan/configuration/global/TransportConfiguration.java
+++ b/core/src/main/java/org/infinispan/configuration/global/TransportConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.global;
 
 import org.infinispan.commons.util.TypedProperties;
diff --git a/core/src/main/java/org/infinispan/configuration/global/TransportConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/global/TransportConfigurationBuilder.java
index 904b2faa5445..97a7c7fcc2c8 100644
--- a/core/src/main/java/org/infinispan/configuration/global/TransportConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/global/TransportConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.global;
 
 import org.infinispan.commons.util.TypedProperties;
diff --git a/core/src/main/java/org/infinispan/configuration/parsing/AbstractParserContext.java b/core/src/main/java/org/infinispan/configuration/parsing/AbstractParserContext.java
index 64699cd87ff0..446509a93db2 100644
--- a/core/src/main/java/org/infinispan/configuration/parsing/AbstractParserContext.java
+++ b/core/src/main/java/org/infinispan/configuration/parsing/AbstractParserContext.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.configuration.parsing;
 
 import java.util.ArrayList;
diff --git a/core/src/main/java/org/infinispan/configuration/parsing/Attribute.java b/core/src/main/java/org/infinispan/configuration/parsing/Attribute.java
index ab2b01f1b6c3..fd10cee5f67b 100644
--- a/core/src/main/java/org/infinispan/configuration/parsing/Attribute.java
+++ b/core/src/main/java/org/infinispan/configuration/parsing/Attribute.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.configuration.parsing;
 
 import java.util.HashMap;
diff --git a/core/src/main/java/org/infinispan/configuration/parsing/ConfigFilesConvertor.java b/core/src/main/java/org/infinispan/configuration/parsing/ConfigFilesConvertor.java
index 261c10b8cf78..36c0f4d0ecd8 100644
--- a/core/src/main/java/org/infinispan/configuration/parsing/ConfigFilesConvertor.java
+++ b/core/src/main/java/org/infinispan/configuration/parsing/ConfigFilesConvertor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.configuration.parsing;
 
 import org.infinispan.commons.util.FileLookupFactory;
diff --git a/core/src/main/java/org/infinispan/configuration/parsing/ConfigurationBuilderHolder.java b/core/src/main/java/org/infinispan/configuration/parsing/ConfigurationBuilderHolder.java
index 79e00a550f45..daa5660fc907 100644
--- a/core/src/main/java/org/infinispan/configuration/parsing/ConfigurationBuilderHolder.java
+++ b/core/src/main/java/org/infinispan/configuration/parsing/ConfigurationBuilderHolder.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.parsing;
 
 import java.lang.ref.WeakReference;
diff --git a/core/src/main/java/org/infinispan/configuration/parsing/ConfigurationParser.java b/core/src/main/java/org/infinispan/configuration/parsing/ConfigurationParser.java
index fa73645c7cf4..b5576301fa7d 100644
--- a/core/src/main/java/org/infinispan/configuration/parsing/ConfigurationParser.java
+++ b/core/src/main/java/org/infinispan/configuration/parsing/ConfigurationParser.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.configuration.parsing;
 
 import javax.xml.stream.XMLStreamException;
diff --git a/core/src/main/java/org/infinispan/configuration/parsing/Element.java b/core/src/main/java/org/infinispan/configuration/parsing/Element.java
index be51a2c32fbe..3d0121e39c5f 100644
--- a/core/src/main/java/org/infinispan/configuration/parsing/Element.java
+++ b/core/src/main/java/org/infinispan/configuration/parsing/Element.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.configuration.parsing;
 
 import java.util.HashMap;
diff --git a/core/src/main/java/org/infinispan/configuration/parsing/ParseUtils.java b/core/src/main/java/org/infinispan/configuration/parsing/ParseUtils.java
index cdd895f512a8..8e509021689c 100644
--- a/core/src/main/java/org/infinispan/configuration/parsing/ParseUtils.java
+++ b/core/src/main/java/org/infinispan/configuration/parsing/ParseUtils.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.configuration.parsing;
 
 import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
diff --git a/core/src/main/java/org/infinispan/configuration/parsing/ParsedCacheMode.java b/core/src/main/java/org/infinispan/configuration/parsing/ParsedCacheMode.java
index 84e87151e673..0a9d4511f211 100644
--- a/core/src/main/java/org/infinispan/configuration/parsing/ParsedCacheMode.java
+++ b/core/src/main/java/org/infinispan/configuration/parsing/ParsedCacheMode.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.parsing;
 
 import java.util.ArrayList;
diff --git a/core/src/main/java/org/infinispan/configuration/parsing/Parser51.java b/core/src/main/java/org/infinispan/configuration/parsing/Parser51.java
index f5d3c21a03c4..085286dd2084 100644
--- a/core/src/main/java/org/infinispan/configuration/parsing/Parser51.java
+++ b/core/src/main/java/org/infinispan/configuration/parsing/Parser51.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.parsing;
 
 import static org.infinispan.commons.util.StringPropertyReplacer.replaceProperties;
diff --git a/core/src/main/java/org/infinispan/configuration/parsing/Parser52.java b/core/src/main/java/org/infinispan/configuration/parsing/Parser52.java
index ec2f47591230..33c75daee414 100644
--- a/core/src/main/java/org/infinispan/configuration/parsing/Parser52.java
+++ b/core/src/main/java/org/infinispan/configuration/parsing/Parser52.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.parsing;
 
 import static org.infinispan.commons.util.StringPropertyReplacer.replaceProperties;
diff --git a/core/src/main/java/org/infinispan/configuration/parsing/Parser53.java b/core/src/main/java/org/infinispan/configuration/parsing/Parser53.java
index d470c160a904..7ab7deecf4b4 100644
--- a/core/src/main/java/org/infinispan/configuration/parsing/Parser53.java
+++ b/core/src/main/java/org/infinispan/configuration/parsing/Parser53.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.parsing;
 
 import org.infinispan.commons.CacheConfigurationException;
diff --git a/core/src/main/java/org/infinispan/container/DataContainer.java b/core/src/main/java/org/infinispan/container/DataContainer.java
index 364c9a93ce5a..54de14355883 100644
--- a/core/src/main/java/org/infinispan/container/DataContainer.java
+++ b/core/src/main/java/org/infinispan/container/DataContainer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.container;
 
 import java.util.Collection;
diff --git a/core/src/main/java/org/infinispan/container/DefaultDataContainer.java b/core/src/main/java/org/infinispan/container/DefaultDataContainer.java
index d59bbf379292..751d12a3475c 100644
--- a/core/src/main/java/org/infinispan/container/DefaultDataContainer.java
+++ b/core/src/main/java/org/infinispan/container/DefaultDataContainer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.container;
 
 import net.jcip.annotations.ThreadSafe;
diff --git a/core/src/main/java/org/infinispan/container/EntryFactory.java b/core/src/main/java/org/infinispan/container/EntryFactory.java
index f3a1a8e119ca..bb0b24fddb81 100644
--- a/core/src/main/java/org/infinispan/container/EntryFactory.java
+++ b/core/src/main/java/org/infinispan/container/EntryFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.container;
 
 import org.infinispan.atomic.Delta;
diff --git a/core/src/main/java/org/infinispan/container/EntryFactoryImpl.java b/core/src/main/java/org/infinispan/container/EntryFactoryImpl.java
index ac65d57c48aa..716479875ff9 100644
--- a/core/src/main/java/org/infinispan/container/EntryFactoryImpl.java
+++ b/core/src/main/java/org/infinispan/container/EntryFactoryImpl.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.container;
 
 import org.infinispan.metadata.Metadata;
diff --git a/core/src/main/java/org/infinispan/container/IncrementalVersionableEntryFactoryImpl.java b/core/src/main/java/org/infinispan/container/IncrementalVersionableEntryFactoryImpl.java
index 2d6bacc74e33..cd4381e34d57 100644
--- a/core/src/main/java/org/infinispan/container/IncrementalVersionableEntryFactoryImpl.java
+++ b/core/src/main/java/org/infinispan/container/IncrementalVersionableEntryFactoryImpl.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container;
 
 import org.infinispan.metadata.Metadata;
diff --git a/core/src/main/java/org/infinispan/container/InternalEntryFactory.java b/core/src/main/java/org/infinispan/container/InternalEntryFactory.java
index c76d7114c782..5383d810b406 100644
--- a/core/src/main/java/org/infinispan/container/InternalEntryFactory.java
+++ b/core/src/main/java/org/infinispan/container/InternalEntryFactory.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container;
 
 import org.infinispan.metadata.Metadata;
diff --git a/core/src/main/java/org/infinispan/container/InternalEntryFactoryImpl.java b/core/src/main/java/org/infinispan/container/InternalEntryFactoryImpl.java
index 48cc9dd29175..ed8225c7bc22 100644
--- a/core/src/main/java/org/infinispan/container/InternalEntryFactoryImpl.java
+++ b/core/src/main/java/org/infinispan/container/InternalEntryFactoryImpl.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container;
 
 import org.infinispan.metadata.EmbeddedMetadata;
diff --git a/core/src/main/java/org/infinispan/container/entries/AbstractInternalCacheEntry.java b/core/src/main/java/org/infinispan/container/entries/AbstractInternalCacheEntry.java
index 459ab7c27936..b1c145d634af 100644
--- a/core/src/main/java/org/infinispan/container/entries/AbstractInternalCacheEntry.java
+++ b/core/src/main/java/org/infinispan/container/entries/AbstractInternalCacheEntry.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.container.entries;
 
 import org.infinispan.metadata.Metadata;
diff --git a/core/src/main/java/org/infinispan/container/entries/CacheEntry.java b/core/src/main/java/org/infinispan/container/entries/CacheEntry.java
index 487ca4c14b29..b241d4e0fa42 100644
--- a/core/src/main/java/org/infinispan/container/entries/CacheEntry.java
+++ b/core/src/main/java/org/infinispan/container/entries/CacheEntry.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.container.entries;
 
 import org.infinispan.metadata.Metadata;
diff --git a/core/src/main/java/org/infinispan/container/entries/ClusteredRepeatableReadEntry.java b/core/src/main/java/org/infinispan/container/entries/ClusteredRepeatableReadEntry.java
index 15907f40f66c..8f667bf13cbd 100644
--- a/core/src/main/java/org/infinispan/container/entries/ClusteredRepeatableReadEntry.java
+++ b/core/src/main/java/org/infinispan/container/entries/ClusteredRepeatableReadEntry.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container.entries;
 
 import org.infinispan.metadata.Metadata;
diff --git a/core/src/main/java/org/infinispan/container/entries/DeltaAwareCacheEntry.java b/core/src/main/java/org/infinispan/container/entries/DeltaAwareCacheEntry.java
index 1546e35ff7df..9c1abc1d22bf 100644
--- a/core/src/main/java/org/infinispan/container/entries/DeltaAwareCacheEntry.java
+++ b/core/src/main/java/org/infinispan/container/entries/DeltaAwareCacheEntry.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.container.entries;
 
 import org.infinispan.metadata.Metadata;
diff --git a/core/src/main/java/org/infinispan/container/entries/ExpiryHelper.java b/core/src/main/java/org/infinispan/container/entries/ExpiryHelper.java
index 568045b0cee9..a6fc16337176 100644
--- a/core/src/main/java/org/infinispan/container/entries/ExpiryHelper.java
+++ b/core/src/main/java/org/infinispan/container/entries/ExpiryHelper.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.container.entries;
 
 /**
diff --git a/core/src/main/java/org/infinispan/container/entries/ImmortalCacheEntry.java b/core/src/main/java/org/infinispan/container/entries/ImmortalCacheEntry.java
index 8affd092bf5d..06e0d0b0e663 100644
--- a/core/src/main/java/org/infinispan/container/entries/ImmortalCacheEntry.java
+++ b/core/src/main/java/org/infinispan/container/entries/ImmortalCacheEntry.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.container.entries;
 
 import org.infinispan.metadata.EmbeddedMetadata;
diff --git a/core/src/main/java/org/infinispan/container/entries/ImmortalCacheValue.java b/core/src/main/java/org/infinispan/container/entries/ImmortalCacheValue.java
index 983c7476a030..4873ff61d968 100644
--- a/core/src/main/java/org/infinispan/container/entries/ImmortalCacheValue.java
+++ b/core/src/main/java/org/infinispan/container/entries/ImmortalCacheValue.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.container.entries;
 
 import org.infinispan.commons.marshall.AbstractExternalizer;
diff --git a/core/src/main/java/org/infinispan/container/entries/InternalCacheEntry.java b/core/src/main/java/org/infinispan/container/entries/InternalCacheEntry.java
index 33d61a5ed48f..64f007f813fb 100644
--- a/core/src/main/java/org/infinispan/container/entries/InternalCacheEntry.java
+++ b/core/src/main/java/org/infinispan/container/entries/InternalCacheEntry.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.container.entries;
 
 /**
diff --git a/core/src/main/java/org/infinispan/container/entries/InternalCacheValue.java b/core/src/main/java/org/infinispan/container/entries/InternalCacheValue.java
index 3de7fbccdb5b..5e12d71ff14a 100644
--- a/core/src/main/java/org/infinispan/container/entries/InternalCacheValue.java
+++ b/core/src/main/java/org/infinispan/container/entries/InternalCacheValue.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.container.entries;
 
 /**
diff --git a/core/src/main/java/org/infinispan/container/entries/MVCCEntry.java b/core/src/main/java/org/infinispan/container/entries/MVCCEntry.java
index 4705c88dfd7f..4f3e3a3b0311 100644
--- a/core/src/main/java/org/infinispan/container/entries/MVCCEntry.java
+++ b/core/src/main/java/org/infinispan/container/entries/MVCCEntry.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.container.entries;
 
 import org.infinispan.container.DataContainer;
diff --git a/core/src/main/java/org/infinispan/container/entries/MortalCacheEntry.java b/core/src/main/java/org/infinispan/container/entries/MortalCacheEntry.java
index ca5d4c9cdd0e..019a681256db 100644
--- a/core/src/main/java/org/infinispan/container/entries/MortalCacheEntry.java
+++ b/core/src/main/java/org/infinispan/container/entries/MortalCacheEntry.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.container.entries;
 
 import org.infinispan.metadata.EmbeddedMetadata;
diff --git a/core/src/main/java/org/infinispan/container/entries/MortalCacheValue.java b/core/src/main/java/org/infinispan/container/entries/MortalCacheValue.java
index 65ff9ab67791..c710128992df 100644
--- a/core/src/main/java/org/infinispan/container/entries/MortalCacheValue.java
+++ b/core/src/main/java/org/infinispan/container/entries/MortalCacheValue.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.container.entries;
 
 import org.infinispan.commons.io.UnsignedNumeric;
diff --git a/core/src/main/java/org/infinispan/container/entries/NullMarkerEntry.java b/core/src/main/java/org/infinispan/container/entries/NullMarkerEntry.java
index 64faad057690..cf74f28d44d6 100644
--- a/core/src/main/java/org/infinispan/container/entries/NullMarkerEntry.java
+++ b/core/src/main/java/org/infinispan/container/entries/NullMarkerEntry.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.container.entries;
 
 import org.infinispan.container.DataContainer;
diff --git a/core/src/main/java/org/infinispan/container/entries/NullMarkerEntryForRemoval.java b/core/src/main/java/org/infinispan/container/entries/NullMarkerEntryForRemoval.java
index da60c4d7be79..da3bd86a2e25 100644
--- a/core/src/main/java/org/infinispan/container/entries/NullMarkerEntryForRemoval.java
+++ b/core/src/main/java/org/infinispan/container/entries/NullMarkerEntryForRemoval.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.container.entries;
 
 import org.infinispan.metadata.Metadata;
diff --git a/core/src/main/java/org/infinispan/container/entries/ReadCommittedEntry.java b/core/src/main/java/org/infinispan/container/entries/ReadCommittedEntry.java
index b47ddafdcfd6..1a9f12fcd330 100644
--- a/core/src/main/java/org/infinispan/container/entries/ReadCommittedEntry.java
+++ b/core/src/main/java/org/infinispan/container/entries/ReadCommittedEntry.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.container.entries;
 
 import org.infinispan.metadata.Metadata;
diff --git a/core/src/main/java/org/infinispan/container/entries/RepeatableReadEntry.java b/core/src/main/java/org/infinispan/container/entries/RepeatableReadEntry.java
index 1bd32eedf90d..2858c840b371 100644
--- a/core/src/main/java/org/infinispan/container/entries/RepeatableReadEntry.java
+++ b/core/src/main/java/org/infinispan/container/entries/RepeatableReadEntry.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.container.entries;
 
 import org.infinispan.metadata.Metadata;
diff --git a/core/src/main/java/org/infinispan/container/entries/StateChangingEntry.java b/core/src/main/java/org/infinispan/container/entries/StateChangingEntry.java
index 97afbe389eec..28f5142d3fa1 100644
--- a/core/src/main/java/org/infinispan/container/entries/StateChangingEntry.java
+++ b/core/src/main/java/org/infinispan/container/entries/StateChangingEntry.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container.entries;
 
 /**
diff --git a/core/src/main/java/org/infinispan/container/entries/TransientCacheEntry.java b/core/src/main/java/org/infinispan/container/entries/TransientCacheEntry.java
index b3bfc2c9333c..8bbe05b4e1ac 100644
--- a/core/src/main/java/org/infinispan/container/entries/TransientCacheEntry.java
+++ b/core/src/main/java/org/infinispan/container/entries/TransientCacheEntry.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.container.entries;
 
 import org.infinispan.metadata.EmbeddedMetadata;
diff --git a/core/src/main/java/org/infinispan/container/entries/TransientCacheValue.java b/core/src/main/java/org/infinispan/container/entries/TransientCacheValue.java
index 68c7ad4b05fe..a190bf125f43 100644
--- a/core/src/main/java/org/infinispan/container/entries/TransientCacheValue.java
+++ b/core/src/main/java/org/infinispan/container/entries/TransientCacheValue.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.container.entries;
 
 import org.infinispan.commons.io.UnsignedNumeric;
diff --git a/core/src/main/java/org/infinispan/container/entries/TransientMortalCacheEntry.java b/core/src/main/java/org/infinispan/container/entries/TransientMortalCacheEntry.java
index c89c8cd61e5b..ef191021a11e 100644
--- a/core/src/main/java/org/infinispan/container/entries/TransientMortalCacheEntry.java
+++ b/core/src/main/java/org/infinispan/container/entries/TransientMortalCacheEntry.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.container.entries;
 
 import org.infinispan.metadata.EmbeddedMetadata;
diff --git a/core/src/main/java/org/infinispan/container/entries/TransientMortalCacheValue.java b/core/src/main/java/org/infinispan/container/entries/TransientMortalCacheValue.java
index 35f7b6fbcd3b..4355ebc17eb2 100644
--- a/core/src/main/java/org/infinispan/container/entries/TransientMortalCacheValue.java
+++ b/core/src/main/java/org/infinispan/container/entries/TransientMortalCacheValue.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.container.entries;
 
 import org.infinispan.commons.io.UnsignedNumeric;
diff --git a/core/src/main/java/org/infinispan/container/entries/metadata/MetadataAware.java b/core/src/main/java/org/infinispan/container/entries/metadata/MetadataAware.java
index d76aab03da1b..ae1e53a2edd8 100644
--- a/core/src/main/java/org/infinispan/container/entries/metadata/MetadataAware.java
+++ b/core/src/main/java/org/infinispan/container/entries/metadata/MetadataAware.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.container.entries.metadata;
 
 import org.infinispan.metadata.Metadata;
diff --git a/core/src/main/java/org/infinispan/container/entries/metadata/MetadataImmortalCacheEntry.java b/core/src/main/java/org/infinispan/container/entries/metadata/MetadataImmortalCacheEntry.java
index 6e0fe5b06417..c74be61ee6d6 100644
--- a/core/src/main/java/org/infinispan/container/entries/metadata/MetadataImmortalCacheEntry.java
+++ b/core/src/main/java/org/infinispan/container/entries/metadata/MetadataImmortalCacheEntry.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container.entries.metadata;
 
 import org.infinispan.container.entries.InternalCacheValue;
diff --git a/core/src/main/java/org/infinispan/container/entries/metadata/MetadataImmortalCacheValue.java b/core/src/main/java/org/infinispan/container/entries/metadata/MetadataImmortalCacheValue.java
index f3f1e3af34f6..3dbbba3ce87b 100644
--- a/core/src/main/java/org/infinispan/container/entries/metadata/MetadataImmortalCacheValue.java
+++ b/core/src/main/java/org/infinispan/container/entries/metadata/MetadataImmortalCacheValue.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container.entries.metadata;
 
 import org.infinispan.metadata.Metadata;
diff --git a/core/src/main/java/org/infinispan/container/entries/metadata/MetadataMortalCacheEntry.java b/core/src/main/java/org/infinispan/container/entries/metadata/MetadataMortalCacheEntry.java
index 17e2c3087cca..d8f64c3a9366 100644
--- a/core/src/main/java/org/infinispan/container/entries/metadata/MetadataMortalCacheEntry.java
+++ b/core/src/main/java/org/infinispan/container/entries/metadata/MetadataMortalCacheEntry.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container.entries.metadata;
 
 import org.infinispan.metadata.Metadata;
diff --git a/core/src/main/java/org/infinispan/container/entries/metadata/MetadataMortalCacheValue.java b/core/src/main/java/org/infinispan/container/entries/metadata/MetadataMortalCacheValue.java
index 11c5b0276b14..e1e6b75696e0 100644
--- a/core/src/main/java/org/infinispan/container/entries/metadata/MetadataMortalCacheValue.java
+++ b/core/src/main/java/org/infinispan/container/entries/metadata/MetadataMortalCacheValue.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container.entries.metadata;
 
 import org.infinispan.metadata.Metadata;
diff --git a/core/src/main/java/org/infinispan/container/entries/metadata/MetadataTransientCacheEntry.java b/core/src/main/java/org/infinispan/container/entries/metadata/MetadataTransientCacheEntry.java
index 9188939d1c77..ea4e6f86e5a8 100644
--- a/core/src/main/java/org/infinispan/container/entries/metadata/MetadataTransientCacheEntry.java
+++ b/core/src/main/java/org/infinispan/container/entries/metadata/MetadataTransientCacheEntry.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container.entries.metadata;
 
 import org.infinispan.container.entries.ExpiryHelper;
diff --git a/core/src/main/java/org/infinispan/container/entries/metadata/MetadataTransientCacheValue.java b/core/src/main/java/org/infinispan/container/entries/metadata/MetadataTransientCacheValue.java
index 0266805d7840..c3b2cd8d11b3 100644
--- a/core/src/main/java/org/infinispan/container/entries/metadata/MetadataTransientCacheValue.java
+++ b/core/src/main/java/org/infinispan/container/entries/metadata/MetadataTransientCacheValue.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container.entries.metadata;
 
 import org.infinispan.metadata.Metadata;
diff --git a/core/src/main/java/org/infinispan/container/entries/metadata/MetadataTransientMortalCacheEntry.java b/core/src/main/java/org/infinispan/container/entries/metadata/MetadataTransientMortalCacheEntry.java
index ab504ee32241..42bfaae53da7 100644
--- a/core/src/main/java/org/infinispan/container/entries/metadata/MetadataTransientMortalCacheEntry.java
+++ b/core/src/main/java/org/infinispan/container/entries/metadata/MetadataTransientMortalCacheEntry.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container.entries.metadata;
 
 import org.infinispan.container.entries.ExpiryHelper;
diff --git a/core/src/main/java/org/infinispan/container/entries/metadata/MetadataTransientMortalCacheValue.java b/core/src/main/java/org/infinispan/container/entries/metadata/MetadataTransientMortalCacheValue.java
index 18939018d801..aad4abef839b 100644
--- a/core/src/main/java/org/infinispan/container/entries/metadata/MetadataTransientMortalCacheValue.java
+++ b/core/src/main/java/org/infinispan/container/entries/metadata/MetadataTransientMortalCacheValue.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container.entries.metadata;
 
 import org.infinispan.metadata.Metadata;
diff --git a/core/src/main/java/org/infinispan/container/entries/package-info.java b/core/src/main/java/org/infinispan/container/entries/package-info.java
index 462cd3d2009a..20be542b556e 100644
--- a/core/src/main/java/org/infinispan/container/entries/package-info.java
+++ b/core/src/main/java/org/infinispan/container/entries/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Entries which are stored in data containers.  This package contains different implementations of
  * entries based on the information needed to store an entry.  Certain entries need more information - such as timestamps
diff --git a/core/src/main/java/org/infinispan/container/entries/versioned/Versioned.java b/core/src/main/java/org/infinispan/container/entries/versioned/Versioned.java
index a04d50a86773..373903b2a21a 100644
--- a/core/src/main/java/org/infinispan/container/entries/versioned/Versioned.java
+++ b/core/src/main/java/org/infinispan/container/entries/versioned/Versioned.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container.entries.versioned;
 
 import org.infinispan.container.versioning.EntryVersion;
diff --git a/core/src/main/java/org/infinispan/container/package-info.java b/core/src/main/java/org/infinispan/container/package-info.java
index 61f0678c5d3b..87b720414f5b 100644
--- a/core/src/main/java/org/infinispan/container/package-info.java
+++ b/core/src/main/java/org/infinispan/container/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Data containers which store cache entries.  This package contains different implementations of
  * containers based on their performance and ordering characteristics, as well as the entries
diff --git a/core/src/main/java/org/infinispan/container/versioning/EntryVersion.java b/core/src/main/java/org/infinispan/container/versioning/EntryVersion.java
index 7eb111496bbc..cd32ee69901d 100644
--- a/core/src/main/java/org/infinispan/container/versioning/EntryVersion.java
+++ b/core/src/main/java/org/infinispan/container/versioning/EntryVersion.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container.versioning;
 
 /**
diff --git a/core/src/main/java/org/infinispan/container/versioning/EntryVersionsMap.java b/core/src/main/java/org/infinispan/container/versioning/EntryVersionsMap.java
index d19580692feb..f1f8964c3a13 100644
--- a/core/src/main/java/org/infinispan/container/versioning/EntryVersionsMap.java
+++ b/core/src/main/java/org/infinispan/container/versioning/EntryVersionsMap.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container.versioning;
 
 import java.util.HashMap;
diff --git a/core/src/main/java/org/infinispan/container/versioning/IncrementableEntryVersion.java b/core/src/main/java/org/infinispan/container/versioning/IncrementableEntryVersion.java
index b1fd2eb93b3d..4a61b0dd92db 100644
--- a/core/src/main/java/org/infinispan/container/versioning/IncrementableEntryVersion.java
+++ b/core/src/main/java/org/infinispan/container/versioning/IncrementableEntryVersion.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container.versioning;
 
 /**
diff --git a/core/src/main/java/org/infinispan/container/versioning/InequalVersionComparisonResult.java b/core/src/main/java/org/infinispan/container/versioning/InequalVersionComparisonResult.java
index 7da34a0135a7..c3cd2f326110 100644
--- a/core/src/main/java/org/infinispan/container/versioning/InequalVersionComparisonResult.java
+++ b/core/src/main/java/org/infinispan/container/versioning/InequalVersionComparisonResult.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container.versioning;
 
 /**
diff --git a/core/src/main/java/org/infinispan/container/versioning/NumericVersion.java b/core/src/main/java/org/infinispan/container/versioning/NumericVersion.java
index 4b1c0756828e..d5e7c20a0f88 100644
--- a/core/src/main/java/org/infinispan/container/versioning/NumericVersion.java
+++ b/core/src/main/java/org/infinispan/container/versioning/NumericVersion.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.container.versioning;
 
 import org.infinispan.commons.marshall.AbstractExternalizer;
diff --git a/core/src/main/java/org/infinispan/container/versioning/SimpleClusteredVersion.java b/core/src/main/java/org/infinispan/container/versioning/SimpleClusteredVersion.java
index 304d775e3a67..b7ad003368b2 100644
--- a/core/src/main/java/org/infinispan/container/versioning/SimpleClusteredVersion.java
+++ b/core/src/main/java/org/infinispan/container/versioning/SimpleClusteredVersion.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container.versioning;
 
 import net.jcip.annotations.Immutable;
diff --git a/core/src/main/java/org/infinispan/container/versioning/SimpleClusteredVersionGenerator.java b/core/src/main/java/org/infinispan/container/versioning/SimpleClusteredVersionGenerator.java
index 67e727b8c7e7..bea1c1fdeb0f 100644
--- a/core/src/main/java/org/infinispan/container/versioning/SimpleClusteredVersionGenerator.java
+++ b/core/src/main/java/org/infinispan/container/versioning/SimpleClusteredVersionGenerator.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container.versioning;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/container/versioning/VersionGenerator.java b/core/src/main/java/org/infinispan/container/versioning/VersionGenerator.java
index bd822babe732..ac8187159be5 100644
--- a/core/src/main/java/org/infinispan/container/versioning/VersionGenerator.java
+++ b/core/src/main/java/org/infinispan/container/versioning/VersionGenerator.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container.versioning;
 
 /**
diff --git a/core/src/main/java/org/infinispan/context/AbstractInvocationContextContainer.java b/core/src/main/java/org/infinispan/context/AbstractInvocationContextContainer.java
index 3c552cbf0010..9214367bc91b 100644
--- a/core/src/main/java/org/infinispan/context/AbstractInvocationContextContainer.java
+++ b/core/src/main/java/org/infinispan/context/AbstractInvocationContextContainer.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.context;
 
 import org.infinispan.commands.FlagAffectedCommand;
diff --git a/core/src/main/java/org/infinispan/context/EntryLookup.java b/core/src/main/java/org/infinispan/context/EntryLookup.java
index f5d77c24ca5a..a9039b4a682f 100644
--- a/core/src/main/java/org/infinispan/context/EntryLookup.java
+++ b/core/src/main/java/org/infinispan/context/EntryLookup.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.context;
 
 import org.infinispan.container.entries.CacheEntry;
diff --git a/core/src/main/java/org/infinispan/context/Flag.java b/core/src/main/java/org/infinispan/context/Flag.java
index 40b90c7d659f..f0a03504dc71 100644
--- a/core/src/main/java/org/infinispan/context/Flag.java
+++ b/core/src/main/java/org/infinispan/context/Flag.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.context;
 
 import java.io.IOException;
diff --git a/core/src/main/java/org/infinispan/context/FlagContainer.java b/core/src/main/java/org/infinispan/context/FlagContainer.java
index 8ebf35d80954..7921c9dc226d 100644
--- a/core/src/main/java/org/infinispan/context/FlagContainer.java
+++ b/core/src/main/java/org/infinispan/context/FlagContainer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.context;
 
 import java.util.Collection;
diff --git a/core/src/main/java/org/infinispan/context/InvocationContext.java b/core/src/main/java/org/infinispan/context/InvocationContext.java
index 9ed1deca9978..05be605a7d22 100644
--- a/core/src/main/java/org/infinispan/context/InvocationContext.java
+++ b/core/src/main/java/org/infinispan/context/InvocationContext.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.context;
 
 import java.util.Set;
diff --git a/core/src/main/java/org/infinispan/context/InvocationContextContainer.java b/core/src/main/java/org/infinispan/context/InvocationContextContainer.java
index a399e40c0931..d0909dd9dc35 100644
--- a/core/src/main/java/org/infinispan/context/InvocationContextContainer.java
+++ b/core/src/main/java/org/infinispan/context/InvocationContextContainer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.context;
 
 import org.infinispan.commands.VisitableCommand;
diff --git a/core/src/main/java/org/infinispan/context/NonTransactionalInvocationContextContainer.java b/core/src/main/java/org/infinispan/context/NonTransactionalInvocationContextContainer.java
index a45f8fb13e9e..ad9bd0f29249 100644
--- a/core/src/main/java/org/infinispan/context/NonTransactionalInvocationContextContainer.java
+++ b/core/src/main/java/org/infinispan/context/NonTransactionalInvocationContextContainer.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.context;
 
 import org.infinispan.configuration.cache.Configuration;
diff --git a/core/src/main/java/org/infinispan/context/SingleKeyNonTxInvocationContext.java b/core/src/main/java/org/infinispan/context/SingleKeyNonTxInvocationContext.java
index 7cadfe751a1d..e3a6afa8da4b 100644
--- a/core/src/main/java/org/infinispan/context/SingleKeyNonTxInvocationContext.java
+++ b/core/src/main/java/org/infinispan/context/SingleKeyNonTxInvocationContext.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.context;
 
 import org.infinispan.commons.equivalence.Equivalence;
diff --git a/core/src/main/java/org/infinispan/context/TransactionalInvocationContextContainer.java b/core/src/main/java/org/infinispan/context/TransactionalInvocationContextContainer.java
index e6c0b9a9f12e..167056b79fd0 100644
--- a/core/src/main/java/org/infinispan/context/TransactionalInvocationContextContainer.java
+++ b/core/src/main/java/org/infinispan/context/TransactionalInvocationContextContainer.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.context;
 
 import org.infinispan.batch.BatchContainer;
diff --git a/core/src/main/java/org/infinispan/context/impl/AbstractInvocationContext.java b/core/src/main/java/org/infinispan/context/impl/AbstractInvocationContext.java
index 0bb8b6458b44..07b28a2e1c34 100644
--- a/core/src/main/java/org/infinispan/context/impl/AbstractInvocationContext.java
+++ b/core/src/main/java/org/infinispan/context/impl/AbstractInvocationContext.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.context.impl;
 
 import org.infinispan.container.entries.CacheEntry;
diff --git a/core/src/main/java/org/infinispan/context/impl/AbstractTxInvocationContext.java b/core/src/main/java/org/infinispan/context/impl/AbstractTxInvocationContext.java
index 52557c8e1f96..38eaa4c7f947 100644
--- a/core/src/main/java/org/infinispan/context/impl/AbstractTxInvocationContext.java
+++ b/core/src/main/java/org/infinispan/context/impl/AbstractTxInvocationContext.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.context.impl;
 
 import javax.transaction.Transaction;
diff --git a/core/src/main/java/org/infinispan/context/impl/ImmutableContext.java b/core/src/main/java/org/infinispan/context/impl/ImmutableContext.java
index 3d3a366ca346..7ac516cd3482 100644
--- a/core/src/main/java/org/infinispan/context/impl/ImmutableContext.java
+++ b/core/src/main/java/org/infinispan/context/impl/ImmutableContext.java
@@ -1,22 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.context.impl;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/main/java/org/infinispan/context/impl/LocalTxInvocationContext.java b/core/src/main/java/org/infinispan/context/impl/LocalTxInvocationContext.java
index 4d9717377214..05e01ce71edb 100644
--- a/core/src/main/java/org/infinispan/context/impl/LocalTxInvocationContext.java
+++ b/core/src/main/java/org/infinispan/context/impl/LocalTxInvocationContext.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.context.impl;
 
 import org.infinispan.commands.write.WriteCommand;
diff --git a/core/src/main/java/org/infinispan/context/impl/NonTxInvocationContext.java b/core/src/main/java/org/infinispan/context/impl/NonTxInvocationContext.java
index aac95a23f206..8acb83d51ed3 100644
--- a/core/src/main/java/org/infinispan/context/impl/NonTxInvocationContext.java
+++ b/core/src/main/java/org/infinispan/context/impl/NonTxInvocationContext.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.context.impl;
 
 import org.infinispan.commons.equivalence.AnyEquivalence;
diff --git a/core/src/main/java/org/infinispan/context/impl/RemoteTxInvocationContext.java b/core/src/main/java/org/infinispan/context/impl/RemoteTxInvocationContext.java
index 8b79709e1041..913964c1fae8 100644
--- a/core/src/main/java/org/infinispan/context/impl/RemoteTxInvocationContext.java
+++ b/core/src/main/java/org/infinispan/context/impl/RemoteTxInvocationContext.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.context.impl;
 
 import org.infinispan.commands.write.WriteCommand;
diff --git a/core/src/main/java/org/infinispan/context/impl/TxInvocationContext.java b/core/src/main/java/org/infinispan/context/impl/TxInvocationContext.java
index c5e62155daea..e76080aac50b 100644
--- a/core/src/main/java/org/infinispan/context/impl/TxInvocationContext.java
+++ b/core/src/main/java/org/infinispan/context/impl/TxInvocationContext.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.context.impl;
 
 import org.infinispan.commands.write.WriteCommand;
diff --git a/core/src/main/java/org/infinispan/context/impl/package-info.java b/core/src/main/java/org/infinispan/context/impl/package-info.java
index 2bfd1a974eb3..ad34e59f4dbf 100644
--- a/core/src/main/java/org/infinispan/context/impl/package-info.java
+++ b/core/src/main/java/org/infinispan/context/impl/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * This package contains different context implementations, selected dynamically based on the type of invocation.
  */
diff --git a/core/src/main/java/org/infinispan/context/package-info.java b/core/src/main/java/org/infinispan/context/package-info.java
index 79f783ee70c3..db853148e598 100644
--- a/core/src/main/java/org/infinispan/context/package-info.java
+++ b/core/src/main/java/org/infinispan/context/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Contexts contain information of a specific invocation on the cache, such as its origins, scope
  * (transactional or non-transactional), as well as invocation-specific flags.
diff --git a/core/src/main/java/org/infinispan/distexec/DefaultExecutorService.java b/core/src/main/java/org/infinispan/distexec/DefaultExecutorService.java
index 611864a4af90..ee09f8981694 100644
--- a/core/src/main/java/org/infinispan/distexec/DefaultExecutorService.java
+++ b/core/src/main/java/org/infinispan/distexec/DefaultExecutorService.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec;
 
 import static org.infinispan.factories.KnownComponentNames.CACHE_MARSHALLER;
diff --git a/core/src/main/java/org/infinispan/distexec/DistributedCallable.java b/core/src/main/java/org/infinispan/distexec/DistributedCallable.java
index 19891a9f55fd..f90534d1659d 100644
--- a/core/src/main/java/org/infinispan/distexec/DistributedCallable.java
+++ b/core/src/main/java/org/infinispan/distexec/DistributedCallable.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec;
 
 import java.util.Set;
diff --git a/core/src/main/java/org/infinispan/distexec/DistributedExecutionCompletionService.java b/core/src/main/java/org/infinispan/distexec/DistributedExecutionCompletionService.java
index c1cd60665286..b2b236f72516 100644
--- a/core/src/main/java/org/infinispan/distexec/DistributedExecutionCompletionService.java
+++ b/core/src/main/java/org/infinispan/distexec/DistributedExecutionCompletionService.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec;
 
 import java.util.Comparator;
diff --git a/core/src/main/java/org/infinispan/distexec/DistributedExecutorService.java b/core/src/main/java/org/infinispan/distexec/DistributedExecutorService.java
index 37cfb210058b..81a0e2ffc313 100644
--- a/core/src/main/java/org/infinispan/distexec/DistributedExecutorService.java
+++ b/core/src/main/java/org/infinispan/distexec/DistributedExecutorService.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec;
 
 import java.io.Externalizable;
diff --git a/core/src/main/java/org/infinispan/distexec/DistributedTask.java b/core/src/main/java/org/infinispan/distexec/DistributedTask.java
index 588e61c34d63..273eca087cbc 100644
--- a/core/src/main/java/org/infinispan/distexec/DistributedTask.java
+++ b/core/src/main/java/org/infinispan/distexec/DistributedTask.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.distexec;
 
 import java.util.concurrent.Callable;
diff --git a/core/src/main/java/org/infinispan/distexec/DistributedTaskBuilder.java b/core/src/main/java/org/infinispan/distexec/DistributedTaskBuilder.java
index 6a8448a1bf1d..4146ad6898ea 100644
--- a/core/src/main/java/org/infinispan/distexec/DistributedTaskBuilder.java
+++ b/core/src/main/java/org/infinispan/distexec/DistributedTaskBuilder.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.distexec;
 
 import java.util.concurrent.Callable;
diff --git a/core/src/main/java/org/infinispan/distexec/DistributedTaskExecutionPolicy.java b/core/src/main/java/org/infinispan/distexec/DistributedTaskExecutionPolicy.java
index 545b4003e3c5..88d1546f6f04 100644
--- a/core/src/main/java/org/infinispan/distexec/DistributedTaskExecutionPolicy.java
+++ b/core/src/main/java/org/infinispan/distexec/DistributedTaskExecutionPolicy.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.distexec;
 
 /**
diff --git a/core/src/main/java/org/infinispan/distexec/DistributedTaskFailoverPolicy.java b/core/src/main/java/org/infinispan/distexec/DistributedTaskFailoverPolicy.java
index bf1841bd7406..b63f58142903 100644
--- a/core/src/main/java/org/infinispan/distexec/DistributedTaskFailoverPolicy.java
+++ b/core/src/main/java/org/infinispan/distexec/DistributedTaskFailoverPolicy.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.distexec;
 
 import org.infinispan.remoting.transport.Address;
diff --git a/core/src/main/java/org/infinispan/distexec/FailoverContext.java b/core/src/main/java/org/infinispan/distexec/FailoverContext.java
index fdee8b8d3e9d..4edad1a34789 100644
--- a/core/src/main/java/org/infinispan/distexec/FailoverContext.java
+++ b/core/src/main/java/org/infinispan/distexec/FailoverContext.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.distexec;
 
 import java.util.List;
diff --git a/core/src/main/java/org/infinispan/distexec/mapreduce/Collator.java b/core/src/main/java/org/infinispan/distexec/mapreduce/Collator.java
index 8875bcd799ec..71c14da0f403 100644
--- a/core/src/main/java/org/infinispan/distexec/mapreduce/Collator.java
+++ b/core/src/main/java/org/infinispan/distexec/mapreduce/Collator.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec.mapreduce;
 
 import java.util.Map;
diff --git a/core/src/main/java/org/infinispan/distexec/mapreduce/Collector.java b/core/src/main/java/org/infinispan/distexec/mapreduce/Collector.java
index 99f1804efe7e..b177d60f4cd8 100644
--- a/core/src/main/java/org/infinispan/distexec/mapreduce/Collector.java
+++ b/core/src/main/java/org/infinispan/distexec/mapreduce/Collector.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec.mapreduce;
 
 /**
diff --git a/core/src/main/java/org/infinispan/distexec/mapreduce/MapReduceManager.java b/core/src/main/java/org/infinispan/distexec/mapreduce/MapReduceManager.java
index 87d00f38e024..0a9ea1376904 100644
--- a/core/src/main/java/org/infinispan/distexec/mapreduce/MapReduceManager.java
+++ b/core/src/main/java/org/infinispan/distexec/mapreduce/MapReduceManager.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.distexec.mapreduce;
 
 import java.util.Collection;
diff --git a/core/src/main/java/org/infinispan/distexec/mapreduce/MapReduceManagerFactory.java b/core/src/main/java/org/infinispan/distexec/mapreduce/MapReduceManagerFactory.java
index 5748891e414c..e039eb9d519c 100644
--- a/core/src/main/java/org/infinispan/distexec/mapreduce/MapReduceManagerFactory.java
+++ b/core/src/main/java/org/infinispan/distexec/mapreduce/MapReduceManagerFactory.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.distexec.mapreduce;
 
 import org.infinispan.factories.AbstractNamedCacheComponentFactory;
diff --git a/core/src/main/java/org/infinispan/distexec/mapreduce/MapReduceManagerImpl.java b/core/src/main/java/org/infinispan/distexec/mapreduce/MapReduceManagerImpl.java
index 2e004bc23141..675cf90ee71e 100644
--- a/core/src/main/java/org/infinispan/distexec/mapreduce/MapReduceManagerImpl.java
+++ b/core/src/main/java/org/infinispan/distexec/mapreduce/MapReduceManagerImpl.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.distexec.mapreduce;
 
 import static org.infinispan.distexec.mapreduce.MapReduceTask.DEFAULT_TMP_CACHE_CONFIGURATION_NAME;
diff --git a/core/src/main/java/org/infinispan/distexec/mapreduce/MapReduceTask.java b/core/src/main/java/org/infinispan/distexec/mapreduce/MapReduceTask.java
index 4749f39a3ab5..b3289584d2a9 100644
--- a/core/src/main/java/org/infinispan/distexec/mapreduce/MapReduceTask.java
+++ b/core/src/main/java/org/infinispan/distexec/mapreduce/MapReduceTask.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec.mapreduce;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/main/java/org/infinispan/distexec/mapreduce/Mapper.java b/core/src/main/java/org/infinispan/distexec/mapreduce/Mapper.java
index 27e94e746ca9..75860e9792a3 100644
--- a/core/src/main/java/org/infinispan/distexec/mapreduce/Mapper.java
+++ b/core/src/main/java/org/infinispan/distexec/mapreduce/Mapper.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec.mapreduce;
 
 import java.io.Serializable;
diff --git a/core/src/main/java/org/infinispan/distexec/mapreduce/Reducer.java b/core/src/main/java/org/infinispan/distexec/mapreduce/Reducer.java
index 1c8bec543c86..258c9800e40f 100644
--- a/core/src/main/java/org/infinispan/distexec/mapreduce/Reducer.java
+++ b/core/src/main/java/org/infinispan/distexec/mapreduce/Reducer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec.mapreduce;
 
 import java.io.Serializable;
diff --git a/core/src/main/java/org/infinispan/distexec/mapreduce/spi/DefaultMapReduceTaskLifecycle.java b/core/src/main/java/org/infinispan/distexec/mapreduce/spi/DefaultMapReduceTaskLifecycle.java
index 15a44231ce57..156be1632d9b 100644
--- a/core/src/main/java/org/infinispan/distexec/mapreduce/spi/DefaultMapReduceTaskLifecycle.java
+++ b/core/src/main/java/org/infinispan/distexec/mapreduce/spi/DefaultMapReduceTaskLifecycle.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.distexec.mapreduce.spi;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/distexec/mapreduce/spi/MapReduceTaskLifecycle.java b/core/src/main/java/org/infinispan/distexec/mapreduce/spi/MapReduceTaskLifecycle.java
index 477df3fab324..7cfa15fb8ec3 100644
--- a/core/src/main/java/org/infinispan/distexec/mapreduce/spi/MapReduceTaskLifecycle.java
+++ b/core/src/main/java/org/infinispan/distexec/mapreduce/spi/MapReduceTaskLifecycle.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.distexec.mapreduce.spi;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/distexec/mapreduce/spi/MapReduceTaskLifecycleService.java b/core/src/main/java/org/infinispan/distexec/mapreduce/spi/MapReduceTaskLifecycleService.java
index c2b0846cf47a..6d89ac451c5b 100644
--- a/core/src/main/java/org/infinispan/distexec/mapreduce/spi/MapReduceTaskLifecycleService.java
+++ b/core/src/main/java/org/infinispan/distexec/mapreduce/spi/MapReduceTaskLifecycleService.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.distexec.mapreduce.spi;
 
 import java.io.IOException;
diff --git a/core/src/main/java/org/infinispan/distexec/spi/DefaultDistributedTaskLifecycle.java b/core/src/main/java/org/infinispan/distexec/spi/DefaultDistributedTaskLifecycle.java
index b5491b6a564d..576e5c1c4ab7 100644
--- a/core/src/main/java/org/infinispan/distexec/spi/DefaultDistributedTaskLifecycle.java
+++ b/core/src/main/java/org/infinispan/distexec/spi/DefaultDistributedTaskLifecycle.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.distexec.spi;
 
 import java.util.concurrent.Callable;
diff --git a/core/src/main/java/org/infinispan/distexec/spi/DistributedTaskLifecycle.java b/core/src/main/java/org/infinispan/distexec/spi/DistributedTaskLifecycle.java
index 39dce0a9b576..10db9ec39640 100644
--- a/core/src/main/java/org/infinispan/distexec/spi/DistributedTaskLifecycle.java
+++ b/core/src/main/java/org/infinispan/distexec/spi/DistributedTaskLifecycle.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.distexec.spi;
 
 import java.util.concurrent.Callable;
diff --git a/core/src/main/java/org/infinispan/distexec/spi/DistributedTaskLifecycleService.java b/core/src/main/java/org/infinispan/distexec/spi/DistributedTaskLifecycleService.java
index aee684ec8585..4f5b1e3e2018 100644
--- a/core/src/main/java/org/infinispan/distexec/spi/DistributedTaskLifecycleService.java
+++ b/core/src/main/java/org/infinispan/distexec/spi/DistributedTaskLifecycleService.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.distexec.spi;
 
 import java.io.IOException;
diff --git a/core/src/main/java/org/infinispan/distribution/DataLocality.java b/core/src/main/java/org/infinispan/distribution/DataLocality.java
index 3d228806b2bd..2ce91f6d4358 100644
--- a/core/src/main/java/org/infinispan/distribution/DataLocality.java
+++ b/core/src/main/java/org/infinispan/distribution/DataLocality.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 /**
diff --git a/core/src/main/java/org/infinispan/distribution/DistributionManager.java b/core/src/main/java/org/infinispan/distribution/DistributionManager.java
index 39cb43e893c5..828c8d2b5959 100644
--- a/core/src/main/java/org/infinispan/distribution/DistributionManager.java
+++ b/core/src/main/java/org/infinispan/distribution/DistributionManager.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.distribution.ch.ConsistentHash;
diff --git a/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java b/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java
index bf5fcc5b7921..334426ae2075 100644
--- a/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java
+++ b/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.distribution.ch.ConsistentHash;
diff --git a/core/src/main/java/org/infinispan/distribution/L1Manager.java b/core/src/main/java/org/infinispan/distribution/L1Manager.java
index 2e9b0ef5345e..876a9add6294 100644
--- a/core/src/main/java/org/infinispan/distribution/L1Manager.java
+++ b/core/src/main/java/org/infinispan/distribution/L1Manager.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.factories.scopes.Scope;
diff --git a/core/src/main/java/org/infinispan/distribution/L1ManagerImpl.java b/core/src/main/java/org/infinispan/distribution/L1ManagerImpl.java
index 49f9327e5c8c..a369f98786ec 100644
--- a/core/src/main/java/org/infinispan/distribution/L1ManagerImpl.java
+++ b/core/src/main/java/org/infinispan/distribution/L1ManagerImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.commands.CommandsFactory;
diff --git a/core/src/main/java/org/infinispan/distribution/ch/ConsistentHash.java b/core/src/main/java/org/infinispan/distribution/ch/ConsistentHash.java
index fa974066d869..5e0c6ce745d7 100644
--- a/core/src/main/java/org/infinispan/distribution/ch/ConsistentHash.java
+++ b/core/src/main/java/org/infinispan/distribution/ch/ConsistentHash.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.distribution.ch;
 
 import org.infinispan.commons.hash.Hash;
diff --git a/core/src/main/java/org/infinispan/distribution/ch/ConsistentHashFactory.java b/core/src/main/java/org/infinispan/distribution/ch/ConsistentHashFactory.java
index e729d382c5a8..0215a74ba072 100644
--- a/core/src/main/java/org/infinispan/distribution/ch/ConsistentHashFactory.java
+++ b/core/src/main/java/org/infinispan/distribution/ch/ConsistentHashFactory.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.distribution.ch;
 
 import java.util.List;
diff --git a/core/src/main/java/org/infinispan/distribution/ch/DefaultConsistentHash.java b/core/src/main/java/org/infinispan/distribution/ch/DefaultConsistentHash.java
index 1b673749b602..f967420f2038 100644
--- a/core/src/main/java/org/infinispan/distribution/ch/DefaultConsistentHash.java
+++ b/core/src/main/java/org/infinispan/distribution/ch/DefaultConsistentHash.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.distribution.ch;
 
 import java.io.IOException;
diff --git a/core/src/main/java/org/infinispan/distribution/ch/DefaultConsistentHashFactory.java b/core/src/main/java/org/infinispan/distribution/ch/DefaultConsistentHashFactory.java
index ea001919f30a..6695ea262174 100644
--- a/core/src/main/java/org/infinispan/distribution/ch/DefaultConsistentHashFactory.java
+++ b/core/src/main/java/org/infinispan/distribution/ch/DefaultConsistentHashFactory.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.distribution.ch;
 
 import java.io.IOException;
diff --git a/core/src/main/java/org/infinispan/distribution/ch/OwnershipStatistics.java b/core/src/main/java/org/infinispan/distribution/ch/OwnershipStatistics.java
index 67387f08ed9d..35f51b05315b 100644
--- a/core/src/main/java/org/infinispan/distribution/ch/OwnershipStatistics.java
+++ b/core/src/main/java/org/infinispan/distribution/ch/OwnershipStatistics.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.distribution.ch;
 
 import java.util.Arrays;
diff --git a/core/src/main/java/org/infinispan/distribution/ch/ReplicatedConsistentHash.java b/core/src/main/java/org/infinispan/distribution/ch/ReplicatedConsistentHash.java
index 8d4d8e28db91..3400a056ebfa 100644
--- a/core/src/main/java/org/infinispan/distribution/ch/ReplicatedConsistentHash.java
+++ b/core/src/main/java/org/infinispan/distribution/ch/ReplicatedConsistentHash.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.distribution.ch;
 
 import org.infinispan.commons.hash.Hash;
diff --git a/core/src/main/java/org/infinispan/distribution/ch/ReplicatedConsistentHashFactory.java b/core/src/main/java/org/infinispan/distribution/ch/ReplicatedConsistentHashFactory.java
index 36371cc6f065..d4713f5677ca 100644
--- a/core/src/main/java/org/infinispan/distribution/ch/ReplicatedConsistentHashFactory.java
+++ b/core/src/main/java/org/infinispan/distribution/ch/ReplicatedConsistentHashFactory.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.distribution.ch;
 
 import org.infinispan.commons.hash.Hash;
diff --git a/core/src/main/java/org/infinispan/distribution/ch/SyncConsistentHashFactory.java b/core/src/main/java/org/infinispan/distribution/ch/SyncConsistentHashFactory.java
index 812f1ad33827..56cb78066a1e 100644
--- a/core/src/main/java/org/infinispan/distribution/ch/SyncConsistentHashFactory.java
+++ b/core/src/main/java/org/infinispan/distribution/ch/SyncConsistentHashFactory.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.distribution.ch;
 
 import java.io.ObjectInput;
diff --git a/core/src/main/java/org/infinispan/distribution/ch/TopologyAwareConsistentHashFactory.java b/core/src/main/java/org/infinispan/distribution/ch/TopologyAwareConsistentHashFactory.java
index 763c2eb56885..cc31ca29f60c 100644
--- a/core/src/main/java/org/infinispan/distribution/ch/TopologyAwareConsistentHashFactory.java
+++ b/core/src/main/java/org/infinispan/distribution/ch/TopologyAwareConsistentHashFactory.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.distribution.ch;
 
 import java.io.ObjectInput;
diff --git a/core/src/main/java/org/infinispan/distribution/ch/TopologyAwareSyncConsistentHashFactory.java b/core/src/main/java/org/infinispan/distribution/ch/TopologyAwareSyncConsistentHashFactory.java
index 49553a708302..94eb40d1a98e 100644
--- a/core/src/main/java/org/infinispan/distribution/ch/TopologyAwareSyncConsistentHashFactory.java
+++ b/core/src/main/java/org/infinispan/distribution/ch/TopologyAwareSyncConsistentHashFactory.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.distribution.ch;
 
 import java.io.ObjectInput;
diff --git a/core/src/main/java/org/infinispan/distribution/group/GroupManagerFactory.java b/core/src/main/java/org/infinispan/distribution/group/GroupManagerFactory.java
index f1273390056a..f043b40657a7 100644
--- a/core/src/main/java/org/infinispan/distribution/group/GroupManagerFactory.java
+++ b/core/src/main/java/org/infinispan/distribution/group/GroupManagerFactory.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.distribution.group;
 
 import org.infinispan.configuration.cache.GroupsConfiguration;
diff --git a/core/src/main/java/org/infinispan/distribution/group/GroupingConsistentHash.java b/core/src/main/java/org/infinispan/distribution/group/GroupingConsistentHash.java
index bc98719a7140..267eead88203 100644
--- a/core/src/main/java/org/infinispan/distribution/group/GroupingConsistentHash.java
+++ b/core/src/main/java/org/infinispan/distribution/group/GroupingConsistentHash.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.distribution.group;
 
 import org.infinispan.commons.hash.Hash;
diff --git a/core/src/main/java/org/infinispan/distribution/package-info.java b/core/src/main/java/org/infinispan/distribution/package-info.java
index 1e82a09d7cef..7bcd77baf861 100644
--- a/core/src/main/java/org/infinispan/distribution/package-info.java
+++ b/core/src/main/java/org/infinispan/distribution/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Classes relating to the distributed cache mode.
  */
diff --git a/core/src/main/java/org/infinispan/distribution/topologyaware/TopologyInfo.java b/core/src/main/java/org/infinispan/distribution/topologyaware/TopologyInfo.java
index d04f2bd29367..b0d3f2b8f957 100644
--- a/core/src/main/java/org/infinispan/distribution/topologyaware/TopologyInfo.java
+++ b/core/src/main/java/org/infinispan/distribution/topologyaware/TopologyInfo.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.topologyaware;
 
 import java.util.ArrayList;
diff --git a/core/src/main/java/org/infinispan/distribution/topologyaware/TopologyLevel.java b/core/src/main/java/org/infinispan/distribution/topologyaware/TopologyLevel.java
index 83408dc50fc3..ab6b4b8f27ab 100644
--- a/core/src/main/java/org/infinispan/distribution/topologyaware/TopologyLevel.java
+++ b/core/src/main/java/org/infinispan/distribution/topologyaware/TopologyLevel.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.distribution.topologyaware;
 
 /**
diff --git a/core/src/main/java/org/infinispan/eviction/ActivationManager.java b/core/src/main/java/org/infinispan/eviction/ActivationManager.java
index 0fb0b72d8eb1..a36be4c71b2e 100644
--- a/core/src/main/java/org/infinispan/eviction/ActivationManager.java
+++ b/core/src/main/java/org/infinispan/eviction/ActivationManager.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.eviction;
 
 import org.infinispan.factories.scopes.Scope;
diff --git a/core/src/main/java/org/infinispan/eviction/ActivationManagerImpl.java b/core/src/main/java/org/infinispan/eviction/ActivationManagerImpl.java
index bc9519c61f10..dd44ab6b541f 100644
--- a/core/src/main/java/org/infinispan/eviction/ActivationManagerImpl.java
+++ b/core/src/main/java/org/infinispan/eviction/ActivationManagerImpl.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.eviction;
 
 import org.infinispan.commons.CacheConfigurationException;
diff --git a/core/src/main/java/org/infinispan/eviction/EvictionManager.java b/core/src/main/java/org/infinispan/eviction/EvictionManager.java
index 69018fff6d6b..f7faafeee363 100644
--- a/core/src/main/java/org/infinispan/eviction/EvictionManager.java
+++ b/core/src/main/java/org/infinispan/eviction/EvictionManager.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.eviction;
 
 import java.util.Map;
diff --git a/core/src/main/java/org/infinispan/eviction/EvictionManagerImpl.java b/core/src/main/java/org/infinispan/eviction/EvictionManagerImpl.java
index 54b79dd6cff2..5ce9d82e63d9 100644
--- a/core/src/main/java/org/infinispan/eviction/EvictionManagerImpl.java
+++ b/core/src/main/java/org/infinispan/eviction/EvictionManagerImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.eviction;
 
 import net.jcip.annotations.ThreadSafe;
diff --git a/core/src/main/java/org/infinispan/eviction/EvictionStrategy.java b/core/src/main/java/org/infinispan/eviction/EvictionStrategy.java
index 0051b071c06e..e8471514c6dc 100644
--- a/core/src/main/java/org/infinispan/eviction/EvictionStrategy.java
+++ b/core/src/main/java/org/infinispan/eviction/EvictionStrategy.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.eviction;
 
 /**
diff --git a/core/src/main/java/org/infinispan/eviction/EvictionThreadPolicy.java b/core/src/main/java/org/infinispan/eviction/EvictionThreadPolicy.java
index 784e03174e03..7b466ca425a7 100644
--- a/core/src/main/java/org/infinispan/eviction/EvictionThreadPolicy.java
+++ b/core/src/main/java/org/infinispan/eviction/EvictionThreadPolicy.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.eviction;
 
 /**
diff --git a/core/src/main/java/org/infinispan/eviction/PassivationManager.java b/core/src/main/java/org/infinispan/eviction/PassivationManager.java
index d509a2aa90ae..92c83847e44d 100644
--- a/core/src/main/java/org/infinispan/eviction/PassivationManager.java
+++ b/core/src/main/java/org/infinispan/eviction/PassivationManager.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.eviction;
 
 import net.jcip.annotations.ThreadSafe;
diff --git a/core/src/main/java/org/infinispan/eviction/PassivationManagerImpl.java b/core/src/main/java/org/infinispan/eviction/PassivationManagerImpl.java
index 65eb6be82254..f34c94ec6959 100644
--- a/core/src/main/java/org/infinispan/eviction/PassivationManagerImpl.java
+++ b/core/src/main/java/org/infinispan/eviction/PassivationManagerImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.eviction;
 
 import org.infinispan.commons.util.Util;
diff --git a/core/src/main/java/org/infinispan/eviction/package-info.java b/core/src/main/java/org/infinispan/eviction/package-info.java
index cf3fb6d081b8..17ecb1446d64 100644
--- a/core/src/main/java/org/infinispan/eviction/package-info.java
+++ b/core/src/main/java/org/infinispan/eviction/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Classes related to eviction.
  * Need @XmlSchema annotation for EvictionStrategy.java
diff --git a/core/src/main/java/org/infinispan/executors/DefaultExecutorFactory.java b/core/src/main/java/org/infinispan/executors/DefaultExecutorFactory.java
index c33d01038664..45c295cad503 100644
--- a/core/src/main/java/org/infinispan/executors/DefaultExecutorFactory.java
+++ b/core/src/main/java/org/infinispan/executors/DefaultExecutorFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.executors;
 
 import org.infinispan.commons.executors.ExecutorFactory;
diff --git a/core/src/main/java/org/infinispan/executors/DefaultScheduledExecutorFactory.java b/core/src/main/java/org/infinispan/executors/DefaultScheduledExecutorFactory.java
index d28791c07750..7e999c346219 100644
--- a/core/src/main/java/org/infinispan/executors/DefaultScheduledExecutorFactory.java
+++ b/core/src/main/java/org/infinispan/executors/DefaultScheduledExecutorFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.executors;
 
 import org.infinispan.commons.util.TypedProperties;
diff --git a/core/src/main/java/org/infinispan/executors/LazyInitializingBlockingTaskAwareExecutorService.java b/core/src/main/java/org/infinispan/executors/LazyInitializingBlockingTaskAwareExecutorService.java
index 1803af9abdee..fffd127d7b65 100644
--- a/core/src/main/java/org/infinispan/executors/LazyInitializingBlockingTaskAwareExecutorService.java
+++ b/core/src/main/java/org/infinispan/executors/LazyInitializingBlockingTaskAwareExecutorService.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.executors;
 
 import org.infinispan.commons.executors.ExecutorFactory;
diff --git a/core/src/main/java/org/infinispan/executors/LazyInitializingExecutorService.java b/core/src/main/java/org/infinispan/executors/LazyInitializingExecutorService.java
index 6b2bebe39aa5..e209f00d5aca 100644
--- a/core/src/main/java/org/infinispan/executors/LazyInitializingExecutorService.java
+++ b/core/src/main/java/org/infinispan/executors/LazyInitializingExecutorService.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.executors;
 
 import org.infinispan.commons.executors.ExecutorFactory;
diff --git a/core/src/main/java/org/infinispan/executors/LazyInitializingScheduledExecutorService.java b/core/src/main/java/org/infinispan/executors/LazyInitializingScheduledExecutorService.java
index 93b6d074fa49..9c6e5238fd64 100644
--- a/core/src/main/java/org/infinispan/executors/LazyInitializingScheduledExecutorService.java
+++ b/core/src/main/java/org/infinispan/executors/LazyInitializingScheduledExecutorService.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.executors;
 
 import org.infinispan.commons.util.InfinispanCollections;
diff --git a/core/src/main/java/org/infinispan/executors/ScheduledExecutorFactory.java b/core/src/main/java/org/infinispan/executors/ScheduledExecutorFactory.java
index 6cb9fcb8356b..6c28eebb4a45 100644
--- a/core/src/main/java/org/infinispan/executors/ScheduledExecutorFactory.java
+++ b/core/src/main/java/org/infinispan/executors/ScheduledExecutorFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.executors;
 
 import java.util.Properties;
diff --git a/core/src/main/java/org/infinispan/executors/WithinThreadExecutorFactory.java b/core/src/main/java/org/infinispan/executors/WithinThreadExecutorFactory.java
index b5944bbd7007..b88aa0cc0c4a 100644
--- a/core/src/main/java/org/infinispan/executors/WithinThreadExecutorFactory.java
+++ b/core/src/main/java/org/infinispan/executors/WithinThreadExecutorFactory.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.executors;
 
 import org.infinispan.commons.executors.ExecutorFactory;
diff --git a/core/src/main/java/org/infinispan/executors/package-info.java b/core/src/main/java/org/infinispan/executors/package-info.java
index d5aaf3f44af3..8a8847c59108 100644
--- a/core/src/main/java/org/infinispan/executors/package-info.java
+++ b/core/src/main/java/org/infinispan/executors/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Implementations of different executors used for asynchronous operation.
  */
diff --git a/core/src/main/java/org/infinispan/factories/AbstractComponentFactory.java b/core/src/main/java/org/infinispan/factories/AbstractComponentFactory.java
index 993214915344..44c59abb4adf 100644
--- a/core/src/main/java/org/infinispan/factories/AbstractComponentFactory.java
+++ b/core/src/main/java/org/infinispan/factories/AbstractComponentFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories;
 
 import org.infinispan.commons.CacheConfigurationException;
diff --git a/core/src/main/java/org/infinispan/factories/AbstractComponentRegistry.java b/core/src/main/java/org/infinispan/factories/AbstractComponentRegistry.java
index bcc0b143ff6e..ce9623e264a8 100644
--- a/core/src/main/java/org/infinispan/factories/AbstractComponentRegistry.java
+++ b/core/src/main/java/org/infinispan/factories/AbstractComponentRegistry.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/main/java/org/infinispan/factories/AbstractNamedCacheComponentFactory.java b/core/src/main/java/org/infinispan/factories/AbstractNamedCacheComponentFactory.java
index 19d1d3d649de..ea7e618d526c 100644
--- a/core/src/main/java/org/infinispan/factories/AbstractNamedCacheComponentFactory.java
+++ b/core/src/main/java/org/infinispan/factories/AbstractNamedCacheComponentFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories;
 
 import org.infinispan.configuration.cache.Configuration;
diff --git a/core/src/main/java/org/infinispan/factories/AutoInstantiableFactory.java b/core/src/main/java/org/infinispan/factories/AutoInstantiableFactory.java
index dc199f1d3575..e7c9f4729b32 100644
--- a/core/src/main/java/org/infinispan/factories/AutoInstantiableFactory.java
+++ b/core/src/main/java/org/infinispan/factories/AutoInstantiableFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories;
 
 /**
diff --git a/core/src/main/java/org/infinispan/factories/BootstrapFactory.java b/core/src/main/java/org/infinispan/factories/BootstrapFactory.java
index 2ba38b809bee..554b8027d857 100644
--- a/core/src/main/java/org/infinispan/factories/BootstrapFactory.java
+++ b/core/src/main/java/org/infinispan/factories/BootstrapFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/main/java/org/infinispan/factories/ComponentRegistry.java b/core/src/main/java/org/infinispan/factories/ComponentRegistry.java
index b4b69559d961..4316db3e644d 100644
--- a/core/src/main/java/org/infinispan/factories/ComponentRegistry.java
+++ b/core/src/main/java/org/infinispan/factories/ComponentRegistry.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/main/java/org/infinispan/factories/DataContainerFactory.java b/core/src/main/java/org/infinispan/factories/DataContainerFactory.java
index 7db521195b22..0d75b295042b 100644
--- a/core/src/main/java/org/infinispan/factories/DataContainerFactory.java
+++ b/core/src/main/java/org/infinispan/factories/DataContainerFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories;
 
 import org.infinispan.commons.equivalence.AnyEquivalence;
diff --git a/core/src/main/java/org/infinispan/factories/DistributionManagerFactory.java b/core/src/main/java/org/infinispan/factories/DistributionManagerFactory.java
index ca684eeb52ba..147fb20909bc 100644
--- a/core/src/main/java/org/infinispan/factories/DistributionManagerFactory.java
+++ b/core/src/main/java/org/infinispan/factories/DistributionManagerFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories;
 
 import org.infinispan.distribution.DistributionManager;
diff --git a/core/src/main/java/org/infinispan/factories/EmptyConstructorFactory.java b/core/src/main/java/org/infinispan/factories/EmptyConstructorFactory.java
index 27ba60ac4f1a..d9fbca3bcbaa 100644
--- a/core/src/main/java/org/infinispan/factories/EmptyConstructorFactory.java
+++ b/core/src/main/java/org/infinispan/factories/EmptyConstructorFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories;
 
 import org.infinispan.commands.CancellationService;
diff --git a/core/src/main/java/org/infinispan/factories/EmptyConstructorNamedCacheFactory.java b/core/src/main/java/org/infinispan/factories/EmptyConstructorNamedCacheFactory.java
index 14c63a2d601e..26caf810878c 100644
--- a/core/src/main/java/org/infinispan/factories/EmptyConstructorNamedCacheFactory.java
+++ b/core/src/main/java/org/infinispan/factories/EmptyConstructorNamedCacheFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories;
 
 
diff --git a/core/src/main/java/org/infinispan/factories/EntryMetaFactory.java b/core/src/main/java/org/infinispan/factories/EntryMetaFactory.java
index 4d2f36d14e84..b66353617aaa 100644
--- a/core/src/main/java/org/infinispan/factories/EntryMetaFactory.java
+++ b/core/src/main/java/org/infinispan/factories/EntryMetaFactory.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.factories;
 
 import org.infinispan.container.EntryFactory;
diff --git a/core/src/main/java/org/infinispan/factories/GlobalComponentRegistry.java b/core/src/main/java/org/infinispan/factories/GlobalComponentRegistry.java
index 447662917241..f8e90695f182 100644
--- a/core/src/main/java/org/infinispan/factories/GlobalComponentRegistry.java
+++ b/core/src/main/java/org/infinispan/factories/GlobalComponentRegistry.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories;
 
 import net.jcip.annotations.ThreadSafe;
diff --git a/core/src/main/java/org/infinispan/factories/InterceptorChainFactory.java b/core/src/main/java/org/infinispan/factories/InterceptorChainFactory.java
index 1f08db368a0b..a86d4b5d76c6 100644
--- a/core/src/main/java/org/infinispan/factories/InterceptorChainFactory.java
+++ b/core/src/main/java/org/infinispan/factories/InterceptorChainFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories;
 
 
diff --git a/core/src/main/java/org/infinispan/factories/InternalCacheFactory.java b/core/src/main/java/org/infinispan/factories/InternalCacheFactory.java
index 4df3b52cfdce..3ba908b382fd 100644
--- a/core/src/main/java/org/infinispan/factories/InternalCacheFactory.java
+++ b/core/src/main/java/org/infinispan/factories/InternalCacheFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/main/java/org/infinispan/factories/KnownComponentNames.java b/core/src/main/java/org/infinispan/factories/KnownComponentNames.java
index 538b85da0e13..146257b005ac 100644
--- a/core/src/main/java/org/infinispan/factories/KnownComponentNames.java
+++ b/core/src/main/java/org/infinispan/factories/KnownComponentNames.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories;
 
 import java.util.Arrays;
diff --git a/core/src/main/java/org/infinispan/factories/LockManagerFactory.java b/core/src/main/java/org/infinispan/factories/LockManagerFactory.java
index 60e0534cd7c4..f84ac92b32f8 100644
--- a/core/src/main/java/org/infinispan/factories/LockManagerFactory.java
+++ b/core/src/main/java/org/infinispan/factories/LockManagerFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories;
 
 import org.infinispan.factories.annotations.DefaultFactoryFor;
diff --git a/core/src/main/java/org/infinispan/factories/MarshallerFactory.java b/core/src/main/java/org/infinispan/factories/MarshallerFactory.java
index 9a4ea03061b6..5de67075f2b6 100644
--- a/core/src/main/java/org/infinispan/factories/MarshallerFactory.java
+++ b/core/src/main/java/org/infinispan/factories/MarshallerFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories;
 
 import org.infinispan.factories.annotations.DefaultFactoryFor;
diff --git a/core/src/main/java/org/infinispan/factories/NamedComponentFactory.java b/core/src/main/java/org/infinispan/factories/NamedComponentFactory.java
index f369af912b94..a2cea3d90825 100644
--- a/core/src/main/java/org/infinispan/factories/NamedComponentFactory.java
+++ b/core/src/main/java/org/infinispan/factories/NamedComponentFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories;
 
 /**
diff --git a/core/src/main/java/org/infinispan/factories/NamedExecutorsFactory.java b/core/src/main/java/org/infinispan/factories/NamedExecutorsFactory.java
index 0ddc5a58606e..f5c13dd2ea83 100644
--- a/core/src/main/java/org/infinispan/factories/NamedExecutorsFactory.java
+++ b/core/src/main/java/org/infinispan/factories/NamedExecutorsFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories;
 
 import org.infinispan.commons.executors.ExecutorFactory;
diff --git a/core/src/main/java/org/infinispan/factories/RecoveryManagerFactory.java b/core/src/main/java/org/infinispan/factories/RecoveryManagerFactory.java
index c70b8e0f0910..89d2496185f0 100644
--- a/core/src/main/java/org/infinispan/factories/RecoveryManagerFactory.java
+++ b/core/src/main/java/org/infinispan/factories/RecoveryManagerFactory.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.factories;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/factories/ReplicationQueueFactory.java b/core/src/main/java/org/infinispan/factories/ReplicationQueueFactory.java
index 2d04bd0ba904..c1d3a1987b92 100644
--- a/core/src/main/java/org/infinispan/factories/ReplicationQueueFactory.java
+++ b/core/src/main/java/org/infinispan/factories/ReplicationQueueFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories;
 
 import org.infinispan.configuration.cache.ClusteringConfiguration;
diff --git a/core/src/main/java/org/infinispan/factories/ResponseGeneratorFactory.java b/core/src/main/java/org/infinispan/factories/ResponseGeneratorFactory.java
index c34fdd1b90ff..1feeb8e349dd 100644
--- a/core/src/main/java/org/infinispan/factories/ResponseGeneratorFactory.java
+++ b/core/src/main/java/org/infinispan/factories/ResponseGeneratorFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories;
 
 import org.infinispan.factories.annotations.DefaultFactoryFor;
diff --git a/core/src/main/java/org/infinispan/factories/RpcManagerFactory.java b/core/src/main/java/org/infinispan/factories/RpcManagerFactory.java
index 2c24bf5b51d1..31204294fbca 100644
--- a/core/src/main/java/org/infinispan/factories/RpcManagerFactory.java
+++ b/core/src/main/java/org/infinispan/factories/RpcManagerFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories;
 
 import org.infinispan.commons.CacheConfigurationException;
diff --git a/core/src/main/java/org/infinispan/factories/StateTransferComponentFactory.java b/core/src/main/java/org/infinispan/factories/StateTransferComponentFactory.java
index b30d5d10593b..34119ceb7281 100644
--- a/core/src/main/java/org/infinispan/factories/StateTransferComponentFactory.java
+++ b/core/src/main/java/org/infinispan/factories/StateTransferComponentFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories;
 
 import org.infinispan.commons.CacheConfigurationException;
diff --git a/core/src/main/java/org/infinispan/factories/TestDelayFactory.java b/core/src/main/java/org/infinispan/factories/TestDelayFactory.java
index 7c9249b9a321..239940009baf 100644
--- a/core/src/main/java/org/infinispan/factories/TestDelayFactory.java
+++ b/core/src/main/java/org/infinispan/factories/TestDelayFactory.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.factories;
 
 import java.util.concurrent.CountDownLatch;
diff --git a/core/src/main/java/org/infinispan/factories/TransactionManagerFactory.java b/core/src/main/java/org/infinispan/factories/TransactionManagerFactory.java
index 9459703c5130..0030478499d9 100644
--- a/core/src/main/java/org/infinispan/factories/TransactionManagerFactory.java
+++ b/core/src/main/java/org/infinispan/factories/TransactionManagerFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories;
 
 import javax.transaction.TransactionManager;
diff --git a/core/src/main/java/org/infinispan/factories/TransactionSynchronizationRegistryFactory.java b/core/src/main/java/org/infinispan/factories/TransactionSynchronizationRegistryFactory.java
index d86076f18550..2ea5d6165165 100644
--- a/core/src/main/java/org/infinispan/factories/TransactionSynchronizationRegistryFactory.java
+++ b/core/src/main/java/org/infinispan/factories/TransactionSynchronizationRegistryFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories;
 
 import org.infinispan.commons.CacheConfigurationException;
diff --git a/core/src/main/java/org/infinispan/factories/TransactionTableFactory.java b/core/src/main/java/org/infinispan/factories/TransactionTableFactory.java
index 079da7325fe7..3d84a8c7a719 100644
--- a/core/src/main/java/org/infinispan/factories/TransactionTableFactory.java
+++ b/core/src/main/java/org/infinispan/factories/TransactionTableFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories;
 
 import org.infinispan.factories.annotations.DefaultFactoryFor;
diff --git a/core/src/main/java/org/infinispan/factories/TransportFactory.java b/core/src/main/java/org/infinispan/factories/TransportFactory.java
index 28869a1688fb..fac4a4d5318a 100644
--- a/core/src/main/java/org/infinispan/factories/TransportFactory.java
+++ b/core/src/main/java/org/infinispan/factories/TransportFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories;
 
 import org.infinispan.factories.annotations.DefaultFactoryFor;
diff --git a/core/src/main/java/org/infinispan/factories/VersioningMetaFactory.java b/core/src/main/java/org/infinispan/factories/VersioningMetaFactory.java
index 7a13290370db..739ef6a93f16 100644
--- a/core/src/main/java/org/infinispan/factories/VersioningMetaFactory.java
+++ b/core/src/main/java/org/infinispan/factories/VersioningMetaFactory.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.factories;
 
 import org.infinispan.commons.equivalence.AnyEquivalence;
diff --git a/core/src/main/java/org/infinispan/factories/annotations/ComponentName.java b/core/src/main/java/org/infinispan/factories/annotations/ComponentName.java
index 9dedbe489d01..b3cddcc053f8 100644
--- a/core/src/main/java/org/infinispan/factories/annotations/ComponentName.java
+++ b/core/src/main/java/org/infinispan/factories/annotations/ComponentName.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories.annotations;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/org/infinispan/factories/annotations/DefaultFactoryFor.java b/core/src/main/java/org/infinispan/factories/annotations/DefaultFactoryFor.java
index 5ff9d21995e5..87d4c02d7a02 100644
--- a/core/src/main/java/org/infinispan/factories/annotations/DefaultFactoryFor.java
+++ b/core/src/main/java/org/infinispan/factories/annotations/DefaultFactoryFor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories.annotations;
 
 import static java.lang.annotation.ElementType.TYPE;
diff --git a/core/src/main/java/org/infinispan/factories/annotations/Inject.java b/core/src/main/java/org/infinispan/factories/annotations/Inject.java
index 285ba426895e..7fafa2dc225f 100644
--- a/core/src/main/java/org/infinispan/factories/annotations/Inject.java
+++ b/core/src/main/java/org/infinispan/factories/annotations/Inject.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories.annotations;
 
 import org.infinispan.factories.AbstractComponentFactory;
diff --git a/core/src/main/java/org/infinispan/factories/annotations/Start.java b/core/src/main/java/org/infinispan/factories/annotations/Start.java
index f7f49e66a02f..adee002843e7 100644
--- a/core/src/main/java/org/infinispan/factories/annotations/Start.java
+++ b/core/src/main/java/org/infinispan/factories/annotations/Start.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories.annotations;
 
 import static java.lang.annotation.ElementType.METHOD;
diff --git a/core/src/main/java/org/infinispan/factories/annotations/Stop.java b/core/src/main/java/org/infinispan/factories/annotations/Stop.java
index 53a07d43d35d..fe59a2229fd1 100644
--- a/core/src/main/java/org/infinispan/factories/annotations/Stop.java
+++ b/core/src/main/java/org/infinispan/factories/annotations/Stop.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories.annotations;
 
 import static java.lang.annotation.ElementType.METHOD;
diff --git a/core/src/main/java/org/infinispan/factories/annotations/SurvivesRestarts.java b/core/src/main/java/org/infinispan/factories/annotations/SurvivesRestarts.java
index 93a4132dd3fb..9039c0ddf9cc 100644
--- a/core/src/main/java/org/infinispan/factories/annotations/SurvivesRestarts.java
+++ b/core/src/main/java/org/infinispan/factories/annotations/SurvivesRestarts.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories.annotations;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/org/infinispan/factories/annotations/package-info.java b/core/src/main/java/org/infinispan/factories/annotations/package-info.java
index 8ae313949a18..1170bd40658c 100644
--- a/core/src/main/java/org/infinispan/factories/annotations/package-info.java
+++ b/core/src/main/java/org/infinispan/factories/annotations/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Internal annotations to control the lifecycle of cache components.
  */
diff --git a/core/src/main/java/org/infinispan/factories/components/ComponentMetadata.java b/core/src/main/java/org/infinispan/factories/components/ComponentMetadata.java
index cf2b7709b659..6c55d7d662bb 100644
--- a/core/src/main/java/org/infinispan/factories/components/ComponentMetadata.java
+++ b/core/src/main/java/org/infinispan/factories/components/ComponentMetadata.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.factories.components;
 
 import org.infinispan.factories.ComponentRegistry;
diff --git a/core/src/main/java/org/infinispan/factories/components/ComponentMetadataPersister.java b/core/src/main/java/org/infinispan/factories/components/ComponentMetadataPersister.java
index 650ed11bc946..bad772231d81 100644
--- a/core/src/main/java/org/infinispan/factories/components/ComponentMetadataPersister.java
+++ b/core/src/main/java/org/infinispan/factories/components/ComponentMetadataPersister.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.factories.components;
 
 import org.infinispan.commons.util.ReflectionUtil;
diff --git a/core/src/main/java/org/infinispan/factories/components/ComponentMetadataRepo.java b/core/src/main/java/org/infinispan/factories/components/ComponentMetadataRepo.java
index ef29fb2eb680..c4d4421ff147 100644
--- a/core/src/main/java/org/infinispan/factories/components/ComponentMetadataRepo.java
+++ b/core/src/main/java/org/infinispan/factories/components/ComponentMetadataRepo.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.factories.components;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/main/java/org/infinispan/factories/components/JmxAttributeMetadata.java b/core/src/main/java/org/infinispan/factories/components/JmxAttributeMetadata.java
index 6e262a3b2f31..730f08bfffaa 100644
--- a/core/src/main/java/org/infinispan/factories/components/JmxAttributeMetadata.java
+++ b/core/src/main/java/org/infinispan/factories/components/JmxAttributeMetadata.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.factories.components;
 
 import org.infinispan.commons.util.ReflectionUtil;
diff --git a/core/src/main/java/org/infinispan/factories/components/JmxOperationMetadata.java b/core/src/main/java/org/infinispan/factories/components/JmxOperationMetadata.java
index 4af8ccb25203..aac59eb396c8 100644
--- a/core/src/main/java/org/infinispan/factories/components/JmxOperationMetadata.java
+++ b/core/src/main/java/org/infinispan/factories/components/JmxOperationMetadata.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.factories.components;
 
 import org.infinispan.jmx.annotations.ManagedOperation;
diff --git a/core/src/main/java/org/infinispan/factories/components/JmxOperationParameter.java b/core/src/main/java/org/infinispan/factories/components/JmxOperationParameter.java
index 81c29caa4531..168375311702 100644
--- a/core/src/main/java/org/infinispan/factories/components/JmxOperationParameter.java
+++ b/core/src/main/java/org/infinispan/factories/components/JmxOperationParameter.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.factories.components;
 
 import java.io.Serializable;
diff --git a/core/src/main/java/org/infinispan/factories/components/ManageableComponentMetadata.java b/core/src/main/java/org/infinispan/factories/components/ManageableComponentMetadata.java
index 3976c4d54cae..487abc25879a 100644
--- a/core/src/main/java/org/infinispan/factories/components/ManageableComponentMetadata.java
+++ b/core/src/main/java/org/infinispan/factories/components/ManageableComponentMetadata.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.factories.components;
 
 import org.infinispan.commons.util.InfinispanCollections;
diff --git a/core/src/main/java/org/infinispan/factories/components/ModuleMetadataFileFinder.java b/core/src/main/java/org/infinispan/factories/components/ModuleMetadataFileFinder.java
index a5b1a1f8792e..4e2bee363b37 100644
--- a/core/src/main/java/org/infinispan/factories/components/ModuleMetadataFileFinder.java
+++ b/core/src/main/java/org/infinispan/factories/components/ModuleMetadataFileFinder.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.factories.components;
 
 import org.infinispan.factories.annotations.Inject;
diff --git a/core/src/main/java/org/infinispan/factories/package-info.java b/core/src/main/java/org/infinispan/factories/package-info.java
index 967cf2a3a1e8..bbde1dae102b 100644
--- a/core/src/main/java/org/infinispan/factories/package-info.java
+++ b/core/src/main/java/org/infinispan/factories/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Factories are internal components used to create other components based on a cache's
  * configuration.  This package also contains the ComponentRegistry classes, a light injection
diff --git a/core/src/main/java/org/infinispan/factories/scopes/Scope.java b/core/src/main/java/org/infinispan/factories/scopes/Scope.java
index 9503409e4b07..ab3e59a3c879 100644
--- a/core/src/main/java/org/infinispan/factories/scopes/Scope.java
+++ b/core/src/main/java/org/infinispan/factories/scopes/Scope.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories.scopes;
 
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/org/infinispan/factories/scopes/ScopeDetector.java b/core/src/main/java/org/infinispan/factories/scopes/ScopeDetector.java
index a5149b070bc1..872dce30224e 100644
--- a/core/src/main/java/org/infinispan/factories/scopes/ScopeDetector.java
+++ b/core/src/main/java/org/infinispan/factories/scopes/ScopeDetector.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories.scopes;
 
 import org.infinispan.commons.util.ReflectionUtil;
diff --git a/core/src/main/java/org/infinispan/factories/scopes/Scopes.java b/core/src/main/java/org/infinispan/factories/scopes/Scopes.java
index e3c0a0dd01ed..d27f6e44e827 100644
--- a/core/src/main/java/org/infinispan/factories/scopes/Scopes.java
+++ b/core/src/main/java/org/infinispan/factories/scopes/Scopes.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories.scopes;
 
 /**
diff --git a/core/src/main/java/org/infinispan/factories/scopes/package-info.java b/core/src/main/java/org/infinispan/factories/scopes/package-info.java
index ede2a9b985ca..99456d00f407 100644
--- a/core/src/main/java/org/infinispan/factories/scopes/package-info.java
+++ b/core/src/main/java/org/infinispan/factories/scopes/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Scopes of components within the lifespan of a {@link CacheManager} and its various {@link Cache}s, and related
  * utilities.
diff --git a/core/src/main/java/org/infinispan/interceptors/ActivationInterceptor.java b/core/src/main/java/org/infinispan/interceptors/ActivationInterceptor.java
index 46611d372f35..fc208f902391 100644
--- a/core/src/main/java/org/infinispan/interceptors/ActivationInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/ActivationInterceptor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.interceptors;
 
 import org.infinispan.commands.FlagAffectedCommand;
diff --git a/core/src/main/java/org/infinispan/interceptors/BatchingInterceptor.java b/core/src/main/java/org/infinispan/interceptors/BatchingInterceptor.java
index 24a1174e8721..d5781d9f0976 100644
--- a/core/src/main/java/org/infinispan/interceptors/BatchingInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/BatchingInterceptor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.interceptors;
 
 import org.infinispan.batch.BatchContainer;
diff --git a/core/src/main/java/org/infinispan/interceptors/CacheLoaderInterceptor.java b/core/src/main/java/org/infinispan/interceptors/CacheLoaderInterceptor.java
index 905bcf81159f..978a8425bf13 100755
--- a/core/src/main/java/org/infinispan/interceptors/CacheLoaderInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/CacheLoaderInterceptor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.interceptors;
 
 import org.infinispan.metadata.Metadata;
diff --git a/core/src/main/java/org/infinispan/interceptors/CacheMgmtInterceptor.java b/core/src/main/java/org/infinispan/interceptors/CacheMgmtInterceptor.java
index 3b0f6fa462c0..7d23036bb4f0 100644
--- a/core/src/main/java/org/infinispan/interceptors/CacheMgmtInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/CacheMgmtInterceptor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.interceptors;
 
 import org.infinispan.commands.FlagAffectedCommand;
diff --git a/core/src/main/java/org/infinispan/interceptors/CacheStoreInterceptor.java b/core/src/main/java/org/infinispan/interceptors/CacheStoreInterceptor.java
index c5956d046627..3d1172588351 100755
--- a/core/src/main/java/org/infinispan/interceptors/CacheStoreInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/CacheStoreInterceptor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.interceptors;
 
 import org.infinispan.atomic.AtomicHashMap;
diff --git a/core/src/main/java/org/infinispan/interceptors/CallInterceptor.java b/core/src/main/java/org/infinispan/interceptors/CallInterceptor.java
index 9d58d71ca97f..3cd70eefeaab 100644
--- a/core/src/main/java/org/infinispan/interceptors/CallInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/CallInterceptor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.interceptors;
 
 
diff --git a/core/src/main/java/org/infinispan/interceptors/ClusteredActivationInterceptor.java b/core/src/main/java/org/infinispan/interceptors/ClusteredActivationInterceptor.java
index e40dc0d57fb0..5d5a25a8cf94 100644
--- a/core/src/main/java/org/infinispan/interceptors/ClusteredActivationInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/ClusteredActivationInterceptor.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.interceptors;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/main/java/org/infinispan/interceptors/ClusteredCacheLoaderInterceptor.java b/core/src/main/java/org/infinispan/interceptors/ClusteredCacheLoaderInterceptor.java
index 859cf047d501..64aec64122f4 100644
--- a/core/src/main/java/org/infinispan/interceptors/ClusteredCacheLoaderInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/ClusteredCacheLoaderInterceptor.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.interceptors;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/main/java/org/infinispan/interceptors/ClusteringInterceptor.java b/core/src/main/java/org/infinispan/interceptors/ClusteringInterceptor.java
index 7f974a85b710..e67af2eb46aa 100644
--- a/core/src/main/java/org/infinispan/interceptors/ClusteringInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/ClusteringInterceptor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.interceptors;
 
 import org.infinispan.commands.CommandsFactory;
diff --git a/core/src/main/java/org/infinispan/interceptors/DeadlockDetectingInterceptor.java b/core/src/main/java/org/infinispan/interceptors/DeadlockDetectingInterceptor.java
index ecf1ffa37120..9f162e95557b 100644
--- a/core/src/main/java/org/infinispan/interceptors/DeadlockDetectingInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/DeadlockDetectingInterceptor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.interceptors;
 
 import org.infinispan.commands.VisitableCommand;
diff --git a/core/src/main/java/org/infinispan/interceptors/DefensiveMarshalledValueInterceptor.java b/core/src/main/java/org/infinispan/interceptors/DefensiveMarshalledValueInterceptor.java
index 46552e0912c2..551cb0ff8caf 100644
--- a/core/src/main/java/org/infinispan/interceptors/DefensiveMarshalledValueInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/DefensiveMarshalledValueInterceptor.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.interceptors;
 
 import org.infinispan.context.InvocationContext;
diff --git a/core/src/main/java/org/infinispan/interceptors/DistCacheStoreInterceptor.java b/core/src/main/java/org/infinispan/interceptors/DistCacheStoreInterceptor.java
index 04b97e53b46b..fd3074aa8ffc 100644
--- a/core/src/main/java/org/infinispan/interceptors/DistCacheStoreInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/DistCacheStoreInterceptor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.interceptors;
 
 import org.infinispan.commands.FlagAffectedCommand;
diff --git a/core/src/main/java/org/infinispan/interceptors/EntryWrappingInterceptor.java b/core/src/main/java/org/infinispan/interceptors/EntryWrappingInterceptor.java
index 0bd77a4c1c60..cf87aa175ef6 100644
--- a/core/src/main/java/org/infinispan/interceptors/EntryWrappingInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/EntryWrappingInterceptor.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.interceptors;
 
 import org.infinispan.metadata.Metadata;
diff --git a/core/src/main/java/org/infinispan/interceptors/InterceptorChain.java b/core/src/main/java/org/infinispan/interceptors/InterceptorChain.java
index b5931c9397e7..bceea5147ce7 100644
--- a/core/src/main/java/org/infinispan/interceptors/InterceptorChain.java
+++ b/core/src/main/java/org/infinispan/interceptors/InterceptorChain.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.interceptors;
 
 import org.infinispan.commands.VisitableCommand;
diff --git a/core/src/main/java/org/infinispan/interceptors/InvalidationInterceptor.java b/core/src/main/java/org/infinispan/interceptors/InvalidationInterceptor.java
index af2d912e0fc8..944947e98685 100644
--- a/core/src/main/java/org/infinispan/interceptors/InvalidationInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/InvalidationInterceptor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.interceptors;
 
 import java.util.Arrays;
diff --git a/core/src/main/java/org/infinispan/interceptors/InvocationContextInterceptor.java b/core/src/main/java/org/infinispan/interceptors/InvocationContextInterceptor.java
index e0352f8c0146..b33f7623a852 100644
--- a/core/src/main/java/org/infinispan/interceptors/InvocationContextInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/InvocationContextInterceptor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.interceptors;
 
 
diff --git a/core/src/main/java/org/infinispan/interceptors/IsMarshallableInterceptor.java b/core/src/main/java/org/infinispan/interceptors/IsMarshallableInterceptor.java
index e4a0803c7ece..80ca8d4744ba 100644
--- a/core/src/main/java/org/infinispan/interceptors/IsMarshallableInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/IsMarshallableInterceptor.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.interceptors;
 
 import org.infinispan.commands.FlagAffectedCommand;
diff --git a/core/src/main/java/org/infinispan/interceptors/MarshalledValueInterceptor.java b/core/src/main/java/org/infinispan/interceptors/MarshalledValueInterceptor.java
index 8eef0559d4e2..75ddfd1b40db 100644
--- a/core/src/main/java/org/infinispan/interceptors/MarshalledValueInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/MarshalledValueInterceptor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.interceptors;
 
 import org.infinispan.commands.control.LockControlCommand;
diff --git a/core/src/main/java/org/infinispan/interceptors/NotificationInterceptor.java b/core/src/main/java/org/infinispan/interceptors/NotificationInterceptor.java
index 777527366ef8..ca45b86823fc 100644
--- a/core/src/main/java/org/infinispan/interceptors/NotificationInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/NotificationInterceptor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.interceptors;
 
 import org.infinispan.commands.tx.CommitCommand;
diff --git a/core/src/main/java/org/infinispan/interceptors/PassivationInterceptor.java b/core/src/main/java/org/infinispan/interceptors/PassivationInterceptor.java
index 2cda808269f6..d44cc29329ca 100644
--- a/core/src/main/java/org/infinispan/interceptors/PassivationInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/PassivationInterceptor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.interceptors;
 
 import org.infinispan.commands.write.EvictCommand;
diff --git a/core/src/main/java/org/infinispan/interceptors/TxInterceptor.java b/core/src/main/java/org/infinispan/interceptors/TxInterceptor.java
index b82d06363012..494576f95dd1 100644
--- a/core/src/main/java/org/infinispan/interceptors/TxInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/TxInterceptor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.interceptors;
 
 import java.util.concurrent.atomic.AtomicLong;
diff --git a/core/src/main/java/org/infinispan/interceptors/VersionedEntryWrappingInterceptor.java b/core/src/main/java/org/infinispan/interceptors/VersionedEntryWrappingInterceptor.java
index e4ed1318b498..26da2b4c83fc 100644
--- a/core/src/main/java/org/infinispan/interceptors/VersionedEntryWrappingInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/VersionedEntryWrappingInterceptor.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.interceptors;
 
 import org.infinispan.metadata.EmbeddedMetadata;
diff --git a/core/src/main/java/org/infinispan/interceptors/base/BaseCustomInterceptor.java b/core/src/main/java/org/infinispan/interceptors/base/BaseCustomInterceptor.java
index d4145d555cc0..cf0236cd5487 100644
--- a/core/src/main/java/org/infinispan/interceptors/base/BaseCustomInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/base/BaseCustomInterceptor.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.interceptors.base;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/interceptors/base/BaseRpcInterceptor.java b/core/src/main/java/org/infinispan/interceptors/base/BaseRpcInterceptor.java
index 319389636ce4..98e9306cc6a7 100644
--- a/core/src/main/java/org/infinispan/interceptors/base/BaseRpcInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/base/BaseRpcInterceptor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.interceptors.base;
 
 import org.infinispan.commands.FlagAffectedCommand;
diff --git a/core/src/main/java/org/infinispan/interceptors/base/CommandInterceptor.java b/core/src/main/java/org/infinispan/interceptors/base/CommandInterceptor.java
index 8d6c007ed134..fd80ee880fcb 100644
--- a/core/src/main/java/org/infinispan/interceptors/base/CommandInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/base/CommandInterceptor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.interceptors.base;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/interceptors/base/JmxStatsCommandInterceptor.java b/core/src/main/java/org/infinispan/interceptors/base/JmxStatsCommandInterceptor.java
index ccdd5c2774df..cf874d0962ea 100644
--- a/core/src/main/java/org/infinispan/interceptors/base/JmxStatsCommandInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/base/JmxStatsCommandInterceptor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.interceptors.base;
 
 import org.infinispan.factories.annotations.Start;
diff --git a/core/src/main/java/org/infinispan/interceptors/base/PrePostProcessingCommandInterceptor.java b/core/src/main/java/org/infinispan/interceptors/base/PrePostProcessingCommandInterceptor.java
index db8346ff6255..4cbc14370d20 100644
--- a/core/src/main/java/org/infinispan/interceptors/base/PrePostProcessingCommandInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/base/PrePostProcessingCommandInterceptor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.interceptors.base;
 
 import org.infinispan.commands.VisitableCommand;
diff --git a/core/src/main/java/org/infinispan/interceptors/base/package-info.java b/core/src/main/java/org/infinispan/interceptors/base/package-info.java
index 51f76c5d5433..035e5cc6c542 100644
--- a/core/src/main/java/org/infinispan/interceptors/base/package-info.java
+++ b/core/src/main/java/org/infinispan/interceptors/base/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Base interceptors containing common, reusable behavior.
  */
diff --git a/core/src/main/java/org/infinispan/interceptors/distribution/BaseDistributionInterceptor.java b/core/src/main/java/org/infinispan/interceptors/distribution/BaseDistributionInterceptor.java
index 5e77b0ece18d..c1628c26f499 100644
--- a/core/src/main/java/org/infinispan/interceptors/distribution/BaseDistributionInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/distribution/BaseDistributionInterceptor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.interceptors.distribution;
 
 import org.infinispan.commands.FlagAffectedCommand;
diff --git a/core/src/main/java/org/infinispan/interceptors/distribution/L1NonTxInterceptor.java b/core/src/main/java/org/infinispan/interceptors/distribution/L1NonTxInterceptor.java
index e47cf71a4a7c..4d577a46be82 100644
--- a/core/src/main/java/org/infinispan/interceptors/distribution/L1NonTxInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/distribution/L1NonTxInterceptor.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.interceptors.distribution;
 
 import org.infinispan.metadata.Metadata;
diff --git a/core/src/main/java/org/infinispan/interceptors/distribution/NonTxDistributionInterceptor.java b/core/src/main/java/org/infinispan/interceptors/distribution/NonTxDistributionInterceptor.java
index 8704593faef5..51ec4a6a3f24 100644
--- a/core/src/main/java/org/infinispan/interceptors/distribution/NonTxDistributionInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/distribution/NonTxDistributionInterceptor.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.interceptors.distribution;
 
 import org.infinispan.commands.FlagAffectedCommand;
diff --git a/core/src/main/java/org/infinispan/interceptors/distribution/TxDistributionInterceptor.java b/core/src/main/java/org/infinispan/interceptors/distribution/TxDistributionInterceptor.java
index a7aae2d0c0e3..2a0511ec8583 100644
--- a/core/src/main/java/org/infinispan/interceptors/distribution/TxDistributionInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/distribution/TxDistributionInterceptor.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.interceptors.distribution;
 
 import org.infinispan.atomic.DeltaCompositeKey;
diff --git a/core/src/main/java/org/infinispan/interceptors/distribution/VersionedDistributionInterceptor.java b/core/src/main/java/org/infinispan/interceptors/distribution/VersionedDistributionInterceptor.java
index 077928f0b5f7..4b83552656af 100644
--- a/core/src/main/java/org/infinispan/interceptors/distribution/VersionedDistributionInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/distribution/VersionedDistributionInterceptor.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.interceptors.distribution;
 
 import org.infinispan.commands.tx.PrepareCommand;
diff --git a/core/src/main/java/org/infinispan/interceptors/locking/AbstractLockingInterceptor.java b/core/src/main/java/org/infinispan/interceptors/locking/AbstractLockingInterceptor.java
index 235c8a4336ef..0a33cad28e8e 100644
--- a/core/src/main/java/org/infinispan/interceptors/locking/AbstractLockingInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/locking/AbstractLockingInterceptor.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.interceptors.locking;
 
 import org.infinispan.commands.FlagAffectedCommand;
diff --git a/core/src/main/java/org/infinispan/interceptors/locking/AbstractTxLockingInterceptor.java b/core/src/main/java/org/infinispan/interceptors/locking/AbstractTxLockingInterceptor.java
index a41f554266df..3618240ba82d 100644
--- a/core/src/main/java/org/infinispan/interceptors/locking/AbstractTxLockingInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/locking/AbstractTxLockingInterceptor.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.interceptors.locking;
 
 import org.infinispan.atomic.DeltaCompositeKey;
diff --git a/core/src/main/java/org/infinispan/interceptors/locking/ClusteringDependentLogic.java b/core/src/main/java/org/infinispan/interceptors/locking/ClusteringDependentLogic.java
index 65a967dd6880..14c1dfa45549 100644
--- a/core/src/main/java/org/infinispan/interceptors/locking/ClusteringDependentLogic.java
+++ b/core/src/main/java/org/infinispan/interceptors/locking/ClusteringDependentLogic.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.interceptors.locking;
 
 import org.infinispan.manager.EmbeddedCacheManager;
diff --git a/core/src/main/java/org/infinispan/interceptors/locking/NonTransactionalLockingInterceptor.java b/core/src/main/java/org/infinispan/interceptors/locking/NonTransactionalLockingInterceptor.java
index c55a215d2490..4255c380237d 100644
--- a/core/src/main/java/org/infinispan/interceptors/locking/NonTransactionalLockingInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/locking/NonTransactionalLockingInterceptor.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.interceptors.locking;
 
 import org.infinispan.InvalidCacheUsageException;
diff --git a/core/src/main/java/org/infinispan/interceptors/locking/OptimisticLockingInterceptor.java b/core/src/main/java/org/infinispan/interceptors/locking/OptimisticLockingInterceptor.java
index 405f6453629d..1436bcc80dae 100644
--- a/core/src/main/java/org/infinispan/interceptors/locking/OptimisticLockingInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/locking/OptimisticLockingInterceptor.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.interceptors.locking;
 
 import org.infinispan.InvalidCacheUsageException;
diff --git a/core/src/main/java/org/infinispan/interceptors/locking/PessimisticLockingInterceptor.java b/core/src/main/java/org/infinispan/interceptors/locking/PessimisticLockingInterceptor.java
index c51e3a790a09..ba9714a205e9 100644
--- a/core/src/main/java/org/infinispan/interceptors/locking/PessimisticLockingInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/locking/PessimisticLockingInterceptor.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.interceptors.locking;
 
 import org.infinispan.commands.CommandsFactory;
diff --git a/core/src/main/java/org/infinispan/interceptors/package-info.java b/core/src/main/java/org/infinispan/interceptors/package-info.java
index b5167c117824..73e93aeb3302 100644
--- a/core/src/main/java/org/infinispan/interceptors/package-info.java
+++ b/core/src/main/java/org/infinispan/interceptors/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Infinispan is designed around a set of interceptors around a data container.  These interceptors
  * add behavioral aspects to the data container.
diff --git a/core/src/main/java/org/infinispan/interceptors/totalorder/RetryPrepareException.java b/core/src/main/java/org/infinispan/interceptors/totalorder/RetryPrepareException.java
index 9e8a2c88d7f0..aa85b796ec80 100644
--- a/core/src/main/java/org/infinispan/interceptors/totalorder/RetryPrepareException.java
+++ b/core/src/main/java/org/infinispan/interceptors/totalorder/RetryPrepareException.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.interceptors.totalorder;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/main/java/org/infinispan/interceptors/totalorder/TotalOrderDistributionInterceptor.java b/core/src/main/java/org/infinispan/interceptors/totalorder/TotalOrderDistributionInterceptor.java
index 5dba2894a4c9..dd64bdd3ec42 100644
--- a/core/src/main/java/org/infinispan/interceptors/totalorder/TotalOrderDistributionInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/totalorder/TotalOrderDistributionInterceptor.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.interceptors.totalorder;
 
 import org.infinispan.commands.FlagAffectedCommand;
diff --git a/core/src/main/java/org/infinispan/interceptors/totalorder/TotalOrderInterceptor.java b/core/src/main/java/org/infinispan/interceptors/totalorder/TotalOrderInterceptor.java
index ef9803f20940..80785f486eb0 100644
--- a/core/src/main/java/org/infinispan/interceptors/totalorder/TotalOrderInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/totalorder/TotalOrderInterceptor.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.interceptors.totalorder;
 
 import org.infinispan.commands.control.LockControlCommand;
diff --git a/core/src/main/java/org/infinispan/interceptors/totalorder/TotalOrderStateTransferInterceptor.java b/core/src/main/java/org/infinispan/interceptors/totalorder/TotalOrderStateTransferInterceptor.java
index 23ae64f475a2..40f77fc16d57 100644
--- a/core/src/main/java/org/infinispan/interceptors/totalorder/TotalOrderStateTransferInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/totalorder/TotalOrderStateTransferInterceptor.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.interceptors.totalorder;
 
 import org.infinispan.commands.tx.PrepareCommand;
diff --git a/core/src/main/java/org/infinispan/interceptors/totalorder/TotalOrderVersionedDistributionInterceptor.java b/core/src/main/java/org/infinispan/interceptors/totalorder/TotalOrderVersionedDistributionInterceptor.java
index ef34e15c2305..b1d8d1ce3429 100644
--- a/core/src/main/java/org/infinispan/interceptors/totalorder/TotalOrderVersionedDistributionInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/totalorder/TotalOrderVersionedDistributionInterceptor.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.interceptors.totalorder;
 
 import org.infinispan.commands.FlagAffectedCommand;
diff --git a/core/src/main/java/org/infinispan/interceptors/totalorder/TotalOrderVersionedEntryWrappingInterceptor.java b/core/src/main/java/org/infinispan/interceptors/totalorder/TotalOrderVersionedEntryWrappingInterceptor.java
index 87f6009af4cc..1a5c72ee04d7 100644
--- a/core/src/main/java/org/infinispan/interceptors/totalorder/TotalOrderVersionedEntryWrappingInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/totalorder/TotalOrderVersionedEntryWrappingInterceptor.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.interceptors.totalorder;
 
 import org.infinispan.metadata.EmbeddedMetadata;
diff --git a/core/src/main/java/org/infinispan/interceptors/xsite/BaseBackupInterceptor.java b/core/src/main/java/org/infinispan/interceptors/xsite/BaseBackupInterceptor.java
index 92e83526a0d2..a23b1d12f833 100644
--- a/core/src/main/java/org/infinispan/interceptors/xsite/BaseBackupInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/xsite/BaseBackupInterceptor.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.interceptors.xsite;
 
 import org.infinispan.context.impl.TxInvocationContext;
diff --git a/core/src/main/java/org/infinispan/interceptors/xsite/NonTransactionalBackupInterceptor.java b/core/src/main/java/org/infinispan/interceptors/xsite/NonTransactionalBackupInterceptor.java
index 7d60703ceb08..663563da47da 100644
--- a/core/src/main/java/org/infinispan/interceptors/xsite/NonTransactionalBackupInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/xsite/NonTransactionalBackupInterceptor.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.interceptors.xsite;
 
 import org.infinispan.commands.write.ClearCommand;
diff --git a/core/src/main/java/org/infinispan/interceptors/xsite/OptimisticBackupInterceptor.java b/core/src/main/java/org/infinispan/interceptors/xsite/OptimisticBackupInterceptor.java
index 45014e5a917c..808f9f0c7e0b 100644
--- a/core/src/main/java/org/infinispan/interceptors/xsite/OptimisticBackupInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/xsite/OptimisticBackupInterceptor.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.interceptors.xsite;
 
 import org.infinispan.commands.tx.CommitCommand;
diff --git a/core/src/main/java/org/infinispan/interceptors/xsite/PessimisticBackupInterceptor.java b/core/src/main/java/org/infinispan/interceptors/xsite/PessimisticBackupInterceptor.java
index a3e782a051bb..974faf7c7814 100644
--- a/core/src/main/java/org/infinispan/interceptors/xsite/PessimisticBackupInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/xsite/PessimisticBackupInterceptor.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.interceptors.xsite;
 
 import org.infinispan.commands.tx.CommitCommand;
diff --git a/core/src/main/java/org/infinispan/io/ByteBuffer.java b/core/src/main/java/org/infinispan/io/ByteBuffer.java
index e065cc03e452..c4b10caedec5 100644
--- a/core/src/main/java/org/infinispan/io/ByteBuffer.java
+++ b/core/src/main/java/org/infinispan/io/ByteBuffer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.io;
 
 /**
diff --git a/core/src/main/java/org/infinispan/io/ExpandableMarshalledValueByteStream.java b/core/src/main/java/org/infinispan/io/ExpandableMarshalledValueByteStream.java
index 491c1b8fcb65..81fe775e7cd8 100644
--- a/core/src/main/java/org/infinispan/io/ExpandableMarshalledValueByteStream.java
+++ b/core/src/main/java/org/infinispan/io/ExpandableMarshalledValueByteStream.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.io;
 
 /**
diff --git a/core/src/main/java/org/infinispan/io/ExposedByteArrayOutputStream.java b/core/src/main/java/org/infinispan/io/ExposedByteArrayOutputStream.java
index 3924efd10956..ae12233d2481 100644
--- a/core/src/main/java/org/infinispan/io/ExposedByteArrayOutputStream.java
+++ b/core/src/main/java/org/infinispan/io/ExposedByteArrayOutputStream.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.io;
 
 import net.jcip.annotations.NotThreadSafe;
diff --git a/core/src/main/java/org/infinispan/io/FileChunkMapper.java b/core/src/main/java/org/infinispan/io/FileChunkMapper.java
index 82b25a56e25e..173b9ae3b06f 100644
--- a/core/src/main/java/org/infinispan/io/FileChunkMapper.java
+++ b/core/src/main/java/org/infinispan/io/FileChunkMapper.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.io;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/io/GridFile.java b/core/src/main/java/org/infinispan/io/GridFile.java
index f84793e27f47..14f884156ccd 100644
--- a/core/src/main/java/org/infinispan/io/GridFile.java
+++ b/core/src/main/java/org/infinispan/io/GridFile.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.io;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/main/java/org/infinispan/io/GridFilesystem.java b/core/src/main/java/org/infinispan/io/GridFilesystem.java
index d2ba59089fd2..097908002393 100644
--- a/core/src/main/java/org/infinispan/io/GridFilesystem.java
+++ b/core/src/main/java/org/infinispan/io/GridFilesystem.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.io;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/main/java/org/infinispan/io/GridInputStream.java b/core/src/main/java/org/infinispan/io/GridInputStream.java
index ceb8776cc07b..b206cef6a7b5 100644
--- a/core/src/main/java/org/infinispan/io/GridInputStream.java
+++ b/core/src/main/java/org/infinispan/io/GridInputStream.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.io;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/io/GridOutputStream.java b/core/src/main/java/org/infinispan/io/GridOutputStream.java
index 6e6ac63dc37c..146c4ffe67bd 100644
--- a/core/src/main/java/org/infinispan/io/GridOutputStream.java
+++ b/core/src/main/java/org/infinispan/io/GridOutputStream.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.io;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/io/ImmutableMarshalledValueByteStream.java b/core/src/main/java/org/infinispan/io/ImmutableMarshalledValueByteStream.java
index 3029bf24cf96..3c38fe949666 100644
--- a/core/src/main/java/org/infinispan/io/ImmutableMarshalledValueByteStream.java
+++ b/core/src/main/java/org/infinispan/io/ImmutableMarshalledValueByteStream.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.io;
 
 import net.jcip.annotations.ThreadSafe;
diff --git a/core/src/main/java/org/infinispan/io/MarshalledValueByteStream.java b/core/src/main/java/org/infinispan/io/MarshalledValueByteStream.java
index 5ce291e4e9fc..07ce500333f5 100644
--- a/core/src/main/java/org/infinispan/io/MarshalledValueByteStream.java
+++ b/core/src/main/java/org/infinispan/io/MarshalledValueByteStream.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.io;
 
 
diff --git a/core/src/main/java/org/infinispan/io/ReadableGridFileChannel.java b/core/src/main/java/org/infinispan/io/ReadableGridFileChannel.java
index bc0c6467885d..c7b0354c4531 100644
--- a/core/src/main/java/org/infinispan/io/ReadableGridFileChannel.java
+++ b/core/src/main/java/org/infinispan/io/ReadableGridFileChannel.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.io;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/io/UnclosableObjectInputStream.java b/core/src/main/java/org/infinispan/io/UnclosableObjectInputStream.java
index 55dd5c4c8f79..be373ab5b54a 100644
--- a/core/src/main/java/org/infinispan/io/UnclosableObjectInputStream.java
+++ b/core/src/main/java/org/infinispan/io/UnclosableObjectInputStream.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.io;
 
 import java.io.IOException;
diff --git a/core/src/main/java/org/infinispan/io/UnclosableObjectOutputStream.java b/core/src/main/java/org/infinispan/io/UnclosableObjectOutputStream.java
index 047d1f96d817..c27a42cb1e70 100644
--- a/core/src/main/java/org/infinispan/io/UnclosableObjectOutputStream.java
+++ b/core/src/main/java/org/infinispan/io/UnclosableObjectOutputStream.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.io;
 
 import java.io.IOException;
diff --git a/core/src/main/java/org/infinispan/io/WritableGridFileChannel.java b/core/src/main/java/org/infinispan/io/WritableGridFileChannel.java
index cad578f610c0..7f04a1a7f294 100644
--- a/core/src/main/java/org/infinispan/io/WritableGridFileChannel.java
+++ b/core/src/main/java/org/infinispan/io/WritableGridFileChannel.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.io;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/io/package-info.java b/core/src/main/java/org/infinispan/io/package-info.java
index cd9734779cbe..99b1f5558693 100644
--- a/core/src/main/java/org/infinispan/io/package-info.java
+++ b/core/src/main/java/org/infinispan/io/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Provides Infinispan-specific input and output streams, buffers and related utilities.
  */
diff --git a/core/src/main/java/org/infinispan/jmx/AbstractJmxRegistration.java b/core/src/main/java/org/infinispan/jmx/AbstractJmxRegistration.java
index 191514379db6..79dfab77e486 100644
--- a/core/src/main/java/org/infinispan/jmx/AbstractJmxRegistration.java
+++ b/core/src/main/java/org/infinispan/jmx/AbstractJmxRegistration.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jmx;
 
 import java.util.Set;
diff --git a/core/src/main/java/org/infinispan/jmx/CacheJmxRegistration.java b/core/src/main/java/org/infinispan/jmx/CacheJmxRegistration.java
index 4583c7a4473f..b1d1863feb7d 100644
--- a/core/src/main/java/org/infinispan/jmx/CacheJmxRegistration.java
+++ b/core/src/main/java/org/infinispan/jmx/CacheJmxRegistration.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jmx;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/main/java/org/infinispan/jmx/CacheManagerJmxRegistration.java b/core/src/main/java/org/infinispan/jmx/CacheManagerJmxRegistration.java
index 60bd569da049..691c25e987a1 100644
--- a/core/src/main/java/org/infinispan/jmx/CacheManagerJmxRegistration.java
+++ b/core/src/main/java/org/infinispan/jmx/CacheManagerJmxRegistration.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jmx;
 
 import org.infinispan.configuration.global.GlobalConfiguration;
diff --git a/core/src/main/java/org/infinispan/jmx/ComponentsJmxRegistration.java b/core/src/main/java/org/infinispan/jmx/ComponentsJmxRegistration.java
index 5e3be2a5e333..0989d2403ebc 100644
--- a/core/src/main/java/org/infinispan/jmx/ComponentsJmxRegistration.java
+++ b/core/src/main/java/org/infinispan/jmx/ComponentsJmxRegistration.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jmx;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/main/java/org/infinispan/jmx/IspnMBeanOperationInfo.java b/core/src/main/java/org/infinispan/jmx/IspnMBeanOperationInfo.java
index f76d66b76fa7..844b4b7fb2a5 100644
--- a/core/src/main/java/org/infinispan/jmx/IspnMBeanOperationInfo.java
+++ b/core/src/main/java/org/infinispan/jmx/IspnMBeanOperationInfo.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.jmx;
 
 import javax.management.Descriptor;
diff --git a/core/src/main/java/org/infinispan/jmx/JBossMBeanServerLookup.java b/core/src/main/java/org/infinispan/jmx/JBossMBeanServerLookup.java
index 86c206f8aa41..cd57360c5573 100644
--- a/core/src/main/java/org/infinispan/jmx/JBossMBeanServerLookup.java
+++ b/core/src/main/java/org/infinispan/jmx/JBossMBeanServerLookup.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.jmx;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/main/java/org/infinispan/jmx/JmxDomainConflictException.java b/core/src/main/java/org/infinispan/jmx/JmxDomainConflictException.java
index 47ed5813876f..d3717da5d058 100644
--- a/core/src/main/java/org/infinispan/jmx/JmxDomainConflictException.java
+++ b/core/src/main/java/org/infinispan/jmx/JmxDomainConflictException.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jmx;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/main/java/org/infinispan/jmx/JmxStatisticsExposer.java b/core/src/main/java/org/infinispan/jmx/JmxStatisticsExposer.java
index 4a3fcff5785d..b8660fb6264a 100644
--- a/core/src/main/java/org/infinispan/jmx/JmxStatisticsExposer.java
+++ b/core/src/main/java/org/infinispan/jmx/JmxStatisticsExposer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jmx;
 
 /**
diff --git a/core/src/main/java/org/infinispan/jmx/JmxUtil.java b/core/src/main/java/org/infinispan/jmx/JmxUtil.java
index f3dfd9df9f87..8807182fd556 100644
--- a/core/src/main/java/org/infinispan/jmx/JmxUtil.java
+++ b/core/src/main/java/org/infinispan/jmx/JmxUtil.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.jmx;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/main/java/org/infinispan/jmx/MBeanServerLookup.java b/core/src/main/java/org/infinispan/jmx/MBeanServerLookup.java
index 0ce53e60178b..d4643f3a6225 100644
--- a/core/src/main/java/org/infinispan/jmx/MBeanServerLookup.java
+++ b/core/src/main/java/org/infinispan/jmx/MBeanServerLookup.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jmx;
 
 import javax.management.MBeanServer;
diff --git a/core/src/main/java/org/infinispan/jmx/PlatformMBeanServerLookup.java b/core/src/main/java/org/infinispan/jmx/PlatformMBeanServerLookup.java
index 59ed678c0fdb..f801820b21eb 100644
--- a/core/src/main/java/org/infinispan/jmx/PlatformMBeanServerLookup.java
+++ b/core/src/main/java/org/infinispan/jmx/PlatformMBeanServerLookup.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jmx;
 
 import javax.management.MBeanServer;
diff --git a/core/src/main/java/org/infinispan/jmx/ResourceDMBean.java b/core/src/main/java/org/infinispan/jmx/ResourceDMBean.java
index 27256d68d95c..9aeb178f84c2 100644
--- a/core/src/main/java/org/infinispan/jmx/ResourceDMBean.java
+++ b/core/src/main/java/org/infinispan/jmx/ResourceDMBean.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jmx;
 
 import org.infinispan.commons.util.CollectionFactory;
diff --git a/core/src/main/java/org/infinispan/jmx/annotations/DataType.java b/core/src/main/java/org/infinispan/jmx/annotations/DataType.java
index d0d12e1da386..828cde758860 100644
--- a/core/src/main/java/org/infinispan/jmx/annotations/DataType.java
+++ b/core/src/main/java/org/infinispan/jmx/annotations/DataType.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.jmx.annotations;
 
 public enum DataType {
diff --git a/core/src/main/java/org/infinispan/jmx/annotations/DisplayType.java b/core/src/main/java/org/infinispan/jmx/annotations/DisplayType.java
index a500e4be137c..018e13283273 100644
--- a/core/src/main/java/org/infinispan/jmx/annotations/DisplayType.java
+++ b/core/src/main/java/org/infinispan/jmx/annotations/DisplayType.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.jmx.annotations;
 
 public enum DisplayType {
diff --git a/core/src/main/java/org/infinispan/jmx/annotations/MBean.java b/core/src/main/java/org/infinispan/jmx/annotations/MBean.java
index fe5b12fe2ff6..741521f54bef 100644
--- a/core/src/main/java/org/infinispan/jmx/annotations/MBean.java
+++ b/core/src/main/java/org/infinispan/jmx/annotations/MBean.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jmx.annotations;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/org/infinispan/jmx/annotations/ManagedAttribute.java b/core/src/main/java/org/infinispan/jmx/annotations/ManagedAttribute.java
index ee66a25f2a5f..dd3d48a05219 100644
--- a/core/src/main/java/org/infinispan/jmx/annotations/ManagedAttribute.java
+++ b/core/src/main/java/org/infinispan/jmx/annotations/ManagedAttribute.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jmx.annotations;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/org/infinispan/jmx/annotations/ManagedOperation.java b/core/src/main/java/org/infinispan/jmx/annotations/ManagedOperation.java
index f10e949c2941..2903909dda0a 100644
--- a/core/src/main/java/org/infinispan/jmx/annotations/ManagedOperation.java
+++ b/core/src/main/java/org/infinispan/jmx/annotations/ManagedOperation.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jmx.annotations;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/org/infinispan/jmx/annotations/MeasurementType.java b/core/src/main/java/org/infinispan/jmx/annotations/MeasurementType.java
index 2b173e6c8453..3b636851d053 100644
--- a/core/src/main/java/org/infinispan/jmx/annotations/MeasurementType.java
+++ b/core/src/main/java/org/infinispan/jmx/annotations/MeasurementType.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.jmx.annotations;
 
 public enum MeasurementType {
diff --git a/core/src/main/java/org/infinispan/jmx/annotations/Parameter.java b/core/src/main/java/org/infinispan/jmx/annotations/Parameter.java
index 34072d805b63..60064a5d66bd 100644
--- a/core/src/main/java/org/infinispan/jmx/annotations/Parameter.java
+++ b/core/src/main/java/org/infinispan/jmx/annotations/Parameter.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.jmx.annotations;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/org/infinispan/jmx/annotations/Units.java b/core/src/main/java/org/infinispan/jmx/annotations/Units.java
index b53afe4fcca3..fb2897bb515e 100644
--- a/core/src/main/java/org/infinispan/jmx/annotations/Units.java
+++ b/core/src/main/java/org/infinispan/jmx/annotations/Units.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.jmx.annotations;
 
 public enum Units {
diff --git a/core/src/main/java/org/infinispan/jmx/annotations/package-info.java b/core/src/main/java/org/infinispan/jmx/annotations/package-info.java
index 424f218099e8..0ebcc85d886f 100644
--- a/core/src/main/java/org/infinispan/jmx/annotations/package-info.java
+++ b/core/src/main/java/org/infinispan/jmx/annotations/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * JMX 2.0-like annotations, with no dependencies on JMX 2.0.  A temporary set of annotations until we eventually
  * baseline on Java 7.  These annotations are for internal use, to allow Infinispan components to expose attributes
diff --git a/core/src/main/java/org/infinispan/jmx/package-info.java b/core/src/main/java/org/infinispan/jmx/package-info.java
index a89f1c139d86..1d210914cfbe 100644
--- a/core/src/main/java/org/infinispan/jmx/package-info.java
+++ b/core/src/main/java/org/infinispan/jmx/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Helpers that allow easy exposure of attributes and operations via JMX.
  */
diff --git a/core/src/main/java/org/infinispan/lifecycle/AbstractModuleLifecycle.java b/core/src/main/java/org/infinispan/lifecycle/AbstractModuleLifecycle.java
index c32ac62e1c60..974fb9acdd3a 100644
--- a/core/src/main/java/org/infinispan/lifecycle/AbstractModuleLifecycle.java
+++ b/core/src/main/java/org/infinispan/lifecycle/AbstractModuleLifecycle.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lifecycle;
 
 import org.infinispan.configuration.cache.Configuration;
diff --git a/core/src/main/java/org/infinispan/lifecycle/ComponentStatus.java b/core/src/main/java/org/infinispan/lifecycle/ComponentStatus.java
index 597a273255df..3b50d54ed928 100644
--- a/core/src/main/java/org/infinispan/lifecycle/ComponentStatus.java
+++ b/core/src/main/java/org/infinispan/lifecycle/ComponentStatus.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lifecycle;
 
 import org.infinispan.util.logging.Log;
diff --git a/core/src/main/java/org/infinispan/lifecycle/Lifecycle.java b/core/src/main/java/org/infinispan/lifecycle/Lifecycle.java
index 6b9ae4b2608b..57a87066c546 100644
--- a/core/src/main/java/org/infinispan/lifecycle/Lifecycle.java
+++ b/core/src/main/java/org/infinispan/lifecycle/Lifecycle.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lifecycle;
 
 /**
diff --git a/core/src/main/java/org/infinispan/lifecycle/ModuleLifecycle.java b/core/src/main/java/org/infinispan/lifecycle/ModuleLifecycle.java
index 2f9f0d03b9af..f2ec60d74309 100644
--- a/core/src/main/java/org/infinispan/lifecycle/ModuleLifecycle.java
+++ b/core/src/main/java/org/infinispan/lifecycle/ModuleLifecycle.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lifecycle;
 
 import org.infinispan.configuration.cache.Configuration;
diff --git a/core/src/main/java/org/infinispan/lifecycle/package-info.java b/core/src/main/java/org/infinispan/lifecycle/package-info.java
index e43ef125b307..110490b96283 100644
--- a/core/src/main/java/org/infinispan/lifecycle/package-info.java
+++ b/core/src/main/java/org/infinispan/lifecycle/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Component lifecycle.
  */
diff --git a/core/src/main/java/org/infinispan/loaders/AbstractCacheLoader.java b/core/src/main/java/org/infinispan/loaders/AbstractCacheLoader.java
index 8a8ca1f95e2c..48d208ea2861 100644
--- a/core/src/main/java/org/infinispan/loaders/AbstractCacheLoader.java
+++ b/core/src/main/java/org/infinispan/loaders/AbstractCacheLoader.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/loaders/AbstractCacheLoaderConfig.java b/core/src/main/java/org/infinispan/loaders/AbstractCacheLoaderConfig.java
index e9bc50265cef..c88234a2a76b 100644
--- a/core/src/main/java/org/infinispan/loaders/AbstractCacheLoaderConfig.java
+++ b/core/src/main/java/org/infinispan/loaders/AbstractCacheLoaderConfig.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import java.io.ByteArrayInputStream;
diff --git a/core/src/main/java/org/infinispan/loaders/AbstractCacheStore.java b/core/src/main/java/org/infinispan/loaders/AbstractCacheStore.java
index 0324da00e2d8..6605c8511f24 100644
--- a/core/src/main/java/org/infinispan/loaders/AbstractCacheStore.java
+++ b/core/src/main/java/org/infinispan/loaders/AbstractCacheStore.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/loaders/AbstractCacheStoreConfig.java b/core/src/main/java/org/infinispan/loaders/AbstractCacheStoreConfig.java
index e94150e6f593..dacfec350ca6 100644
--- a/core/src/main/java/org/infinispan/loaders/AbstractCacheStoreConfig.java
+++ b/core/src/main/java/org/infinispan/loaders/AbstractCacheStoreConfig.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import org.infinispan.commons.util.TypedProperties;
diff --git a/core/src/main/java/org/infinispan/loaders/CacheLoader.java b/core/src/main/java/org/infinispan/loaders/CacheLoader.java
index 6f481b38c734..f38951053bf7 100644
--- a/core/src/main/java/org/infinispan/loaders/CacheLoader.java
+++ b/core/src/main/java/org/infinispan/loaders/CacheLoader.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/loaders/CacheLoaderConfig.java b/core/src/main/java/org/infinispan/loaders/CacheLoaderConfig.java
index 4ecb054bbd53..fc8685d318bf 100644
--- a/core/src/main/java/org/infinispan/loaders/CacheLoaderConfig.java
+++ b/core/src/main/java/org/infinispan/loaders/CacheLoaderConfig.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import org.infinispan.commons.util.Util;
diff --git a/core/src/main/java/org/infinispan/loaders/CacheLoaderException.java b/core/src/main/java/org/infinispan/loaders/CacheLoaderException.java
index 4fa9a2df291a..eb385594b965 100644
--- a/core/src/main/java/org/infinispan/loaders/CacheLoaderException.java
+++ b/core/src/main/java/org/infinispan/loaders/CacheLoaderException.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 /**
diff --git a/core/src/main/java/org/infinispan/loaders/CacheLoaderManager.java b/core/src/main/java/org/infinispan/loaders/CacheLoaderManager.java
index 16a06750cee0..d2c4fc768e3d 100644
--- a/core/src/main/java/org/infinispan/loaders/CacheLoaderManager.java
+++ b/core/src/main/java/org/infinispan/loaders/CacheLoaderManager.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import java.util.List;
diff --git a/core/src/main/java/org/infinispan/loaders/CacheLoaderManagerImpl.java b/core/src/main/java/org/infinispan/loaders/CacheLoaderManagerImpl.java
index 342bffb97868..e0d18e839294 100644
--- a/core/src/main/java/org/infinispan/loaders/CacheLoaderManagerImpl.java
+++ b/core/src/main/java/org/infinispan/loaders/CacheLoaderManagerImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
diff --git a/core/src/main/java/org/infinispan/loaders/CacheLoaderMetadata.java b/core/src/main/java/org/infinispan/loaders/CacheLoaderMetadata.java
index 2fc6ee02970c..15a4b625c92c 100644
--- a/core/src/main/java/org/infinispan/loaders/CacheLoaderMetadata.java
+++ b/core/src/main/java/org/infinispan/loaders/CacheLoaderMetadata.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/org/infinispan/loaders/CacheStore.java b/core/src/main/java/org/infinispan/loaders/CacheStore.java
index b761a25ae8cf..b315639afe01 100644
--- a/core/src/main/java/org/infinispan/loaders/CacheStore.java
+++ b/core/src/main/java/org/infinispan/loaders/CacheStore.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import org.infinispan.container.entries.InternalCacheEntry;
diff --git a/core/src/main/java/org/infinispan/loaders/CacheStoreConfig.java b/core/src/main/java/org/infinispan/loaders/CacheStoreConfig.java
index 2693d1e5f424..71cacd638311 100644
--- a/core/src/main/java/org/infinispan/loaders/CacheStoreConfig.java
+++ b/core/src/main/java/org/infinispan/loaders/CacheStoreConfig.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import org.infinispan.loaders.decorators.AsyncStoreConfig;
diff --git a/core/src/main/java/org/infinispan/loaders/LockSupportCacheStore.java b/core/src/main/java/org/infinispan/loaders/LockSupportCacheStore.java
index e1664ff9e3ad..022aa4ea9798 100644
--- a/core/src/main/java/org/infinispan/loaders/LockSupportCacheStore.java
+++ b/core/src/main/java/org/infinispan/loaders/LockSupportCacheStore.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import java.io.ObjectInput;
diff --git a/core/src/main/java/org/infinispan/loaders/LockSupportCacheStoreConfig.java b/core/src/main/java/org/infinispan/loaders/LockSupportCacheStoreConfig.java
index b472530552d5..f9246c7f5fec 100644
--- a/core/src/main/java/org/infinispan/loaders/LockSupportCacheStoreConfig.java
+++ b/core/src/main/java/org/infinispan/loaders/LockSupportCacheStoreConfig.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 
diff --git a/core/src/main/java/org/infinispan/loaders/bucket/Bucket.java b/core/src/main/java/org/infinispan/loaders/bucket/Bucket.java
index b363fe87c551..59af9fd28b9f 100644
--- a/core/src/main/java/org/infinispan/loaders/bucket/Bucket.java
+++ b/core/src/main/java/org/infinispan/loaders/bucket/Bucket.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.bucket;
 
 import org.infinispan.container.entries.InternalCacheEntry;
diff --git a/core/src/main/java/org/infinispan/loaders/bucket/BucketBasedCacheStore.java b/core/src/main/java/org/infinispan/loaders/bucket/BucketBasedCacheStore.java
index bb0241cafd26..2587590054a3 100644
--- a/core/src/main/java/org/infinispan/loaders/bucket/BucketBasedCacheStore.java
+++ b/core/src/main/java/org/infinispan/loaders/bucket/BucketBasedCacheStore.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.bucket;
 
 import org.infinispan.container.entries.InternalCacheEntry;
diff --git a/core/src/main/java/org/infinispan/loaders/bucket/package-info.java b/core/src/main/java/org/infinispan/loaders/bucket/package-info.java
index 2a4c7e7ecf92..f9b134800a25 100644
--- a/core/src/main/java/org/infinispan/loaders/bucket/package-info.java
+++ b/core/src/main/java/org/infinispan/loaders/bucket/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Abstract classes that use hashed buckets to store entries.
  */
diff --git a/core/src/main/java/org/infinispan/loaders/cluster/ClusterCacheLoader.java b/core/src/main/java/org/infinispan/loaders/cluster/ClusterCacheLoader.java
index 7173895a78f9..8445ce3b2573 100644
--- a/core/src/main/java/org/infinispan/loaders/cluster/ClusterCacheLoader.java
+++ b/core/src/main/java/org/infinispan/loaders/cluster/ClusterCacheLoader.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.cluster;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/main/java/org/infinispan/loaders/cluster/ClusterCacheLoaderConfig.java b/core/src/main/java/org/infinispan/loaders/cluster/ClusterCacheLoaderConfig.java
index 9b727f084487..d1f0efd920df 100644
--- a/core/src/main/java/org/infinispan/loaders/cluster/ClusterCacheLoaderConfig.java
+++ b/core/src/main/java/org/infinispan/loaders/cluster/ClusterCacheLoaderConfig.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.cluster;
 
 import org.infinispan.loaders.AbstractCacheLoaderConfig;
diff --git a/core/src/main/java/org/infinispan/loaders/cluster/package-info.java b/core/src/main/java/org/infinispan/loaders/cluster/package-info.java
index f6041fbc59f7..f760f3ef4b89 100644
--- a/core/src/main/java/org/infinispan/loaders/cluster/package-info.java
+++ b/core/src/main/java/org/infinispan/loaders/cluster/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * A {@link CacheLoader} (not {@link CacheStore}) that polls other nodes in the cluster for state.  Useful if state
  * transfer on startup is disabled, this {@link CacheLoader} implementation allows for lazily loading state from
diff --git a/core/src/main/java/org/infinispan/loaders/decorators/AbstractDecoratorConfigurationBean.java b/core/src/main/java/org/infinispan/loaders/decorators/AbstractDecoratorConfigurationBean.java
index e1dbaaf8eb1e..195a47fadada 100644
--- a/core/src/main/java/org/infinispan/loaders/decorators/AbstractDecoratorConfigurationBean.java
+++ b/core/src/main/java/org/infinispan/loaders/decorators/AbstractDecoratorConfigurationBean.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.loaders.decorators;
 
 import org.infinispan.config.AbstractNamedCacheConfigurationBean;
diff --git a/core/src/main/java/org/infinispan/loaders/decorators/AbstractDelegatingStore.java b/core/src/main/java/org/infinispan/loaders/decorators/AbstractDelegatingStore.java
index 9ac3bbd3e7b2..e6974237480b 100644
--- a/core/src/main/java/org/infinispan/loaders/decorators/AbstractDelegatingStore.java
+++ b/core/src/main/java/org/infinispan/loaders/decorators/AbstractDelegatingStore.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.decorators;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/loaders/decorators/AsyncStore.java b/core/src/main/java/org/infinispan/loaders/decorators/AsyncStore.java
index 26c0da61a0e7..9ea10d7144c1 100644
--- a/core/src/main/java/org/infinispan/loaders/decorators/AsyncStore.java
+++ b/core/src/main/java/org/infinispan/loaders/decorators/AsyncStore.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.decorators;
 
 import net.jcip.annotations.GuardedBy;
diff --git a/core/src/main/java/org/infinispan/loaders/decorators/AsyncStoreConfig.java b/core/src/main/java/org/infinispan/loaders/decorators/AsyncStoreConfig.java
index 8041a9fe7339..184b25db4e21 100644
--- a/core/src/main/java/org/infinispan/loaders/decorators/AsyncStoreConfig.java
+++ b/core/src/main/java/org/infinispan/loaders/decorators/AsyncStoreConfig.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.decorators;
 
 import org.infinispan.config.ConfigurationBeanVisitor;
diff --git a/core/src/main/java/org/infinispan/loaders/decorators/ChainingCacheStore.java b/core/src/main/java/org/infinispan/loaders/decorators/ChainingCacheStore.java
index 069f578d930a..a94f596204a9 100644
--- a/core/src/main/java/org/infinispan/loaders/decorators/ChainingCacheStore.java
+++ b/core/src/main/java/org/infinispan/loaders/decorators/ChainingCacheStore.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.decorators;
 
 import net.jcip.annotations.GuardedBy;
diff --git a/core/src/main/java/org/infinispan/loaders/decorators/ReadOnlyStore.java b/core/src/main/java/org/infinispan/loaders/decorators/ReadOnlyStore.java
index 518971e2fa65..2d43262722cb 100644
--- a/core/src/main/java/org/infinispan/loaders/decorators/ReadOnlyStore.java
+++ b/core/src/main/java/org/infinispan/loaders/decorators/ReadOnlyStore.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.decorators;
 
 import org.infinispan.container.entries.InternalCacheEntry;
diff --git a/core/src/main/java/org/infinispan/loaders/decorators/SingletonStore.java b/core/src/main/java/org/infinispan/loaders/decorators/SingletonStore.java
index ce4ca061f4cb..d0d5f8b99a7c 100644
--- a/core/src/main/java/org/infinispan/loaders/decorators/SingletonStore.java
+++ b/core/src/main/java/org/infinispan/loaders/decorators/SingletonStore.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.decorators;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/loaders/decorators/SingletonStoreConfig.java b/core/src/main/java/org/infinispan/loaders/decorators/SingletonStoreConfig.java
index 82e1a30cab54..defb27c3353c 100644
--- a/core/src/main/java/org/infinispan/loaders/decorators/SingletonStoreConfig.java
+++ b/core/src/main/java/org/infinispan/loaders/decorators/SingletonStoreConfig.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.decorators;
 
 import org.infinispan.config.ConfigurationBeanVisitor;
diff --git a/core/src/main/java/org/infinispan/loaders/decorators/package-info.java b/core/src/main/java/org/infinispan/loaders/decorators/package-info.java
index 4d46c759d853..d490be009917 100644
--- a/core/src/main/java/org/infinispan/loaders/decorators/package-info.java
+++ b/core/src/main/java/org/infinispan/loaders/decorators/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * This package contains loaders and stores, which are used for overflow or persistence.
  * Need @XmlSchema annotation for AsyncStoreConfig.java and SingletonStoreConfig.java
diff --git a/core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java b/core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java
index 6b1527210c30..c63322cf52b9 100644
--- a/core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java
+++ b/core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.file;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/loaders/file/FileCacheStoreConfig.java b/core/src/main/java/org/infinispan/loaders/file/FileCacheStoreConfig.java
index 94e344f01dbc..5243cd38f847 100644
--- a/core/src/main/java/org/infinispan/loaders/file/FileCacheStoreConfig.java
+++ b/core/src/main/java/org/infinispan/loaders/file/FileCacheStoreConfig.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.file;
 
 import org.infinispan.loaders.LockSupportCacheStoreConfig;
diff --git a/core/src/main/java/org/infinispan/loaders/file/package-info.java b/core/src/main/java/org/infinispan/loaders/file/package-info.java
index 47025202b934..ce0a54329526 100644
--- a/core/src/main/java/org/infinispan/loaders/file/package-info.java
+++ b/core/src/main/java/org/infinispan/loaders/file/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Simple filesystem-based {@link CacheStore} implementation.
  */
diff --git a/core/src/main/java/org/infinispan/loaders/keymappers/DefaultTwoWayKey2StringMapper.java b/core/src/main/java/org/infinispan/loaders/keymappers/DefaultTwoWayKey2StringMapper.java
index 1c64f9cf7956..6d8d1c5c9859 100644
--- a/core/src/main/java/org/infinispan/loaders/keymappers/DefaultTwoWayKey2StringMapper.java
+++ b/core/src/main/java/org/infinispan/loaders/keymappers/DefaultTwoWayKey2StringMapper.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.keymappers;
 
 import org.infinispan.commons.util.Base64;
diff --git a/core/src/main/java/org/infinispan/loaders/keymappers/Key2StringMapper.java b/core/src/main/java/org/infinispan/loaders/keymappers/Key2StringMapper.java
index a814ea493553..924c435bdda4 100644
--- a/core/src/main/java/org/infinispan/loaders/keymappers/Key2StringMapper.java
+++ b/core/src/main/java/org/infinispan/loaders/keymappers/Key2StringMapper.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.keymappers;
 
 /**
diff --git a/core/src/main/java/org/infinispan/loaders/keymappers/MarshalledValueOrPrimitiveMapper.java b/core/src/main/java/org/infinispan/loaders/keymappers/MarshalledValueOrPrimitiveMapper.java
index 37facbf5ca0f..2af5ececf110 100644
--- a/core/src/main/java/org/infinispan/loaders/keymappers/MarshalledValueOrPrimitiveMapper.java
+++ b/core/src/main/java/org/infinispan/loaders/keymappers/MarshalledValueOrPrimitiveMapper.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.keymappers;
 
 import java.io.ByteArrayInputStream;
diff --git a/core/src/main/java/org/infinispan/loaders/keymappers/MarshallingTwoWayKey2StringMapper.java b/core/src/main/java/org/infinispan/loaders/keymappers/MarshallingTwoWayKey2StringMapper.java
index 9b7a250f45f1..8eee05396fa9 100644
--- a/core/src/main/java/org/infinispan/loaders/keymappers/MarshallingTwoWayKey2StringMapper.java
+++ b/core/src/main/java/org/infinispan/loaders/keymappers/MarshallingTwoWayKey2StringMapper.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.keymappers;
 
 import org.infinispan.commons.marshall.StreamingMarshaller;
diff --git a/core/src/main/java/org/infinispan/loaders/keymappers/TwoWayKey2StringMapper.java b/core/src/main/java/org/infinispan/loaders/keymappers/TwoWayKey2StringMapper.java
index f1b0cc970bc2..0d9ea82ec0e4 100644
--- a/core/src/main/java/org/infinispan/loaders/keymappers/TwoWayKey2StringMapper.java
+++ b/core/src/main/java/org/infinispan/loaders/keymappers/TwoWayKey2StringMapper.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.keymappers;
 
 /**
diff --git a/core/src/main/java/org/infinispan/loaders/keymappers/UnsupportedKeyTypeException.java b/core/src/main/java/org/infinispan/loaders/keymappers/UnsupportedKeyTypeException.java
index 2c3ddfa21e5b..412d949f6a6b 100644
--- a/core/src/main/java/org/infinispan/loaders/keymappers/UnsupportedKeyTypeException.java
+++ b/core/src/main/java/org/infinispan/loaders/keymappers/UnsupportedKeyTypeException.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.keymappers;
 
 import org.infinispan.loaders.CacheLoaderException;
diff --git a/core/src/main/java/org/infinispan/loaders/modifications/Clear.java b/core/src/main/java/org/infinispan/loaders/modifications/Clear.java
index faeb7a82f22d..2d5b29ba27b6 100644
--- a/core/src/main/java/org/infinispan/loaders/modifications/Clear.java
+++ b/core/src/main/java/org/infinispan/loaders/modifications/Clear.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.modifications;
 
 /**
diff --git a/core/src/main/java/org/infinispan/loaders/modifications/Modification.java b/core/src/main/java/org/infinispan/loaders/modifications/Modification.java
index 123458e68ea5..b81e8fa4c163 100644
--- a/core/src/main/java/org/infinispan/loaders/modifications/Modification.java
+++ b/core/src/main/java/org/infinispan/loaders/modifications/Modification.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.modifications;
 
 /**
diff --git a/core/src/main/java/org/infinispan/loaders/modifications/ModificationsList.java b/core/src/main/java/org/infinispan/loaders/modifications/ModificationsList.java
index 3ff9d464958b..a5dc5e09db59 100644
--- a/core/src/main/java/org/infinispan/loaders/modifications/ModificationsList.java
+++ b/core/src/main/java/org/infinispan/loaders/modifications/ModificationsList.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.modifications;
 
 import java.util.List;
diff --git a/core/src/main/java/org/infinispan/loaders/modifications/PurgeExpired.java b/core/src/main/java/org/infinispan/loaders/modifications/PurgeExpired.java
index 801286de534a..34eb32a86748 100644
--- a/core/src/main/java/org/infinispan/loaders/modifications/PurgeExpired.java
+++ b/core/src/main/java/org/infinispan/loaders/modifications/PurgeExpired.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.modifications;
 
 public class PurgeExpired implements Modification {
diff --git a/core/src/main/java/org/infinispan/loaders/modifications/Remove.java b/core/src/main/java/org/infinispan/loaders/modifications/Remove.java
index 49a24b8e7b4c..5917500f414f 100644
--- a/core/src/main/java/org/infinispan/loaders/modifications/Remove.java
+++ b/core/src/main/java/org/infinispan/loaders/modifications/Remove.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.modifications;
 
 /**
diff --git a/core/src/main/java/org/infinispan/loaders/modifications/Store.java b/core/src/main/java/org/infinispan/loaders/modifications/Store.java
index 66627bac7828..90233fcbe5d9 100644
--- a/core/src/main/java/org/infinispan/loaders/modifications/Store.java
+++ b/core/src/main/java/org/infinispan/loaders/modifications/Store.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.modifications;
 
 import org.infinispan.container.entries.InternalCacheEntry;
diff --git a/core/src/main/java/org/infinispan/loaders/modifications/package-info.java b/core/src/main/java/org/infinispan/loaders/modifications/package-info.java
index c82000acad48..e7d8d5b8f5e5 100644
--- a/core/src/main/java/org/infinispan/loaders/modifications/package-info.java
+++ b/core/src/main/java/org/infinispan/loaders/modifications/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Modifications that are used to encapsulate cache operations for application to a {@link CacheStore}.
  */
diff --git a/core/src/main/java/org/infinispan/loaders/package-info.java b/core/src/main/java/org/infinispan/loaders/package-info.java
index ebcf60253f40..d0a7d61eb6bf 100644
--- a/core/src/main/java/org/infinispan/loaders/package-info.java
+++ b/core/src/main/java/org/infinispan/loaders/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * This package contains loaders and stores, which are used for overflow or persistence.
  * Need @XmlSchema annotation for CacheLoaderConfig.java and AbstractCacheStoreConfig.java
diff --git a/core/src/main/java/org/infinispan/manager/AbstractDelegatingEmbeddedCacheManager.java b/core/src/main/java/org/infinispan/manager/AbstractDelegatingEmbeddedCacheManager.java
index 90420d8da279..ca36e9232446 100644
--- a/core/src/main/java/org/infinispan/manager/AbstractDelegatingEmbeddedCacheManager.java
+++ b/core/src/main/java/org/infinispan/manager/AbstractDelegatingEmbeddedCacheManager.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.manager;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/manager/CacheManager.java b/core/src/main/java/org/infinispan/manager/CacheManager.java
index 79ec17c1515d..19ef322a4c09 100644
--- a/core/src/main/java/org/infinispan/manager/CacheManager.java
+++ b/core/src/main/java/org/infinispan/manager/CacheManager.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.manager;
 
 /**
diff --git a/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java b/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java
index 67676e510d49..8f3471c72a14 100644
--- a/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java
+++ b/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.manager;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/manager/EmbeddedCacheManager.java b/core/src/main/java/org/infinispan/manager/EmbeddedCacheManager.java
index ec848405c424..b0de724a40ad 100644
--- a/core/src/main/java/org/infinispan/manager/EmbeddedCacheManager.java
+++ b/core/src/main/java/org/infinispan/manager/EmbeddedCacheManager.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.manager;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/manager/EmbeddedCacheManagerStartupException.java b/core/src/main/java/org/infinispan/manager/EmbeddedCacheManagerStartupException.java
index 6f5462d7d079..561202beadf0 100644
--- a/core/src/main/java/org/infinispan/manager/EmbeddedCacheManagerStartupException.java
+++ b/core/src/main/java/org/infinispan/manager/EmbeddedCacheManagerStartupException.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.manager;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/main/java/org/infinispan/manager/NamedCacheNotFoundException.java b/core/src/main/java/org/infinispan/manager/NamedCacheNotFoundException.java
index 893272cd51b0..e5daf1475d5b 100644
--- a/core/src/main/java/org/infinispan/manager/NamedCacheNotFoundException.java
+++ b/core/src/main/java/org/infinispan/manager/NamedCacheNotFoundException.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.manager;
 
 /**
diff --git a/core/src/main/java/org/infinispan/manager/package-info.java b/core/src/main/java/org/infinispan/manager/package-info.java
index 77798d983f70..a7b5033f8022 100644
--- a/core/src/main/java/org/infinispan/manager/package-info.java
+++ b/core/src/main/java/org/infinispan/manager/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Cache manager package
  */
diff --git a/core/src/main/java/org/infinispan/marshall/AbstractMarshaller.java b/core/src/main/java/org/infinispan/marshall/AbstractMarshaller.java
index a3e724a5172b..6b6eda052a90 100644
--- a/core/src/main/java/org/infinispan/marshall/AbstractMarshaller.java
+++ b/core/src/main/java/org/infinispan/marshall/AbstractMarshaller.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.marshall;
 
 import org.infinispan.commons.marshall.MarshallableTypeHints;
diff --git a/core/src/main/java/org/infinispan/marshall/AdvancedExternalizer.java b/core/src/main/java/org/infinispan/marshall/AdvancedExternalizer.java
index fa7771969ead..2a0e20627572 100644
--- a/core/src/main/java/org/infinispan/marshall/AdvancedExternalizer.java
+++ b/core/src/main/java/org/infinispan/marshall/AdvancedExternalizer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.marshall;
 
 import java.util.Set;
diff --git a/core/src/main/java/org/infinispan/marshall/BufferSizePredictor.java b/core/src/main/java/org/infinispan/marshall/BufferSizePredictor.java
index 343496b428e3..0a0d1b7c8c9c 100644
--- a/core/src/main/java/org/infinispan/marshall/BufferSizePredictor.java
+++ b/core/src/main/java/org/infinispan/marshall/BufferSizePredictor.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.marshall;
 
 /**
diff --git a/core/src/main/java/org/infinispan/marshall/Externalizer.java b/core/src/main/java/org/infinispan/marshall/Externalizer.java
index 586d6686e8a3..7760f1dcd1c7 100644
--- a/core/src/main/java/org/infinispan/marshall/Externalizer.java
+++ b/core/src/main/java/org/infinispan/marshall/Externalizer.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.marshall;
 
 import java.io.IOException;
diff --git a/core/src/main/java/org/infinispan/marshall/Marshaller.java b/core/src/main/java/org/infinispan/marshall/Marshaller.java
index 48bd003ecd99..7bfa09129417 100644
--- a/core/src/main/java/org/infinispan/marshall/Marshaller.java
+++ b/core/src/main/java/org/infinispan/marshall/Marshaller.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.marshall;
 
 import net.jcip.annotations.ThreadSafe;
diff --git a/core/src/main/java/org/infinispan/marshall/SerializeWith.java b/core/src/main/java/org/infinispan/marshall/SerializeWith.java
index bc6350704dae..c0cbc8a2af2b 100644
--- a/core/src/main/java/org/infinispan/marshall/SerializeWith.java
+++ b/core/src/main/java/org/infinispan/marshall/SerializeWith.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.marshall;
 
 import java.lang.annotation.Documented;
diff --git a/core/src/main/java/org/infinispan/marshall/StreamingMarshaller.java b/core/src/main/java/org/infinispan/marshall/StreamingMarshaller.java
index 27d4590981bb..88ce3c06c2d8 100644
--- a/core/src/main/java/org/infinispan/marshall/StreamingMarshaller.java
+++ b/core/src/main/java/org/infinispan/marshall/StreamingMarshaller.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.marshall;
 
 import net.jcip.annotations.ThreadSafe;
diff --git a/core/src/main/java/org/infinispan/marshall/core/ExternalizerTable.java b/core/src/main/java/org/infinispan/marshall/core/ExternalizerTable.java
index 483a90c63af1..ed9c44da5cdf 100644
--- a/core/src/main/java/org/infinispan/marshall/core/ExternalizerTable.java
+++ b/core/src/main/java/org/infinispan/marshall/core/ExternalizerTable.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.marshall.core;
 
 import org.infinispan.atomic.DeltaCompositeKey;
diff --git a/core/src/main/java/org/infinispan/marshall/core/Ids.java b/core/src/main/java/org/infinispan/marshall/core/Ids.java
index b319ba37f367..8b45959a35c4 100644
--- a/core/src/main/java/org/infinispan/marshall/core/Ids.java
+++ b/core/src/main/java/org/infinispan/marshall/core/Ids.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.marshall.core;
 
 /**
diff --git a/core/src/main/java/org/infinispan/marshall/core/JBossMarshaller.java b/core/src/main/java/org/infinispan/marshall/core/JBossMarshaller.java
index 4472770bb231..bb582abadb03 100644
--- a/core/src/main/java/org/infinispan/marshall/core/JBossMarshaller.java
+++ b/core/src/main/java/org/infinispan/marshall/core/JBossMarshaller.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.marshall.core;
 
 import java.io.IOException;
diff --git a/core/src/main/java/org/infinispan/marshall/core/MarshalledValue.java b/core/src/main/java/org/infinispan/marshall/core/MarshalledValue.java
index f91178203719..584984046930 100644
--- a/core/src/main/java/org/infinispan/marshall/core/MarshalledValue.java
+++ b/core/src/main/java/org/infinispan/marshall/core/MarshalledValue.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.marshall.core;
 
 import org.infinispan.commands.ReplicableCommand;
diff --git a/core/src/main/java/org/infinispan/marshall/core/SerializeWithExtFactory.java b/core/src/main/java/org/infinispan/marshall/core/SerializeWithExtFactory.java
index 575ce2a08968..ab71c9f10832 100644
--- a/core/src/main/java/org/infinispan/marshall/core/SerializeWithExtFactory.java
+++ b/core/src/main/java/org/infinispan/marshall/core/SerializeWithExtFactory.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.marshall.core;
 
 import org.infinispan.commons.marshall.SerializeWith;
diff --git a/core/src/main/java/org/infinispan/marshall/core/VersionAwareMarshaller.java b/core/src/main/java/org/infinispan/marshall/core/VersionAwareMarshaller.java
index a901f2f605bd..87eeaea731bf 100644
--- a/core/src/main/java/org/infinispan/marshall/core/VersionAwareMarshaller.java
+++ b/core/src/main/java/org/infinispan/marshall/core/VersionAwareMarshaller.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.marshall.core;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/marshall/exts/ArrayListExternalizer.java b/core/src/main/java/org/infinispan/marshall/exts/ArrayListExternalizer.java
index 5f6fff8b13a4..9206d1ce9118 100644
--- a/core/src/main/java/org/infinispan/marshall/exts/ArrayListExternalizer.java
+++ b/core/src/main/java/org/infinispan/marshall/exts/ArrayListExternalizer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.marshall.exts;
 
 import net.jcip.annotations.Immutable;
diff --git a/core/src/main/java/org/infinispan/marshall/exts/CacheRpcCommandExternalizer.java b/core/src/main/java/org/infinispan/marshall/exts/CacheRpcCommandExternalizer.java
index d29a1cb4608b..0918b61a5200 100644
--- a/core/src/main/java/org/infinispan/marshall/exts/CacheRpcCommandExternalizer.java
+++ b/core/src/main/java/org/infinispan/marshall/exts/CacheRpcCommandExternalizer.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.marshall.exts;
 
 import org.infinispan.commands.CancelCommand;
diff --git a/core/src/main/java/org/infinispan/marshall/exts/LinkedListExternalizer.java b/core/src/main/java/org/infinispan/marshall/exts/LinkedListExternalizer.java
index 2bd236165d06..3c3850f12ef0 100644
--- a/core/src/main/java/org/infinispan/marshall/exts/LinkedListExternalizer.java
+++ b/core/src/main/java/org/infinispan/marshall/exts/LinkedListExternalizer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.marshall.exts;
 
 import net.jcip.annotations.Immutable;
diff --git a/core/src/main/java/org/infinispan/marshall/exts/MapExternalizer.java b/core/src/main/java/org/infinispan/marshall/exts/MapExternalizer.java
index 48f77e493783..fd36a41c7cbc 100644
--- a/core/src/main/java/org/infinispan/marshall/exts/MapExternalizer.java
+++ b/core/src/main/java/org/infinispan/marshall/exts/MapExternalizer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.marshall.exts;
 
 import org.infinispan.commons.marshall.AbstractExternalizer;
diff --git a/core/src/main/java/org/infinispan/marshall/exts/ReplicableCommandExternalizer.java b/core/src/main/java/org/infinispan/marshall/exts/ReplicableCommandExternalizer.java
index bace8744c3fc..431272925609 100644
--- a/core/src/main/java/org/infinispan/marshall/exts/ReplicableCommandExternalizer.java
+++ b/core/src/main/java/org/infinispan/marshall/exts/ReplicableCommandExternalizer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.marshall.exts;
 
 import org.infinispan.atomic.DeltaAware;
diff --git a/core/src/main/java/org/infinispan/marshall/exts/SetExternalizer.java b/core/src/main/java/org/infinispan/marshall/exts/SetExternalizer.java
index 25bfc41fd930..e4dea96eef4d 100644
--- a/core/src/main/java/org/infinispan/marshall/exts/SetExternalizer.java
+++ b/core/src/main/java/org/infinispan/marshall/exts/SetExternalizer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.marshall.exts;
 
 import net.jcip.annotations.Immutable;
diff --git a/core/src/main/java/org/infinispan/marshall/exts/SingletonListExternalizer.java b/core/src/main/java/org/infinispan/marshall/exts/SingletonListExternalizer.java
index d488034f8b1c..3eadef631703 100644
--- a/core/src/main/java/org/infinispan/marshall/exts/SingletonListExternalizer.java
+++ b/core/src/main/java/org/infinispan/marshall/exts/SingletonListExternalizer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.marshall.exts;
 
 import java.io.IOException;
diff --git a/core/src/main/java/org/infinispan/marshall/exts/package-info.java b/core/src/main/java/org/infinispan/marshall/exts/package-info.java
index e5c3dad96a39..8e4beafe573e 100644
--- a/core/src/main/java/org/infinispan/marshall/exts/package-info.java
+++ b/core/src/main/java/org/infinispan/marshall/exts/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Externalizers for various JDK types that are marshalled using the marshalling framework.
  */
diff --git a/core/src/main/java/org/infinispan/metadata/EmbeddedMetadata.java b/core/src/main/java/org/infinispan/metadata/EmbeddedMetadata.java
index 962e7cb7d3ce..b840adc39fb5 100644
--- a/core/src/main/java/org/infinispan/metadata/EmbeddedMetadata.java
+++ b/core/src/main/java/org/infinispan/metadata/EmbeddedMetadata.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.metadata;
 
 import org.infinispan.container.versioning.EntryVersion;
diff --git a/core/src/main/java/org/infinispan/metadata/Metadata.java b/core/src/main/java/org/infinispan/metadata/Metadata.java
index 52b12f0235a5..819e941ed34a 100644
--- a/core/src/main/java/org/infinispan/metadata/Metadata.java
+++ b/core/src/main/java/org/infinispan/metadata/Metadata.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.metadata;
 
 import org.infinispan.container.versioning.EntryVersion;
diff --git a/core/src/main/java/org/infinispan/metadata/Metadatas.java b/core/src/main/java/org/infinispan/metadata/Metadatas.java
index 7b1d197e47ea..526c6d16029f 100644
--- a/core/src/main/java/org/infinispan/metadata/Metadatas.java
+++ b/core/src/main/java/org/infinispan/metadata/Metadatas.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.metadata;
 
 /**
diff --git a/core/src/main/java/org/infinispan/notifications/AbstractListenerImpl.java b/core/src/main/java/org/infinispan/notifications/AbstractListenerImpl.java
index c12e25848eca..8925787aa9f7 100644
--- a/core/src/main/java/org/infinispan/notifications/AbstractListenerImpl.java
+++ b/core/src/main/java/org/infinispan/notifications/AbstractListenerImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/main/java/org/infinispan/notifications/ClassLoaderAwareListenable.java b/core/src/main/java/org/infinispan/notifications/ClassLoaderAwareListenable.java
index 95b66ecefa47..b1a17af856d6 100644
--- a/core/src/main/java/org/infinispan/notifications/ClassLoaderAwareListenable.java
+++ b/core/src/main/java/org/infinispan/notifications/ClassLoaderAwareListenable.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.notifications;
 
 /**
diff --git a/core/src/main/java/org/infinispan/notifications/IncorrectListenerException.java b/core/src/main/java/org/infinispan/notifications/IncorrectListenerException.java
index 32e2fe061e3a..a21497c12728 100644
--- a/core/src/main/java/org/infinispan/notifications/IncorrectListenerException.java
+++ b/core/src/main/java/org/infinispan/notifications/IncorrectListenerException.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/main/java/org/infinispan/notifications/Listenable.java b/core/src/main/java/org/infinispan/notifications/Listenable.java
index 3d34a79b049c..dea03f6e1dec 100644
--- a/core/src/main/java/org/infinispan/notifications/Listenable.java
+++ b/core/src/main/java/org/infinispan/notifications/Listenable.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications;
 
 import java.util.Set;
diff --git a/core/src/main/java/org/infinispan/notifications/Listener.java b/core/src/main/java/org/infinispan/notifications/Listener.java
index 90c5b6cd97bb..fa8a64eeb4de 100644
--- a/core/src/main/java/org/infinispan/notifications/Listener.java
+++ b/core/src/main/java/org/infinispan/notifications/Listener.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/CacheNotifier.java b/core/src/main/java/org/infinispan/notifications/cachelistener/CacheNotifier.java
index 64608134e36e..3da0e04fc3b5 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/CacheNotifier.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/CacheNotifier.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener;
 
 import org.infinispan.commands.FlagAffectedCommand;
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/CacheNotifierImpl.java b/core/src/main/java/org/infinispan/notifications/cachelistener/CacheNotifierImpl.java
index f7c07be8bbd9..6cc1cfb38564 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/CacheNotifierImpl.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/CacheNotifierImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntriesEvicted.java b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntriesEvicted.java
index 811b01a04e5f..11425ce34095 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntriesEvicted.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntriesEvicted.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.notifications.cachelistener.annotation;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryActivated.java b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryActivated.java
index a0945ede214b..d34c3fa1f930 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryActivated.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryActivated.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener.annotation;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryCreated.java b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryCreated.java
index b6aa0890ba08..1e83e93229eb 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryCreated.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryCreated.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener.annotation;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryEvicted.java b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryEvicted.java
index 614239ca97fc..b496ad201dd6 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryEvicted.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryEvicted.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.notifications.cachelistener.annotation;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryInvalidated.java b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryInvalidated.java
index ef659d67be8a..5959baaef515 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryInvalidated.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryInvalidated.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener.annotation;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryLoaded.java b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryLoaded.java
index 26b29261aec9..b3f4f35f4fb0 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryLoaded.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryLoaded.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener.annotation;
 
 import org.infinispan.loaders.CacheLoader;
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryModified.java b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryModified.java
index 2c5627861a05..e2ee34a85bb4 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryModified.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryModified.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener.annotation;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryPassivated.java b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryPassivated.java
index 97678dc19f76..60eaf4782036 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryPassivated.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryPassivated.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.notifications.cachelistener.annotation;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryRemoved.java b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryRemoved.java
index 632cccc1c44b..b427237ab3ea 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryRemoved.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryRemoved.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener.annotation;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryVisited.java b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryVisited.java
index 1e3ac1e421b6..522177793af5 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryVisited.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryVisited.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener.annotation;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/DataRehashed.java b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/DataRehashed.java
index a7adc8e3866e..e90d21c68a16 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/DataRehashed.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/DataRehashed.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.notifications.cachelistener.annotation;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/TopologyChanged.java b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/TopologyChanged.java
index e0dd10ba6227..78db14ed42d3 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/TopologyChanged.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/TopologyChanged.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.notifications.cachelistener.annotation;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/TransactionCompleted.java b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/TransactionCompleted.java
index 1bd1a788da00..aa3abfdf0781 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/TransactionCompleted.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/TransactionCompleted.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener.annotation;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/TransactionRegistered.java b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/TransactionRegistered.java
index 1c59bf65471b..7ee39b0e8ae9 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/TransactionRegistered.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/TransactionRegistered.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener.annotation;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntriesEvictedEvent.java b/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntriesEvictedEvent.java
index 8930777aa1c8..28a420a75e7f 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntriesEvictedEvent.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntriesEvictedEvent.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.notifications.cachelistener.event;
 
 import java.util.Map;
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryActivatedEvent.java b/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryActivatedEvent.java
index 5ad7f08387ce..09b93213d1cc 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryActivatedEvent.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryActivatedEvent.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener.event;
 
 /**
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryCreatedEvent.java b/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryCreatedEvent.java
index 5841dc7edf76..204b19193b0e 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryCreatedEvent.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryCreatedEvent.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener.event;
 
 /**
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryEvent.java b/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryEvent.java
index 1f5bb1156b1b..6d3dcfc47cef 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryEvent.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryEvent.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener.event;
 
 /**
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryEvictedEvent.java b/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryEvictedEvent.java
index 701bf03b5fac..d638c639e40e 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryEvictedEvent.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryEvictedEvent.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.notifications.cachelistener.event;
 
 /**
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryInvalidatedEvent.java b/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryInvalidatedEvent.java
index 489ba6921dfa..06310729d668 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryInvalidatedEvent.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryInvalidatedEvent.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener.event;
 
 /**
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryLoadedEvent.java b/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryLoadedEvent.java
index 8f1dd93f4427..7af55f2eb7d6 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryLoadedEvent.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryLoadedEvent.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener.event;
 
 /**
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryModifiedEvent.java b/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryModifiedEvent.java
index 47b90df3d8a6..7dbf92d28fff 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryModifiedEvent.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryModifiedEvent.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener.event;
 
 /**
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryPassivatedEvent.java b/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryPassivatedEvent.java
index f45960a1f95e..6d2050917c52 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryPassivatedEvent.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryPassivatedEvent.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.notifications.cachelistener.event;
 
 /**
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryRemovedEvent.java b/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryRemovedEvent.java
index 83a3f33b377f..d83130ae19cc 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryRemovedEvent.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryRemovedEvent.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener.event;
 
 /**
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryVisitedEvent.java b/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryVisitedEvent.java
index 4fac45526017..fdbcf0707d2d 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryVisitedEvent.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryVisitedEvent.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener.event;
 
 /**
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/event/DataRehashedEvent.java b/core/src/main/java/org/infinispan/notifications/cachelistener/event/DataRehashedEvent.java
index 20c795af5109..3647125163c0 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/event/DataRehashedEvent.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/event/DataRehashedEvent.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.notifications.cachelistener.event;
 
 import org.infinispan.distribution.ch.ConsistentHash;
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/event/Event.java b/core/src/main/java/org/infinispan/notifications/cachelistener/event/Event.java
index c8471a569aed..faf89c0fa07a 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/event/Event.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/event/Event.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener.event;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/event/EventImpl.java b/core/src/main/java/org/infinispan/notifications/cachelistener/event/EventImpl.java
index ff1f63df8af8..c46dd673de87 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/event/EventImpl.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/event/EventImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener.event;
 
 import net.jcip.annotations.NotThreadSafe;
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/event/TopologyChangedEvent.java b/core/src/main/java/org/infinispan/notifications/cachelistener/event/TopologyChangedEvent.java
index 35d98f4ee278..310c7117b938 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/event/TopologyChangedEvent.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/event/TopologyChangedEvent.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.notifications.cachelistener.event;
 
 import org.infinispan.distribution.ch.ConsistentHash;
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/event/TransactionCompletedEvent.java b/core/src/main/java/org/infinispan/notifications/cachelistener/event/TransactionCompletedEvent.java
index a3b8acde4364..0f373334eb0a 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/event/TransactionCompletedEvent.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/event/TransactionCompletedEvent.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener.event;
 
 /**
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/event/TransactionRegisteredEvent.java b/core/src/main/java/org/infinispan/notifications/cachelistener/event/TransactionRegisteredEvent.java
index 9dfde3786c45..527ae1b6a795 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/event/TransactionRegisteredEvent.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/event/TransactionRegisteredEvent.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener.event;
 
 /**
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/event/TransactionalEvent.java b/core/src/main/java/org/infinispan/notifications/cachelistener/event/TransactionalEvent.java
index c04497af8ade..3821cedeeee7 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/event/TransactionalEvent.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/event/TransactionalEvent.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener.event;
 
 import org.infinispan.transaction.xa.GlobalTransaction;
diff --git a/core/src/main/java/org/infinispan/notifications/cachelistener/package-info.java b/core/src/main/java/org/infinispan/notifications/cachelistener/package-info.java
index 7355bb3eec52..8c5006189870 100644
--- a/core/src/main/java/org/infinispan/notifications/cachelistener/package-info.java
+++ b/core/src/main/java/org/infinispan/notifications/cachelistener/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * {@link Cache}-specific notifications and eventing.
  */
diff --git a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifier.java b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifier.java
index 6f11fbca0eed..f60b84d1e0ce 100644
--- a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifier.java
+++ b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifier.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachemanagerlistener;
 
 import org.infinispan.factories.annotations.SurvivesRestarts;
diff --git a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierImpl.java b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierImpl.java
index c20495a7cacd..6f5e59e6326b 100644
--- a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierImpl.java
+++ b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachemanagerlistener;
 
 import org.infinispan.factories.annotations.Inject;
diff --git a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/CacheStarted.java b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/CacheStarted.java
index 41a68b49544e..f27098c30fce 100644
--- a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/CacheStarted.java
+++ b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/CacheStarted.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachemanagerlistener.annotation;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/CacheStopped.java b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/CacheStopped.java
index e067de0b42e2..2ae0aa102bbc 100644
--- a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/CacheStopped.java
+++ b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/CacheStopped.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachemanagerlistener.annotation;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/Merged.java b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/Merged.java
index 3bc14c59e50a..faa7aae77b62 100644
--- a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/Merged.java
+++ b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/Merged.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachemanagerlistener.annotation;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/ViewChanged.java b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/ViewChanged.java
index ea61c0235793..aaecb3ee97e1 100644
--- a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/ViewChanged.java
+++ b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/ViewChanged.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachemanagerlistener.annotation;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/CacheStartedEvent.java b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/CacheStartedEvent.java
index 83acbf18c31d..dece98a7be58 100644
--- a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/CacheStartedEvent.java
+++ b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/CacheStartedEvent.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachemanagerlistener.event;
 
 /**
diff --git a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/CacheStoppedEvent.java b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/CacheStoppedEvent.java
index 40d579736113..f26669affff0 100644
--- a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/CacheStoppedEvent.java
+++ b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/CacheStoppedEvent.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachemanagerlistener.event;
 
 /**
diff --git a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/Event.java b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/Event.java
index b343a8092b34..471b76d0ae47 100644
--- a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/Event.java
+++ b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/Event.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachemanagerlistener.event;
 
 import org.infinispan.manager.EmbeddedCacheManager;
diff --git a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/EventImpl.java b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/EventImpl.java
index 74f88326f772..ecb48061c81d 100644
--- a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/EventImpl.java
+++ b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/EventImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachemanagerlistener.event;
 
 import org.infinispan.commons.util.InfinispanCollections;
diff --git a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/MergeEvent.java b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/MergeEvent.java
index efc4d8d1c572..c4112aa5b0ba 100644
--- a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/MergeEvent.java
+++ b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/MergeEvent.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachemanagerlistener.event;
 
 import org.infinispan.remoting.transport.Address;
diff --git a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/ViewChangedEvent.java b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/ViewChangedEvent.java
index 40cedfed1e55..03856032f714 100644
--- a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/ViewChangedEvent.java
+++ b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/ViewChangedEvent.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachemanagerlistener.event;
 
 import org.infinispan.remoting.transport.Address;
diff --git a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/package-info.java b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/package-info.java
index 5e823401dce1..b587134e46bb 100644
--- a/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/package-info.java
+++ b/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * {@link CacheManager}-specific notifications and eventing.
  */
diff --git a/core/src/main/java/org/infinispan/notifications/package-info.java b/core/src/main/java/org/infinispan/notifications/package-info.java
index 4a64de32edef..a715caeaf907 100644
--- a/core/src/main/java/org/infinispan/notifications/package-info.java
+++ b/core/src/main/java/org/infinispan/notifications/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Notifications and eventing for listeners on both the Cache and CacheManager interfaces.
  */
diff --git a/core/src/main/java/org/infinispan/package-info.java b/core/src/main/java/org/infinispan/package-info.java
index 84bbb6ce3c73..60541523ac19 100644
--- a/core/src/main/java/org/infinispan/package-info.java
+++ b/core/src/main/java/org/infinispan/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * This is the core of Infinispan, a distributed, transactional, highly scalable data grid
  * platform.  For more information on Infinispan, please read the documentation, tutorials
diff --git a/core/src/main/java/org/infinispan/remoting/InboundInvocationHandler.java b/core/src/main/java/org/infinispan/remoting/InboundInvocationHandler.java
index c46a7e1e3acf..1a3013d8a427 100644
--- a/core/src/main/java/org/infinispan/remoting/InboundInvocationHandler.java
+++ b/core/src/main/java/org/infinispan/remoting/InboundInvocationHandler.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting;
 
 import org.infinispan.commands.remote.CacheRpcCommand;
diff --git a/core/src/main/java/org/infinispan/remoting/InboundInvocationHandlerImpl.java b/core/src/main/java/org/infinispan/remoting/InboundInvocationHandlerImpl.java
index f7beb50fba28..a90a245f3670 100644
--- a/core/src/main/java/org/infinispan/remoting/InboundInvocationHandlerImpl.java
+++ b/core/src/main/java/org/infinispan/remoting/InboundInvocationHandlerImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting;
 
 import org.infinispan.commands.CancellableCommand;
diff --git a/core/src/main/java/org/infinispan/remoting/MIMECacheEntry.java b/core/src/main/java/org/infinispan/remoting/MIMECacheEntry.java
index 203af3491f07..dbd0eed6003d 100644
--- a/core/src/main/java/org/infinispan/remoting/MIMECacheEntry.java
+++ b/core/src/main/java/org/infinispan/remoting/MIMECacheEntry.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting;
 
 import java.io.Serializable;
diff --git a/core/src/main/java/org/infinispan/remoting/RemoteException.java b/core/src/main/java/org/infinispan/remoting/RemoteException.java
index 04bae061f298..9d323aac6307 100644
--- a/core/src/main/java/org/infinispan/remoting/RemoteException.java
+++ b/core/src/main/java/org/infinispan/remoting/RemoteException.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.remoting;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/main/java/org/infinispan/remoting/ReplicationQueue.java b/core/src/main/java/org/infinispan/remoting/ReplicationQueue.java
index 8dddcdfd6439..5ce0ef75020e 100644
--- a/core/src/main/java/org/infinispan/remoting/ReplicationQueue.java
+++ b/core/src/main/java/org/infinispan/remoting/ReplicationQueue.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting;
 
 import org.infinispan.commands.ReplicableCommand;
diff --git a/core/src/main/java/org/infinispan/remoting/ReplicationQueueImpl.java b/core/src/main/java/org/infinispan/remoting/ReplicationQueueImpl.java
index c9c75e0f2bb2..0c546b941b35 100644
--- a/core/src/main/java/org/infinispan/remoting/ReplicationQueueImpl.java
+++ b/core/src/main/java/org/infinispan/remoting/ReplicationQueueImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/remoting/RpcException.java b/core/src/main/java/org/infinispan/remoting/RpcException.java
index 1c45a89bda53..d12ea1c0ad28 100644
--- a/core/src/main/java/org/infinispan/remoting/RpcException.java
+++ b/core/src/main/java/org/infinispan/remoting/RpcException.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/main/java/org/infinispan/remoting/package-info.java b/core/src/main/java/org/infinispan/remoting/package-info.java
index 903cd20d8d21..394663656358 100644
--- a/core/src/main/java/org/infinispan/remoting/package-info.java
+++ b/core/src/main/java/org/infinispan/remoting/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Remote communication between cache instances.
  */
diff --git a/core/src/main/java/org/infinispan/remoting/responses/ClusteredGetResponseValidityFilter.java b/core/src/main/java/org/infinispan/remoting/responses/ClusteredGetResponseValidityFilter.java
index 82b8358cc7de..c98da4048a44 100644
--- a/core/src/main/java/org/infinispan/remoting/responses/ClusteredGetResponseValidityFilter.java
+++ b/core/src/main/java/org/infinispan/remoting/responses/ClusteredGetResponseValidityFilter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.responses;
 
 import org.infinispan.remoting.rpc.ResponseFilter;
diff --git a/core/src/main/java/org/infinispan/remoting/responses/DefaultResponseGenerator.java b/core/src/main/java/org/infinispan/remoting/responses/DefaultResponseGenerator.java
index f486bb726ea2..547d8bae4577 100644
--- a/core/src/main/java/org/infinispan/remoting/responses/DefaultResponseGenerator.java
+++ b/core/src/main/java/org/infinispan/remoting/responses/DefaultResponseGenerator.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.responses;
 
 import org.infinispan.commands.remote.CacheRpcCommand;
diff --git a/core/src/main/java/org/infinispan/remoting/responses/DistributionResponseGenerator.java b/core/src/main/java/org/infinispan/remoting/responses/DistributionResponseGenerator.java
index aeed760413fe..88cd3541413d 100644
--- a/core/src/main/java/org/infinispan/remoting/responses/DistributionResponseGenerator.java
+++ b/core/src/main/java/org/infinispan/remoting/responses/DistributionResponseGenerator.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.responses;
 
 import org.infinispan.commands.ReplicableCommand;
diff --git a/core/src/main/java/org/infinispan/remoting/responses/ExceptionResponse.java b/core/src/main/java/org/infinispan/remoting/responses/ExceptionResponse.java
index c216d0cf96d3..19a4321d5075 100644
--- a/core/src/main/java/org/infinispan/remoting/responses/ExceptionResponse.java
+++ b/core/src/main/java/org/infinispan/remoting/responses/ExceptionResponse.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.responses;
 
 import java.io.IOException;
diff --git a/core/src/main/java/org/infinispan/remoting/responses/IgnoreExtraResponsesValidityFilter.java b/core/src/main/java/org/infinispan/remoting/responses/IgnoreExtraResponsesValidityFilter.java
index bdbb0517bcf1..3d9be4b70bb6 100644
--- a/core/src/main/java/org/infinispan/remoting/responses/IgnoreExtraResponsesValidityFilter.java
+++ b/core/src/main/java/org/infinispan/remoting/responses/IgnoreExtraResponsesValidityFilter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.responses;
 
 import org.infinispan.remoting.rpc.ResponseFilter;
diff --git a/core/src/main/java/org/infinispan/remoting/responses/InvalidResponse.java b/core/src/main/java/org/infinispan/remoting/responses/InvalidResponse.java
index 08b001501ac3..5033763649a1 100644
--- a/core/src/main/java/org/infinispan/remoting/responses/InvalidResponse.java
+++ b/core/src/main/java/org/infinispan/remoting/responses/InvalidResponse.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.responses;
 
 /**
diff --git a/core/src/main/java/org/infinispan/remoting/responses/KeysValidateFilter.java b/core/src/main/java/org/infinispan/remoting/responses/KeysValidateFilter.java
index e017c838db7c..12cf954da020 100644
--- a/core/src/main/java/org/infinispan/remoting/responses/KeysValidateFilter.java
+++ b/core/src/main/java/org/infinispan/remoting/responses/KeysValidateFilter.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.remoting.responses;
 
 import org.infinispan.container.versioning.EntryVersionsMap;
diff --git a/core/src/main/java/org/infinispan/remoting/responses/NoReturnValuesDistributionResponseGenerator.java b/core/src/main/java/org/infinispan/remoting/responses/NoReturnValuesDistributionResponseGenerator.java
index 27a8c280d521..9e8a90e349c3 100644
--- a/core/src/main/java/org/infinispan/remoting/responses/NoReturnValuesDistributionResponseGenerator.java
+++ b/core/src/main/java/org/infinispan/remoting/responses/NoReturnValuesDistributionResponseGenerator.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.remoting.responses;
 
 import org.infinispan.commands.write.WriteCommand;
diff --git a/core/src/main/java/org/infinispan/remoting/responses/Response.java b/core/src/main/java/org/infinispan/remoting/responses/Response.java
index bd384260096d..290cb7e27804 100644
--- a/core/src/main/java/org/infinispan/remoting/responses/Response.java
+++ b/core/src/main/java/org/infinispan/remoting/responses/Response.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.responses;
 
 /**
diff --git a/core/src/main/java/org/infinispan/remoting/responses/ResponseGenerator.java b/core/src/main/java/org/infinispan/remoting/responses/ResponseGenerator.java
index 2f81be86f233..328613b79005 100644
--- a/core/src/main/java/org/infinispan/remoting/responses/ResponseGenerator.java
+++ b/core/src/main/java/org/infinispan/remoting/responses/ResponseGenerator.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.responses;
 
 import org.infinispan.commands.remote.CacheRpcCommand;
diff --git a/core/src/main/java/org/infinispan/remoting/responses/SelfDeliverFilter.java b/core/src/main/java/org/infinispan/remoting/responses/SelfDeliverFilter.java
index d99642f319bb..9637a537e8c8 100644
--- a/core/src/main/java/org/infinispan/remoting/responses/SelfDeliverFilter.java
+++ b/core/src/main/java/org/infinispan/remoting/responses/SelfDeliverFilter.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.remoting.responses;
 
 import org.infinispan.remoting.rpc.ResponseFilter;
diff --git a/core/src/main/java/org/infinispan/remoting/responses/SuccessfulResponse.java b/core/src/main/java/org/infinispan/remoting/responses/SuccessfulResponse.java
index 4839162e6020..a2ea90793889 100644
--- a/core/src/main/java/org/infinispan/remoting/responses/SuccessfulResponse.java
+++ b/core/src/main/java/org/infinispan/remoting/responses/SuccessfulResponse.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.responses;
 
 import java.io.IOException;
diff --git a/core/src/main/java/org/infinispan/remoting/responses/UnsuccessfulResponse.java b/core/src/main/java/org/infinispan/remoting/responses/UnsuccessfulResponse.java
index 0bec848c66b3..1d07b832ce23 100644
--- a/core/src/main/java/org/infinispan/remoting/responses/UnsuccessfulResponse.java
+++ b/core/src/main/java/org/infinispan/remoting/responses/UnsuccessfulResponse.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.responses;
 
 import org.infinispan.commons.marshall.AbstractExternalizer;
diff --git a/core/src/main/java/org/infinispan/remoting/responses/UnsureResponse.java b/core/src/main/java/org/infinispan/remoting/responses/UnsureResponse.java
index e4fca5ee6703..b57cba872a87 100644
--- a/core/src/main/java/org/infinispan/remoting/responses/UnsureResponse.java
+++ b/core/src/main/java/org/infinispan/remoting/responses/UnsureResponse.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.responses;
 
 import org.infinispan.commons.marshall.AbstractExternalizer;
diff --git a/core/src/main/java/org/infinispan/remoting/responses/ValidResponse.java b/core/src/main/java/org/infinispan/remoting/responses/ValidResponse.java
index 121bd43d4f7d..be1b9c612ded 100644
--- a/core/src/main/java/org/infinispan/remoting/responses/ValidResponse.java
+++ b/core/src/main/java/org/infinispan/remoting/responses/ValidResponse.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.responses;
 
 /**
diff --git a/core/src/main/java/org/infinispan/remoting/responses/package-info.java b/core/src/main/java/org/infinispan/remoting/responses/package-info.java
index 1376600fafeb..5696fdc4bf06 100644
--- a/core/src/main/java/org/infinispan/remoting/responses/package-info.java
+++ b/core/src/main/java/org/infinispan/remoting/responses/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Abstractions of the different response types allowed during RPC.
  */
diff --git a/core/src/main/java/org/infinispan/remoting/rpc/ResponseFilter.java b/core/src/main/java/org/infinispan/remoting/rpc/ResponseFilter.java
index 0b82f74dd714..40ae9b8ca3b5 100644
--- a/core/src/main/java/org/infinispan/remoting/rpc/ResponseFilter.java
+++ b/core/src/main/java/org/infinispan/remoting/rpc/ResponseFilter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.rpc;
 
 import org.infinispan.remoting.responses.Response;
diff --git a/core/src/main/java/org/infinispan/remoting/rpc/ResponseMode.java b/core/src/main/java/org/infinispan/remoting/rpc/ResponseMode.java
index 1e75cf035391..6dcf08a9ea6f 100644
--- a/core/src/main/java/org/infinispan/remoting/rpc/ResponseMode.java
+++ b/core/src/main/java/org/infinispan/remoting/rpc/ResponseMode.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.rpc;
 
 import org.infinispan.configuration.cache.Configuration;
diff --git a/core/src/main/java/org/infinispan/remoting/rpc/RpcManager.java b/core/src/main/java/org/infinispan/remoting/rpc/RpcManager.java
index f2ac96d05b9c..93d1614b457a 100644
--- a/core/src/main/java/org/infinispan/remoting/rpc/RpcManager.java
+++ b/core/src/main/java/org/infinispan/remoting/rpc/RpcManager.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.rpc;
 
 import org.infinispan.commands.ReplicableCommand;
diff --git a/core/src/main/java/org/infinispan/remoting/rpc/RpcManagerImpl.java b/core/src/main/java/org/infinispan/remoting/rpc/RpcManagerImpl.java
index f3af5d31995e..527baa9e2967 100644
--- a/core/src/main/java/org/infinispan/remoting/rpc/RpcManagerImpl.java
+++ b/core/src/main/java/org/infinispan/remoting/rpc/RpcManagerImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.rpc;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/remoting/rpc/RpcOptions.java b/core/src/main/java/org/infinispan/remoting/rpc/RpcOptions.java
index c38b34b3574e..5e4725d00a61 100644
--- a/core/src/main/java/org/infinispan/remoting/rpc/RpcOptions.java
+++ b/core/src/main/java/org/infinispan/remoting/rpc/RpcOptions.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.remoting.rpc;
 
 import java.util.concurrent.TimeUnit;
diff --git a/core/src/main/java/org/infinispan/remoting/rpc/RpcOptionsBuilder.java b/core/src/main/java/org/infinispan/remoting/rpc/RpcOptionsBuilder.java
index 3bc7d9c2b116..965df517bcc6 100644
--- a/core/src/main/java/org/infinispan/remoting/rpc/RpcOptionsBuilder.java
+++ b/core/src/main/java/org/infinispan/remoting/rpc/RpcOptionsBuilder.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.remoting.rpc;
 
 import java.util.concurrent.TimeUnit;
diff --git a/core/src/main/java/org/infinispan/remoting/rpc/package-info.java b/core/src/main/java/org/infinispan/remoting/rpc/package-info.java
index c88f6802768f..f61e2dab250d 100644
--- a/core/src/main/java/org/infinispan/remoting/rpc/package-info.java
+++ b/core/src/main/java/org/infinispan/remoting/rpc/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Remote Procedure Call (RPC) interfaces and components used to invoke remote methods on cache instances.
  */
diff --git a/core/src/main/java/org/infinispan/remoting/transport/AbstractTransport.java b/core/src/main/java/org/infinispan/remoting/transport/AbstractTransport.java
index c90982419f56..d23cc53c18f9 100644
--- a/core/src/main/java/org/infinispan/remoting/transport/AbstractTransport.java
+++ b/core/src/main/java/org/infinispan/remoting/transport/AbstractTransport.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.transport;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/main/java/org/infinispan/remoting/transport/Address.java b/core/src/main/java/org/infinispan/remoting/transport/Address.java
index 935acb22add3..07fc5dfef8f5 100644
--- a/core/src/main/java/org/infinispan/remoting/transport/Address.java
+++ b/core/src/main/java/org/infinispan/remoting/transport/Address.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.transport;
 
 /**
diff --git a/core/src/main/java/org/infinispan/remoting/transport/AggregateBackupResponse.java b/core/src/main/java/org/infinispan/remoting/transport/AggregateBackupResponse.java
index 90e59abe6d0e..276f0a9431ea 100644
--- a/core/src/main/java/org/infinispan/remoting/transport/AggregateBackupResponse.java
+++ b/core/src/main/java/org/infinispan/remoting/transport/AggregateBackupResponse.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- *  Copyright 2012 Red Hat Inc. and/or its affiliates and other
- *  contributors as indicated by the @author tags. All rights reserved
- *  See the copyright.txt in the distribution for a full listing of
- *  individual contributors.
- *
- *  This is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU Lesser General Public License as
- *  published by the Free Software Foundation; either version 2.1 of
- *  the License, or (at your option) any later version.
- *
- *  This software is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this software; if not, write to the Free
- *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- *  02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.remoting.transport;
 
 import java.util.ArrayList;
diff --git a/core/src/main/java/org/infinispan/remoting/transport/BackupResponse.java b/core/src/main/java/org/infinispan/remoting/transport/BackupResponse.java
index 4600be0a078e..9c3f5b6adbd8 100644
--- a/core/src/main/java/org/infinispan/remoting/transport/BackupResponse.java
+++ b/core/src/main/java/org/infinispan/remoting/transport/BackupResponse.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.remoting.transport;
 
 import java.util.Map;
diff --git a/core/src/main/java/org/infinispan/remoting/transport/TopologyAwareAddress.java b/core/src/main/java/org/infinispan/remoting/transport/TopologyAwareAddress.java
index b09232d12697..db9ab027addf 100644
--- a/core/src/main/java/org/infinispan/remoting/transport/TopologyAwareAddress.java
+++ b/core/src/main/java/org/infinispan/remoting/transport/TopologyAwareAddress.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.remoting.transport;
 
 /**
diff --git a/core/src/main/java/org/infinispan/remoting/transport/Transport.java b/core/src/main/java/org/infinispan/remoting/transport/Transport.java
index b30d12781227..064f3d2771fe 100644
--- a/core/src/main/java/org/infinispan/remoting/transport/Transport.java
+++ b/core/src/main/java/org/infinispan/remoting/transport/Transport.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.transport;
 
 import org.infinispan.commands.ReplicableCommand;
diff --git a/core/src/main/java/org/infinispan/remoting/transport/jgroups/CommandAwareRpcDispatcher.java b/core/src/main/java/org/infinispan/remoting/transport/jgroups/CommandAwareRpcDispatcher.java
index c1c6fcf64140..900c842ce6a2 100644
--- a/core/src/main/java/org/infinispan/remoting/transport/jgroups/CommandAwareRpcDispatcher.java
+++ b/core/src/main/java/org/infinispan/remoting/transport/jgroups/CommandAwareRpcDispatcher.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.transport.jgroups;
 
 import net.jcip.annotations.GuardedBy;
diff --git a/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsAddress.java b/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsAddress.java
index cbaec600a150..f0f25460e917 100644
--- a/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsAddress.java
+++ b/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsAddress.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.transport.jgroups;
 
 import java.io.IOException;
diff --git a/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsBackupResponse.java b/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsBackupResponse.java
index 35a4c5bad268..3de73e288cb6 100644
--- a/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsBackupResponse.java
+++ b/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsBackupResponse.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.remoting.transport.jgroups;
 
 import org.infinispan.commons.util.InfinispanCollections;
diff --git a/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsChannelLookup.java b/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsChannelLookup.java
index a3b9aaae7f63..861007e2e05e 100644
--- a/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsChannelLookup.java
+++ b/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsChannelLookup.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.transport.jgroups;
 
 import org.jgroups.Channel;
diff --git a/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsResponseFilterAdapter.java b/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsResponseFilterAdapter.java
index 8611b448a214..5b52908a5826 100644
--- a/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsResponseFilterAdapter.java
+++ b/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsResponseFilterAdapter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.transport.jgroups;
 
 import org.infinispan.remoting.rpc.ResponseFilter;
diff --git a/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTopologyAwareAddress.java b/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTopologyAwareAddress.java
index a2903b5438bf..268050a8ca1c 100644
--- a/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTopologyAwareAddress.java
+++ b/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTopologyAwareAddress.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.remoting.transport.jgroups;
 
 import org.infinispan.commons.marshall.AdvancedExternalizer;
diff --git a/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java b/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java
index c354e152d5b8..33e52b133fdd 100644
--- a/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java
+++ b/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.transport.jgroups;
 
 import org.infinispan.commands.ReplicableCommand;
diff --git a/core/src/main/java/org/infinispan/remoting/transport/jgroups/MarshallerAdapter.java b/core/src/main/java/org/infinispan/remoting/transport/jgroups/MarshallerAdapter.java
index d3a51da97f33..57562d573e75 100644
--- a/core/src/main/java/org/infinispan/remoting/transport/jgroups/MarshallerAdapter.java
+++ b/core/src/main/java/org/infinispan/remoting/transport/jgroups/MarshallerAdapter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.transport.jgroups;
 
 import org.infinispan.commons.io.ByteBuffer;
diff --git a/core/src/main/java/org/infinispan/remoting/transport/jgroups/SuspectException.java b/core/src/main/java/org/infinispan/remoting/transport/jgroups/SuspectException.java
index 5a7bc0327045..e590b0ec9b64 100644
--- a/core/src/main/java/org/infinispan/remoting/transport/jgroups/SuspectException.java
+++ b/core/src/main/java/org/infinispan/remoting/transport/jgroups/SuspectException.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.transport.jgroups;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/main/java/org/infinispan/remoting/transport/jgroups/package-info.java b/core/src/main/java/org/infinispan/remoting/transport/jgroups/package-info.java
index be377f9ea1da..fa59ceb1354e 100644
--- a/core/src/main/java/org/infinispan/remoting/transport/jgroups/package-info.java
+++ b/core/src/main/java/org/infinispan/remoting/transport/jgroups/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * A transport implementation based on <a href="http://www.jgroups.org">JGroups</a>.
  */
diff --git a/core/src/main/java/org/infinispan/remoting/transport/package-info.java b/core/src/main/java/org/infinispan/remoting/transport/package-info.java
index 5ee71ae2f52c..fcf9ab428ff6 100644
--- a/core/src/main/java/org/infinispan/remoting/transport/package-info.java
+++ b/core/src/main/java/org/infinispan/remoting/transport/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Transports handle the low-level networking, used by the remoting components.
  */
diff --git a/core/src/main/java/org/infinispan/statetransfer/AffectedKeysVisitor.java b/core/src/main/java/org/infinispan/statetransfer/AffectedKeysVisitor.java
index 18999620ad11..2c2e6782ddb9 100644
--- a/core/src/main/java/org/infinispan/statetransfer/AffectedKeysVisitor.java
+++ b/core/src/main/java/org/infinispan/statetransfer/AffectedKeysVisitor.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.statetransfer;
 
 import org.infinispan.commands.AbstractVisitor;
diff --git a/core/src/main/java/org/infinispan/statetransfer/InboundTransferTask.java b/core/src/main/java/org/infinispan/statetransfer/InboundTransferTask.java
index d422c0da8f69..f466f9adeff8 100644
--- a/core/src/main/java/org/infinispan/statetransfer/InboundTransferTask.java
+++ b/core/src/main/java/org/infinispan/statetransfer/InboundTransferTask.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.statetransfer;
 
 import org.infinispan.commands.CommandsFactory;
diff --git a/core/src/main/java/org/infinispan/statetransfer/OutboundTransferTask.java b/core/src/main/java/org/infinispan/statetransfer/OutboundTransferTask.java
index 9589e6477f34..966a24d1232c 100644
--- a/core/src/main/java/org/infinispan/statetransfer/OutboundTransferTask.java
+++ b/core/src/main/java/org/infinispan/statetransfer/OutboundTransferTask.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.statetransfer;
 
 import org.infinispan.commands.CommandsFactory;
diff --git a/core/src/main/java/org/infinispan/statetransfer/StateChunk.java b/core/src/main/java/org/infinispan/statetransfer/StateChunk.java
index aa8995dcb259..b2825c57b702 100644
--- a/core/src/main/java/org/infinispan/statetransfer/StateChunk.java
+++ b/core/src/main/java/org/infinispan/statetransfer/StateChunk.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.statetransfer;
 
 import org.infinispan.container.entries.InternalCacheEntry;
diff --git a/core/src/main/java/org/infinispan/statetransfer/StateConsumer.java b/core/src/main/java/org/infinispan/statetransfer/StateConsumer.java
index 1142d10ad91b..cbf460b44b52 100644
--- a/core/src/main/java/org/infinispan/statetransfer/StateConsumer.java
+++ b/core/src/main/java/org/infinispan/statetransfer/StateConsumer.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.statetransfer;
 
 import org.infinispan.factories.scopes.Scope;
diff --git a/core/src/main/java/org/infinispan/statetransfer/StateConsumerImpl.java b/core/src/main/java/org/infinispan/statetransfer/StateConsumerImpl.java
index c90d417bcb2d..e464b2ceedf7 100644
--- a/core/src/main/java/org/infinispan/statetransfer/StateConsumerImpl.java
+++ b/core/src/main/java/org/infinispan/statetransfer/StateConsumerImpl.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.statetransfer;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/statetransfer/StateProvider.java b/core/src/main/java/org/infinispan/statetransfer/StateProvider.java
index bce10db2b0c2..94d398583df9 100644
--- a/core/src/main/java/org/infinispan/statetransfer/StateProvider.java
+++ b/core/src/main/java/org/infinispan/statetransfer/StateProvider.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.statetransfer;
 
 import org.infinispan.factories.scopes.Scope;
diff --git a/core/src/main/java/org/infinispan/statetransfer/StateProviderImpl.java b/core/src/main/java/org/infinispan/statetransfer/StateProviderImpl.java
index ca49f86283fb..f5376d8f7b8b 100644
--- a/core/src/main/java/org/infinispan/statetransfer/StateProviderImpl.java
+++ b/core/src/main/java/org/infinispan/statetransfer/StateProviderImpl.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.statetransfer;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/statetransfer/StateRequestCommand.java b/core/src/main/java/org/infinispan/statetransfer/StateRequestCommand.java
index 49f13af81f93..d65b9f5ef069 100644
--- a/core/src/main/java/org/infinispan/statetransfer/StateRequestCommand.java
+++ b/core/src/main/java/org/infinispan/statetransfer/StateRequestCommand.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.statetransfer;
 
 import org.infinispan.commands.remote.BaseRpcCommand;
diff --git a/core/src/main/java/org/infinispan/statetransfer/StateResponseCommand.java b/core/src/main/java/org/infinispan/statetransfer/StateResponseCommand.java
index 039c57d8a82d..b7f4c6fdcc63 100644
--- a/core/src/main/java/org/infinispan/statetransfer/StateResponseCommand.java
+++ b/core/src/main/java/org/infinispan/statetransfer/StateResponseCommand.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.statetransfer;
 
 import org.infinispan.commands.remote.BaseRpcCommand;
diff --git a/core/src/main/java/org/infinispan/statetransfer/StateTransferInterceptor.java b/core/src/main/java/org/infinispan/statetransfer/StateTransferInterceptor.java
index de49061661ed..2a1d2e1fdd0a 100644
--- a/core/src/main/java/org/infinispan/statetransfer/StateTransferInterceptor.java
+++ b/core/src/main/java/org/infinispan/statetransfer/StateTransferInterceptor.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.statetransfer;
 
 import org.infinispan.commands.CommandsFactory;
diff --git a/core/src/main/java/org/infinispan/statetransfer/StateTransferLock.java b/core/src/main/java/org/infinispan/statetransfer/StateTransferLock.java
index 91f2ba6c4737..904d0da77229 100644
--- a/core/src/main/java/org/infinispan/statetransfer/StateTransferLock.java
+++ b/core/src/main/java/org/infinispan/statetransfer/StateTransferLock.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.statetransfer;
 
 import org.infinispan.factories.scopes.Scope;
diff --git a/core/src/main/java/org/infinispan/statetransfer/StateTransferLockImpl.java b/core/src/main/java/org/infinispan/statetransfer/StateTransferLockImpl.java
index a0d282f919e8..2b55cce264d3 100644
--- a/core/src/main/java/org/infinispan/statetransfer/StateTransferLockImpl.java
+++ b/core/src/main/java/org/infinispan/statetransfer/StateTransferLockImpl.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.statetransfer;
 
 import org.infinispan.util.logging.Log;
diff --git a/core/src/main/java/org/infinispan/statetransfer/StateTransferManager.java b/core/src/main/java/org/infinispan/statetransfer/StateTransferManager.java
index 969c4bc6ffb8..48e2e2ca44e3 100644
--- a/core/src/main/java/org/infinispan/statetransfer/StateTransferManager.java
+++ b/core/src/main/java/org/infinispan/statetransfer/StateTransferManager.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.statetransfer;
 
 import org.infinispan.commands.TopologyAffectedCommand;
diff --git a/core/src/main/java/org/infinispan/statetransfer/StateTransferManagerImpl.java b/core/src/main/java/org/infinispan/statetransfer/StateTransferManagerImpl.java
index 797594fec1a8..9eb49ff131c3 100644
--- a/core/src/main/java/org/infinispan/statetransfer/StateTransferManagerImpl.java
+++ b/core/src/main/java/org/infinispan/statetransfer/StateTransferManagerImpl.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.statetransfer;
 
 import java.util.HashSet;
diff --git a/core/src/main/java/org/infinispan/statetransfer/TransactionInfo.java b/core/src/main/java/org/infinispan/statetransfer/TransactionInfo.java
index b70a7ded050c..f69870283589 100644
--- a/core/src/main/java/org/infinispan/statetransfer/TransactionInfo.java
+++ b/core/src/main/java/org/infinispan/statetransfer/TransactionInfo.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.statetransfer;
 
 import org.infinispan.commands.write.WriteCommand;
diff --git a/core/src/main/java/org/infinispan/statetransfer/TransactionSynchronizerInterceptor.java b/core/src/main/java/org/infinispan/statetransfer/TransactionSynchronizerInterceptor.java
index b19dfbbfc1b1..f35ddf94ce63 100644
--- a/core/src/main/java/org/infinispan/statetransfer/TransactionSynchronizerInterceptor.java
+++ b/core/src/main/java/org/infinispan/statetransfer/TransactionSynchronizerInterceptor.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.statetransfer;
 
 import org.infinispan.commands.control.LockControlCommand;
diff --git a/core/src/main/java/org/infinispan/statetransfer/package-info.java b/core/src/main/java/org/infinispan/statetransfer/package-info.java
index 7b4495afad57..8228dc15bea1 100644
--- a/core/src/main/java/org/infinispan/statetransfer/package-info.java
+++ b/core/src/main/java/org/infinispan/statetransfer/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Transfer of state to new caches in a cluster.
  */
diff --git a/core/src/main/java/org/infinispan/stats/Stats.java b/core/src/main/java/org/infinispan/stats/Stats.java
index c17829310c98..3f5953198b91 100644
--- a/core/src/main/java/org/infinispan/stats/Stats.java
+++ b/core/src/main/java/org/infinispan/stats/Stats.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.stats;
 
 /**
diff --git a/core/src/main/java/org/infinispan/stats/StatsImpl.java b/core/src/main/java/org/infinispan/stats/StatsImpl.java
index 1ca9a80cc7a9..2941a01d5891 100644
--- a/core/src/main/java/org/infinispan/stats/StatsImpl.java
+++ b/core/src/main/java/org/infinispan/stats/StatsImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.stats;
 
 import java.util.List;
diff --git a/core/src/main/java/org/infinispan/stats/package-info.java b/core/src/main/java/org/infinispan/stats/package-info.java
index 22646d5d17c3..78e4979640da 100644
--- a/core/src/main/java/org/infinispan/stats/package-info.java
+++ b/core/src/main/java/org/infinispan/stats/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Cache statistics.
  */
diff --git a/core/src/main/java/org/infinispan/tasks/GlobalKeySetTask.java b/core/src/main/java/org/infinispan/tasks/GlobalKeySetTask.java
index e31e27bc7dbe..4bee31c1d027 100644
--- a/core/src/main/java/org/infinispan/tasks/GlobalKeySetTask.java
+++ b/core/src/main/java/org/infinispan/tasks/GlobalKeySetTask.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.tasks;
 
 import java.io.Serializable;
diff --git a/core/src/main/java/org/infinispan/topology/CacheJoinInfo.java b/core/src/main/java/org/infinispan/topology/CacheJoinInfo.java
index 2ca40789b674..33a37ad8c7fd 100644
--- a/core/src/main/java/org/infinispan/topology/CacheJoinInfo.java
+++ b/core/src/main/java/org/infinispan/topology/CacheJoinInfo.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.topology;
 
 import java.io.IOException;
diff --git a/core/src/main/java/org/infinispan/topology/CacheTopologyControlCommand.java b/core/src/main/java/org/infinispan/topology/CacheTopologyControlCommand.java
index e0b61539ee73..563bdf0a4a38 100644
--- a/core/src/main/java/org/infinispan/topology/CacheTopologyControlCommand.java
+++ b/core/src/main/java/org/infinispan/topology/CacheTopologyControlCommand.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.topology;
 
 import org.infinispan.commands.ReplicableCommand;
diff --git a/core/src/main/java/org/infinispan/topology/CacheTopologyHandler.java b/core/src/main/java/org/infinispan/topology/CacheTopologyHandler.java
index 8d84f2641478..55cfdd800880 100644
--- a/core/src/main/java/org/infinispan/topology/CacheTopologyHandler.java
+++ b/core/src/main/java/org/infinispan/topology/CacheTopologyHandler.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.topology;
 
 import org.infinispan.statetransfer.StateTransferManager;
diff --git a/core/src/main/java/org/infinispan/topology/ClusterCacheStatus.java b/core/src/main/java/org/infinispan/topology/ClusterCacheStatus.java
index a8f107bbbfad..6975eeb67721 100644
--- a/core/src/main/java/org/infinispan/topology/ClusterCacheStatus.java
+++ b/core/src/main/java/org/infinispan/topology/ClusterCacheStatus.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.topology;
 
 import java.util.ArrayList;
diff --git a/core/src/main/java/org/infinispan/topology/ClusterTopologyManager.java b/core/src/main/java/org/infinispan/topology/ClusterTopologyManager.java
index 40cb4df5f432..69fe6908ca3c 100644
--- a/core/src/main/java/org/infinispan/topology/ClusterTopologyManager.java
+++ b/core/src/main/java/org/infinispan/topology/ClusterTopologyManager.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.topology;
 
 import org.infinispan.factories.scopes.Scope;
diff --git a/core/src/main/java/org/infinispan/topology/ClusterTopologyManagerFactory.java b/core/src/main/java/org/infinispan/topology/ClusterTopologyManagerFactory.java
index 2233141c6dbc..fcc97ceeac05 100644
--- a/core/src/main/java/org/infinispan/topology/ClusterTopologyManagerFactory.java
+++ b/core/src/main/java/org/infinispan/topology/ClusterTopologyManagerFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.topology;
 
 import org.infinispan.factories.AbstractComponentFactory;
diff --git a/core/src/main/java/org/infinispan/topology/ClusterTopologyManagerImpl.java b/core/src/main/java/org/infinispan/topology/ClusterTopologyManagerImpl.java
index eb4a0ac14d6b..643b3315a2be 100644
--- a/core/src/main/java/org/infinispan/topology/ClusterTopologyManagerImpl.java
+++ b/core/src/main/java/org/infinispan/topology/ClusterTopologyManagerImpl.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.topology;
 
 
diff --git a/core/src/main/java/org/infinispan/topology/DefaultRebalancePolicy.java b/core/src/main/java/org/infinispan/topology/DefaultRebalancePolicy.java
index fb13cca86e17..b5a02ceff2cd 100644
--- a/core/src/main/java/org/infinispan/topology/DefaultRebalancePolicy.java
+++ b/core/src/main/java/org/infinispan/topology/DefaultRebalancePolicy.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.topology;
 
 import org.infinispan.distribution.ch.ConsistentHash;
diff --git a/core/src/main/java/org/infinispan/topology/LocalTopologyManager.java b/core/src/main/java/org/infinispan/topology/LocalTopologyManager.java
index 0723a87f8926..7f68d483650a 100644
--- a/core/src/main/java/org/infinispan/topology/LocalTopologyManager.java
+++ b/core/src/main/java/org/infinispan/topology/LocalTopologyManager.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.topology;
 
 import java.util.Map;
diff --git a/core/src/main/java/org/infinispan/topology/LocalTopologyManagerFactory.java b/core/src/main/java/org/infinispan/topology/LocalTopologyManagerFactory.java
index 78e5efd7e1ec..7fc4846fd215 100644
--- a/core/src/main/java/org/infinispan/topology/LocalTopologyManagerFactory.java
+++ b/core/src/main/java/org/infinispan/topology/LocalTopologyManagerFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.topology;
 
 import org.infinispan.factories.AbstractComponentFactory;
diff --git a/core/src/main/java/org/infinispan/topology/LocalTopologyManagerImpl.java b/core/src/main/java/org/infinispan/topology/LocalTopologyManagerImpl.java
index 50f92681e4f8..2bb561de4d5f 100644
--- a/core/src/main/java/org/infinispan/topology/LocalTopologyManagerImpl.java
+++ b/core/src/main/java/org/infinispan/topology/LocalTopologyManagerImpl.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.topology;
 
 import java.util.Collections;
diff --git a/core/src/main/java/org/infinispan/topology/RebalanceConfirmationCollector.java b/core/src/main/java/org/infinispan/topology/RebalanceConfirmationCollector.java
index c391fc0d38f3..1c33ae14ac5e 100644
--- a/core/src/main/java/org/infinispan/topology/RebalanceConfirmationCollector.java
+++ b/core/src/main/java/org/infinispan/topology/RebalanceConfirmationCollector.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.topology;
 
 import java.util.Collection;
diff --git a/core/src/main/java/org/infinispan/topology/RebalancePolicy.java b/core/src/main/java/org/infinispan/topology/RebalancePolicy.java
index e5e158cf21d2..9e49c84cc09a 100644
--- a/core/src/main/java/org/infinispan/topology/RebalancePolicy.java
+++ b/core/src/main/java/org/infinispan/topology/RebalancePolicy.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.topology;
 
 import org.infinispan.factories.scopes.Scope;
diff --git a/core/src/main/java/org/infinispan/transaction/AbstractCacheTransaction.java b/core/src/main/java/org/infinispan/transaction/AbstractCacheTransaction.java
index 2ef9a30c9277..45c13c53e317 100644
--- a/core/src/main/java/org/infinispan/transaction/AbstractCacheTransaction.java
+++ b/core/src/main/java/org/infinispan/transaction/AbstractCacheTransaction.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.transaction;
 
 import java.util.ArrayList;
diff --git a/core/src/main/java/org/infinispan/transaction/AbstractEnlistmentAdapter.java b/core/src/main/java/org/infinispan/transaction/AbstractEnlistmentAdapter.java
index 0526d3836af3..f1751c399346 100644
--- a/core/src/main/java/org/infinispan/transaction/AbstractEnlistmentAdapter.java
+++ b/core/src/main/java/org/infinispan/transaction/AbstractEnlistmentAdapter.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.transaction;
 
 import org.infinispan.commands.CommandsFactory;
diff --git a/core/src/main/java/org/infinispan/transaction/LocalTransaction.java b/core/src/main/java/org/infinispan/transaction/LocalTransaction.java
index f37540cec8e0..f9414d75890e 100644
--- a/core/src/main/java/org/infinispan/transaction/LocalTransaction.java
+++ b/core/src/main/java/org/infinispan/transaction/LocalTransaction.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.transaction;
 
 import org.infinispan.commands.write.ClearCommand;
diff --git a/core/src/main/java/org/infinispan/transaction/LockingMode.java b/core/src/main/java/org/infinispan/transaction/LockingMode.java
index bf6b342ef7d5..8c98f64401f7 100644
--- a/core/src/main/java/org/infinispan/transaction/LockingMode.java
+++ b/core/src/main/java/org/infinispan/transaction/LockingMode.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.transaction;
 
 /**
diff --git a/core/src/main/java/org/infinispan/transaction/RemoteTransaction.java b/core/src/main/java/org/infinispan/transaction/RemoteTransaction.java
index 89115d037b6d..ff41d799817b 100644
--- a/core/src/main/java/org/infinispan/transaction/RemoteTransaction.java
+++ b/core/src/main/java/org/infinispan/transaction/RemoteTransaction.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction;
 
 import org.infinispan.commands.write.WriteCommand;
diff --git a/core/src/main/java/org/infinispan/transaction/TotalOrderRemoteTransactionState.java b/core/src/main/java/org/infinispan/transaction/TotalOrderRemoteTransactionState.java
index 249072516873..d86b1e54d4c5 100644
--- a/core/src/main/java/org/infinispan/transaction/TotalOrderRemoteTransactionState.java
+++ b/core/src/main/java/org/infinispan/transaction/TotalOrderRemoteTransactionState.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.transaction;
 
 import org.infinispan.commons.util.InfinispanCollections;
diff --git a/core/src/main/java/org/infinispan/transaction/TransactionCoordinator.java b/core/src/main/java/org/infinispan/transaction/TransactionCoordinator.java
index cba79c9f166e..f3f7f8d2e671 100644
--- a/core/src/main/java/org/infinispan/transaction/TransactionCoordinator.java
+++ b/core/src/main/java/org/infinispan/transaction/TransactionCoordinator.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction;
 
 import org.infinispan.commands.CommandsFactory;
diff --git a/core/src/main/java/org/infinispan/transaction/TransactionMode.java b/core/src/main/java/org/infinispan/transaction/TransactionMode.java
index 2d5c58a79e31..b413e7cd2f9c 100644
--- a/core/src/main/java/org/infinispan/transaction/TransactionMode.java
+++ b/core/src/main/java/org/infinispan/transaction/TransactionMode.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.transaction;
 
 /**
diff --git a/core/src/main/java/org/infinispan/transaction/TransactionProtocol.java b/core/src/main/java/org/infinispan/transaction/TransactionProtocol.java
index cf6eaa46a499..696632308ce9 100644
--- a/core/src/main/java/org/infinispan/transaction/TransactionProtocol.java
+++ b/core/src/main/java/org/infinispan/transaction/TransactionProtocol.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.transaction;
 
 /**
diff --git a/core/src/main/java/org/infinispan/transaction/TransactionTable.java b/core/src/main/java/org/infinispan/transaction/TransactionTable.java
index 1747589e9d07..cd5d3b52528f 100644
--- a/core/src/main/java/org/infinispan/transaction/TransactionTable.java
+++ b/core/src/main/java/org/infinispan/transaction/TransactionTable.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.transaction;
 
 import net.jcip.annotations.GuardedBy;
diff --git a/core/src/main/java/org/infinispan/transaction/WriteSkewException.java b/core/src/main/java/org/infinispan/transaction/WriteSkewException.java
index 5f4bcd8cba17..ebed20be2f97 100644
--- a/core/src/main/java/org/infinispan/transaction/WriteSkewException.java
+++ b/core/src/main/java/org/infinispan/transaction/WriteSkewException.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.transaction;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/main/java/org/infinispan/transaction/WriteSkewHelper.java b/core/src/main/java/org/infinispan/transaction/WriteSkewHelper.java
index a8ee8e0ed55b..9c3cbb1ea4f5 100644
--- a/core/src/main/java/org/infinispan/transaction/WriteSkewHelper.java
+++ b/core/src/main/java/org/infinispan/transaction/WriteSkewHelper.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.transaction;
 
 import org.infinispan.commands.tx.VersionedPrepareCommand;
diff --git a/core/src/main/java/org/infinispan/transaction/lookup/DummyTransactionManagerLookup.java b/core/src/main/java/org/infinispan/transaction/lookup/DummyTransactionManagerLookup.java
index 32ac2b2d86c7..3339223ce126 100644
--- a/core/src/main/java/org/infinispan/transaction/lookup/DummyTransactionManagerLookup.java
+++ b/core/src/main/java/org/infinispan/transaction/lookup/DummyTransactionManagerLookup.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.lookup;
 
 
diff --git a/core/src/main/java/org/infinispan/transaction/lookup/GenericTransactionManagerLookup.java b/core/src/main/java/org/infinispan/transaction/lookup/GenericTransactionManagerLookup.java
index 71b077414d41..86dbc6c4ed29 100644
--- a/core/src/main/java/org/infinispan/transaction/lookup/GenericTransactionManagerLookup.java
+++ b/core/src/main/java/org/infinispan/transaction/lookup/GenericTransactionManagerLookup.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.lookup;
 
 import org.infinispan.commons.util.Util;
diff --git a/core/src/main/java/org/infinispan/transaction/lookup/JBossStandaloneJTAManagerLookup.java b/core/src/main/java/org/infinispan/transaction/lookup/JBossStandaloneJTAManagerLookup.java
index 7c0cb61bf934..bc5feeb45859 100644
--- a/core/src/main/java/org/infinispan/transaction/lookup/JBossStandaloneJTAManagerLookup.java
+++ b/core/src/main/java/org/infinispan/transaction/lookup/JBossStandaloneJTAManagerLookup.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.lookup;
 
 import org.infinispan.commons.util.Util;
diff --git a/core/src/main/java/org/infinispan/transaction/lookup/TransactionManagerLookup.java b/core/src/main/java/org/infinispan/transaction/lookup/TransactionManagerLookup.java
index 3a9840f3f1f8..a36ebe5357b4 100644
--- a/core/src/main/java/org/infinispan/transaction/lookup/TransactionManagerLookup.java
+++ b/core/src/main/java/org/infinispan/transaction/lookup/TransactionManagerLookup.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.lookup;
 
 import javax.transaction.TransactionManager;
diff --git a/core/src/main/java/org/infinispan/transaction/lookup/TransactionSynchronizationRegistryLookup.java b/core/src/main/java/org/infinispan/transaction/lookup/TransactionSynchronizationRegistryLookup.java
index 60e4db76fcff..aac102bde742 100644
--- a/core/src/main/java/org/infinispan/transaction/lookup/TransactionSynchronizationRegistryLookup.java
+++ b/core/src/main/java/org/infinispan/transaction/lookup/TransactionSynchronizationRegistryLookup.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.lookup;
 
 import javax.transaction.TransactionSynchronizationRegistry;
diff --git a/core/src/main/java/org/infinispan/transaction/lookup/package-info.java b/core/src/main/java/org/infinispan/transaction/lookup/package-info.java
index 085e4aee0eef..0195f2d3f8c6 100644
--- a/core/src/main/java/org/infinispan/transaction/lookup/package-info.java
+++ b/core/src/main/java/org/infinispan/transaction/lookup/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Interfaces and implementations of lookup classes to locate and/or instantiate JTA {@link TransactionManager}s.
  */
diff --git a/core/src/main/java/org/infinispan/transaction/package-info.java b/core/src/main/java/org/infinispan/transaction/package-info.java
index cec2ccbe0de8..4ce32819cfe5 100644
--- a/core/src/main/java/org/infinispan/transaction/package-info.java
+++ b/core/src/main/java/org/infinispan/transaction/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * JTA transaction support.
  */
diff --git a/core/src/main/java/org/infinispan/transaction/synchronization/SyncLocalTransaction.java b/core/src/main/java/org/infinispan/transaction/synchronization/SyncLocalTransaction.java
index 28d83b06dfec..491e8ca898ac 100644
--- a/core/src/main/java/org/infinispan/transaction/synchronization/SyncLocalTransaction.java
+++ b/core/src/main/java/org/infinispan/transaction/synchronization/SyncLocalTransaction.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.synchronization;
 
 import org.infinispan.commons.equivalence.Equivalence;
diff --git a/core/src/main/java/org/infinispan/transaction/synchronization/SynchronizationAdapter.java b/core/src/main/java/org/infinispan/transaction/synchronization/SynchronizationAdapter.java
index cff52d2e4c07..0b792d85491f 100644
--- a/core/src/main/java/org/infinispan/transaction/synchronization/SynchronizationAdapter.java
+++ b/core/src/main/java/org/infinispan/transaction/synchronization/SynchronizationAdapter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.synchronization;
 
 import org.infinispan.commands.CommandsFactory;
diff --git a/core/src/main/java/org/infinispan/transaction/tm/BatchModeTransactionManager.java b/core/src/main/java/org/infinispan/transaction/tm/BatchModeTransactionManager.java
index 877a20a2e395..a704304b03c6 100755
--- a/core/src/main/java/org/infinispan/transaction/tm/BatchModeTransactionManager.java
+++ b/core/src/main/java/org/infinispan/transaction/tm/BatchModeTransactionManager.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.tm;
 
 /**
diff --git a/core/src/main/java/org/infinispan/transaction/tm/DummyBaseTransactionManager.java b/core/src/main/java/org/infinispan/transaction/tm/DummyBaseTransactionManager.java
index e2b66c504e65..1eaf361e3514 100755
--- a/core/src/main/java/org/infinispan/transaction/tm/DummyBaseTransactionManager.java
+++ b/core/src/main/java/org/infinispan/transaction/tm/DummyBaseTransactionManager.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.tm;
 
 
diff --git a/core/src/main/java/org/infinispan/transaction/tm/DummyTransaction.java b/core/src/main/java/org/infinispan/transaction/tm/DummyTransaction.java
index d7149547a018..14143545ff9e 100644
--- a/core/src/main/java/org/infinispan/transaction/tm/DummyTransaction.java
+++ b/core/src/main/java/org/infinispan/transaction/tm/DummyTransaction.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.tm;
 
 
diff --git a/core/src/main/java/org/infinispan/transaction/tm/DummyTransactionManager.java b/core/src/main/java/org/infinispan/transaction/tm/DummyTransactionManager.java
index 70b438e6ebd4..bdffb156161a 100644
--- a/core/src/main/java/org/infinispan/transaction/tm/DummyTransactionManager.java
+++ b/core/src/main/java/org/infinispan/transaction/tm/DummyTransactionManager.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.tm;
 
 import org.infinispan.util.logging.Log;
diff --git a/core/src/main/java/org/infinispan/transaction/tm/DummyUserTransaction.java b/core/src/main/java/org/infinispan/transaction/tm/DummyUserTransaction.java
index db51f47825f1..77eedc5de416 100644
--- a/core/src/main/java/org/infinispan/transaction/tm/DummyUserTransaction.java
+++ b/core/src/main/java/org/infinispan/transaction/tm/DummyUserTransaction.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.tm;
 
 
diff --git a/core/src/main/java/org/infinispan/transaction/tm/DummyXid.java b/core/src/main/java/org/infinispan/transaction/tm/DummyXid.java
index 34bd9ecca882..d3ba8cd93335 100644
--- a/core/src/main/java/org/infinispan/transaction/tm/DummyXid.java
+++ b/core/src/main/java/org/infinispan/transaction/tm/DummyXid.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.tm;
 
 import org.infinispan.commons.io.UnsignedNumeric;
diff --git a/core/src/main/java/org/infinispan/transaction/tm/package-info.java b/core/src/main/java/org/infinispan/transaction/tm/package-info.java
index 117e7389b8c0..2c92fb4e884b 100644
--- a/core/src/main/java/org/infinispan/transaction/tm/package-info.java
+++ b/core/src/main/java/org/infinispan/transaction/tm/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Infinispan's bare-bones internal transaction manager, used for batching calls as well as as a dummy, unit-test-only
  * transaction manager.
diff --git a/core/src/main/java/org/infinispan/transaction/totalorder/TotalOrderLatch.java b/core/src/main/java/org/infinispan/transaction/totalorder/TotalOrderLatch.java
index 82a39528e275..100568af0ce1 100644
--- a/core/src/main/java/org/infinispan/transaction/totalorder/TotalOrderLatch.java
+++ b/core/src/main/java/org/infinispan/transaction/totalorder/TotalOrderLatch.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.transaction.totalorder;
 
 /**
diff --git a/core/src/main/java/org/infinispan/transaction/totalorder/TotalOrderLatchImpl.java b/core/src/main/java/org/infinispan/transaction/totalorder/TotalOrderLatchImpl.java
index 178d03ab3dc7..83fff440c6af 100644
--- a/core/src/main/java/org/infinispan/transaction/totalorder/TotalOrderLatchImpl.java
+++ b/core/src/main/java/org/infinispan/transaction/totalorder/TotalOrderLatchImpl.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.transaction.totalorder;
 
 import java.util.concurrent.CountDownLatch;
diff --git a/core/src/main/java/org/infinispan/transaction/totalorder/TotalOrderManager.java b/core/src/main/java/org/infinispan/transaction/totalorder/TotalOrderManager.java
index 284449485de9..8672bc8e5bf8 100644
--- a/core/src/main/java/org/infinispan/transaction/totalorder/TotalOrderManager.java
+++ b/core/src/main/java/org/infinispan/transaction/totalorder/TotalOrderManager.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.transaction.totalorder;
 
 import org.infinispan.commons.util.CollectionFactory;
diff --git a/core/src/main/java/org/infinispan/transaction/xa/CacheTransaction.java b/core/src/main/java/org/infinispan/transaction/xa/CacheTransaction.java
index ca56c4f2ec93..4ccc32d6e740 100644
--- a/core/src/main/java/org/infinispan/transaction/xa/CacheTransaction.java
+++ b/core/src/main/java/org/infinispan/transaction/xa/CacheTransaction.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.xa;
 
 import org.infinispan.commands.write.WriteCommand;
diff --git a/core/src/main/java/org/infinispan/transaction/xa/DldGlobalTransaction.java b/core/src/main/java/org/infinispan/transaction/xa/DldGlobalTransaction.java
index 0ca9f607b0de..13a045be98c1 100644
--- a/core/src/main/java/org/infinispan/transaction/xa/DldGlobalTransaction.java
+++ b/core/src/main/java/org/infinispan/transaction/xa/DldGlobalTransaction.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.xa;
 
 import org.infinispan.commons.util.InfinispanCollections;
diff --git a/core/src/main/java/org/infinispan/transaction/xa/GlobalTransaction.java b/core/src/main/java/org/infinispan/transaction/xa/GlobalTransaction.java
index d0b86a87027c..6ca6d26bd169 100644
--- a/core/src/main/java/org/infinispan/transaction/xa/GlobalTransaction.java
+++ b/core/src/main/java/org/infinispan/transaction/xa/GlobalTransaction.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.xa;
 
 import org.infinispan.commons.marshall.AbstractExternalizer;
diff --git a/core/src/main/java/org/infinispan/transaction/xa/InvalidTransactionException.java b/core/src/main/java/org/infinispan/transaction/xa/InvalidTransactionException.java
index b4f6a85cf721..6aa96097c13a 100644
--- a/core/src/main/java/org/infinispan/transaction/xa/InvalidTransactionException.java
+++ b/core/src/main/java/org/infinispan/transaction/xa/InvalidTransactionException.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.xa;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/main/java/org/infinispan/transaction/xa/LocalXaTransaction.java b/core/src/main/java/org/infinispan/transaction/xa/LocalXaTransaction.java
index f45544ee4edb..ebda8ae50071 100644
--- a/core/src/main/java/org/infinispan/transaction/xa/LocalXaTransaction.java
+++ b/core/src/main/java/org/infinispan/transaction/xa/LocalXaTransaction.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.xa;
 
 import org.infinispan.commons.equivalence.Equivalence;
diff --git a/core/src/main/java/org/infinispan/transaction/xa/TransactionFactory.java b/core/src/main/java/org/infinispan/transaction/xa/TransactionFactory.java
index 13a3f370b953..0edd58382d33 100644
--- a/core/src/main/java/org/infinispan/transaction/xa/TransactionFactory.java
+++ b/core/src/main/java/org/infinispan/transaction/xa/TransactionFactory.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.transaction.xa;
 
 import org.infinispan.commands.write.WriteCommand;
diff --git a/core/src/main/java/org/infinispan/transaction/xa/TransactionXaAdapter.java b/core/src/main/java/org/infinispan/transaction/xa/TransactionXaAdapter.java
index bfa30d0ba2d2..34dac4556d5d 100644
--- a/core/src/main/java/org/infinispan/transaction/xa/TransactionXaAdapter.java
+++ b/core/src/main/java/org/infinispan/transaction/xa/TransactionXaAdapter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.xa;
 
 import org.infinispan.commands.CommandsFactory;
diff --git a/core/src/main/java/org/infinispan/transaction/xa/XaTransactionTable.java b/core/src/main/java/org/infinispan/transaction/xa/XaTransactionTable.java
index 9c2ed26f321a..d45ab228ec3f 100644
--- a/core/src/main/java/org/infinispan/transaction/xa/XaTransactionTable.java
+++ b/core/src/main/java/org/infinispan/transaction/xa/XaTransactionTable.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.xa;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/transaction/xa/package-info.java b/core/src/main/java/org/infinispan/transaction/xa/package-info.java
index c165f8b17ad9..10f4746bfb6b 100644
--- a/core/src/main/java/org/infinispan/transaction/xa/package-info.java
+++ b/core/src/main/java/org/infinispan/transaction/xa/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * XA transaction support.
  */
diff --git a/core/src/main/java/org/infinispan/transaction/xa/recovery/InDoubtTxInfoImpl.java b/core/src/main/java/org/infinispan/transaction/xa/recovery/InDoubtTxInfoImpl.java
index 95ae6402f782..86a9b1153cc1 100644
--- a/core/src/main/java/org/infinispan/transaction/xa/recovery/InDoubtTxInfoImpl.java
+++ b/core/src/main/java/org/infinispan/transaction/xa/recovery/InDoubtTxInfoImpl.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.transaction.xa.recovery;
 
 import org.infinispan.commons.marshall.AbstractExternalizer;
diff --git a/core/src/main/java/org/infinispan/transaction/xa/recovery/PreparedTxIterator.java b/core/src/main/java/org/infinispan/transaction/xa/recovery/PreparedTxIterator.java
index 7236cecd2c48..acf8a69ab775 100644
--- a/core/src/main/java/org/infinispan/transaction/xa/recovery/PreparedTxIterator.java
+++ b/core/src/main/java/org/infinispan/transaction/xa/recovery/PreparedTxIterator.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.xa.recovery;
 
 import javax.transaction.xa.Xid;
diff --git a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoverableTransactionIdentifier.java b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoverableTransactionIdentifier.java
index fbee1c10a621..1afdac29d90d 100644
--- a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoverableTransactionIdentifier.java
+++ b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoverableTransactionIdentifier.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.transaction.xa.recovery;
 
 import javax.transaction.xa.Xid;
diff --git a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAdminOperations.java b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAdminOperations.java
index 7b0801cb9215..0bc558dec055 100644
--- a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAdminOperations.java
+++ b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAdminOperations.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.transaction.xa.recovery;
 
 import org.infinispan.factories.annotations.Inject;
diff --git a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareDldGlobalTransaction.java b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareDldGlobalTransaction.java
index 15df7b66e97b..e62f1cd4ddb1 100644
--- a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareDldGlobalTransaction.java
+++ b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareDldGlobalTransaction.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.xa.recovery;
 
 import org.infinispan.commons.util.InfinispanCollections;
diff --git a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareGlobalTransaction.java b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareGlobalTransaction.java
index 08983e07664e..3f82d6bf1dd8 100644
--- a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareGlobalTransaction.java
+++ b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareGlobalTransaction.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.xa.recovery;
 
 import org.infinispan.commons.util.Util;
diff --git a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareLocalTransaction.java b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareLocalTransaction.java
index a41eb6b3a6a6..efdeb23f4f5f 100644
--- a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareLocalTransaction.java
+++ b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareLocalTransaction.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.xa.recovery;
 
 import org.infinispan.commons.equivalence.Equivalence;
diff --git a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareRemoteTransaction.java b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareRemoteTransaction.java
index 8b06aa208f50..a69b860f9502 100644
--- a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareRemoteTransaction.java
+++ b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareRemoteTransaction.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.xa.recovery;
 
 import org.infinispan.commands.write.WriteCommand;
diff --git a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareTransaction.java b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareTransaction.java
index 2db88b4f890c..d728f64f1680 100644
--- a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareTransaction.java
+++ b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareTransaction.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.xa.recovery;
 
 import org.infinispan.transaction.xa.CacheTransaction;
diff --git a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareTransactionTable.java b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareTransactionTable.java
index d96b1f0436de..101ddd3408a8 100644
--- a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareTransactionTable.java
+++ b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryAwareTransactionTable.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.xa.recovery;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryInfoKey.java b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryInfoKey.java
index 2abad8eaac5b..c57ee5acde8e 100644
--- a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryInfoKey.java
+++ b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryInfoKey.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.xa.recovery;
 
 import javax.transaction.xa.Xid;
diff --git a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryManager.java b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryManager.java
index b2a73bdf26aa..d96a9d3ee13a 100644
--- a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryManager.java
+++ b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryManager.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.xa.recovery;
 
 import org.infinispan.remoting.transport.Address;
diff --git a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryManagerImpl.java b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryManagerImpl.java
index fbf62346d84b..e3f67344174b 100644
--- a/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryManagerImpl.java
+++ b/core/src/main/java/org/infinispan/transaction/xa/recovery/RecoveryManagerImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.xa.recovery;
 
 import org.infinispan.commands.CommandsFactory;
diff --git a/core/src/main/java/org/infinispan/transaction/xa/recovery/SerializableXid.java b/core/src/main/java/org/infinispan/transaction/xa/recovery/SerializableXid.java
index 3c6a72d1fec4..8ed503e29e8e 100644
--- a/core/src/main/java/org/infinispan/transaction/xa/recovery/SerializableXid.java
+++ b/core/src/main/java/org/infinispan/transaction/xa/recovery/SerializableXid.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.transaction.xa.recovery;
 
 import net.jcip.annotations.Immutable;
diff --git a/core/src/main/java/org/infinispan/upgrade/RollingUpgradeManager.java b/core/src/main/java/org/infinispan/upgrade/RollingUpgradeManager.java
index d8d2521b3b47..45cefa2c5777 100644
--- a/core/src/main/java/org/infinispan/upgrade/RollingUpgradeManager.java
+++ b/core/src/main/java/org/infinispan/upgrade/RollingUpgradeManager.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.upgrade;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/upgrade/SourceMigrator.java b/core/src/main/java/org/infinispan/upgrade/SourceMigrator.java
index df43eee384d0..7e582039cf44 100644
--- a/core/src/main/java/org/infinispan/upgrade/SourceMigrator.java
+++ b/core/src/main/java/org/infinispan/upgrade/SourceMigrator.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.upgrade;
 
 /**
diff --git a/core/src/main/java/org/infinispan/upgrade/TargetMigrator.java b/core/src/main/java/org/infinispan/upgrade/TargetMigrator.java
index decd4e861523..d59c0d241656 100644
--- a/core/src/main/java/org/infinispan/upgrade/TargetMigrator.java
+++ b/core/src/main/java/org/infinispan/upgrade/TargetMigrator.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.upgrade;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/util/DefaultTimeService.java b/core/src/main/java/org/infinispan/util/DefaultTimeService.java
index 6ab514ca63cb..f324cb68aa74 100644
--- a/core/src/main/java/org/infinispan/util/DefaultTimeService.java
+++ b/core/src/main/java/org/infinispan/util/DefaultTimeService.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.util;
 
 import java.util.concurrent.TimeUnit;
diff --git a/core/src/main/java/org/infinispan/util/ModuleProperties.java b/core/src/main/java/org/infinispan/util/ModuleProperties.java
index bca2f5f2d7e6..f8864dc7e0f0 100644
--- a/core/src/main/java/org/infinispan/util/ModuleProperties.java
+++ b/core/src/main/java/org/infinispan/util/ModuleProperties.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util;
 
 import org.infinispan.commands.ReplicableCommand;
diff --git a/core/src/main/java/org/infinispan/util/ReadOnlyDataContainerBackedKeySet.java b/core/src/main/java/org/infinispan/util/ReadOnlyDataContainerBackedKeySet.java
index a93132d50302..36cfaad5addd 100644
--- a/core/src/main/java/org/infinispan/util/ReadOnlyDataContainerBackedKeySet.java
+++ b/core/src/main/java/org/infinispan/util/ReadOnlyDataContainerBackedKeySet.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util;
 
 import org.infinispan.container.DataContainer;
diff --git a/core/src/main/java/org/infinispan/util/TimeService.java b/core/src/main/java/org/infinispan/util/TimeService.java
index 8c5d96700e69..e8b3c0b611c0 100644
--- a/core/src/main/java/org/infinispan/util/TimeService.java
+++ b/core/src/main/java/org/infinispan/util/TimeService.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.util;
 
 import org.infinispan.factories.scopes.Scope;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/AbstractInProcessFuture.java b/core/src/main/java/org/infinispan/util/concurrent/AbstractInProcessFuture.java
index 3ffa9c164e6b..fc4c519dedb1 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/AbstractInProcessFuture.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/AbstractInProcessFuture.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent;
 
 import java.util.concurrent.*;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/AbstractInProcessNotifyingFuture.java b/core/src/main/java/org/infinispan/util/concurrent/AbstractInProcessNotifyingFuture.java
index 44a220ad6d18..4e3aa0f73111 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/AbstractInProcessNotifyingFuture.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/AbstractInProcessNotifyingFuture.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent;
 
 /**
diff --git a/core/src/main/java/org/infinispan/util/concurrent/AggregatingNotifyingFutureImpl.java b/core/src/main/java/org/infinispan/util/concurrent/AggregatingNotifyingFutureImpl.java
index 3c7a2ebe866e..c7d587ed5017 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/AggregatingNotifyingFutureImpl.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/AggregatingNotifyingFutureImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent;
 
 import java.util.ArrayList;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/BaseNotifyingFuture.java b/core/src/main/java/org/infinispan/util/concurrent/BaseNotifyingFuture.java
index 01ba4fee8bc9..c5822f08349e 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/BaseNotifyingFuture.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/BaseNotifyingFuture.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.util.concurrent;
 
 import java.util.Set;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/BlockingRunnable.java b/core/src/main/java/org/infinispan/util/concurrent/BlockingRunnable.java
index 370a1907bb5f..fbd9b0eb554c 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/BlockingRunnable.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/BlockingRunnable.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.util.concurrent;
 
 /**
diff --git a/core/src/main/java/org/infinispan/util/concurrent/BlockingTaskAwareExecutorService.java b/core/src/main/java/org/infinispan/util/concurrent/BlockingTaskAwareExecutorService.java
index 7dbcfe61903a..78d54e2f1160 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/BlockingTaskAwareExecutorService.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/BlockingTaskAwareExecutorService.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.util.concurrent;
 
 import java.util.concurrent.ExecutorService;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/BlockingTaskAwareExecutorServiceImpl.java b/core/src/main/java/org/infinispan/util/concurrent/BlockingTaskAwareExecutorServiceImpl.java
index 9195fbef0b85..ebd887409f12 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/BlockingTaskAwareExecutorServiceImpl.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/BlockingTaskAwareExecutorServiceImpl.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.util.concurrent;
 
 import org.infinispan.util.TimeService;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/BoundedConcurrentHashMap.java b/core/src/main/java/org/infinispan/util/concurrent/BoundedConcurrentHashMap.java
index 5b924e534f12..4f931b66e047 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/BoundedConcurrentHashMap.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/BoundedConcurrentHashMap.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 /*
  * Written by Doug Lea with assistance from members of JCP JSR-166
  * Expert Group and released to the public domain, as explained at
diff --git a/core/src/main/java/org/infinispan/util/concurrent/BoundedExecutors.java b/core/src/main/java/org/infinispan/util/concurrent/BoundedExecutors.java
index d06e5ede4bb6..0fd0771fe683 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/BoundedExecutors.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/BoundedExecutors.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent;
 
 import java.util.concurrent.ExecutorService;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/ConcurrentHashSet.java b/core/src/main/java/org/infinispan/util/concurrent/ConcurrentHashSet.java
index e33b3e40a89b..05f6d5358d7e 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/ConcurrentHashSet.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/ConcurrentHashSet.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent;
 
 import org.infinispan.commons.util.CollectionFactory;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/ConcurrentWeakKeyHashMap.java b/core/src/main/java/org/infinispan/util/concurrent/ConcurrentWeakKeyHashMap.java
index a1b3b56dc051..7ba51a82506f 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/ConcurrentWeakKeyHashMap.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/ConcurrentWeakKeyHashMap.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 /*
  * Written by Doug Lea with assistance from members of JCP JSR-166
  * Expert Group and released to the public domain, as explained at
diff --git a/core/src/main/java/org/infinispan/util/concurrent/DeferredReturnFuture.java b/core/src/main/java/org/infinispan/util/concurrent/DeferredReturnFuture.java
index 49cd6f165f8b..12cb5e3a26e7 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/DeferredReturnFuture.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/DeferredReturnFuture.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.util.concurrent;
 
 import java.util.concurrent.*;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/FutureListener.java b/core/src/main/java/org/infinispan/util/concurrent/FutureListener.java
index f57caeeffa4e..d0b973bef3dd 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/FutureListener.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/FutureListener.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent;
 
 import java.util.concurrent.Future;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/IsolationLevel.java b/core/src/main/java/org/infinispan/util/concurrent/IsolationLevel.java
index 11503b90dc99..84b9706f154c 100755
--- a/core/src/main/java/org/infinispan/util/concurrent/IsolationLevel.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/IsolationLevel.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent;
 
 /**
diff --git a/core/src/main/java/org/infinispan/util/concurrent/NoOpFuture.java b/core/src/main/java/org/infinispan/util/concurrent/NoOpFuture.java
index 57e263b6afc4..900b44b40c6a 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/NoOpFuture.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/NoOpFuture.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.util.concurrent;
 
 import java.util.concurrent.*;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/NotifyingFuture.java b/core/src/main/java/org/infinispan/util/concurrent/NotifyingFuture.java
index 5ad16eac3071..87a3ad12396a 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/NotifyingFuture.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/NotifyingFuture.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent;
 
 import java.util.concurrent.Future;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/NotifyingFutureAdaptor.java b/core/src/main/java/org/infinispan/util/concurrent/NotifyingFutureAdaptor.java
index 3106ee352c1e..4f4bedbfc033 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/NotifyingFutureAdaptor.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/NotifyingFutureAdaptor.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.util.concurrent;
 
 import org.infinispan.util.logging.Log;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/NotifyingFutureImpl.java b/core/src/main/java/org/infinispan/util/concurrent/NotifyingFutureImpl.java
index f9e8a20f2877..b269125ef7b9 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/NotifyingFutureImpl.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/NotifyingFutureImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent;
 
 import java.util.Set;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/NotifyingNotifiableFuture.java b/core/src/main/java/org/infinispan/util/concurrent/NotifyingNotifiableFuture.java
index 166344067f56..6bc36fdd8eaa 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/NotifyingNotifiableFuture.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/NotifyingNotifiableFuture.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent;
 
 import java.util.concurrent.Future;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/ReclosableLatch.java b/core/src/main/java/org/infinispan/util/concurrent/ReclosableLatch.java
index 070a5bf9fb9e..0a76b8cb6a19 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/ReclosableLatch.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/ReclosableLatch.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent;
 
 import java.util.concurrent.TimeUnit;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/SynchronizedRestarter.java b/core/src/main/java/org/infinispan/util/concurrent/SynchronizedRestarter.java
index 9f94c72439be..662b89562dd4 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/SynchronizedRestarter.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/SynchronizedRestarter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent;
 
 import org.infinispan.lifecycle.Lifecycle;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/TimeoutException.java b/core/src/main/java/org/infinispan/util/concurrent/TimeoutException.java
index 8fc5ec02a948..62e1186a0d6a 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/TimeoutException.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/TimeoutException.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/WithinThreadExecutor.java b/core/src/main/java/org/infinispan/util/concurrent/WithinThreadExecutor.java
index 70b57fe09ee9..1bb244ce6604 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/WithinThreadExecutor.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/WithinThreadExecutor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent;
 
 import org.infinispan.commons.util.InfinispanCollections;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/locks/DeadlockDetectedException.java b/core/src/main/java/org/infinispan/util/concurrent/locks/DeadlockDetectedException.java
index 06f3ebb2b754..7cd2a161ee3d 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/locks/DeadlockDetectedException.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/locks/DeadlockDetectedException.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent.locks;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/locks/DeadlockDetectingLockManager.java b/core/src/main/java/org/infinispan/util/concurrent/locks/DeadlockDetectingLockManager.java
index 608720727051..1138a26bad1e 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/locks/DeadlockDetectingLockManager.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/locks/DeadlockDetectingLockManager.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent.locks;
 
 import org.infinispan.context.InvocationContext;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/locks/LockManager.java b/core/src/main/java/org/infinispan/util/concurrent/locks/LockManager.java
index 3298a7fac34d..bf6366192467 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/locks/LockManager.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/locks/LockManager.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent.locks;
 
 import org.infinispan.container.entries.CacheEntry;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/locks/LockManagerImpl.java b/core/src/main/java/org/infinispan/util/concurrent/locks/LockManagerImpl.java
index d6a177e65b2e..a6a75a913a4e 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/locks/LockManagerImpl.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/locks/LockManagerImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent.locks;
 
 import org.infinispan.commons.util.Util;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/locks/OwnableReentrantLock.java b/core/src/main/java/org/infinispan/util/concurrent/locks/OwnableReentrantLock.java
index 584756bfd329..33fa05ec1820 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/locks/OwnableReentrantLock.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/locks/OwnableReentrantLock.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent.locks;
 
 import net.jcip.annotations.ThreadSafe;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/locks/OwnableRefCountingReentrantLock.java b/core/src/main/java/org/infinispan/util/concurrent/locks/OwnableRefCountingReentrantLock.java
index 56fe2a21b273..a885a0a6c1a7 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/locks/OwnableRefCountingReentrantLock.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/locks/OwnableRefCountingReentrantLock.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.util.concurrent.locks;
 
 import org.infinispan.util.concurrent.locks.containers.OwnableReentrantPerEntryLockContainer;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/locks/RefCountingLock.java b/core/src/main/java/org/infinispan/util/concurrent/locks/RefCountingLock.java
index 281dac713a7d..098bbf14ea8e 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/locks/RefCountingLock.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/locks/RefCountingLock.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.util.concurrent.locks;
 
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/locks/StripedLock.java b/core/src/main/java/org/infinispan/util/concurrent/locks/StripedLock.java
index 9606af10425d..2516647dfaf6 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/locks/StripedLock.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/locks/StripedLock.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent.locks;
 
 import net.jcip.annotations.ThreadSafe;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/locks/VisibleOwnerReentrantLock.java b/core/src/main/java/org/infinispan/util/concurrent/locks/VisibleOwnerReentrantLock.java
index 7246e2275b8e..d8f62cd56986 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/locks/VisibleOwnerReentrantLock.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/locks/VisibleOwnerReentrantLock.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.util.concurrent.locks;
 
 import java.util.concurrent.locks.ReentrantLock;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/locks/VisibleOwnerRefCountingReentrantLock.java b/core/src/main/java/org/infinispan/util/concurrent/locks/VisibleOwnerRefCountingReentrantLock.java
index 195f671d1fa2..1b86e0433d39 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/locks/VisibleOwnerRefCountingReentrantLock.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/locks/VisibleOwnerRefCountingReentrantLock.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.util.concurrent.locks;
 
 import org.infinispan.util.concurrent.locks.containers.ReentrantPerEntryLockContainer;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractLockContainer.java b/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractLockContainer.java
index 346f09f38420..24964afaa56a 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractLockContainer.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractLockContainer.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.util.concurrent.locks.containers;
 
 import org.infinispan.util.logging.Log;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractPerEntryLockContainer.java b/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractPerEntryLockContainer.java
index 2cd78719d3f1..c72809c13c68 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractPerEntryLockContainer.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractPerEntryLockContainer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent.locks.containers;
 
 import org.infinispan.commons.equivalence.AnyEquivalence;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractStripedLockContainer.java b/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractStripedLockContainer.java
index b216d9602cb5..e4aa4e87515f 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractStripedLockContainer.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractStripedLockContainer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent.locks.containers;
 
 import net.jcip.annotations.ThreadSafe;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/locks/containers/LockContainer.java b/core/src/main/java/org/infinispan/util/concurrent/locks/containers/LockContainer.java
index 733c5fa9867f..d68cc68b6bc7 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/locks/containers/LockContainer.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/locks/containers/LockContainer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent.locks.containers;
 
 import java.util.concurrent.TimeUnit;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/locks/containers/OwnableReentrantPerEntryLockContainer.java b/core/src/main/java/org/infinispan/util/concurrent/locks/containers/OwnableReentrantPerEntryLockContainer.java
index 6f52ff081128..d0e96387cdd9 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/locks/containers/OwnableReentrantPerEntryLockContainer.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/locks/containers/OwnableReentrantPerEntryLockContainer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent.locks.containers;
 
 import org.infinispan.util.concurrent.locks.OwnableReentrantLock;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/locks/containers/OwnableReentrantStripedLockContainer.java b/core/src/main/java/org/infinispan/util/concurrent/locks/containers/OwnableReentrantStripedLockContainer.java
index 868084da1943..75a20a0ae83e 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/locks/containers/OwnableReentrantStripedLockContainer.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/locks/containers/OwnableReentrantStripedLockContainer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent.locks.containers;
 
 import net.jcip.annotations.ThreadSafe;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/locks/containers/ReentrantPerEntryLockContainer.java b/core/src/main/java/org/infinispan/util/concurrent/locks/containers/ReentrantPerEntryLockContainer.java
index da110716f529..954079a0ba31 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/locks/containers/ReentrantPerEntryLockContainer.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/locks/containers/ReentrantPerEntryLockContainer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent.locks.containers;
 
 import org.infinispan.util.concurrent.locks.OwnableReentrantLock;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/locks/containers/ReentrantStripedLockContainer.java b/core/src/main/java/org/infinispan/util/concurrent/locks/containers/ReentrantStripedLockContainer.java
index 5ff0c57e8280..80215ec69419 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/locks/containers/ReentrantStripedLockContainer.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/locks/containers/ReentrantStripedLockContainer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.concurrent.locks.containers;
 
 import net.jcip.annotations.ThreadSafe;
diff --git a/core/src/main/java/org/infinispan/util/concurrent/locks/containers/package-info.java b/core/src/main/java/org/infinispan/util/concurrent/locks/containers/package-info.java
index 003180c7562e..0bbd4fcddbb6 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/locks/containers/package-info.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/locks/containers/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Concurrent lock containers.
  */
diff --git a/core/src/main/java/org/infinispan/util/concurrent/locks/package-info.java b/core/src/main/java/org/infinispan/util/concurrent/locks/package-info.java
index f1e04fc29a1e..90740759fc7e 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/locks/package-info.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/locks/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Lock and synchronization related classes, tools and utilities.
  */
diff --git a/core/src/main/java/org/infinispan/util/concurrent/package-info.java b/core/src/main/java/org/infinispan/util/concurrent/package-info.java
index 19de3a832785..141ee11a1550 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/package-info.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Thread-safe containers and other concurrency-related utilities, designed to supplement JDK concurrency utilities
  * and containers.
diff --git a/core/src/main/java/org/infinispan/util/logging/Log.java b/core/src/main/java/org/infinispan/util/logging/Log.java
index fcae90d9ebcf..d703ef7667b9 100644
--- a/core/src/main/java/org/infinispan/util/logging/Log.java
+++ b/core/src/main/java/org/infinispan/util/logging/Log.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.logging;
 
 import org.infinispan.commands.ReplicableCommand;
diff --git a/core/src/main/java/org/infinispan/util/logging/LogFactory.java b/core/src/main/java/org/infinispan/util/logging/LogFactory.java
index a8c255d892b5..6d0a5a73318c 100644
--- a/core/src/main/java/org/infinispan/util/logging/LogFactory.java
+++ b/core/src/main/java/org/infinispan/util/logging/LogFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util.logging;
 
 import org.jboss.logging.Logger;
diff --git a/core/src/main/java/org/infinispan/util/logging/package-info.java b/core/src/main/java/org/infinispan/util/logging/package-info.java
index 30255469e764..3c1908d922d1 100644
--- a/core/src/main/java/org/infinispan/util/logging/package-info.java
+++ b/core/src/main/java/org/infinispan/util/logging/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Infinispan's logging abstractions that delegate to either JDK or Log4J logging engines.
  */
diff --git a/core/src/main/java/org/infinispan/util/package-info.java b/core/src/main/java/org/infinispan/util/package-info.java
index 6b22676d9b99..479e9bfc4f4f 100644
--- a/core/src/main/java/org/infinispan/util/package-info.java
+++ b/core/src/main/java/org/infinispan/util/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * General utilities that are not specific to Infinispan, including string parsing helpers, reflection tools and
  * collections and containers designed to supplement the JDK-provided containers. 
diff --git a/core/src/main/java/org/infinispan/util/stream/Streams.java b/core/src/main/java/org/infinispan/util/stream/Streams.java
index aacd18a10d0d..ca1d28246530 100644
--- a/core/src/main/java/org/infinispan/util/stream/Streams.java
+++ b/core/src/main/java/org/infinispan/util/stream/Streams.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.util.stream;
 
 import org.infinispan.util.logging.Log;
diff --git a/core/src/main/java/org/infinispan/xsite/AbstractCustomFailurePolicy.java b/core/src/main/java/org/infinispan/xsite/AbstractCustomFailurePolicy.java
index 767dbf5dfc88..2fa2c606d992 100644
--- a/core/src/main/java/org/infinispan/xsite/AbstractCustomFailurePolicy.java
+++ b/core/src/main/java/org/infinispan/xsite/AbstractCustomFailurePolicy.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/xsite/BackupFailureException.java b/core/src/main/java/org/infinispan/xsite/BackupFailureException.java
index cf9031427e1a..8d1651c78acf 100644
--- a/core/src/main/java/org/infinispan/xsite/BackupFailureException.java
+++ b/core/src/main/java/org/infinispan/xsite/BackupFailureException.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.remoting.RpcException;
diff --git a/core/src/main/java/org/infinispan/xsite/BackupReceiver.java b/core/src/main/java/org/infinispan/xsite/BackupReceiver.java
index ae5826a6fad5..35382b9c1ec7 100644
--- a/core/src/main/java/org/infinispan/xsite/BackupReceiver.java
+++ b/core/src/main/java/org/infinispan/xsite/BackupReceiver.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/xsite/BackupReceiverImpl.java b/core/src/main/java/org/infinispan/xsite/BackupReceiverImpl.java
index 91ede59cb833..4ef3921a41e4 100644
--- a/core/src/main/java/org/infinispan/xsite/BackupReceiverImpl.java
+++ b/core/src/main/java/org/infinispan/xsite/BackupReceiverImpl.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/main/java/org/infinispan/xsite/BackupReceiverRepository.java b/core/src/main/java/org/infinispan/xsite/BackupReceiverRepository.java
index a95053fda410..4132392545a6 100644
--- a/core/src/main/java/org/infinispan/xsite/BackupReceiverRepository.java
+++ b/core/src/main/java/org/infinispan/xsite/BackupReceiverRepository.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.commands.remote.SingleRpcCommand;
diff --git a/core/src/main/java/org/infinispan/xsite/BackupReceiverRepositoryImpl.java b/core/src/main/java/org/infinispan/xsite/BackupReceiverRepositoryImpl.java
index 14d1cb3a663c..99d157326bc6 100644
--- a/core/src/main/java/org/infinispan/xsite/BackupReceiverRepositoryImpl.java
+++ b/core/src/main/java/org/infinispan/xsite/BackupReceiverRepositoryImpl.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/xsite/BackupSender.java b/core/src/main/java/org/infinispan/xsite/BackupSender.java
index e68ef487092e..2816ea84ea68 100644
--- a/core/src/main/java/org/infinispan/xsite/BackupSender.java
+++ b/core/src/main/java/org/infinispan/xsite/BackupSender.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.commands.VisitableCommand;
diff --git a/core/src/main/java/org/infinispan/xsite/BackupSenderImpl.java b/core/src/main/java/org/infinispan/xsite/BackupSenderImpl.java
index 97c88f57f408..d5ccf92c7a4f 100644
--- a/core/src/main/java/org/infinispan/xsite/BackupSenderImpl.java
+++ b/core/src/main/java/org/infinispan/xsite/BackupSenderImpl.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/xsite/CustomFailurePolicy.java b/core/src/main/java/org/infinispan/xsite/CustomFailurePolicy.java
index 7cb1dd4cfed9..76571f6f9053 100644
--- a/core/src/main/java/org/infinispan/xsite/CustomFailurePolicy.java
+++ b/core/src/main/java/org/infinispan/xsite/CustomFailurePolicy.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/xsite/OfflineStatus.java b/core/src/main/java/org/infinispan/xsite/OfflineStatus.java
index 95ed0c6e8af7..225a0cbc87ec 100644
--- a/core/src/main/java/org/infinispan/xsite/OfflineStatus.java
+++ b/core/src/main/java/org/infinispan/xsite/OfflineStatus.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import net.jcip.annotations.ThreadSafe;
diff --git a/core/src/main/java/org/infinispan/xsite/XSiteAdminCommand.java b/core/src/main/java/org/infinispan/xsite/XSiteAdminCommand.java
index d3b2386ae6ce..4c25990dd347 100644
--- a/core/src/main/java/org/infinispan/xsite/XSiteAdminCommand.java
+++ b/core/src/main/java/org/infinispan/xsite/XSiteAdminCommand.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- *  Copyright 2012 Red Hat Inc. and/or its affiliates and other
- *  contributors as indicated by the @author tags. All rights reserved
- *  See the copyright.txt in the distribution for a full listing of
- *  individual contributors.
- *
- *  This is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU Lesser General Public License as
- *  published by the Free Software Foundation; either version 2.1 of
- *  the License, or (at your option) any later version.
- *
- *  This software is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this software; if not, write to the Free
- *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- *  02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.commands.remote.BaseRpcCommand;
diff --git a/core/src/main/java/org/infinispan/xsite/XSiteAdminOperations.java b/core/src/main/java/org/infinispan/xsite/XSiteAdminOperations.java
index 17a16df3f6e5..4bf645b53353 100644
--- a/core/src/main/java/org/infinispan/xsite/XSiteAdminOperations.java
+++ b/core/src/main/java/org/infinispan/xsite/XSiteAdminOperations.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.Cache;
diff --git a/core/src/main/java/org/infinispan/xsite/XSiteBackup.java b/core/src/main/java/org/infinispan/xsite/XSiteBackup.java
index 9fe29e1353ff..082b9d45ef7e 100644
--- a/core/src/main/java/org/infinispan/xsite/XSiteBackup.java
+++ b/core/src/main/java/org/infinispan/xsite/XSiteBackup.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 /**
diff --git a/core/src/main/release/Copyright.txt b/core/src/main/release/Copyright.txt
index e0b50e302036..c2d9249954dd 100644
--- a/core/src/main/release/Copyright.txt
+++ b/core/src/main/release/Copyright.txt
@@ -1,27 +1,16 @@
-Infinispan is Copyright 2008 - 2010, Red Hat Middleware LLC
-and individual contributors, and is licensed under the GNU LGPL.
+   Copyright 2009 - 2013, Red Hat Inc. and/or its affiliates.
 
-A summary of the individual contributors is given below.
-Any omission should be sent to msurtani@redhat.com.
+   All files in this repository or distribution are licensed under the
+   Apache License, Version 2.0 (the "License");
+   you may not use any files in this repository or distribution except
+   in compliance with the License.
 
-SVN Login(s)                                 Name
--------------------------------------------------------------------------------
-adriancole                                   Adrian Cole
-aamonten                                     Alejandro Montenegro
-bela, bela@jboss.com, belaban                Bela Ban
-bstansberry, bstansberry@jboss.com           Brian Stansberry
-dpospisi@redhat.com                          Dominik Pospisil
-gzamarreno, galder.zamarreno@jboss.com       Galder Zamarreno
-pilhuhn                                      Heiko W. Rupp
-jgreene, jason.greene@jboss.com              Jason T. Greene
-lmoren                                       Lukasz Moren
-msurtani, manik.surtani@jboss.com            Manik Surtani
-michael.neale@jboss.com                      Michael Neale
-mmarkus, mircea.markus                       Mircea Markus
-navssurtani                                  Navin Surtani
-noelo                                        Noel O'Connor
-pvdyck                                       Phillipe van Dyck
-sannegrinovero                               Sanne Grinovero
-tfenelly                                     Tom Fenelly
-vblagojevic, vblagojevic@jboss.com           Vladimir Blagojevic
--------------------------------------------------------------------------------
+   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.
\ No newline at end of file
diff --git a/core/src/main/release/etc/config-samples-5.2/distributed-ec2.xml b/core/src/main/release/etc/config-samples-5.2/distributed-ec2.xml
index fcdc764e2f5c..b0be31e8d611 100644
--- a/core/src/main/release/etc/config-samples-5.2/distributed-ec2.xml
+++ b/core/src/main/release/etc/config-samples-5.2/distributed-ec2.xml
@@ -1,23 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2011 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <infinispan
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:infinispan:config:5.2 http://www.infinispan.org/schemas/infinispan-config-5.2.xsd"
diff --git a/core/src/main/release/etc/config-samples-5.2/distributed-udp.xml b/core/src/main/release/etc/config-samples-5.2/distributed-udp.xml
index d56faf4052cf..17e12cf050f8 100644
--- a/core/src/main/release/etc/config-samples-5.2/distributed-udp.xml
+++ b/core/src/main/release/etc/config-samples-5.2/distributed-udp.xml
@@ -1,23 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2011 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <infinispan
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:infinispan:config:5.2 http://www.infinispan.org/schemas/infinispan-config-5.2.xsd"
diff --git a/core/src/main/release/etc/config-samples-5.2/minimal.xml b/core/src/main/release/etc/config-samples-5.2/minimal.xml
index f3067b97e431..9b1e0aa1bd23 100644
--- a/core/src/main/release/etc/config-samples-5.2/minimal.xml
+++ b/core/src/main/release/etc/config-samples-5.2/minimal.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <infinispan>
    
 </infinispan>
\ No newline at end of file
diff --git a/core/src/main/release/etc/config-samples-5.2/sample.xml b/core/src/main/release/etc/config-samples-5.2/sample.xml
index 4be0e423db9b..2abfb921d273 100644
--- a/core/src/main/release/etc/config-samples-5.2/sample.xml
+++ b/core/src/main/release/etc/config-samples-5.2/sample.xml
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-
 <infinispan
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:infinispan:config:5.2 http://www.infinispan.org/schemas/infinispan-config-5.2.xsd"
diff --git a/core/src/main/release/etc/config-samples/distributed-ec2.xml b/core/src/main/release/etc/config-samples/distributed-ec2.xml
index a6084a3b45ef..011059ecf907 100644
--- a/core/src/main/release/etc/config-samples/distributed-ec2.xml
+++ b/core/src/main/release/etc/config-samples/distributed-ec2.xml
@@ -1,23 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2011 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <infinispan
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:infinispan:config:5.3 http://www.infinispan.org/schemas/infinispan-config-5.3.xsd"
diff --git a/core/src/main/release/etc/config-samples/distributed-udp.xml b/core/src/main/release/etc/config-samples/distributed-udp.xml
index 33396101e7e6..8b60c670bdec 100644
--- a/core/src/main/release/etc/config-samples/distributed-udp.xml
+++ b/core/src/main/release/etc/config-samples/distributed-udp.xml
@@ -1,23 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2011 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <infinispan
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:infinispan:config:5.3 http://www.infinispan.org/schemas/infinispan-config-5.3.xsd"
diff --git a/core/src/main/release/etc/config-samples/minimal.xml b/core/src/main/release/etc/config-samples/minimal.xml
index f3067b97e431..9b1e0aa1bd23 100644
--- a/core/src/main/release/etc/config-samples/minimal.xml
+++ b/core/src/main/release/etc/config-samples/minimal.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <infinispan>
    
 </infinispan>
\ No newline at end of file
diff --git a/core/src/main/release/etc/config-samples/sample.xml b/core/src/main/release/etc/config-samples/sample.xml
index 67534dbb0bf4..9e64d883d826 100644
--- a/core/src/main/release/etc/config-samples/sample.xml
+++ b/core/src/main/release/etc/config-samples/sample.xml
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-
 <infinispan
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:infinispan:config:5.3 http://www.infinispan.org/schemas/infinispan-config-5.3.xsd"
diff --git a/core/src/main/release/licenses/README.txt b/core/src/main/release/licenses/README.txt
index b324cf44be01..440cbde0ce5e 100644
--- a/core/src/main/release/licenses/README.txt
+++ b/core/src/main/release/licenses/README.txt
@@ -1,5 +1,5 @@
 This directory contains the licenses for some of the other libraries shipped with the distribution, that are not
-covered by the LGPL-2.1 license.
+covered by the Apache License version 2.0.
 
 It is important to note that not all the libraries shipped are needed in all cases and if you do not use certain
 libraries you may not come under some of the licenses in this directory.
diff --git a/core/src/main/resources/jgroups-ec2.xml b/core/src/main/resources/jgroups-ec2.xml
index 00cb6eccb437..59da7df71962 100644
--- a/core/src/main/resources/jgroups-ec2.xml
+++ b/core/src/main/resources/jgroups-ec2.xml
@@ -1,25 +1,3 @@
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <config xmlns="urn:org:jgroups"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="urn:org:jgroups file:schema/JGroups-3.2.xsd">
diff --git a/core/src/main/resources/jgroups-tcp.xml b/core/src/main/resources/jgroups-tcp.xml
index 2d75692fb11f..abd5bfd9558b 100644
--- a/core/src/main/resources/jgroups-tcp.xml
+++ b/core/src/main/resources/jgroups-tcp.xml
@@ -1,25 +1,3 @@
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <config xmlns="urn:org:jgroups"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="urn:org:jgroups file:schema/JGroups-3.2.xsd">
diff --git a/core/src/main/resources/jgroups-udp.xml b/core/src/main/resources/jgroups-udp.xml
index 37337e8f8a73..5a3283cdcb63 100644
--- a/core/src/main/resources/jgroups-udp.xml
+++ b/core/src/main/resources/jgroups-udp.xml
@@ -1,25 +1,3 @@
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <config xmlns="urn:org:jgroups"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="urn:org:jgroups file:schema/JGroups-3.2.xsd">
diff --git a/core/src/main/resources/schema/infinispan-config-5.2.xsd b/core/src/main/resources/schema/infinispan-config-5.2.xsd
index 98e5a6f66bfd..7c001a32f07b 100644
--- a/core/src/main/resources/schema/infinispan-config-5.2.xsd
+++ b/core/src/main/resources/schema/infinispan-config-5.2.xsd
@@ -1,23 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-  ~ Copyright 2012 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" version="1.0" targetNamespace="urn:infinispan:config:5.2" xmlns:tns="urn:infinispan:config:5.2" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
   <xs:element name="infinispan">
diff --git a/core/src/main/resources/schema/infinispan-config-5.3.xsd b/core/src/main/resources/schema/infinispan-config-5.3.xsd
index b476d8e61309..44f110ad4887 100644
--- a/core/src/main/resources/schema/infinispan-config-5.3.xsd
+++ b/core/src/main/resources/schema/infinispan-config-5.3.xsd
@@ -1,23 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-  ~ Copyright 2012 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" version="1.0" targetNamespace="urn:infinispan:config:5.3" xmlns:tns="urn:infinispan:config:5.3" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
   <xs:element name="infinispan">
diff --git a/core/src/main/resources/xslt/coherence35x2infinispan4x.xslt b/core/src/main/resources/xslt/coherence35x2infinispan4x.xslt
index 33fd7109a532..33e291a5db90 100644
--- a/core/src/main/resources/xslt/coherence35x2infinispan4x.xslt
+++ b/core/src/main/resources/xslt/coherence35x2infinispan4x.xslt
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <xsl:stylesheet xmlns="urn:infinispan:config:5.2" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
    <xsl:output method="xml" indent="yes" version="1.0" encoding="UTF-8" omit-xml-declaration="no"/>
 
diff --git a/core/src/main/resources/xslt/ehcache1x2infinispan4x.xslt b/core/src/main/resources/xslt/ehcache1x2infinispan4x.xslt
index ef034a9a4461..504fa4b669a3 100644
--- a/core/src/main/resources/xslt/ehcache1x2infinispan4x.xslt
+++ b/core/src/main/resources/xslt/ehcache1x2infinispan4x.xslt
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <xsl:stylesheet xmlns="urn:infinispan:config:5.2" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
    <xsl:output method="xml" indent="yes" version="1.0" encoding="UTF-8" omit-xml-declaration="no"/>
    <xsl:template match="/ehcache">
diff --git a/core/src/main/resources/xslt/indent.xslt b/core/src/main/resources/xslt/indent.xslt
index 4bba85607b54..49bb1878f712 100644
--- a/core/src/main/resources/xslt/indent.xslt
+++ b/core/src/main/resources/xslt/indent.xslt
@@ -1,25 +1,3 @@
-   <!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <xsl:stylesheet version="1.0"
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
    <xsl:output method="xml"/>
diff --git a/core/src/main/resources/xslt/jbc3x2infinispan4x.xslt b/core/src/main/resources/xslt/jbc3x2infinispan4x.xslt
index 8c1e26a2f98d..0bc67b9c1eb5 100644
--- a/core/src/main/resources/xslt/jbc3x2infinispan4x.xslt
+++ b/core/src/main/resources/xslt/jbc3x2infinispan4x.xslt
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <xsl:stylesheet xmlns="urn:infinispan:config:5.2" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
    <xsl:output method="xml" indent="yes" version="1.0" encoding="UTF-8" omit-xml-declaration="no"/>
 
diff --git a/core/src/main/resources/xslt/jgroupsFileGen.xslt b/core/src/main/resources/xslt/jgroupsFileGen.xslt
index 6130c6c4accf..886e8e43161f 100644
--- a/core/src/main/resources/xslt/jgroupsFileGen.xslt
+++ b/core/src/main/resources/xslt/jgroupsFileGen.xslt
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
    <xsl:output method="xml" indent="yes" version="1.0" encoding="UTF-8" omit-xml-declaration="yes"
diff --git a/core/src/test/java/org/infinispan/affinity/BaseFilterKeyAffinityServiceTest.java b/core/src/test/java/org/infinispan/affinity/BaseFilterKeyAffinityServiceTest.java
index efa9f38ab43b..803dcd248128 100644
--- a/core/src/test/java/org/infinispan/affinity/BaseFilterKeyAffinityServiceTest.java
+++ b/core/src/test/java/org/infinispan/affinity/BaseFilterKeyAffinityServiceTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.affinity;
 
 import junit.framework.Assert;
diff --git a/core/src/test/java/org/infinispan/affinity/BaseKeyAffinityServiceTest.java b/core/src/test/java/org/infinispan/affinity/BaseKeyAffinityServiceTest.java
index c896124ac228..1ee8a4874099 100644
--- a/core/src/test/java/org/infinispan/affinity/BaseKeyAffinityServiceTest.java
+++ b/core/src/test/java/org/infinispan/affinity/BaseKeyAffinityServiceTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.affinity;
 
 import org.infinispan.distribution.BaseDistFunctionalTest;
diff --git a/core/src/test/java/org/infinispan/affinity/ConcurrentStartupTest.java b/core/src/test/java/org/infinispan/affinity/ConcurrentStartupTest.java
index 15ac5c08ea10..7158fd5fd83d 100644
--- a/core/src/test/java/org/infinispan/affinity/ConcurrentStartupTest.java
+++ b/core/src/test/java/org/infinispan/affinity/ConcurrentStartupTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.affinity;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/test/java/org/infinispan/affinity/FilteredKeyAffinityServiceTest.java b/core/src/test/java/org/infinispan/affinity/FilteredKeyAffinityServiceTest.java
index 457fbb65a447..2128815400f7 100644
--- a/core/src/test/java/org/infinispan/affinity/FilteredKeyAffinityServiceTest.java
+++ b/core/src/test/java/org/infinispan/affinity/FilteredKeyAffinityServiceTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.affinity;
 
 import org.infinispan.remoting.transport.Address;
diff --git a/core/src/test/java/org/infinispan/affinity/KeyAffinityServiceShutdownTest.java b/core/src/test/java/org/infinispan/affinity/KeyAffinityServiceShutdownTest.java
index d3cd5953b445..9d4ead6d47e9 100644
--- a/core/src/test/java/org/infinispan/affinity/KeyAffinityServiceShutdownTest.java
+++ b/core/src/test/java/org/infinispan/affinity/KeyAffinityServiceShutdownTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.affinity;
 
 import org.infinispan.manager.EmbeddedCacheManager;
diff --git a/core/src/test/java/org/infinispan/affinity/KeyAffinityServiceTest.java b/core/src/test/java/org/infinispan/affinity/KeyAffinityServiceTest.java
index 1e08b2dc681e..602f230f49ce 100644
--- a/core/src/test/java/org/infinispan/affinity/KeyAffinityServiceTest.java
+++ b/core/src/test/java/org/infinispan/affinity/KeyAffinityServiceTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.affinity;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/affinity/LocalKeyAffinityServiceTest.java b/core/src/test/java/org/infinispan/affinity/LocalKeyAffinityServiceTest.java
index 32c2f617bc0a..90fd5998aaf8 100644
--- a/core/src/test/java/org/infinispan/affinity/LocalKeyAffinityServiceTest.java
+++ b/core/src/test/java/org/infinispan/affinity/LocalKeyAffinityServiceTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.affinity;
 
 import org.infinispan.remoting.transport.Address;
diff --git a/core/src/test/java/org/infinispan/api/APINonTxTest.java b/core/src/test/java/org/infinispan/api/APINonTxTest.java
index e63b6fb1fe26..afa8787b0114 100644
--- a/core/src/test/java/org/infinispan/api/APINonTxTest.java
+++ b/core/src/test/java/org/infinispan/api/APINonTxTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.api;
 
 import org.infinispan.commons.util.ObjectDuplicator;
diff --git a/core/src/test/java/org/infinispan/api/AsyncAPITest.java b/core/src/test/java/org/infinispan/api/AsyncAPITest.java
index 1085b73efc60..45a97a2af1dc 100644
--- a/core/src/test/java/org/infinispan/api/AsyncAPITest.java
+++ b/core/src/test/java/org/infinispan/api/AsyncAPITest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/api/AsyncWithTxTest.java b/core/src/test/java/org/infinispan/api/AsyncWithTxTest.java
index dce78df2abb3..a99b7a950b65 100644
--- a/core/src/test/java/org/infinispan/api/AsyncWithTxTest.java
+++ b/core/src/test/java/org/infinispan/api/AsyncWithTxTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/api/BaseDistClearTest.java b/core/src/test/java/org/infinispan/api/BaseDistClearTest.java
index 38e08b280ce1..9fb65814f0be 100644
--- a/core/src/test/java/org/infinispan/api/BaseDistClearTest.java
+++ b/core/src/test/java/org/infinispan/api/BaseDistClearTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.api;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/test/java/org/infinispan/api/ByteArrayCacheTest.java b/core/src/test/java/org/infinispan/api/ByteArrayCacheTest.java
index 8b8b197d61a8..e308b1e9aaad 100644
--- a/core/src/test/java/org/infinispan/api/ByteArrayCacheTest.java
+++ b/core/src/test/java/org/infinispan/api/ByteArrayCacheTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.api;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/api/CacheAPITest.java b/core/src/test/java/org/infinispan/api/CacheAPITest.java
index 7638391e3fe4..18bdec320cf2 100644
--- a/core/src/test/java/org/infinispan/api/CacheAPITest.java
+++ b/core/src/test/java/org/infinispan/api/CacheAPITest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/api/CacheClusterJoinTest.java b/core/src/test/java/org/infinispan/api/CacheClusterJoinTest.java
index 45776e9c03bc..f8b4c5932b74 100644
--- a/core/src/test/java/org/infinispan/api/CacheClusterJoinTest.java
+++ b/core/src/test/java/org/infinispan/api/CacheClusterJoinTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/api/ConcurrentOperationsTest.java b/core/src/test/java/org/infinispan/api/ConcurrentOperationsTest.java
index fc2e8a417c52..d46d7a153c6a 100644
--- a/core/src/test/java/org/infinispan/api/ConcurrentOperationsTest.java
+++ b/core/src/test/java/org/infinispan/api/ConcurrentOperationsTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.api;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/test/java/org/infinispan/api/ConditionalOperationsConcurrentOptimisticTest.java b/core/src/test/java/org/infinispan/api/ConditionalOperationsConcurrentOptimisticTest.java
index 992b935aaf78..37517438ad2d 100644
--- a/core/src/test/java/org/infinispan/api/ConditionalOperationsConcurrentOptimisticTest.java
+++ b/core/src/test/java/org/infinispan/api/ConditionalOperationsConcurrentOptimisticTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.api;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/api/ConditionalOperationsConcurrentPessimisticTest.java b/core/src/test/java/org/infinispan/api/ConditionalOperationsConcurrentPessimisticTest.java
index b21154d38856..428702ee3a9e 100644
--- a/core/src/test/java/org/infinispan/api/ConditionalOperationsConcurrentPessimisticTest.java
+++ b/core/src/test/java/org/infinispan/api/ConditionalOperationsConcurrentPessimisticTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.api;
 
 import org.infinispan.transaction.LockingMode;
diff --git a/core/src/test/java/org/infinispan/api/ConditionalOperationsConcurrentTest.java b/core/src/test/java/org/infinispan/api/ConditionalOperationsConcurrentTest.java
index 258a2e1dad85..7f854ee32dd2 100644
--- a/core/src/test/java/org/infinispan/api/ConditionalOperationsConcurrentTest.java
+++ b/core/src/test/java/org/infinispan/api/ConditionalOperationsConcurrentTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/test/java/org/infinispan/api/ConditionalOperationsConcurrentWriteSkewTest.java b/core/src/test/java/org/infinispan/api/ConditionalOperationsConcurrentWriteSkewTest.java
index 5e1bce756861..861149ce08e5 100644
--- a/core/src/test/java/org/infinispan/api/ConditionalOperationsConcurrentWriteSkewTest.java
+++ b/core/src/test/java/org/infinispan/api/ConditionalOperationsConcurrentWriteSkewTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.api;
 
 import java.util.List;
diff --git a/core/src/test/java/org/infinispan/api/DistNonTxClearTest.java b/core/src/test/java/org/infinispan/api/DistNonTxClearTest.java
index 4d3a88731b24..b3a52b38327e 100644
--- a/core/src/test/java/org/infinispan/api/DistNonTxClearTest.java
+++ b/core/src/test/java/org/infinispan/api/DistNonTxClearTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.api;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/api/DistOptimisticTxClearTest.java b/core/src/test/java/org/infinispan/api/DistOptimisticTxClearTest.java
index d340c366d666..be82b7bb2c85 100644
--- a/core/src/test/java/org/infinispan/api/DistOptimisticTxClearTest.java
+++ b/core/src/test/java/org/infinispan/api/DistOptimisticTxClearTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.api;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/api/DistPessimisticTxClearTest.java b/core/src/test/java/org/infinispan/api/DistPessimisticTxClearTest.java
index 9bc3afb48db4..3bf0e92a14b7 100644
--- a/core/src/test/java/org/infinispan/api/DistPessimisticTxClearTest.java
+++ b/core/src/test/java/org/infinispan/api/DistPessimisticTxClearTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.api;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/api/ForceWriteLockTest.java b/core/src/test/java/org/infinispan/api/ForceWriteLockTest.java
index cd97887843e8..404a3c8248df 100644
--- a/core/src/test/java/org/infinispan/api/ForceWriteLockTest.java
+++ b/core/src/test/java/org/infinispan/api/ForceWriteLockTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/test/java/org/infinispan/api/GetOnRemoveKeyDistTest.java b/core/src/test/java/org/infinispan/api/GetOnRemoveKeyDistTest.java
index 98ea407b2022..55431e5f8842 100644
--- a/core/src/test/java/org/infinispan/api/GetOnRemoveKeyDistTest.java
+++ b/core/src/test/java/org/infinispan/api/GetOnRemoveKeyDistTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.api;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/api/GetOnRemovedKeyTest.java b/core/src/test/java/org/infinispan/api/GetOnRemovedKeyTest.java
index 4a301cfcd68f..4bcd2aae5701 100644
--- a/core/src/test/java/org/infinispan/api/GetOnRemovedKeyTest.java
+++ b/core/src/test/java/org/infinispan/api/GetOnRemovedKeyTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.api;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/api/IgnoreReturnValueForConditionalOperationsTest.java b/core/src/test/java/org/infinispan/api/IgnoreReturnValueForConditionalOperationsTest.java
index 640b776c7544..eadf6fa57d9f 100644
--- a/core/src/test/java/org/infinispan/api/IgnoreReturnValueForConditionalOperationsTest.java
+++ b/core/src/test/java/org/infinispan/api/IgnoreReturnValueForConditionalOperationsTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- *  Copyright 2013 Red Hat Inc. and/or its affiliates and other
- *  contributors as indicated by the @author tags. All rights reserved
- *  See the copyright.txt in the distribution for a full listing of
- *  individual contributors.
- *
- *  This is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU Lesser General Public License as
- *  published by the Free Software Foundation; either version 2.1 of
- *  the License, or (at your option) any later version.
- *
- *  This software is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this software; if not, write to the Free
- *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- *  02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.api;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/api/IgnoreReturnValueForConditionalOperationsTxTest.java b/core/src/test/java/org/infinispan/api/IgnoreReturnValueForConditionalOperationsTxTest.java
index ca9044bdcba8..d02806fc88a1 100644
--- a/core/src/test/java/org/infinispan/api/IgnoreReturnValueForConditionalOperationsTxTest.java
+++ b/core/src/test/java/org/infinispan/api/IgnoreReturnValueForConditionalOperationsTxTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- *  Copyright 2013 Red Hat Inc. and/or its affiliates and other
- *  contributors as indicated by the @author tags. All rights reserved
- *  See the copyright.txt in the distribution for a full listing of
- *  individual contributors.
- *
- *  This is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU Lesser General Public License as
- *  published by the Free Software Foundation; either version 2.1 of
- *  the License, or (at your option) any later version.
- *
- *  This software is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this software; if not, write to the Free
- *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- *  02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.api;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/api/MetadataAPITest.java b/core/src/test/java/org/infinispan/api/MetadataAPITest.java
index a558665ae7f3..d704f99a03ef 100644
--- a/core/src/test/java/org/infinispan/api/MetadataAPITest.java
+++ b/core/src/test/java/org/infinispan/api/MetadataAPITest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.api;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/test/java/org/infinispan/api/MixedModeTest.java b/core/src/test/java/org/infinispan/api/MixedModeTest.java
index 245f3fdcb4ad..813653124f5a 100644
--- a/core/src/test/java/org/infinispan/api/MixedModeTest.java
+++ b/core/src/test/java/org/infinispan/api/MixedModeTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/test/java/org/infinispan/api/ParallelCacheStartTest.java b/core/src/test/java/org/infinispan/api/ParallelCacheStartTest.java
index 2c48dc8103fe..58896b75c465 100644
--- a/core/src/test/java/org/infinispan/api/ParallelCacheStartTest.java
+++ b/core/src/test/java/org/infinispan/api/ParallelCacheStartTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.api;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/api/ReplaceWithValueChangedTest.java b/core/src/test/java/org/infinispan/api/ReplaceWithValueChangedTest.java
index 845ca5fc6e6b..61643933ba1a 100644
--- a/core/src/test/java/org/infinispan/api/ReplaceWithValueChangedTest.java
+++ b/core/src/test/java/org/infinispan/api/ReplaceWithValueChangedTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.api;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/api/SimpleConditionalOperationTest.java b/core/src/test/java/org/infinispan/api/SimpleConditionalOperationTest.java
index e87c3cd90d83..edcd9fe55c7f 100644
--- a/core/src/test/java/org/infinispan/api/SimpleConditionalOperationTest.java
+++ b/core/src/test/java/org/infinispan/api/SimpleConditionalOperationTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.api;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/api/SkipLockingTest.java b/core/src/test/java/org/infinispan/api/SkipLockingTest.java
index 54a26e2e4811..e711788ba6da 100644
--- a/core/src/test/java/org/infinispan/api/SkipLockingTest.java
+++ b/core/src/test/java/org/infinispan/api/SkipLockingTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/test/java/org/infinispan/api/StartCacheFromListenerTest.java b/core/src/test/java/org/infinispan/api/StartCacheFromListenerTest.java
index 77733bce2c33..b0974c55c3d5 100644
--- a/core/src/test/java/org/infinispan/api/StartCacheFromListenerTest.java
+++ b/core/src/test/java/org/infinispan/api/StartCacheFromListenerTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.api;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/api/TerminatedCacheTest.java b/core/src/test/java/org/infinispan/api/TerminatedCacheTest.java
index bc1ced0b20c4..dc4d5d6433a1 100644
--- a/core/src/test/java/org/infinispan/api/TerminatedCacheTest.java
+++ b/core/src/test/java/org/infinispan/api/TerminatedCacheTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.api;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/api/TxCacheAndAsyncOpsTest.java b/core/src/test/java/org/infinispan/api/TxCacheAndAsyncOpsTest.java
index c71a72426de0..1b660c5c5b35 100644
--- a/core/src/test/java/org/infinispan/api/TxCacheAndAsyncOpsTest.java
+++ b/core/src/test/java/org/infinispan/api/TxCacheAndAsyncOpsTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.api;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/api/batch/AbstractBatchTest.java b/core/src/test/java/org/infinispan/api/batch/AbstractBatchTest.java
index fd3f53ed2df2..29024cf94666 100644
--- a/core/src/test/java/org/infinispan/api/batch/AbstractBatchTest.java
+++ b/core/src/test/java/org/infinispan/api/batch/AbstractBatchTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.batch;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/api/batch/BatchWithCustomTMTest.java b/core/src/test/java/org/infinispan/api/batch/BatchWithCustomTMTest.java
index 01400faa38d9..8b1dcc020808 100644
--- a/core/src/test/java/org/infinispan/api/batch/BatchWithCustomTMTest.java
+++ b/core/src/test/java/org/infinispan/api/batch/BatchWithCustomTMTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.batch;
 
 import static org.testng.AssertJUnit.assertNull;
diff --git a/core/src/test/java/org/infinispan/api/batch/BatchWithTMTest.java b/core/src/test/java/org/infinispan/api/batch/BatchWithTMTest.java
index 0e06148cfe35..604754e4573a 100644
--- a/core/src/test/java/org/infinispan/api/batch/BatchWithTMTest.java
+++ b/core/src/test/java/org/infinispan/api/batch/BatchWithTMTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.batch;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/api/batch/BatchWithoutTMTest.java b/core/src/test/java/org/infinispan/api/batch/BatchWithoutTMTest.java
index c63ed423d271..5a492fead87c 100644
--- a/core/src/test/java/org/infinispan/api/batch/BatchWithoutTMTest.java
+++ b/core/src/test/java/org/infinispan/api/batch/BatchWithoutTMTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.batch;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/api/batch/LockInBatchTest.java b/core/src/test/java/org/infinispan/api/batch/LockInBatchTest.java
index a962f96eb9d9..01ded65d898b 100644
--- a/core/src/test/java/org/infinispan/api/batch/LockInBatchTest.java
+++ b/core/src/test/java/org/infinispan/api/batch/LockInBatchTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.api.batch;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/api/flags/DecoratedCacheTest.java b/core/src/test/java/org/infinispan/api/flags/DecoratedCacheTest.java
index 1b4bbd159f27..48882376f4a9 100644
--- a/core/src/test/java/org/infinispan/api/flags/DecoratedCacheTest.java
+++ b/core/src/test/java/org/infinispan/api/flags/DecoratedCacheTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.flags;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/test/java/org/infinispan/api/flags/FlagsEnabledTest.java b/core/src/test/java/org/infinispan/api/flags/FlagsEnabledTest.java
index 024e15ecd87d..be3e3df7efd1 100644
--- a/core/src/test/java/org/infinispan/api/flags/FlagsEnabledTest.java
+++ b/core/src/test/java/org/infinispan/api/flags/FlagsEnabledTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.flags;
 
 import static org.infinispan.context.Flag.CACHE_MODE_LOCAL;
diff --git a/core/src/test/java/org/infinispan/api/lazy/LazyCacheAPITest.java b/core/src/test/java/org/infinispan/api/lazy/LazyCacheAPITest.java
index 9f042bfe449a..470b2acac698 100644
--- a/core/src/test/java/org/infinispan/api/lazy/LazyCacheAPITest.java
+++ b/core/src/test/java/org/infinispan/api/lazy/LazyCacheAPITest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.lazy;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/api/lru/read_committed/CacheAPIMVCCTest.java b/core/src/test/java/org/infinispan/api/lru/read_committed/CacheAPIMVCCTest.java
index 28bcf9a06728..495def8710b0 100644
--- a/core/src/test/java/org/infinispan/api/lru/read_committed/CacheAPIMVCCTest.java
+++ b/core/src/test/java/org/infinispan/api/lru/read_committed/CacheAPIMVCCTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.lru.read_committed;
 
 import org.infinispan.api.CacheAPITest;
diff --git a/core/src/test/java/org/infinispan/api/mvcc/LockAssert.java b/core/src/test/java/org/infinispan/api/mvcc/LockAssert.java
index e074f3809795..48dff433ad9a 100644
--- a/core/src/test/java/org/infinispan/api/mvcc/LockAssert.java
+++ b/core/src/test/java/org/infinispan/api/mvcc/LockAssert.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.mvcc;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/api/mvcc/LockPerEntryTest.java b/core/src/test/java/org/infinispan/api/mvcc/LockPerEntryTest.java
index dc3de841e21a..be657220f3f8 100644
--- a/core/src/test/java/org/infinispan/api/mvcc/LockPerEntryTest.java
+++ b/core/src/test/java/org/infinispan/api/mvcc/LockPerEntryTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.mvcc;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/api/mvcc/LockTestBase.java b/core/src/test/java/org/infinispan/api/mvcc/LockTestBase.java
index 4513c953c914..f21f45d9db75 100644
--- a/core/src/test/java/org/infinispan/api/mvcc/LockTestBase.java
+++ b/core/src/test/java/org/infinispan/api/mvcc/LockTestBase.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.mvcc;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadDistNonTxTest.java b/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadDistNonTxTest.java
index a4a96d82549d..b96f9484992c 100644
--- a/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadDistNonTxTest.java
+++ b/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadDistNonTxTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.mvcc;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadDistOptimisticTest.java b/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadDistOptimisticTest.java
index fe3e0c9de520..06d61532e2a8 100644
--- a/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadDistOptimisticTest.java
+++ b/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadDistOptimisticTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.mvcc;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadDistPessimisticTest.java b/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadDistPessimisticTest.java
index a2a3dff63e39..0e80061f9782 100644
--- a/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadDistPessimisticTest.java
+++ b/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadDistPessimisticTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.mvcc;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadReplNonTxTest.java b/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadReplNonTxTest.java
index abe08a0b6a72..1af83ef4ade2 100644
--- a/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadReplNonTxTest.java
+++ b/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadReplNonTxTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.mvcc;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadReplOptimisticTest.java b/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadReplOptimisticTest.java
index f2a55f35531f..28f236b5e458 100644
--- a/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadReplOptimisticTest.java
+++ b/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadReplOptimisticTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.mvcc;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadReplPessimisticTest.java b/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadReplPessimisticTest.java
index 58f6db3ced2e..ebd247f8e87b 100644
--- a/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadReplPessimisticTest.java
+++ b/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadReplPessimisticTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.mvcc;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java b/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java
index 5dee590a2f0f..c1a2f6c54134 100644
--- a/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java
+++ b/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.mvcc;
 
 import static org.infinispan.context.Flag.CACHE_MODE_LOCAL;
diff --git a/core/src/test/java/org/infinispan/api/mvcc/read_committed/CacheAPIOptimisticTest.java b/core/src/test/java/org/infinispan/api/mvcc/read_committed/CacheAPIOptimisticTest.java
index 9df7541c5a58..ce0f8665b66c 100644
--- a/core/src/test/java/org/infinispan/api/mvcc/read_committed/CacheAPIOptimisticTest.java
+++ b/core/src/test/java/org/infinispan/api/mvcc/read_committed/CacheAPIOptimisticTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.mvcc.read_committed;
 
 import org.infinispan.api.CacheAPITest;
diff --git a/core/src/test/java/org/infinispan/api/mvcc/read_committed/CacheAPIPessimisticTest.java b/core/src/test/java/org/infinispan/api/mvcc/read_committed/CacheAPIPessimisticTest.java
index 18332f82daf7..40e4ae9c814d 100644
--- a/core/src/test/java/org/infinispan/api/mvcc/read_committed/CacheAPIPessimisticTest.java
+++ b/core/src/test/java/org/infinispan/api/mvcc/read_committed/CacheAPIPessimisticTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.api.mvcc.read_committed;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/api/mvcc/read_committed/ReadCommittedLockTest.java b/core/src/test/java/org/infinispan/api/mvcc/read_committed/ReadCommittedLockTest.java
index f967b5784756..2adb56c18d76 100644
--- a/core/src/test/java/org/infinispan/api/mvcc/read_committed/ReadCommittedLockTest.java
+++ b/core/src/test/java/org/infinispan/api/mvcc/read_committed/ReadCommittedLockTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.mvcc.read_committed;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/CacheAPIOptimisticTest.java b/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/CacheAPIOptimisticTest.java
index 4db3536f5c46..33a34e35cba0 100644
--- a/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/CacheAPIOptimisticTest.java
+++ b/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/CacheAPIOptimisticTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.mvcc.repeatable_read;
 
 import org.infinispan.api.CacheAPITest;
diff --git a/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/CacheAPIPessimisticTest.java b/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/CacheAPIPessimisticTest.java
index 04f51df6bb2d..21a053abcb88 100644
--- a/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/CacheAPIPessimisticTest.java
+++ b/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/CacheAPIPessimisticTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.api.mvcc.repeatable_read;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/RepeatableReadLockTest.java b/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/RepeatableReadLockTest.java
index 44550c173fef..6daff0be7243 100644
--- a/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/RepeatableReadLockTest.java
+++ b/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/RepeatableReadLockTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.mvcc.repeatable_read;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/WriteSkewTest.java b/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/WriteSkewTest.java
index c14bbb9debfe..fc29cb0fb985 100644
--- a/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/WriteSkewTest.java
+++ b/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/WriteSkewTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.mvcc.repeatable_read;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/atomic/AtomicHashMapPassivationTest.java b/core/src/test/java/org/infinispan/atomic/AtomicHashMapPassivationTest.java
index b1b7273a233b..a230eac45287 100644
--- a/core/src/test/java/org/infinispan/atomic/AtomicHashMapPassivationTest.java
+++ b/core/src/test/java/org/infinispan/atomic/AtomicHashMapPassivationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 import org.infinispan.config.CacheLoaderManagerConfig;
diff --git a/core/src/test/java/org/infinispan/atomic/AtomicHashMapPessimisticConcurrencyTest.java b/core/src/test/java/org/infinispan/atomic/AtomicHashMapPessimisticConcurrencyTest.java
index 380acd6d5c4b..3b1d32434700 100644
--- a/core/src/test/java/org/infinispan/atomic/AtomicHashMapPessimisticConcurrencyTest.java
+++ b/core/src/test/java/org/infinispan/atomic/AtomicHashMapPessimisticConcurrencyTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 import java.util.Arrays;
diff --git a/core/src/test/java/org/infinispan/atomic/AtomicHashMapTest.java b/core/src/test/java/org/infinispan/atomic/AtomicHashMapTest.java
index 7deccf7aeb02..a51c63e7f7c2 100644
--- a/core/src/test/java/org/infinispan/atomic/AtomicHashMapTest.java
+++ b/core/src/test/java/org/infinispan/atomic/AtomicHashMapTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.atomic;
 
 import org.infinispan.test.AbstractInfinispanTest;
diff --git a/core/src/test/java/org/infinispan/atomic/AtomicHashMapTestAssertions.java b/core/src/test/java/org/infinispan/atomic/AtomicHashMapTestAssertions.java
index 87be7d978c0d..37ba29f3d7c4 100644
--- a/core/src/test/java/org/infinispan/atomic/AtomicHashMapTestAssertions.java
+++ b/core/src/test/java/org/infinispan/atomic/AtomicHashMapTestAssertions.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/atomic/AtomicMapFunctionalTest.java b/core/src/test/java/org/infinispan/atomic/AtomicMapFunctionalTest.java
index eb4d32a9efa9..b9056cb79c69 100644
--- a/core/src/test/java/org/infinispan/atomic/AtomicMapFunctionalTest.java
+++ b/core/src/test/java/org/infinispan/atomic/AtomicMapFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 import java.util.HashSet;
diff --git a/core/src/test/java/org/infinispan/atomic/AtomicMapLocalTest.java b/core/src/test/java/org/infinispan/atomic/AtomicMapLocalTest.java
index 1b032d862c87..ee6deeac8404 100644
--- a/core/src/test/java/org/infinispan/atomic/AtomicMapLocalTest.java
+++ b/core/src/test/java/org/infinispan/atomic/AtomicMapLocalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/atomic/AtomicMapReplTest.java b/core/src/test/java/org/infinispan/atomic/AtomicMapReplTest.java
index df3727ff3208..9dd710b0b3bb 100644
--- a/core/src/test/java/org/infinispan/atomic/AtomicMapReplTest.java
+++ b/core/src/test/java/org/infinispan/atomic/AtomicMapReplTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/atomic/BaseAtomicMapLockingTest.java b/core/src/test/java/org/infinispan/atomic/BaseAtomicMapLockingTest.java
index 6c3ea8d84bff..ede70b0cda3f 100644
--- a/core/src/test/java/org/infinispan/atomic/BaseAtomicMapLockingTest.java
+++ b/core/src/test/java/org/infinispan/atomic/BaseAtomicMapLockingTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.atomic;
 
 import org.infinispan.commands.tx.PrepareCommand;
diff --git a/core/src/test/java/org/infinispan/atomic/ClusteredAtomicMapPassivationTest.java b/core/src/test/java/org/infinispan/atomic/ClusteredAtomicMapPassivationTest.java
index bcaaa21594d8..878a24d39976 100644
--- a/core/src/test/java/org/infinispan/atomic/ClusteredAtomicMapPassivationTest.java
+++ b/core/src/test/java/org/infinispan/atomic/ClusteredAtomicMapPassivationTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.atomic;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/atomic/FineGrainedAtomicMapAPITest.java b/core/src/test/java/org/infinispan/atomic/FineGrainedAtomicMapAPITest.java
index 026708c5b7e5..5ee29fd3fd26 100644
--- a/core/src/test/java/org/infinispan/atomic/FineGrainedAtomicMapAPITest.java
+++ b/core/src/test/java/org/infinispan/atomic/FineGrainedAtomicMapAPITest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 import java.util.Collection;
diff --git a/core/src/test/java/org/infinispan/atomic/LocalDeltaAwareEvictionTest.java b/core/src/test/java/org/infinispan/atomic/LocalDeltaAwareEvictionTest.java
index b6fe974d30c2..5d348d25589e 100644
--- a/core/src/test/java/org/infinispan/atomic/LocalDeltaAwareEvictionTest.java
+++ b/core/src/test/java/org/infinispan/atomic/LocalDeltaAwareEvictionTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/atomic/LocalDeltaAwarePassivationTest.java b/core/src/test/java/org/infinispan/atomic/LocalDeltaAwarePassivationTest.java
index c5fbcb2cf57d..318a9847c5d0 100644
--- a/core/src/test/java/org/infinispan/atomic/LocalDeltaAwarePassivationTest.java
+++ b/core/src/test/java/org/infinispan/atomic/LocalDeltaAwarePassivationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/atomic/OptimisticTxAtomicLocking.java b/core/src/test/java/org/infinispan/atomic/OptimisticTxAtomicLocking.java
index b234deff0f7a..e43bb0f347a5 100644
--- a/core/src/test/java/org/infinispan/atomic/OptimisticTxAtomicLocking.java
+++ b/core/src/test/java/org/infinispan/atomic/OptimisticTxAtomicLocking.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.atomic;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/atomic/PessimisticTxAtomicLocking.java b/core/src/test/java/org/infinispan/atomic/PessimisticTxAtomicLocking.java
index 991c195662ea..6ebaf02095f5 100644
--- a/core/src/test/java/org/infinispan/atomic/PessimisticTxAtomicLocking.java
+++ b/core/src/test/java/org/infinispan/atomic/PessimisticTxAtomicLocking.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.atomic;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/atomic/RepetableReadFineGrainedAtomicMapAPITest.java b/core/src/test/java/org/infinispan/atomic/RepetableReadFineGrainedAtomicMapAPITest.java
index ea2c9677c43f..7a58c986eb0b 100644
--- a/core/src/test/java/org/infinispan/atomic/RepetableReadFineGrainedAtomicMapAPITest.java
+++ b/core/src/test/java/org/infinispan/atomic/RepetableReadFineGrainedAtomicMapAPITest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/atomic/ReplDeltaAwareEvictionTest.java b/core/src/test/java/org/infinispan/atomic/ReplDeltaAwareEvictionTest.java
index d2ad078e8d07..67da2cfd4ceb 100644
--- a/core/src/test/java/org/infinispan/atomic/ReplDeltaAwareEvictionTest.java
+++ b/core/src/test/java/org/infinispan/atomic/ReplDeltaAwareEvictionTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/atomic/ReplDeltaAwarePassivationTest.java b/core/src/test/java/org/infinispan/atomic/ReplDeltaAwarePassivationTest.java
index f6249c27ee78..a8d637a4e6fd 100644
--- a/core/src/test/java/org/infinispan/atomic/ReplDeltaAwarePassivationTest.java
+++ b/core/src/test/java/org/infinispan/atomic/ReplDeltaAwarePassivationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/atomic/TestDeltaAware.java b/core/src/test/java/org/infinispan/atomic/TestDeltaAware.java
index 80dfd8d6a167..ce4568b27ec3 100644
--- a/core/src/test/java/org/infinispan/atomic/TestDeltaAware.java
+++ b/core/src/test/java/org/infinispan/atomic/TestDeltaAware.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.atomic;
 
 import java.io.Serializable;
diff --git a/core/src/test/java/org/infinispan/commands/CommandIdUniquenessTest.java b/core/src/test/java/org/infinispan/commands/CommandIdUniquenessTest.java
index c5227bba0ce6..8501fc5b2bf8 100644
--- a/core/src/test/java/org/infinispan/commands/CommandIdUniquenessTest.java
+++ b/core/src/test/java/org/infinispan/commands/CommandIdUniquenessTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.commands;
 
 import org.infinispan.commons.util.ClassFinder;
diff --git a/core/src/test/java/org/infinispan/commands/PutMapCommandNonTxTest.java b/core/src/test/java/org/infinispan/commands/PutMapCommandNonTxTest.java
index fde2845895c9..49261487492d 100644
--- a/core/src/test/java/org/infinispan/commands/PutMapCommandNonTxTest.java
+++ b/core/src/test/java/org/infinispan/commands/PutMapCommandNonTxTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2013 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.commands;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/commands/PutMapCommandTest.java b/core/src/test/java/org/infinispan/commands/PutMapCommandTest.java
index 48547a2f18d0..15c9a5616d43 100644
--- a/core/src/test/java/org/infinispan/commands/PutMapCommandTest.java
+++ b/core/src/test/java/org/infinispan/commands/PutMapCommandTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.commands;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/commons/marshall/AdaptiveBufferSizePredictorTest.java b/core/src/test/java/org/infinispan/commons/marshall/AdaptiveBufferSizePredictorTest.java
index 940aed8f2b9d..3e611aaf9755 100644
--- a/core/src/test/java/org/infinispan/commons/marshall/AdaptiveBufferSizePredictorTest.java
+++ b/core/src/test/java/org/infinispan/commons/marshall/AdaptiveBufferSizePredictorTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commons.marshall;
 
 import org.infinispan.commons.marshall.AdaptiveBufferSizePredictor;
diff --git a/core/src/test/java/org/infinispan/commons/marshall/PojoWithAttributes.java b/core/src/test/java/org/infinispan/commons/marshall/PojoWithAttributes.java
index 5e7879969d47..a0328b96b9d7 100644
--- a/core/src/test/java/org/infinispan/commons/marshall/PojoWithAttributes.java
+++ b/core/src/test/java/org/infinispan/commons/marshall/PojoWithAttributes.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commons.marshall;
 
 import org.infinispan.container.entries.CacheEntry;
diff --git a/core/src/test/java/org/infinispan/commons/marshall/PojoWithJBossExternalize.java b/core/src/test/java/org/infinispan/commons/marshall/PojoWithJBossExternalize.java
index 58400a0574c6..ec46cc664981 100644
--- a/core/src/test/java/org/infinispan/commons/marshall/PojoWithJBossExternalize.java
+++ b/core/src/test/java/org/infinispan/commons/marshall/PojoWithJBossExternalize.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commons.marshall;
 
 import org.jboss.marshalling.Creator;
diff --git a/core/src/test/java/org/infinispan/commons/marshall/PojoWithSerializeWith.java b/core/src/test/java/org/infinispan/commons/marshall/PojoWithSerializeWith.java
index f726b31f4361..a06927e63ec0 100644
--- a/core/src/test/java/org/infinispan/commons/marshall/PojoWithSerializeWith.java
+++ b/core/src/test/java/org/infinispan/commons/marshall/PojoWithSerializeWith.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commons.marshall;
 
 import java.io.IOException;
diff --git a/core/src/test/java/org/infinispan/commons/util/concurrent/jdk8backported/EquivalentConcurrentHashMapV8Test.java b/core/src/test/java/org/infinispan/commons/util/concurrent/jdk8backported/EquivalentConcurrentHashMapV8Test.java
index 3093c0bb05cc..c0901411ba51 100644
--- a/core/src/test/java/org/infinispan/commons/util/concurrent/jdk8backported/EquivalentConcurrentHashMapV8Test.java
+++ b/core/src/test/java/org/infinispan/commons/util/concurrent/jdk8backported/EquivalentConcurrentHashMapV8Test.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.commons.util.concurrent.jdk8backported;
 
 import org.infinispan.commons.equivalence.AnyEquivalence;
diff --git a/core/src/test/java/org/infinispan/config/ConfigurationCloneTest.java b/core/src/test/java/org/infinispan/config/ConfigurationCloneTest.java
index d3ac994aee9b..565a32479225 100644
--- a/core/src/test/java/org/infinispan/config/ConfigurationCloneTest.java
+++ b/core/src/test/java/org/infinispan/config/ConfigurationCloneTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import java.lang.reflect.Method;
diff --git a/core/src/test/java/org/infinispan/config/ConfigurationToXmlStringTest.java b/core/src/test/java/org/infinispan/config/ConfigurationToXmlStringTest.java
index 3be7593e3c20..366211d9cce2 100644
--- a/core/src/test/java/org/infinispan/config/ConfigurationToXmlStringTest.java
+++ b/core/src/test/java/org/infinispan/config/ConfigurationToXmlStringTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.config;
 
 import org.infinispan.eviction.EvictionStrategy;
diff --git a/core/src/test/java/org/infinispan/config/ConfigurationValidation2Test.java b/core/src/test/java/org/infinispan/config/ConfigurationValidation2Test.java
index 653bc44e6c99..ff5ebb496fdf 100644
--- a/core/src/test/java/org/infinispan/config/ConfigurationValidation2Test.java
+++ b/core/src/test/java/org/infinispan/config/ConfigurationValidation2Test.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import org.infinispan.manager.EmbeddedCacheManager;
diff --git a/core/src/test/java/org/infinispan/config/ConfigurationValidationTest.java b/core/src/test/java/org/infinispan/config/ConfigurationValidationTest.java
index 3f889401f3e1..b57fbd3a6f10 100644
--- a/core/src/test/java/org/infinispan/config/ConfigurationValidationTest.java
+++ b/core/src/test/java/org/infinispan/config/ConfigurationValidationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import org.infinispan.commons.CacheConfigurationException;
diff --git a/core/src/test/java/org/infinispan/config/CustomInterceptorConfigTest.java b/core/src/test/java/org/infinispan/config/CustomInterceptorConfigTest.java
index 16b66040abcc..df514d5d701e 100644
--- a/core/src/test/java/org/infinispan/config/CustomInterceptorConfigTest.java
+++ b/core/src/test/java/org/infinispan/config/CustomInterceptorConfigTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/config/CustomInterceptorInjectionTest.java b/core/src/test/java/org/infinispan/config/CustomInterceptorInjectionTest.java
index adc8c0ae0d3a..ebfee5a3b46f 100644
--- a/core/src/test/java/org/infinispan/config/CustomInterceptorInjectionTest.java
+++ b/core/src/test/java/org/infinispan/config/CustomInterceptorInjectionTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.config;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/config/DataContainerTest.java b/core/src/test/java/org/infinispan/config/DataContainerTest.java
index 70160e3e1e97..43ac5a592f27 100644
--- a/core/src/test/java/org/infinispan/config/DataContainerTest.java
+++ b/core/src/test/java/org/infinispan/config/DataContainerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/test/java/org/infinispan/config/DifferentCacheModesTest.java b/core/src/test/java/org/infinispan/config/DifferentCacheModesTest.java
index defc21023c46..941e8c5de5cc 100644
--- a/core/src/test/java/org/infinispan/config/DifferentCacheModesTest.java
+++ b/core/src/test/java/org/infinispan/config/DifferentCacheModesTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 
diff --git a/core/src/test/java/org/infinispan/config/ProgrammaticNameSetConfigTest.java b/core/src/test/java/org/infinispan/config/ProgrammaticNameSetConfigTest.java
index 7b72a9c5df66..4f95b046274b 100644
--- a/core/src/test/java/org/infinispan/config/ProgrammaticNameSetConfigTest.java
+++ b/core/src/test/java/org/infinispan/config/ProgrammaticNameSetConfigTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.config;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/config/QueryableDataContainer.java b/core/src/test/java/org/infinispan/config/QueryableDataContainer.java
index 4f2796863442..50f4e61c3dc8 100644
--- a/core/src/test/java/org/infinispan/config/QueryableDataContainer.java
+++ b/core/src/test/java/org/infinispan/config/QueryableDataContainer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import org.infinispan.metadata.Metadata;
diff --git a/core/src/test/java/org/infinispan/config/SampleConfigFilesCorrectness52Test.java b/core/src/test/java/org/infinispan/config/SampleConfigFilesCorrectness52Test.java
index bbcc55e01f6c..699b1f3160d2 100644
--- a/core/src/test/java/org/infinispan/config/SampleConfigFilesCorrectness52Test.java
+++ b/core/src/test/java/org/infinispan/config/SampleConfigFilesCorrectness52Test.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/config/SampleConfigFilesCorrectnessTest.java b/core/src/test/java/org/infinispan/config/SampleConfigFilesCorrectnessTest.java
index 23eb17037e1c..ea77ef205648 100644
--- a/core/src/test/java/org/infinispan/config/SampleConfigFilesCorrectnessTest.java
+++ b/core/src/test/java/org/infinispan/config/SampleConfigFilesCorrectnessTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import org.apache.log4j.AppenderSkeleton;
diff --git a/core/src/test/java/org/infinispan/config/SomeInterceptor.java b/core/src/test/java/org/infinispan/config/SomeInterceptor.java
index ec61a699eba0..5b77563f47fd 100644
--- a/core/src/test/java/org/infinispan/config/SomeInterceptor.java
+++ b/core/src/test/java/org/infinispan/config/SomeInterceptor.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.config;
 
 import org.infinispan.interceptors.base.BaseCustomInterceptor;
diff --git a/core/src/test/java/org/infinispan/config/StringPropertyReplacementTest.java b/core/src/test/java/org/infinispan/config/StringPropertyReplacementTest.java
index 0b590ff1dee8..6881f922e882 100644
--- a/core/src/test/java/org/infinispan/config/StringPropertyReplacementTest.java
+++ b/core/src/test/java/org/infinispan/config/StringPropertyReplacementTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import org.infinispan.manager.EmbeddedCacheManager;
diff --git a/core/src/test/java/org/infinispan/config/SyncAsyncParsingTest.java b/core/src/test/java/org/infinispan/config/SyncAsyncParsingTest.java
index a2dc05804564..7abd639b5ba7 100644
--- a/core/src/test/java/org/infinispan/config/SyncAsyncParsingTest.java
+++ b/core/src/test/java/org/infinispan/config/SyncAsyncParsingTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import org.infinispan.commons.CacheConfigurationException;
diff --git a/core/src/test/java/org/infinispan/config/TransactionalCacheConfigTest.java b/core/src/test/java/org/infinispan/config/TransactionalCacheConfigTest.java
index 54cd79861abb..4b1b852c8d6a 100644
--- a/core/src/test/java/org/infinispan/config/TransactionalCacheConfigTest.java
+++ b/core/src/test/java/org/infinispan/config/TransactionalCacheConfigTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.config;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/config/TxManagerLookupConfigTest.java b/core/src/test/java/org/infinispan/config/TxManagerLookupConfigTest.java
index db700d1f2677..5d4735708b4d 100644
--- a/core/src/test/java/org/infinispan/config/TxManagerLookupConfigTest.java
+++ b/core/src/test/java/org/infinispan/config/TxManagerLookupConfigTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config;
 
 import org.infinispan.manager.DefaultCacheManager;
diff --git a/core/src/test/java/org/infinispan/config/parsing/Coherence2InfinispanTransformerTest.java b/core/src/test/java/org/infinispan/config/parsing/Coherence2InfinispanTransformerTest.java
index aa291bdf5e3c..9fca75e9f93d 100644
--- a/core/src/test/java/org/infinispan/config/parsing/Coherence2InfinispanTransformerTest.java
+++ b/core/src/test/java/org/infinispan/config/parsing/Coherence2InfinispanTransformerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config.parsing;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/config/parsing/EHCache2InfinispanTransformerTest.java b/core/src/test/java/org/infinispan/config/parsing/EHCache2InfinispanTransformerTest.java
index 365fb60776ed..e0e190cdb277 100644
--- a/core/src/test/java/org/infinispan/config/parsing/EHCache2InfinispanTransformerTest.java
+++ b/core/src/test/java/org/infinispan/config/parsing/EHCache2InfinispanTransformerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config.parsing;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/config/parsing/Jbc2InfinispanTransformerTest.java b/core/src/test/java/org/infinispan/config/parsing/Jbc2InfinispanTransformerTest.java
index a08eb2953bc2..b23197cced28 100644
--- a/core/src/test/java/org/infinispan/config/parsing/Jbc2InfinispanTransformerTest.java
+++ b/core/src/test/java/org/infinispan/config/parsing/Jbc2InfinispanTransformerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.config.parsing;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/configuration/ClassResolverConfigTest.java b/core/src/test/java/org/infinispan/configuration/ClassResolverConfigTest.java
index 61a59411bb9e..5cc03f2f08d8 100644
--- a/core/src/test/java/org/infinispan/configuration/ClassResolverConfigTest.java
+++ b/core/src/test/java/org/infinispan/configuration/ClassResolverConfigTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.configuration;
 
 import org.infinispan.api.WithClassLoaderTest;
diff --git a/core/src/test/java/org/infinispan/configuration/ConfigurationCompatibilityTest.java b/core/src/test/java/org/infinispan/configuration/ConfigurationCompatibilityTest.java
index afc26d8e1e1a..5d8f4885305a 100644
--- a/core/src/test/java/org/infinispan/configuration/ConfigurationCompatibilityTest.java
+++ b/core/src/test/java/org/infinispan/configuration/ConfigurationCompatibilityTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.configuration;
 
 import org.infinispan.configuration.cache.CacheStoreConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/configuration/ConfigurationOverrideTest.java b/core/src/test/java/org/infinispan/configuration/ConfigurationOverrideTest.java
index 9a6aa94be5b5..c088293d6d15 100644
--- a/core/src/test/java/org/infinispan/configuration/ConfigurationOverrideTest.java
+++ b/core/src/test/java/org/infinispan/configuration/ConfigurationOverrideTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.configuration;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/configuration/ConfigurationUnitTest.java b/core/src/test/java/org/infinispan/configuration/ConfigurationUnitTest.java
index 028a1ea382b5..af4bf7293415 100644
--- a/core/src/test/java/org/infinispan/configuration/ConfigurationUnitTest.java
+++ b/core/src/test/java/org/infinispan/configuration/ConfigurationUnitTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.configuration;
 
 import static org.infinispan.test.TestingUtil.withCacheManager;
diff --git a/core/src/test/java/org/infinispan/configuration/HashConfigurationBuilderTest.java b/core/src/test/java/org/infinispan/configuration/HashConfigurationBuilderTest.java
index 559de0380130..b8dfa64b6e1c 100644
--- a/core/src/test/java/org/infinispan/configuration/HashConfigurationBuilderTest.java
+++ b/core/src/test/java/org/infinispan/configuration/HashConfigurationBuilderTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.configuration;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/configuration/ParserOverrideTest.java b/core/src/test/java/org/infinispan/configuration/ParserOverrideTest.java
index 36ad58e7e649..aae5f8b6658f 100644
--- a/core/src/test/java/org/infinispan/configuration/ParserOverrideTest.java
+++ b/core/src/test/java/org/infinispan/configuration/ParserOverrideTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.configuration;
 
 import static org.infinispan.test.TestingUtil.INFINISPAN_START_TAG;
diff --git a/core/src/test/java/org/infinispan/configuration/XmlFileParsingTest.java b/core/src/test/java/org/infinispan/configuration/XmlFileParsingTest.java
index ac048808afac..3560be9feb6d 100644
--- a/core/src/test/java/org/infinispan/configuration/XmlFileParsingTest.java
+++ b/core/src/test/java/org/infinispan/configuration/XmlFileParsingTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.configuration;
 
 import static org.infinispan.test.TestingUtil.INFINISPAN_END_TAG;
diff --git a/core/src/test/java/org/infinispan/configuration/module/Attribute.java b/core/src/test/java/org/infinispan/configuration/module/Attribute.java
index f2a5709bf9b4..8795064f04ce 100644
--- a/core/src/test/java/org/infinispan/configuration/module/Attribute.java
+++ b/core/src/test/java/org/infinispan/configuration/module/Attribute.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.configuration.module;
 
 import java.util.HashMap;
diff --git a/core/src/test/java/org/infinispan/configuration/module/Element.java b/core/src/test/java/org/infinispan/configuration/module/Element.java
index ee4f735cad8e..b6b5b56ab98f 100644
--- a/core/src/test/java/org/infinispan/configuration/module/Element.java
+++ b/core/src/test/java/org/infinispan/configuration/module/Element.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.configuration.module;
 
 import java.util.HashMap;
diff --git a/core/src/test/java/org/infinispan/configuration/module/ExtendedParserTest.java b/core/src/test/java/org/infinispan/configuration/module/ExtendedParserTest.java
index 02b683479a72..2b0756a39d45 100644
--- a/core/src/test/java/org/infinispan/configuration/module/ExtendedParserTest.java
+++ b/core/src/test/java/org/infinispan/configuration/module/ExtendedParserTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.configuration.module;
 
 import static org.infinispan.test.TestingUtil.INFINISPAN_START_TAG;
diff --git a/core/src/test/java/org/infinispan/configuration/module/ModuleConfigurationTest.java b/core/src/test/java/org/infinispan/configuration/module/ModuleConfigurationTest.java
index b07bede85c6d..346c58d9c8e7 100644
--- a/core/src/test/java/org/infinispan/configuration/module/ModuleConfigurationTest.java
+++ b/core/src/test/java/org/infinispan/configuration/module/ModuleConfigurationTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.configuration.module;
 
 import org.infinispan.configuration.cache.Configuration;
diff --git a/core/src/test/java/org/infinispan/configuration/module/MyModuleConfiguration.java b/core/src/test/java/org/infinispan/configuration/module/MyModuleConfiguration.java
index a04c71eceb32..2b9bf8aa0bbe 100644
--- a/core/src/test/java/org/infinispan/configuration/module/MyModuleConfiguration.java
+++ b/core/src/test/java/org/infinispan/configuration/module/MyModuleConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.configuration.module;
 
 import org.infinispan.commons.configuration.BuiltBy;
diff --git a/core/src/test/java/org/infinispan/configuration/module/MyModuleConfigurationBuilder.java b/core/src/test/java/org/infinispan/configuration/module/MyModuleConfigurationBuilder.java
index d93e83cfb66e..563f13de5ad2 100644
--- a/core/src/test/java/org/infinispan/configuration/module/MyModuleConfigurationBuilder.java
+++ b/core/src/test/java/org/infinispan/configuration/module/MyModuleConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.configuration.module;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/core/src/test/java/org/infinispan/configuration/module/MyParserExtension.java b/core/src/test/java/org/infinispan/configuration/module/MyParserExtension.java
index 59088f831167..e64350573aa3 100644
--- a/core/src/test/java/org/infinispan/configuration/module/MyParserExtension.java
+++ b/core/src/test/java/org/infinispan/configuration/module/MyParserExtension.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.configuration.module;
 
 import static org.infinispan.commons.util.StringPropertyReplacer.replaceProperties;
diff --git a/core/src/test/java/org/infinispan/configuration/override/XMLConfigurationOverridingTest.java b/core/src/test/java/org/infinispan/configuration/override/XMLConfigurationOverridingTest.java
index b1f353eae096..1aeb445ba9a3 100644
--- a/core/src/test/java/org/infinispan/configuration/override/XMLConfigurationOverridingTest.java
+++ b/core/src/test/java/org/infinispan/configuration/override/XMLConfigurationOverridingTest.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.configuration.override;
 
 import junit.framework.Assert;
diff --git a/core/src/test/java/org/infinispan/container/SimpleDataContainerTest.java b/core/src/test/java/org/infinispan/container/SimpleDataContainerTest.java
index 755a0bf0df32..027f30e037a1 100644
--- a/core/src/test/java/org/infinispan/container/SimpleDataContainerTest.java
+++ b/core/src/test/java/org/infinispan/container/SimpleDataContainerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.container;
 
 import org.infinispan.metadata.EmbeddedMetadata;
diff --git a/core/src/test/java/org/infinispan/container/versioning/AbstractClusteredWriteSkewTest.java b/core/src/test/java/org/infinispan/container/versioning/AbstractClusteredWriteSkewTest.java
index 705d47136dbf..286f4c248c6f 100644
--- a/core/src/test/java/org/infinispan/container/versioning/AbstractClusteredWriteSkewTest.java
+++ b/core/src/test/java/org/infinispan/container/versioning/AbstractClusteredWriteSkewTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container.versioning;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/container/versioning/DistL1WriteSkewTest.java b/core/src/test/java/org/infinispan/container/versioning/DistL1WriteSkewTest.java
index 8e5abb444948..bc24df9a7285 100644
--- a/core/src/test/java/org/infinispan/container/versioning/DistL1WriteSkewTest.java
+++ b/core/src/test/java/org/infinispan/container/versioning/DistL1WriteSkewTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container.versioning;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/container/versioning/DistWriteSkewTest.java b/core/src/test/java/org/infinispan/container/versioning/DistWriteSkewTest.java
index 212196b94a92..e0da74917981 100644
--- a/core/src/test/java/org/infinispan/container/versioning/DistWriteSkewTest.java
+++ b/core/src/test/java/org/infinispan/container/versioning/DistWriteSkewTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container.versioning;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/container/versioning/LocalWriteSkewTest.java b/core/src/test/java/org/infinispan/container/versioning/LocalWriteSkewTest.java
index 1aff8d1c27ad..0e336719325a 100644
--- a/core/src/test/java/org/infinispan/container/versioning/LocalWriteSkewTest.java
+++ b/core/src/test/java/org/infinispan/container/versioning/LocalWriteSkewTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container.versioning;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/test/java/org/infinispan/container/versioning/NumericVersionGeneratorTest.java b/core/src/test/java/org/infinispan/container/versioning/NumericVersionGeneratorTest.java
index 5e6ab68b5615..b7da9407a9d8 100644
--- a/core/src/test/java/org/infinispan/container/versioning/NumericVersionGeneratorTest.java
+++ b/core/src/test/java/org/infinispan/container/versioning/NumericVersionGeneratorTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.container.versioning;
 
 import org.infinispan.remoting.transport.Address;
diff --git a/core/src/test/java/org/infinispan/container/versioning/ReplWriteSkewTest.java b/core/src/test/java/org/infinispan/container/versioning/ReplWriteSkewTest.java
index 893f5d955167..8d088e8ff1a9 100644
--- a/core/src/test/java/org/infinispan/container/versioning/ReplWriteSkewTest.java
+++ b/core/src/test/java/org/infinispan/container/versioning/ReplWriteSkewTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container.versioning;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/container/versioning/SimpleConditionalOperationsWriteSkewTest.java b/core/src/test/java/org/infinispan/container/versioning/SimpleConditionalOperationsWriteSkewTest.java
index effe1a73adfe..5a14c1d7e250 100644
--- a/core/src/test/java/org/infinispan/container/versioning/SimpleConditionalOperationsWriteSkewTest.java
+++ b/core/src/test/java/org/infinispan/container/versioning/SimpleConditionalOperationsWriteSkewTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.container.versioning;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/container/versioning/TransactionalLocalWriteSkewTest.java b/core/src/test/java/org/infinispan/container/versioning/TransactionalLocalWriteSkewTest.java
index e1f3d57a1b24..075ddecd31f6 100644
--- a/core/src/test/java/org/infinispan/container/versioning/TransactionalLocalWriteSkewTest.java
+++ b/core/src/test/java/org/infinispan/container/versioning/TransactionalLocalWriteSkewTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container.versioning;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/container/versioning/VersionedConditionalOperationsTest.java b/core/src/test/java/org/infinispan/container/versioning/VersionedConditionalOperationsTest.java
index 54de00e237d8..413ca0fefe1d 100644
--- a/core/src/test/java/org/infinispan/container/versioning/VersionedConditionalOperationsTest.java
+++ b/core/src/test/java/org/infinispan/container/versioning/VersionedConditionalOperationsTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.container.versioning;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/container/versioning/VersionedDistStateTransferTest.java b/core/src/test/java/org/infinispan/container/versioning/VersionedDistStateTransferTest.java
index ecb0136b0e87..5d0ca3140e47 100644
--- a/core/src/test/java/org/infinispan/container/versioning/VersionedDistStateTransferTest.java
+++ b/core/src/test/java/org/infinispan/container/versioning/VersionedDistStateTransferTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container.versioning;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/container/versioning/VersionedReplStateTransferTest.java b/core/src/test/java/org/infinispan/container/versioning/VersionedReplStateTransferTest.java
index 95d8f132e6da..3d65afabc9b2 100644
--- a/core/src/test/java/org/infinispan/container/versioning/VersionedReplStateTransferTest.java
+++ b/core/src/test/java/org/infinispan/container/versioning/VersionedReplStateTransferTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.container.versioning;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/context/InvocationContextTest.java b/core/src/test/java/org/infinispan/context/InvocationContextTest.java
index 35b3930d68f1..cc19d9d493eb 100644
--- a/core/src/test/java/org/infinispan/context/InvocationContextTest.java
+++ b/core/src/test/java/org/infinispan/context/InvocationContextTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.context;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/context/MarshalledValueContextTest.java b/core/src/test/java/org/infinispan/context/MarshalledValueContextTest.java
index 2da9079a1902..4c5f9431117e 100644
--- a/core/src/test/java/org/infinispan/context/MarshalledValueContextTest.java
+++ b/core/src/test/java/org/infinispan/context/MarshalledValueContextTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.context;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distexec/BasicDistributedExecutorTest.java b/core/src/test/java/org/infinispan/distexec/BasicDistributedExecutorTest.java
index 4f7b86af6809..642c851c1589 100644
--- a/core/src/test/java/org/infinispan/distexec/BasicDistributedExecutorTest.java
+++ b/core/src/test/java/org/infinispan/distexec/BasicDistributedExecutorTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distexec/DistributedExecutionCompletionTest.java b/core/src/test/java/org/infinispan/distexec/DistributedExecutionCompletionTest.java
index 68f9f25eef2d..4a1ebca44763 100644
--- a/core/src/test/java/org/infinispan/distexec/DistributedExecutionCompletionTest.java
+++ b/core/src/test/java/org/infinispan/distexec/DistributedExecutionCompletionTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distexec/DistributedExecutorTest.java b/core/src/test/java/org/infinispan/distexec/DistributedExecutorTest.java
index 38db25bccda3..3cac5256a71c 100644
--- a/core/src/test/java/org/infinispan/distexec/DistributedExecutorTest.java
+++ b/core/src/test/java/org/infinispan/distexec/DistributedExecutorTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec;
 
 import java.io.Serializable;
diff --git a/core/src/test/java/org/infinispan/distexec/DistributedExecutorWithTopologyAwareNodesTest.java b/core/src/test/java/org/infinispan/distexec/DistributedExecutorWithTopologyAwareNodesTest.java
index d21e11d87845..9ccea4f48f2e 100644
--- a/core/src/test/java/org/infinispan/distexec/DistributedExecutorWithTopologyAwareNodesTest.java
+++ b/core/src/test/java/org/infinispan/distexec/DistributedExecutorWithTopologyAwareNodesTest.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.distexec;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/distexec/ReplSyncDistributedExecutorTest.java b/core/src/test/java/org/infinispan/distexec/ReplSyncDistributedExecutorTest.java
index ad4c6ec7c576..5c003a7cec1d 100644
--- a/core/src/test/java/org/infinispan/distexec/ReplSyncDistributedExecutorTest.java
+++ b/core/src/test/java/org/infinispan/distexec/ReplSyncDistributedExecutorTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/distexec/mapreduce/BaseWordCountMapReduceTest.java b/core/src/test/java/org/infinispan/distexec/mapreduce/BaseWordCountMapReduceTest.java
index 690565f21b43..bad91a26a403 100644
--- a/core/src/test/java/org/infinispan/distexec/mapreduce/BaseWordCountMapReduceTest.java
+++ b/core/src/test/java/org/infinispan/distexec/mapreduce/BaseWordCountMapReduceTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec.mapreduce;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distexec/mapreduce/Book.java b/core/src/test/java/org/infinispan/distexec/mapreduce/Book.java
index 91d12413dbd4..1a7fbe2a6137 100644
--- a/core/src/test/java/org/infinispan/distexec/mapreduce/Book.java
+++ b/core/src/test/java/org/infinispan/distexec/mapreduce/Book.java
@@ -1,22 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.distexec.mapreduce;
 
 import java.io.Serializable;
diff --git a/core/src/test/java/org/infinispan/distexec/mapreduce/BookSearchTest.java b/core/src/test/java/org/infinispan/distexec/mapreduce/BookSearchTest.java
index 5708c77dd2b5..78b7dab27003 100644
--- a/core/src/test/java/org/infinispan/distexec/mapreduce/BookSearchTest.java
+++ b/core/src/test/java/org/infinispan/distexec/mapreduce/BookSearchTest.java
@@ -1,22 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.distexec.mapreduce;
 
 import java.util.Iterator;
diff --git a/core/src/test/java/org/infinispan/distexec/mapreduce/BookStoreAsBinarySearchTest.java b/core/src/test/java/org/infinispan/distexec/mapreduce/BookStoreAsBinarySearchTest.java
index fd1a3b6a2e9e..98e2dc04e62b 100644
--- a/core/src/test/java/org/infinispan/distexec/mapreduce/BookStoreAsBinarySearchTest.java
+++ b/core/src/test/java/org/infinispan/distexec/mapreduce/BookStoreAsBinarySearchTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec.mapreduce;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/distexec/mapreduce/BookStoreAsBinaryWithCacheLoaderSearchTest.java b/core/src/test/java/org/infinispan/distexec/mapreduce/BookStoreAsBinaryWithCacheLoaderSearchTest.java
index cc4d2359c0fc..97f7d0fdf033 100644
--- a/core/src/test/java/org/infinispan/distexec/mapreduce/BookStoreAsBinaryWithCacheLoaderSearchTest.java
+++ b/core/src/test/java/org/infinispan/distexec/mapreduce/BookStoreAsBinaryWithCacheLoaderSearchTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec.mapreduce;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/distexec/mapreduce/DistributedFourNodesMapReduceTest.java b/core/src/test/java/org/infinispan/distexec/mapreduce/DistributedFourNodesMapReduceTest.java
index 6e06f6fe21cb..ca0ff7188473 100644
--- a/core/src/test/java/org/infinispan/distexec/mapreduce/DistributedFourNodesMapReduceTest.java
+++ b/core/src/test/java/org/infinispan/distexec/mapreduce/DistributedFourNodesMapReduceTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec.mapreduce;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distexec/mapreduce/DistributedSharedCacheFourNodesMapReduceTest.java b/core/src/test/java/org/infinispan/distexec/mapreduce/DistributedSharedCacheFourNodesMapReduceTest.java
index 5270e10553be..0005a2103090 100644
--- a/core/src/test/java/org/infinispan/distexec/mapreduce/DistributedSharedCacheFourNodesMapReduceTest.java
+++ b/core/src/test/java/org/infinispan/distexec/mapreduce/DistributedSharedCacheFourNodesMapReduceTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec.mapreduce;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distexec/mapreduce/DistributedSharedCacheTwoNodesMapReduceTest.java b/core/src/test/java/org/infinispan/distexec/mapreduce/DistributedSharedCacheTwoNodesMapReduceTest.java
index 2cfe5fa0ba61..e8f745224377 100644
--- a/core/src/test/java/org/infinispan/distexec/mapreduce/DistributedSharedCacheTwoNodesMapReduceTest.java
+++ b/core/src/test/java/org/infinispan/distexec/mapreduce/DistributedSharedCacheTwoNodesMapReduceTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec.mapreduce;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distexec/mapreduce/DistributedTwoNodesMapReduceTest.java b/core/src/test/java/org/infinispan/distexec/mapreduce/DistributedTwoNodesMapReduceTest.java
index be6cda7a2db6..84de859f53c9 100644
--- a/core/src/test/java/org/infinispan/distexec/mapreduce/DistributedTwoNodesMapReduceTest.java
+++ b/core/src/test/java/org/infinispan/distexec/mapreduce/DistributedTwoNodesMapReduceTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec.mapreduce;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distexec/mapreduce/LocalSimpleBookSearchTest.java b/core/src/test/java/org/infinispan/distexec/mapreduce/LocalSimpleBookSearchTest.java
index f859fded2847..f9d2b82031b5 100644
--- a/core/src/test/java/org/infinispan/distexec/mapreduce/LocalSimpleBookSearchTest.java
+++ b/core/src/test/java/org/infinispan/distexec/mapreduce/LocalSimpleBookSearchTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec.mapreduce;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distexec/mapreduce/ReplicatedTwoNodesMapReduceTest.java b/core/src/test/java/org/infinispan/distexec/mapreduce/ReplicatedTwoNodesMapReduceTest.java
index 93b1493adf40..5fbed86e2ee8 100644
--- a/core/src/test/java/org/infinispan/distexec/mapreduce/ReplicatedTwoNodesMapReduceTest.java
+++ b/core/src/test/java/org/infinispan/distexec/mapreduce/ReplicatedTwoNodesMapReduceTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec.mapreduce;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distexec/mapreduce/SimpleBookSearchTest.java b/core/src/test/java/org/infinispan/distexec/mapreduce/SimpleBookSearchTest.java
index e0e69df74200..9d8743f044fe 100644
--- a/core/src/test/java/org/infinispan/distexec/mapreduce/SimpleBookSearchTest.java
+++ b/core/src/test/java/org/infinispan/distexec/mapreduce/SimpleBookSearchTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec.mapreduce;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/distexec/mapreduce/SimpleFourNodesMapReduceTest.java b/core/src/test/java/org/infinispan/distexec/mapreduce/SimpleFourNodesMapReduceTest.java
index 356f855f4566..bb9c3f9d3f27 100644
--- a/core/src/test/java/org/infinispan/distexec/mapreduce/SimpleFourNodesMapReduceTest.java
+++ b/core/src/test/java/org/infinispan/distexec/mapreduce/SimpleFourNodesMapReduceTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec.mapreduce;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/distexec/mapreduce/SimpleTwoNodesMapReduceTest.java b/core/src/test/java/org/infinispan/distexec/mapreduce/SimpleTwoNodesMapReduceTest.java
index e1bcbd14a7d6..25f968d91b72 100644
--- a/core/src/test/java/org/infinispan/distexec/mapreduce/SimpleTwoNodesMapReduceTest.java
+++ b/core/src/test/java/org/infinispan/distexec/mapreduce/SimpleTwoNodesMapReduceTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec.mapreduce;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distexec/mapreduce/TopologyAwareTwoNodesMapReduceTest.java b/core/src/test/java/org/infinispan/distexec/mapreduce/TopologyAwareTwoNodesMapReduceTest.java
index b2a3d23e46e4..0ecbe521ac9c 100644
--- a/core/src/test/java/org/infinispan/distexec/mapreduce/TopologyAwareTwoNodesMapReduceTest.java
+++ b/core/src/test/java/org/infinispan/distexec/mapreduce/TopologyAwareTwoNodesMapReduceTest.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.distexec.mapreduce;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/distexec/mapreduce/TwoNodesWithCacheLoaderMapReduceTest.java b/core/src/test/java/org/infinispan/distexec/mapreduce/TwoNodesWithCacheLoaderMapReduceTest.java
index bff2b6a9dbfc..10c1240f6cbc 100644
--- a/core/src/test/java/org/infinispan/distexec/mapreduce/TwoNodesWithCacheLoaderMapReduceTest.java
+++ b/core/src/test/java/org/infinispan/distexec/mapreduce/TwoNodesWithCacheLoaderMapReduceTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec.mapreduce;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/distexec/mapreduce/TwoNodesWithCacheStoreMapReduceTest.java b/core/src/test/java/org/infinispan/distexec/mapreduce/TwoNodesWithCacheStoreMapReduceTest.java
index 1fcbac38c80c..394a1737a6bc 100644
--- a/core/src/test/java/org/infinispan/distexec/mapreduce/TwoNodesWithCacheStoreMapReduceTest.java
+++ b/core/src/test/java/org/infinispan/distexec/mapreduce/TwoNodesWithCacheStoreMapReduceTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distexec.mapreduce;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/AsyncAPINonTxAsyncDistTest.java b/core/src/test/java/org/infinispan/distribution/AsyncAPINonTxAsyncDistTest.java
index c8504cdfe435..c6de55b8b7e8 100644
--- a/core/src/test/java/org/infinispan/distribution/AsyncAPINonTxAsyncDistTest.java
+++ b/core/src/test/java/org/infinispan/distribution/AsyncAPINonTxAsyncDistTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.distribution;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/distribution/AsyncAPINonTxSyncDistTest.java b/core/src/test/java/org/infinispan/distribution/AsyncAPINonTxSyncDistTest.java
index 9e0c44131e4e..3d7c71e2097f 100644
--- a/core/src/test/java/org/infinispan/distribution/AsyncAPINonTxSyncDistTest.java
+++ b/core/src/test/java/org/infinispan/distribution/AsyncAPINonTxSyncDistTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.distribution;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/AsyncAPITxAsyncDistTest.java b/core/src/test/java/org/infinispan/distribution/AsyncAPITxAsyncDistTest.java
index de35b0bd7957..8ede3870581e 100644
--- a/core/src/test/java/org/infinispan/distribution/AsyncAPITxAsyncDistTest.java
+++ b/core/src/test/java/org/infinispan/distribution/AsyncAPITxAsyncDistTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.commands.write.WriteCommand;
diff --git a/core/src/test/java/org/infinispan/distribution/AsyncAPITxSyncDistTest.java b/core/src/test/java/org/infinispan/distribution/AsyncAPITxSyncDistTest.java
index 5ad74f106335..a80b40a0be46 100644
--- a/core/src/test/java/org/infinispan/distribution/AsyncAPITxSyncDistTest.java
+++ b/core/src/test/java/org/infinispan/distribution/AsyncAPITxSyncDistTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/BaseDistCacheStoreTest.java b/core/src/test/java/org/infinispan/distribution/BaseDistCacheStoreTest.java
index 135ad941caa6..4d689fa7a228 100644
--- a/core/src/test/java/org/infinispan/distribution/BaseDistCacheStoreTest.java
+++ b/core/src/test/java/org/infinispan/distribution/BaseDistCacheStoreTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.config.CacheLoaderManagerConfig;
diff --git a/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java b/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java
index af1eecf6a15d..9c6f17a48d90 100644
--- a/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java
+++ b/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/ConcurrentStartWithReplTest.java b/core/src/test/java/org/infinispan/distribution/ConcurrentStartWithReplTest.java
index 76ba4fce6d8b..a1a20d7c6968 100644
--- a/core/src/test/java/org/infinispan/distribution/ConcurrentStartWithReplTest.java
+++ b/core/src/test/java/org/infinispan/distribution/ConcurrentStartWithReplTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/ConsistentHashPerfTest.java b/core/src/test/java/org/infinispan/distribution/ConsistentHashPerfTest.java
index 6a85ad97a5f5..87b3e2ab182f 100644
--- a/core/src/test/java/org/infinispan/distribution/ConsistentHashPerfTest.java
+++ b/core/src/test/java/org/infinispan/distribution/ConsistentHashPerfTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.commons.util.Util;
diff --git a/core/src/test/java/org/infinispan/distribution/DisabledL1Test.java b/core/src/test/java/org/infinispan/distribution/DisabledL1Test.java
index ea1539f44321..31c86e8d8c9c 100644
--- a/core/src/test/java/org/infinispan/distribution/DisabledL1Test.java
+++ b/core/src/test/java/org/infinispan/distribution/DisabledL1Test.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/DisabledL1WithRetValsTest.java b/core/src/test/java/org/infinispan/distribution/DisabledL1WithRetValsTest.java
index f9cf1615a3f9..52d5157c43d5 100644
--- a/core/src/test/java/org/infinispan/distribution/DisabledL1WithRetValsTest.java
+++ b/core/src/test/java/org/infinispan/distribution/DisabledL1WithRetValsTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.distribution;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/DistAsyncFuncTest.java b/core/src/test/java/org/infinispan/distribution/DistAsyncFuncTest.java
index 0b2ff5c5273b..9f168ec42f88 100644
--- a/core/src/test/java/org/infinispan/distribution/DistAsyncFuncTest.java
+++ b/core/src/test/java/org/infinispan/distribution/DistAsyncFuncTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/DistAsyncTxFuncTest.java b/core/src/test/java/org/infinispan/distribution/DistAsyncTxFuncTest.java
index 13fda26c628b..f3a212c694c9 100644
--- a/core/src/test/java/org/infinispan/distribution/DistAsyncTxFuncTest.java
+++ b/core/src/test/java/org/infinispan/distribution/DistAsyncTxFuncTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/DistAsyncTxUnsafeFuncTest.java b/core/src/test/java/org/infinispan/distribution/DistAsyncTxUnsafeFuncTest.java
index 3038890b4543..413be1cc83e8 100644
--- a/core/src/test/java/org/infinispan/distribution/DistAsyncTxUnsafeFuncTest.java
+++ b/core/src/test/java/org/infinispan/distribution/DistAsyncTxUnsafeFuncTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/distribution/DistAsyncUnsafeFuncTest.java b/core/src/test/java/org/infinispan/distribution/DistAsyncUnsafeFuncTest.java
index cf7e97a32aad..38238b5ea741 100644
--- a/core/src/test/java/org/infinispan/distribution/DistAsyncUnsafeFuncTest.java
+++ b/core/src/test/java/org/infinispan/distribution/DistAsyncUnsafeFuncTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/distribution/DistCacheStorePreloadTest.java b/core/src/test/java/org/infinispan/distribution/DistCacheStorePreloadTest.java
index ae9d35d761ef..c65e11f02ed4 100644
--- a/core/src/test/java/org/infinispan/distribution/DistCacheStorePreloadTest.java
+++ b/core/src/test/java/org/infinispan/distribution/DistCacheStorePreloadTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/DistCacheStoreTxDisjointSetTest.java b/core/src/test/java/org/infinispan/distribution/DistCacheStoreTxDisjointSetTest.java
index c3b816545b04..69bcc0e6f9c9 100644
--- a/core/src/test/java/org/infinispan/distribution/DistCacheStoreTxDisjointSetTest.java
+++ b/core/src/test/java/org/infinispan/distribution/DistCacheStoreTxDisjointSetTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/DistCacheStoreTxPreloadTest.java b/core/src/test/java/org/infinispan/distribution/DistCacheStoreTxPreloadTest.java
index 21f2b0c75cce..b4035e2efb20 100644
--- a/core/src/test/java/org/infinispan/distribution/DistCacheStoreTxPreloadTest.java
+++ b/core/src/test/java/org/infinispan/distribution/DistCacheStoreTxPreloadTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.distribution;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/distribution/DistSkipRemoteLookupBatchingTest.java b/core/src/test/java/org/infinispan/distribution/DistSkipRemoteLookupBatchingTest.java
index 3962fd7b9312..f6ac44a8fc68 100644
--- a/core/src/test/java/org/infinispan/distribution/DistSkipRemoteLookupBatchingTest.java
+++ b/core/src/test/java/org/infinispan/distribution/DistSkipRemoteLookupBatchingTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.distribution;
 
 import org.infinispan.test.AbstractCacheTest;
diff --git a/core/src/test/java/org/infinispan/distribution/DistSkipRemoteLookupTest.java b/core/src/test/java/org/infinispan/distribution/DistSkipRemoteLookupTest.java
index 9b1007ecbc1b..4128fb696d83 100644
--- a/core/src/test/java/org/infinispan/distribution/DistSkipRemoteLookupTest.java
+++ b/core/src/test/java/org/infinispan/distribution/DistSkipRemoteLookupTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import static org.infinispan.context.Flag.SKIP_REMOTE_LOOKUP;
diff --git a/core/src/test/java/org/infinispan/distribution/DistSkipRemoteLookupWithoutL1Test.java b/core/src/test/java/org/infinispan/distribution/DistSkipRemoteLookupWithoutL1Test.java
index a980efee4b45..9b8e0c929fd6 100644
--- a/core/src/test/java/org/infinispan/distribution/DistSkipRemoteLookupWithoutL1Test.java
+++ b/core/src/test/java/org/infinispan/distribution/DistSkipRemoteLookupWithoutL1Test.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/distribution/DistSyncCacheStoreNotSharedTest.java b/core/src/test/java/org/infinispan/distribution/DistSyncCacheStoreNotSharedTest.java
index 1ecfafdae9d6..afbef712be0d 100644
--- a/core/src/test/java/org/infinispan/distribution/DistSyncCacheStoreNotSharedTest.java
+++ b/core/src/test/java/org/infinispan/distribution/DistSyncCacheStoreNotSharedTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/test/java/org/infinispan/distribution/DistSyncCacheStoreSharedTest.java b/core/src/test/java/org/infinispan/distribution/DistSyncCacheStoreSharedTest.java
index 870d97eb4e1d..749ee97a0b6d 100644
--- a/core/src/test/java/org/infinispan/distribution/DistSyncCacheStoreSharedTest.java
+++ b/core/src/test/java/org/infinispan/distribution/DistSyncCacheStoreSharedTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/DistSyncFuncTest.java b/core/src/test/java/org/infinispan/distribution/DistSyncFuncTest.java
index fe47ce3b9424..61168a7b4204 100644
--- a/core/src/test/java/org/infinispan/distribution/DistSyncFuncTest.java
+++ b/core/src/test/java/org/infinispan/distribution/DistSyncFuncTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/DistSyncTxCacheStoreSharedTest.java b/core/src/test/java/org/infinispan/distribution/DistSyncTxCacheStoreSharedTest.java
index 5910129958f8..f9d5783c7285 100644
--- a/core/src/test/java/org/infinispan/distribution/DistSyncTxCacheStoreSharedTest.java
+++ b/core/src/test/java/org/infinispan/distribution/DistSyncTxCacheStoreSharedTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.distribution;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/DistSyncTxCommitDiffThreadTest.java b/core/src/test/java/org/infinispan/distribution/DistSyncTxCommitDiffThreadTest.java
index 11d21c4a7ed9..bf9fb4882011 100644
--- a/core/src/test/java/org/infinispan/distribution/DistSyncTxCommitDiffThreadTest.java
+++ b/core/src/test/java/org/infinispan/distribution/DistSyncTxCommitDiffThreadTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.distribution;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/DistSyncTxFuncTest.java b/core/src/test/java/org/infinispan/distribution/DistSyncTxFuncTest.java
index d3b8fa0a1748..2a867e86f197 100644
--- a/core/src/test/java/org/infinispan/distribution/DistSyncTxFuncTest.java
+++ b/core/src/test/java/org/infinispan/distribution/DistSyncTxFuncTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/DistSyncTxUnsafeFuncTest.java b/core/src/test/java/org/infinispan/distribution/DistSyncTxUnsafeFuncTest.java
index e223b7ebefb5..8796b5368c46 100644
--- a/core/src/test/java/org/infinispan/distribution/DistSyncTxUnsafeFuncTest.java
+++ b/core/src/test/java/org/infinispan/distribution/DistSyncTxUnsafeFuncTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/distribution/DistSyncUnsafeFuncTest.java b/core/src/test/java/org/infinispan/distribution/DistSyncUnsafeFuncTest.java
index a24151db60d4..d173d3449184 100644
--- a/core/src/test/java/org/infinispan/distribution/DistSyncUnsafeFuncTest.java
+++ b/core/src/test/java/org/infinispan/distribution/DistSyncUnsafeFuncTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/distribution/DistributionTestHelper.java b/core/src/test/java/org/infinispan/distribution/DistributionTestHelper.java
index 36319d789e42..78e9f1c1a0fc 100644
--- a/core/src/test/java/org/infinispan/distribution/DistributionTestHelper.java
+++ b/core/src/test/java/org/infinispan/distribution/DistributionTestHelper.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/HashFunctionComparisonTest.java b/core/src/test/java/org/infinispan/distribution/HashFunctionComparisonTest.java
index a4a15322b96f..025d8e39b214 100644
--- a/core/src/test/java/org/infinispan/distribution/HashFunctionComparisonTest.java
+++ b/core/src/test/java/org/infinispan/distribution/HashFunctionComparisonTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
diff --git a/core/src/test/java/org/infinispan/distribution/IllegalMonitorTest.java b/core/src/test/java/org/infinispan/distribution/IllegalMonitorTest.java
index fe3773e8199c..f9aef202207f 100644
--- a/core/src/test/java/org/infinispan/distribution/IllegalMonitorTest.java
+++ b/core/src/test/java/org/infinispan/distribution/IllegalMonitorTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.distribution;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/test/java/org/infinispan/distribution/InvalidationFailureTest.java b/core/src/test/java/org/infinispan/distribution/InvalidationFailureTest.java
index 64d9f6ed5917..0a5c5334bb57 100644
--- a/core/src/test/java/org/infinispan/distribution/InvalidationFailureTest.java
+++ b/core/src/test/java/org/infinispan/distribution/InvalidationFailureTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/distribution/InvalidationNoReplicationNoTxTest.java b/core/src/test/java/org/infinispan/distribution/InvalidationNoReplicationNoTxTest.java
index b21b7fdd9514..ee93f3534c1b 100644
--- a/core/src/test/java/org/infinispan/distribution/InvalidationNoReplicationNoTxTest.java
+++ b/core/src/test/java/org/infinispan/distribution/InvalidationNoReplicationNoTxTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.distribution;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/distribution/InvalidationNoReplicationTest.java b/core/src/test/java/org/infinispan/distribution/InvalidationNoReplicationTest.java
index 14bbdf8f4e78..58ef180ec708 100644
--- a/core/src/test/java/org/infinispan/distribution/InvalidationNoReplicationTest.java
+++ b/core/src/test/java/org/infinispan/distribution/InvalidationNoReplicationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.affinity.KeyAffinityService;
diff --git a/core/src/test/java/org/infinispan/distribution/MagicKey.java b/core/src/test/java/org/infinispan/distribution/MagicKey.java
index cb12cf478850..c4d9627ea4bf 100644
--- a/core/src/test/java/org/infinispan/distribution/MagicKey.java
+++ b/core/src/test/java/org/infinispan/distribution/MagicKey.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/MagicKeyTest.java b/core/src/test/java/org/infinispan/distribution/MagicKeyTest.java
index a0278d2b0f92..204500386534 100644
--- a/core/src/test/java/org/infinispan/distribution/MagicKeyTest.java
+++ b/core/src/test/java/org/infinispan/distribution/MagicKeyTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/distribution/MulticastInvalidationFuncTest.java b/core/src/test/java/org/infinispan/distribution/MulticastInvalidationFuncTest.java
index d83083f1f67b..36efc50f9bf7 100644
--- a/core/src/test/java/org/infinispan/distribution/MulticastInvalidationFuncTest.java
+++ b/core/src/test/java/org/infinispan/distribution/MulticastInvalidationFuncTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/MultipleNodesLeavingTest.java b/core/src/test/java/org/infinispan/distribution/MultipleNodesLeavingTest.java
index 0d4885bffafb..f8a561a50d38 100644
--- a/core/src/test/java/org/infinispan/distribution/MultipleNodesLeavingTest.java
+++ b/core/src/test/java/org/infinispan/distribution/MultipleNodesLeavingTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.distribution;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/distribution/PessimisticDistSyncTxCacheStoreSharedTest.java b/core/src/test/java/org/infinispan/distribution/PessimisticDistSyncTxCacheStoreSharedTest.java
index db9c8198d84f..a586b3174778 100644
--- a/core/src/test/java/org/infinispan/distribution/PessimisticDistSyncTxCacheStoreSharedTest.java
+++ b/core/src/test/java/org/infinispan/distribution/PessimisticDistSyncTxCacheStoreSharedTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.distribution;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/RemoteGetTest.java b/core/src/test/java/org/infinispan/distribution/RemoteGetTest.java
index 0560cdb37e06..1836b8f52d8a 100644
--- a/core/src/test/java/org/infinispan/distribution/RemoteGetTest.java
+++ b/core/src/test/java/org/infinispan/distribution/RemoteGetTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/SingleOwnerAndAsyncMethodsTest.java b/core/src/test/java/org/infinispan/distribution/SingleOwnerAndAsyncMethodsTest.java
index d051b1de9d29..6682f62655a0 100644
--- a/core/src/test/java/org/infinispan/distribution/SingleOwnerAndAsyncMethodsTest.java
+++ b/core/src/test/java/org/infinispan/distribution/SingleOwnerAndAsyncMethodsTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.distribution;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/test/java/org/infinispan/distribution/SingleOwnerAndAsyncMethodsWithTxTest.java b/core/src/test/java/org/infinispan/distribution/SingleOwnerAndAsyncMethodsWithTxTest.java
index 13744a67422d..a30269b01a04 100644
--- a/core/src/test/java/org/infinispan/distribution/SingleOwnerAndAsyncMethodsWithTxTest.java
+++ b/core/src/test/java/org/infinispan/distribution/SingleOwnerAndAsyncMethodsWithTxTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.distribution;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/SingleOwnerTest.java b/core/src/test/java/org/infinispan/distribution/SingleOwnerTest.java
index 50b9fccd34bb..da2f4ac1f20d 100644
--- a/core/src/test/java/org/infinispan/distribution/SingleOwnerTest.java
+++ b/core/src/test/java/org/infinispan/distribution/SingleOwnerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 
diff --git a/core/src/test/java/org/infinispan/distribution/SyncDistLockingTest.java b/core/src/test/java/org/infinispan/distribution/SyncDistLockingTest.java
index 05ddb7a9721e..54216355f013 100644
--- a/core/src/test/java/org/infinispan/distribution/SyncDistLockingTest.java
+++ b/core/src/test/java/org/infinispan/distribution/SyncDistLockingTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/distribution/SyncDistPessimisticLockingTest.java b/core/src/test/java/org/infinispan/distribution/SyncDistPessimisticLockingTest.java
index 9bbceea2ee82..d4047b387436 100644
--- a/core/src/test/java/org/infinispan/distribution/SyncDistPessimisticLockingTest.java
+++ b/core/src/test/java/org/infinispan/distribution/SyncDistPessimisticLockingTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/distribution/TestAddress.java b/core/src/test/java/org/infinispan/distribution/TestAddress.java
index 7ae7bdb7c80d..1e0fc5265321 100644
--- a/core/src/test/java/org/infinispan/distribution/TestAddress.java
+++ b/core/src/test/java/org/infinispan/distribution/TestAddress.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.remoting.transport.Address;
diff --git a/core/src/test/java/org/infinispan/distribution/TestTopologyAwareAddress.java b/core/src/test/java/org/infinispan/distribution/TestTopologyAwareAddress.java
index b248cb8c3c13..dadbe1bb28e4 100644
--- a/core/src/test/java/org/infinispan/distribution/TestTopologyAwareAddress.java
+++ b/core/src/test/java/org/infinispan/distribution/TestTopologyAwareAddress.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.distribution;
 
 import org.infinispan.remoting.transport.TopologyAwareAddress;
diff --git a/core/src/test/java/org/infinispan/distribution/UnicastInvalidationFuncTest.java b/core/src/test/java/org/infinispan/distribution/UnicastInvalidationFuncTest.java
index c7e82a6af099..110342c237f6 100644
--- a/core/src/test/java/org/infinispan/distribution/UnicastInvalidationFuncTest.java
+++ b/core/src/test/java/org/infinispan/distribution/UnicastInvalidationFuncTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import java.util.ArrayList;
diff --git a/core/src/test/java/org/infinispan/distribution/UnknownCacheStartTest.java b/core/src/test/java/org/infinispan/distribution/UnknownCacheStartTest.java
index eb1db676f458..047d983757c1 100644
--- a/core/src/test/java/org/infinispan/distribution/UnknownCacheStartTest.java
+++ b/core/src/test/java/org/infinispan/distribution/UnknownCacheStartTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/ch/DefaultConsistentHashFactoryTest.java b/core/src/test/java/org/infinispan/distribution/ch/DefaultConsistentHashFactoryTest.java
index 856ce88db0af..0ed9522f5d22 100644
--- a/core/src/test/java/org/infinispan/distribution/ch/DefaultConsistentHashFactoryTest.java
+++ b/core/src/test/java/org/infinispan/distribution/ch/DefaultConsistentHashFactoryTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.ch;
 
 import java.util.ArrayList;
diff --git a/core/src/test/java/org/infinispan/distribution/ch/ReplicatedConsistentHashFactoryTest.java b/core/src/test/java/org/infinispan/distribution/ch/ReplicatedConsistentHashFactoryTest.java
index d579da0963e1..a020e4803fbf 100644
--- a/core/src/test/java/org/infinispan/distribution/ch/ReplicatedConsistentHashFactoryTest.java
+++ b/core/src/test/java/org/infinispan/distribution/ch/ReplicatedConsistentHashFactoryTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.distribution.ch;
 
 import org.infinispan.commons.hash.MurmurHash3;
diff --git a/core/src/test/java/org/infinispan/distribution/ch/SyncConsistentHashFactoryKeyDistributionTest.java b/core/src/test/java/org/infinispan/distribution/ch/SyncConsistentHashFactoryKeyDistributionTest.java
index 4e76c6502de0..8acbffc3f118 100644
--- a/core/src/test/java/org/infinispan/distribution/ch/SyncConsistentHashFactoryKeyDistributionTest.java
+++ b/core/src/test/java/org/infinispan/distribution/ch/SyncConsistentHashFactoryKeyDistributionTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  021101301, USA.
- */
-
 package org.infinispan.distribution.ch;
 
 import java.util.ArrayList;
diff --git a/core/src/test/java/org/infinispan/distribution/ch/SyncConsistentHashFactoryTest.java b/core/src/test/java/org/infinispan/distribution/ch/SyncConsistentHashFactoryTest.java
index 90e141037516..8f943e7ac24a 100644
--- a/core/src/test/java/org/infinispan/distribution/ch/SyncConsistentHashFactoryTest.java
+++ b/core/src/test/java/org/infinispan/distribution/ch/SyncConsistentHashFactoryTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.distribution.ch;
 
 import java.util.Collection;
diff --git a/core/src/test/java/org/infinispan/distribution/groups/GroupsChFunctionalTest.java b/core/src/test/java/org/infinispan/distribution/groups/GroupsChFunctionalTest.java
index 8117233feebd..e4d86cb4fedc 100644
--- a/core/src/test/java/org/infinispan/distribution/groups/GroupsChFunctionalTest.java
+++ b/core/src/test/java/org/infinispan/distribution/groups/GroupsChFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.groups;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/groups/GroupsDistAsyncFuncTest.java b/core/src/test/java/org/infinispan/distribution/groups/GroupsDistAsyncFuncTest.java
index 8a3e9b692f55..527a1127d082 100644
--- a/core/src/test/java/org/infinispan/distribution/groups/GroupsDistAsyncFuncTest.java
+++ b/core/src/test/java/org/infinispan/distribution/groups/GroupsDistAsyncFuncTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.groups;
 
 import java.util.Collections;
diff --git a/core/src/test/java/org/infinispan/distribution/groups/GroupsDistSyncUnsafeFuncTest.java b/core/src/test/java/org/infinispan/distribution/groups/GroupsDistSyncUnsafeFuncTest.java
index 52fc93bf4a2a..e37841862395 100644
--- a/core/src/test/java/org/infinispan/distribution/groups/GroupsDistSyncUnsafeFuncTest.java
+++ b/core/src/test/java/org/infinispan/distribution/groups/GroupsDistSyncUnsafeFuncTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.groups;
 
 import java.util.Collections;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentJoinAndCoordDeathTest.java b/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentJoinAndCoordDeathTest.java
index 9710e08074f7..5cdb56121f1c 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentJoinAndCoordDeathTest.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentJoinAndCoordDeathTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.rehash;
 
 import org.infinispan.test.AbstractInfinispanTest;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentJoinAndOtherSenderDeathTest.java b/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentJoinAndOtherSenderDeathTest.java
index ae0da0d265b1..ca592e73b2fd 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentJoinAndOtherSenderDeathTest.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentJoinAndOtherSenderDeathTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.rehash;
 
 import org.infinispan.test.AbstractInfinispanTest;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentJoinTest.java b/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentJoinTest.java
index 7ae107462684..ad394beabc5b 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentJoinTest.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentJoinTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.rehash;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentLeaveAndJoinNonOverlappingTest.java b/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentLeaveAndJoinNonOverlappingTest.java
index 7e5b3c6dbe2d..981f1247441b 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentLeaveAndJoinNonOverlappingTest.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentLeaveAndJoinNonOverlappingTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.rehash;
 
 import org.infinispan.test.AbstractInfinispanTest;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentLeaveAndJoinOverlappingTest.java b/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentLeaveAndJoinOverlappingTest.java
index c939562971ea..13b7b77395c8 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentLeaveAndJoinOverlappingTest.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentLeaveAndJoinOverlappingTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.rehash;
 
 import org.infinispan.test.AbstractInfinispanTest;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentNonOverlappingLeaveTest.java b/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentNonOverlappingLeaveTest.java
index 7542be9cada4..92943e443e55 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentNonOverlappingLeaveTest.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentNonOverlappingLeaveTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.rehash;
 
 import java.util.Arrays;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentOverlappingLeaveTest.java b/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentOverlappingLeaveTest.java
index ffbe1ae44214..b35f6d8db12f 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentOverlappingLeaveTest.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentOverlappingLeaveTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.rehash;
 
 import org.infinispan.manager.CacheContainer;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/ConsistencyStressTest.java b/core/src/test/java/org/infinispan/distribution/rehash/ConsistencyStressTest.java
index 1e207178d03c..00651d656a06 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/ConsistencyStressTest.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/ConsistencyStressTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.rehash;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/DataLossOnJoinOneOwnerTest.java b/core/src/test/java/org/infinispan/distribution/rehash/DataLossOnJoinOneOwnerTest.java
index 353d704df9a3..d3ca95379a03 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/DataLossOnJoinOneOwnerTest.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/DataLossOnJoinOneOwnerTest.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.distribution.rehash;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/JoinAndCoordDeathTest.java b/core/src/test/java/org/infinispan/distribution/rehash/JoinAndCoordDeathTest.java
index 8e7bce2eed8e..f508f16199e2 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/JoinAndCoordDeathTest.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/JoinAndCoordDeathTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.rehash;
 
 import org.infinispan.test.AbstractInfinispanTest;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/JoinAndOtherSenderDeathTest.java b/core/src/test/java/org/infinispan/distribution/rehash/JoinAndOtherSenderDeathTest.java
index 8c6e77c06d17..71c4993c9036 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/JoinAndOtherSenderDeathTest.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/JoinAndOtherSenderDeathTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.rehash;
 
 import org.infinispan.test.AbstractInfinispanTest;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/L1OnRehashDisabledTest.java b/core/src/test/java/org/infinispan/distribution/rehash/L1OnRehashDisabledTest.java
index 072e6104a900..d8e9d37244cf 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/L1OnRehashDisabledTest.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/L1OnRehashDisabledTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.rehash;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/L1OnRehashL1DisabledTest.java b/core/src/test/java/org/infinispan/distribution/rehash/L1OnRehashL1DisabledTest.java
index 7c717ee88473..e713ca6742ab 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/L1OnRehashL1DisabledTest.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/L1OnRehashL1DisabledTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.distribution.rehash;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/L1OnRehashTest.java b/core/src/test/java/org/infinispan/distribution/rehash/L1OnRehashTest.java
index 835a1bd6587f..e333fc4a4f83 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/L1OnRehashTest.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/L1OnRehashTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.rehash;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/OngoingTransactionsAndJoinTest.java b/core/src/test/java/org/infinispan/distribution/rehash/OngoingTransactionsAndJoinTest.java
index 76f8d638a7ec..592ebac9cdd6 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/OngoingTransactionsAndJoinTest.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/OngoingTransactionsAndJoinTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.rehash;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/RehashAfterJoinWithPreloadTest.java b/core/src/test/java/org/infinispan/distribution/rehash/RehashAfterJoinWithPreloadTest.java
index 36ee82c8fddf..b44eb5e388d7 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/RehashAfterJoinWithPreloadTest.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/RehashAfterJoinWithPreloadTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.distribution.rehash;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/RehashAfterPartitionMergeTest.java b/core/src/test/java/org/infinispan/distribution/rehash/RehashAfterPartitionMergeTest.java
index 0c0614720ba5..638e69b542bd 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/RehashAfterPartitionMergeTest.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/RehashAfterPartitionMergeTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.rehash;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/RehashCompletedOnJoinTest.java b/core/src/test/java/org/infinispan/distribution/rehash/RehashCompletedOnJoinTest.java
index d68504815d4a..cfbbc4f80732 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/RehashCompletedOnJoinTest.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/RehashCompletedOnJoinTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.rehash;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/RehashLeaveTestBase.java b/core/src/test/java/org/infinispan/distribution/rehash/RehashLeaveTestBase.java
index db0916cef7af..f8c3861d8911 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/RehashLeaveTestBase.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/RehashLeaveTestBase.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.rehash;
 
 import org.infinispan.test.TestingUtil;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/RehashStressTest.java b/core/src/test/java/org/infinispan/distribution/rehash/RehashStressTest.java
index cef631a7adc2..5534b855fc7b 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/RehashStressTest.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/RehashStressTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.distribution.rehash;
 
 import org.apache.log4j.Logger;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/RehashTestBase.java b/core/src/test/java/org/infinispan/distribution/rehash/RehashTestBase.java
index d7df5f7725f5..2d72b27449b7 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/RehashTestBase.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/RehashTestBase.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.rehash;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/RehashWithL1Test.java b/core/src/test/java/org/infinispan/distribution/rehash/RehashWithL1Test.java
index 757a31a92392..4703f583d4c2 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/RehashWithL1Test.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/RehashWithL1Test.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.distribution.rehash;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/RehashWithSharedCacheStoreTest.java b/core/src/test/java/org/infinispan/distribution/rehash/RehashWithSharedCacheStoreTest.java
index 05d1f5d97951..f1c60270e44f 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/RehashWithSharedCacheStoreTest.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/RehashWithSharedCacheStoreTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.rehash;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/SingleJoinTest.java b/core/src/test/java/org/infinispan/distribution/rehash/SingleJoinTest.java
index f5135a2f7e2c..ee68de7e2877 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/SingleJoinTest.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/SingleJoinTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.rehash;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/SingleLeaveTest.java b/core/src/test/java/org/infinispan/distribution/rehash/SingleLeaveTest.java
index d737ac4dc87d..a1300d40572c 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/SingleLeaveTest.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/SingleLeaveTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.rehash;
 
 import org.infinispan.manager.CacheContainer;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/StateResponseOrderingTest.java b/core/src/test/java/org/infinispan/distribution/rehash/StateResponseOrderingTest.java
index 75b3c34acb01..97c4e7f6c402 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/StateResponseOrderingTest.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/StateResponseOrderingTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.rehash;
 
 import java.util.Arrays;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/WorkDuringJoinTest.java b/core/src/test/java/org/infinispan/distribution/rehash/WorkDuringJoinTest.java
index e58b5ca9e2ce..2c1de3a53770 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/WorkDuringJoinTest.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/WorkDuringJoinTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.rehash;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/rehash/XAResourceAdapter.java b/core/src/test/java/org/infinispan/distribution/rehash/XAResourceAdapter.java
index 52385a259c9d..63b6b1bcfac6 100644
--- a/core/src/test/java/org/infinispan/distribution/rehash/XAResourceAdapter.java
+++ b/core/src/test/java/org/infinispan/distribution/rehash/XAResourceAdapter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.rehash;
 
 import javax.transaction.xa.XAException;
diff --git a/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyAwareChFunctionalTest.java b/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyAwareChFunctionalTest.java
index ef381a916bba..c7c9afbec1b8 100644
--- a/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyAwareChFunctionalTest.java
+++ b/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyAwareChFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.topologyaware;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyAwareConsistentHashFactoryTest.java b/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyAwareConsistentHashFactoryTest.java
index 8efcd0953b5d..b357951743af 100644
--- a/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyAwareConsistentHashFactoryTest.java
+++ b/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyAwareConsistentHashFactoryTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.topologyaware;
 
 import org.infinispan.commons.hash.MurmurHash3;
diff --git a/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyAwareDistAsyncFuncTest.java b/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyAwareDistAsyncFuncTest.java
index 28c7556eb12b..c3432bd1b0b5 100644
--- a/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyAwareDistAsyncFuncTest.java
+++ b/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyAwareDistAsyncFuncTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.topologyaware;
 
 import org.infinispan.config.GlobalConfiguration;
diff --git a/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyAwareDistSyncUnsafeFuncTest.java b/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyAwareDistSyncUnsafeFuncTest.java
index 559fa87beb4c..02f3b603df76 100644
--- a/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyAwareDistSyncUnsafeFuncTest.java
+++ b/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyAwareDistSyncUnsafeFuncTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.topologyaware;
 
 import org.infinispan.config.GlobalConfiguration;
diff --git a/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyAwareStateTransferTest.java b/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyAwareStateTransferTest.java
index 0bd5835b8c4a..f942ef66952b 100644
--- a/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyAwareStateTransferTest.java
+++ b/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyAwareStateTransferTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.topologyaware;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyAwareSyncConsistentHashFactoryTest.java b/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyAwareSyncConsistentHashFactoryTest.java
index 5ca0a0e56c54..e375a3620de5 100644
--- a/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyAwareSyncConsistentHashFactoryTest.java
+++ b/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyAwareSyncConsistentHashFactoryTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.topologyaware;
 
 import java.util.List;
diff --git a/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyInfoBroadcastNoRehashTest.java b/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyInfoBroadcastNoRehashTest.java
index edb0023329c6..e9b792f2a4f0 100644
--- a/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyInfoBroadcastNoRehashTest.java
+++ b/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyInfoBroadcastNoRehashTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.topologyaware;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyInfoBroadcastTest.java b/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyInfoBroadcastTest.java
index bf3fd179d60c..1f42d3e61e6a 100644
--- a/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyInfoBroadcastTest.java
+++ b/core/src/test/java/org/infinispan/distribution/topologyaware/TopologyInfoBroadcastTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.distribution.topologyaware;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/eviction/BaseEvictionFunctionalTest.java b/core/src/test/java/org/infinispan/eviction/BaseEvictionFunctionalTest.java
index f7987193265f..f1f6192453c5 100644
--- a/core/src/test/java/org/infinispan/eviction/BaseEvictionFunctionalTest.java
+++ b/core/src/test/java/org/infinispan/eviction/BaseEvictionFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.eviction;
 
 import java.util.Random;
diff --git a/core/src/test/java/org/infinispan/eviction/ConcurrentPassivationActivationTest.java b/core/src/test/java/org/infinispan/eviction/ConcurrentPassivationActivationTest.java
index 53b4f049e2d8..905333693760 100644
--- a/core/src/test/java/org/infinispan/eviction/ConcurrentPassivationActivationTest.java
+++ b/core/src/test/java/org/infinispan/eviction/ConcurrentPassivationActivationTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.eviction;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/eviction/EvictionDuringBatchTest.java b/core/src/test/java/org/infinispan/eviction/EvictionDuringBatchTest.java
index bd1585d113cd..7bdd532cdb49 100644
--- a/core/src/test/java/org/infinispan/eviction/EvictionDuringBatchTest.java
+++ b/core/src/test/java/org/infinispan/eviction/EvictionDuringBatchTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.eviction;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/test/java/org/infinispan/eviction/EvictionManagerTest.java b/core/src/test/java/org/infinispan/eviction/EvictionManagerTest.java
index 8f8f7cfec08b..411388a5fa32 100644
--- a/core/src/test/java/org/infinispan/eviction/EvictionManagerTest.java
+++ b/core/src/test/java/org/infinispan/eviction/EvictionManagerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.eviction;
 
 import static org.mockito.Matchers.any;
diff --git a/core/src/test/java/org/infinispan/eviction/EvictionThreadCountTest.java b/core/src/test/java/org/infinispan/eviction/EvictionThreadCountTest.java
index d076a02f0469..86998c9cd61c 100644
--- a/core/src/test/java/org/infinispan/eviction/EvictionThreadCountTest.java
+++ b/core/src/test/java/org/infinispan/eviction/EvictionThreadCountTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.eviction;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/eviction/EvictionWithPassivationTest.java b/core/src/test/java/org/infinispan/eviction/EvictionWithPassivationTest.java
index b044575ad393..224106578560 100644
--- a/core/src/test/java/org/infinispan/eviction/EvictionWithPassivationTest.java
+++ b/core/src/test/java/org/infinispan/eviction/EvictionWithPassivationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.eviction;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/eviction/ExpensiveEvictionTest.java b/core/src/test/java/org/infinispan/eviction/ExpensiveEvictionTest.java
index bd0207a6c476..2dc46e701624 100644
--- a/core/src/test/java/org/infinispan/eviction/ExpensiveEvictionTest.java
+++ b/core/src/test/java/org/infinispan/eviction/ExpensiveEvictionTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.eviction;
 
 import java.util.concurrent.TimeUnit;
diff --git a/core/src/test/java/org/infinispan/eviction/LIRSEvictionFunctionalTest.java b/core/src/test/java/org/infinispan/eviction/LIRSEvictionFunctionalTest.java
index ca23778796a5..26b6e8f54b77 100644
--- a/core/src/test/java/org/infinispan/eviction/LIRSEvictionFunctionalTest.java
+++ b/core/src/test/java/org/infinispan/eviction/LIRSEvictionFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.eviction;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/eviction/LRUEvictionFunctionalTest.java b/core/src/test/java/org/infinispan/eviction/LRUEvictionFunctionalTest.java
index 4fdf0d15add8..9b6ecf187a85 100644
--- a/core/src/test/java/org/infinispan/eviction/LRUEvictionFunctionalTest.java
+++ b/core/src/test/java/org/infinispan/eviction/LRUEvictionFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.eviction;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/eviction/MarshalledValuesEvictionTest.java b/core/src/test/java/org/infinispan/eviction/MarshalledValuesEvictionTest.java
index 07a3abfcf056..837b71dcb935 100644
--- a/core/src/test/java/org/infinispan/eviction/MarshalledValuesEvictionTest.java
+++ b/core/src/test/java/org/infinispan/eviction/MarshalledValuesEvictionTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.eviction;
 
 import org.infinispan.commands.write.EvictCommand;
diff --git a/core/src/test/java/org/infinispan/eviction/MarshalledValuesManualEvictionTest.java b/core/src/test/java/org/infinispan/eviction/MarshalledValuesManualEvictionTest.java
index 464ee4ac7fdb..0225e2eea5d3 100644
--- a/core/src/test/java/org/infinispan/eviction/MarshalledValuesManualEvictionTest.java
+++ b/core/src/test/java/org/infinispan/eviction/MarshalledValuesManualEvictionTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.eviction;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/eviction/UNORDEREDEvictionFunctionalTest.java b/core/src/test/java/org/infinispan/eviction/UNORDEREDEvictionFunctionalTest.java
index 3201a190e21d..7ad2b6027ddc 100644
--- a/core/src/test/java/org/infinispan/eviction/UNORDEREDEvictionFunctionalTest.java
+++ b/core/src/test/java/org/infinispan/eviction/UNORDEREDEvictionFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.eviction;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/executors/BlockingTaskAwareExecutorServiceTest.java b/core/src/test/java/org/infinispan/executors/BlockingTaskAwareExecutorServiceTest.java
index a0cd2fee2f31..30507c72d45b 100644
--- a/core/src/test/java/org/infinispan/executors/BlockingTaskAwareExecutorServiceTest.java
+++ b/core/src/test/java/org/infinispan/executors/BlockingTaskAwareExecutorServiceTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.executors;
 
 import org.infinispan.test.AbstractInfinispanTest;
diff --git a/core/src/test/java/org/infinispan/expiry/ExpiryTest.java b/core/src/test/java/org/infinispan/expiry/ExpiryTest.java
index a7a178ab664f..eb2a95f51b12 100644
--- a/core/src/test/java/org/infinispan/expiry/ExpiryTest.java
+++ b/core/src/test/java/org/infinispan/expiry/ExpiryTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.expiry;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/expiry/ReplicatedExpiryTest.java b/core/src/test/java/org/infinispan/expiry/ReplicatedExpiryTest.java
index e2932ae621bb..45bafa0a7f59 100644
--- a/core/src/test/java/org/infinispan/expiry/ReplicatedExpiryTest.java
+++ b/core/src/test/java/org/infinispan/expiry/ReplicatedExpiryTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.expiry;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/factories/ComponentRegistryTest.java b/core/src/test/java/org/infinispan/factories/ComponentRegistryTest.java
index 3c42a489d18a..266268badf0c 100644
--- a/core/src/test/java/org/infinispan/factories/ComponentRegistryTest.java
+++ b/core/src/test/java/org/infinispan/factories/ComponentRegistryTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.factories;
 
 import java.util.HashSet;
diff --git a/core/src/test/java/org/infinispan/factories/scopes/ScopeDetectorTest.java b/core/src/test/java/org/infinispan/factories/scopes/ScopeDetectorTest.java
index 65e4fad68453..665b29f3e3af 100644
--- a/core/src/test/java/org/infinispan/factories/scopes/ScopeDetectorTest.java
+++ b/core/src/test/java/org/infinispan/factories/scopes/ScopeDetectorTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.factories.scopes;
 
 import org.infinispan.test.AbstractInfinispanTest;
diff --git a/core/src/test/java/org/infinispan/interceptors/ConcurrentInterceptorVisibilityTest.java b/core/src/test/java/org/infinispan/interceptors/ConcurrentInterceptorVisibilityTest.java
index 91d292e10858..928a15e50c22 100644
--- a/core/src/test/java/org/infinispan/interceptors/ConcurrentInterceptorVisibilityTest.java
+++ b/core/src/test/java/org/infinispan/interceptors/ConcurrentInterceptorVisibilityTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.interceptors;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/interceptors/CustomInterceptorTest.java b/core/src/test/java/org/infinispan/interceptors/CustomInterceptorTest.java
index ebc6b90c80c6..f3800a1a1cb2 100644
--- a/core/src/test/java/org/infinispan/interceptors/CustomInterceptorTest.java
+++ b/core/src/test/java/org/infinispan/interceptors/CustomInterceptorTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.interceptors;
 
 import static org.testng.AssertJUnit.*;
diff --git a/core/src/test/java/org/infinispan/interceptors/FooInterceptor.java b/core/src/test/java/org/infinispan/interceptors/FooInterceptor.java
index cbd747ce3ecb..738e76e73d0a 100644
--- a/core/src/test/java/org/infinispan/interceptors/FooInterceptor.java
+++ b/core/src/test/java/org/infinispan/interceptors/FooInterceptor.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.interceptors;
 
 import org.infinispan.interceptors.base.BaseCustomInterceptor;
diff --git a/core/src/test/java/org/infinispan/interceptors/InterceptorChainTest.java b/core/src/test/java/org/infinispan/interceptors/InterceptorChainTest.java
index 1474173711cf..a61019acb4fd 100644
--- a/core/src/test/java/org/infinispan/interceptors/InterceptorChainTest.java
+++ b/core/src/test/java/org/infinispan/interceptors/InterceptorChainTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.interceptors;
 
 import java.util.ArrayList;
diff --git a/core/src/test/java/org/infinispan/interceptors/MarshalledValueInterceptorTest.java b/core/src/test/java/org/infinispan/interceptors/MarshalledValueInterceptorTest.java
index d0c4602841ec..d8c7ff3ffa2d 100644
--- a/core/src/test/java/org/infinispan/interceptors/MarshalledValueInterceptorTest.java
+++ b/core/src/test/java/org/infinispan/interceptors/MarshalledValueInterceptorTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.interceptors;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/invalidation/AsyncAPIAsyncInvalTest.java b/core/src/test/java/org/infinispan/invalidation/AsyncAPIAsyncInvalTest.java
index 483deb6f63d6..89469a4b75bc 100644
--- a/core/src/test/java/org/infinispan/invalidation/AsyncAPIAsyncInvalTest.java
+++ b/core/src/test/java/org/infinispan/invalidation/AsyncAPIAsyncInvalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.invalidation;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/invalidation/AsyncAPISyncInvalTest.java b/core/src/test/java/org/infinispan/invalidation/AsyncAPISyncInvalTest.java
index 25e1ba8db21e..4aae74200b5e 100644
--- a/core/src/test/java/org/infinispan/invalidation/AsyncAPISyncInvalTest.java
+++ b/core/src/test/java/org/infinispan/invalidation/AsyncAPISyncInvalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.invalidation;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/invalidation/AsyncInvalidationTest.java b/core/src/test/java/org/infinispan/invalidation/AsyncInvalidationTest.java
index 3f1e5304f227..fb6f197e1cbe 100644
--- a/core/src/test/java/org/infinispan/invalidation/AsyncInvalidationTest.java
+++ b/core/src/test/java/org/infinispan/invalidation/AsyncInvalidationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.invalidation;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/invalidation/BaseInvalidationTest.java b/core/src/test/java/org/infinispan/invalidation/BaseInvalidationTest.java
index c7601e98e62c..f4ec25c5b8d8 100644
--- a/core/src/test/java/org/infinispan/invalidation/BaseInvalidationTest.java
+++ b/core/src/test/java/org/infinispan/invalidation/BaseInvalidationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.invalidation;
 
 import static org.infinispan.context.Flag.CACHE_MODE_LOCAL;
diff --git a/core/src/test/java/org/infinispan/invalidation/InvalidationExceptionTest.java b/core/src/test/java/org/infinispan/invalidation/InvalidationExceptionTest.java
index 543f24a8842f..1cf1a04b9a33 100644
--- a/core/src/test/java/org/infinispan/invalidation/InvalidationExceptionTest.java
+++ b/core/src/test/java/org/infinispan/invalidation/InvalidationExceptionTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.invalidation;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/test/java/org/infinispan/invalidation/SyncInvalidationTest.java b/core/src/test/java/org/infinispan/invalidation/SyncInvalidationTest.java
index b508f26873df..27d371422e60 100644
--- a/core/src/test/java/org/infinispan/invalidation/SyncInvalidationTest.java
+++ b/core/src/test/java/org/infinispan/invalidation/SyncInvalidationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.invalidation;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/io/GridFileTest.java b/core/src/test/java/org/infinispan/io/GridFileTest.java
index b9d470fa7c3f..bd6989fb9db7 100644
--- a/core/src/test/java/org/infinispan/io/GridFileTest.java
+++ b/core/src/test/java/org/infinispan/io/GridFileTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.io;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/jmx/ActivationAndPassivationInterceptorMBeanTest.java b/core/src/test/java/org/infinispan/jmx/ActivationAndPassivationInterceptorMBeanTest.java
index 3fa34cc4b279..0366feae00e7 100644
--- a/core/src/test/java/org/infinispan/jmx/ActivationAndPassivationInterceptorMBeanTest.java
+++ b/core/src/test/java/org/infinispan/jmx/ActivationAndPassivationInterceptorMBeanTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jmx;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/jmx/CacheClearTest.java b/core/src/test/java/org/infinispan/jmx/CacheClearTest.java
index 24c82aa22f08..b25335025c7b 100644
--- a/core/src/test/java/org/infinispan/jmx/CacheClearTest.java
+++ b/core/src/test/java/org/infinispan/jmx/CacheClearTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.jmx;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/jmx/CacheLoaderAndCacheStoreInterceptorMBeanTest.java b/core/src/test/java/org/infinispan/jmx/CacheLoaderAndCacheStoreInterceptorMBeanTest.java
index 650ad280cb64..42d89117319e 100644
--- a/core/src/test/java/org/infinispan/jmx/CacheLoaderAndCacheStoreInterceptorMBeanTest.java
+++ b/core/src/test/java/org/infinispan/jmx/CacheLoaderAndCacheStoreInterceptorMBeanTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jmx;
 
 import org.infinispan.config.CacheLoaderManagerConfig;
diff --git a/core/src/test/java/org/infinispan/jmx/CacheMBeanTest.java b/core/src/test/java/org/infinispan/jmx/CacheMBeanTest.java
index bd2a74302c74..5c0e3f32493d 100644
--- a/core/src/test/java/org/infinispan/jmx/CacheMBeanTest.java
+++ b/core/src/test/java/org/infinispan/jmx/CacheMBeanTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jmx;
 
 import java.lang.reflect.Method;
diff --git a/core/src/test/java/org/infinispan/jmx/CacheManagerMBeanTest.java b/core/src/test/java/org/infinispan/jmx/CacheManagerMBeanTest.java
index b8887e45fbdb..d29f381be23d 100644
--- a/core/src/test/java/org/infinispan/jmx/CacheManagerMBeanTest.java
+++ b/core/src/test/java/org/infinispan/jmx/CacheManagerMBeanTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jmx;
 
 import static org.testng.AssertJUnit.assertTrue;
diff --git a/core/src/test/java/org/infinispan/jmx/CacheMgmtInterceptorMBeanTest.java b/core/src/test/java/org/infinispan/jmx/CacheMgmtInterceptorMBeanTest.java
index 985f83bc7ab4..ecfe4fe8e2a2 100644
--- a/core/src/test/java/org/infinispan/jmx/CacheMgmtInterceptorMBeanTest.java
+++ b/core/src/test/java/org/infinispan/jmx/CacheMgmtInterceptorMBeanTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jmx;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/test/java/org/infinispan/jmx/ClusteredCacheManagerMBeanTest.java b/core/src/test/java/org/infinispan/jmx/ClusteredCacheManagerMBeanTest.java
index 665cfe7e81d6..ecd889e4c7f7 100644
--- a/core/src/test/java/org/infinispan/jmx/ClusteredCacheManagerMBeanTest.java
+++ b/core/src/test/java/org/infinispan/jmx/ClusteredCacheManagerMBeanTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.jmx;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/jmx/ClusteredCacheMgmtInterceptorMBeanTest.java b/core/src/test/java/org/infinispan/jmx/ClusteredCacheMgmtInterceptorMBeanTest.java
index 3c08d59cc936..526adc869ec8 100644
--- a/core/src/test/java/org/infinispan/jmx/ClusteredCacheMgmtInterceptorMBeanTest.java
+++ b/core/src/test/java/org/infinispan/jmx/ClusteredCacheMgmtInterceptorMBeanTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.jmx;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/jmx/ComponentsJmxRegistrationTest.java b/core/src/test/java/org/infinispan/jmx/ComponentsJmxRegistrationTest.java
index 9bb2862bd9f9..4690cf274be6 100644
--- a/core/src/test/java/org/infinispan/jmx/ComponentsJmxRegistrationTest.java
+++ b/core/src/test/java/org/infinispan/jmx/ComponentsJmxRegistrationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jmx;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/test/java/org/infinispan/jmx/CustomMBeanServerPropertiesTest.java b/core/src/test/java/org/infinispan/jmx/CustomMBeanServerPropertiesTest.java
index 151fb758d43d..e394ab65f9cf 100644
--- a/core/src/test/java/org/infinispan/jmx/CustomMBeanServerPropertiesTest.java
+++ b/core/src/test/java/org/infinispan/jmx/CustomMBeanServerPropertiesTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jmx;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/jmx/JmxStatsFunctionalTest.java b/core/src/test/java/org/infinispan/jmx/JmxStatsFunctionalTest.java
index 90ad8ea09e84..e1811d115033 100644
--- a/core/src/test/java/org/infinispan/jmx/JmxStatsFunctionalTest.java
+++ b/core/src/test/java/org/infinispan/jmx/JmxStatsFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jmx;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/jmx/MvccLockManagerMBeanTest.java b/core/src/test/java/org/infinispan/jmx/MvccLockManagerMBeanTest.java
index 225620fee89a..b781ccc10c04 100644
--- a/core/src/test/java/org/infinispan/jmx/MvccLockManagerMBeanTest.java
+++ b/core/src/test/java/org/infinispan/jmx/MvccLockManagerMBeanTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jmx;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/jmx/PerThreadMBeanServerLookup.java b/core/src/test/java/org/infinispan/jmx/PerThreadMBeanServerLookup.java
index e3f42ffde389..db03954e221e 100644
--- a/core/src/test/java/org/infinispan/jmx/PerThreadMBeanServerLookup.java
+++ b/core/src/test/java/org/infinispan/jmx/PerThreadMBeanServerLookup.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jmx;
 
 import javax.management.MBeanServer;
diff --git a/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java b/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java
index 814ef983071f..7cd448346801 100644
--- a/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java
+++ b/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jmx;
 
 import java.io.Externalizable;
diff --git a/core/src/test/java/org/infinispan/jmx/TxInterceptorMBeanTest.java b/core/src/test/java/org/infinispan/jmx/TxInterceptorMBeanTest.java
index abc8198a2398..ddb3991aefe8 100644
--- a/core/src/test/java/org/infinispan/jmx/TxInterceptorMBeanTest.java
+++ b/core/src/test/java/org/infinispan/jmx/TxInterceptorMBeanTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jmx;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/jndi/BindingTest.java b/core/src/test/java/org/infinispan/jndi/BindingTest.java
index d150ef156e0a..6ef6b8c8c291 100644
--- a/core/src/test/java/org/infinispan/jndi/BindingTest.java
+++ b/core/src/test/java/org/infinispan/jndi/BindingTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jndi;
 
 import java.lang.reflect.Method;
diff --git a/core/src/test/java/org/infinispan/loaders/AbstractCacheStoreConfigTest.java b/core/src/test/java/org/infinispan/loaders/AbstractCacheStoreConfigTest.java
index 1172d83c63ce..eb9aa071f467 100644
--- a/core/src/test/java/org/infinispan/loaders/AbstractCacheStoreConfigTest.java
+++ b/core/src/test/java/org/infinispan/loaders/AbstractCacheStoreConfigTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import org.infinispan.test.AbstractInfinispanTest;
diff --git a/core/src/test/java/org/infinispan/loaders/AbstractCacheStoreTest.java b/core/src/test/java/org/infinispan/loaders/AbstractCacheStoreTest.java
index 150f53c153a5..40af9b3c7381 100644
--- a/core/src/test/java/org/infinispan/loaders/AbstractCacheStoreTest.java
+++ b/core/src/test/java/org/infinispan/loaders/AbstractCacheStoreTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import static org.mockito.Mockito.mock;
diff --git a/core/src/test/java/org/infinispan/loaders/BaseCacheStoreFunctionalTest.java b/core/src/test/java/org/infinispan/loaders/BaseCacheStoreFunctionalTest.java
index 68f9400782b5..8e523c04dd04 100644
--- a/core/src/test/java/org/infinispan/loaders/BaseCacheStoreFunctionalTest.java
+++ b/core/src/test/java/org/infinispan/loaders/BaseCacheStoreFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/loaders/BaseCacheStoreTest.java b/core/src/test/java/org/infinispan/loaders/BaseCacheStoreTest.java
index bb96b9f752d3..1ec535f1f55a 100644
--- a/core/src/test/java/org/infinispan/loaders/BaseCacheStoreTest.java
+++ b/core/src/test/java/org/infinispan/loaders/BaseCacheStoreTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import static java.util.Collections.emptySet;
diff --git a/core/src/test/java/org/infinispan/loaders/CacheLoaderFunctionalTest.java b/core/src/test/java/org/infinispan/loaders/CacheLoaderFunctionalTest.java
index 166b42698861..17e70c7ca6af 100644
--- a/core/src/test/java/org/infinispan/loaders/CacheLoaderFunctionalTest.java
+++ b/core/src/test/java/org/infinispan/loaders/CacheLoaderFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/test/java/org/infinispan/loaders/ClassLoaderManagerDisablingTest.java b/core/src/test/java/org/infinispan/loaders/ClassLoaderManagerDisablingTest.java
index 7dc3a1c063b9..0d49bbc59bb9 100644
--- a/core/src/test/java/org/infinispan/loaders/ClassLoaderManagerDisablingTest.java
+++ b/core/src/test/java/org/infinispan/loaders/ClassLoaderManagerDisablingTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/loaders/ClusterCacheLoaderTest.java b/core/src/test/java/org/infinispan/loaders/ClusterCacheLoaderTest.java
index 30b218795fcd..9df2529a8ec2 100644
--- a/core/src/test/java/org/infinispan/loaders/ClusterCacheLoaderTest.java
+++ b/core/src/test/java/org/infinispan/loaders/ClusterCacheLoaderTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/loaders/ConcurrentLoadAndEvictTest.java b/core/src/test/java/org/infinispan/loaders/ConcurrentLoadAndEvictTest.java
index 8bd59a2ab6a6..1f588d97a4ee 100644
--- a/core/src/test/java/org/infinispan/loaders/ConcurrentLoadAndEvictTest.java
+++ b/core/src/test/java/org/infinispan/loaders/ConcurrentLoadAndEvictTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import org.infinispan.commands.read.GetKeyValueCommand;
diff --git a/core/src/test/java/org/infinispan/loaders/ConcurrentLoadAndEvictTxTest.java b/core/src/test/java/org/infinispan/loaders/ConcurrentLoadAndEvictTxTest.java
index 71ae11ecfa22..e4ed56b93823 100644
--- a/core/src/test/java/org/infinispan/loaders/ConcurrentLoadAndEvictTxTest.java
+++ b/core/src/test/java/org/infinispan/loaders/ConcurrentLoadAndEvictTxTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/loaders/FlushingAsyncStoreTest.java b/core/src/test/java/org/infinispan/loaders/FlushingAsyncStoreTest.java
index 49910de94002..475201028130 100644
--- a/core/src/test/java/org/infinispan/loaders/FlushingAsyncStoreTest.java
+++ b/core/src/test/java/org/infinispan/loaders/FlushingAsyncStoreTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/loaders/LocalModeNoPassivationTest.java b/core/src/test/java/org/infinispan/loaders/LocalModeNoPassivationTest.java
index 0cf02d1696f2..9ced75bb6459 100644
--- a/core/src/test/java/org/infinispan/loaders/LocalModeNoPassivationTest.java
+++ b/core/src/test/java/org/infinispan/loaders/LocalModeNoPassivationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import org.infinispan.test.fwk.CleanupAfterMethod;
diff --git a/core/src/test/java/org/infinispan/loaders/LocalModePassivationTest.java b/core/src/test/java/org/infinispan/loaders/LocalModePassivationTest.java
index 84af070a3c3f..aca3fe20eb96 100644
--- a/core/src/test/java/org/infinispan/loaders/LocalModePassivationTest.java
+++ b/core/src/test/java/org/infinispan/loaders/LocalModePassivationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/loaders/PassivatePersistentTest.java b/core/src/test/java/org/infinispan/loaders/PassivatePersistentTest.java
index 01c861478050..de8882ff4006 100644
--- a/core/src/test/java/org/infinispan/loaders/PassivatePersistentTest.java
+++ b/core/src/test/java/org/infinispan/loaders/PassivatePersistentTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/loaders/PassivationFunctionalTest.java b/core/src/test/java/org/infinispan/loaders/PassivationFunctionalTest.java
index 4795e4e399b8..aa4ddf82655e 100644
--- a/core/src/test/java/org/infinispan/loaders/PassivationFunctionalTest.java
+++ b/core/src/test/java/org/infinispan/loaders/PassivationFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/loaders/PreloadWithAsyncStoreTest.java b/core/src/test/java/org/infinispan/loaders/PreloadWithAsyncStoreTest.java
index c6fe4c0f2eb7..b930771b2b3d 100644
--- a/core/src/test/java/org/infinispan/loaders/PreloadWithAsyncStoreTest.java
+++ b/core/src/test/java/org/infinispan/loaders/PreloadWithAsyncStoreTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.loaders;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/loaders/ReadOnlyCacheStoreTest.java b/core/src/test/java/org/infinispan/loaders/ReadOnlyCacheStoreTest.java
index a9035c82b151..d32e3193f9e5 100644
--- a/core/src/test/java/org/infinispan/loaders/ReadOnlyCacheStoreTest.java
+++ b/core/src/test/java/org/infinispan/loaders/ReadOnlyCacheStoreTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import org.infinispan.config.CacheLoaderManagerConfig;
diff --git a/core/src/test/java/org/infinispan/loaders/ReplicatedSharedEvictingLoaderTest.java b/core/src/test/java/org/infinispan/loaders/ReplicatedSharedEvictingLoaderTest.java
index 644fbc709fea..08f8a9fd8cdb 100644
--- a/core/src/test/java/org/infinispan/loaders/ReplicatedSharedEvictingLoaderTest.java
+++ b/core/src/test/java/org/infinispan/loaders/ReplicatedSharedEvictingLoaderTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import org.infinispan.config.CacheLoaderManagerConfig;
diff --git a/core/src/test/java/org/infinispan/loaders/SharedCacheStoreTest.java b/core/src/test/java/org/infinispan/loaders/SharedCacheStoreTest.java
index e21cd3a99bb6..f0d9b85bb5ef 100644
--- a/core/src/test/java/org/infinispan/loaders/SharedCacheStoreTest.java
+++ b/core/src/test/java/org/infinispan/loaders/SharedCacheStoreTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/loaders/UnnnecessaryLoadingTest.java b/core/src/test/java/org/infinispan/loaders/UnnnecessaryLoadingTest.java
index 7105f91c190d..ce2faa2b05c0 100644
--- a/core/src/test/java/org/infinispan/loaders/UnnnecessaryLoadingTest.java
+++ b/core/src/test/java/org/infinispan/loaders/UnnnecessaryLoadingTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/loaders/decorators/AsyncStoreEvictionTest.java b/core/src/test/java/org/infinispan/loaders/decorators/AsyncStoreEvictionTest.java
index 6541a31dcbda..d3b48b228062 100644
--- a/core/src/test/java/org/infinispan/loaders/decorators/AsyncStoreEvictionTest.java
+++ b/core/src/test/java/org/infinispan/loaders/decorators/AsyncStoreEvictionTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.decorators;
 
 import java.util.concurrent.locks.ReentrantLock;
diff --git a/core/src/test/java/org/infinispan/loaders/decorators/AsyncStoreFunctionalTest.java b/core/src/test/java/org/infinispan/loaders/decorators/AsyncStoreFunctionalTest.java
index 6177ab1a7874..35bce384682d 100644
--- a/core/src/test/java/org/infinispan/loaders/decorators/AsyncStoreFunctionalTest.java
+++ b/core/src/test/java/org/infinispan/loaders/decorators/AsyncStoreFunctionalTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.loaders.decorators;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/loaders/decorators/AsyncStoreTest.java b/core/src/test/java/org/infinispan/loaders/decorators/AsyncStoreTest.java
index e46d4acc1af1..4176f235000d 100644
--- a/core/src/test/java/org/infinispan/loaders/decorators/AsyncStoreTest.java
+++ b/core/src/test/java/org/infinispan/loaders/decorators/AsyncStoreTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.decorators;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/loaders/decorators/BatchAsyncCacheStoreTest.java b/core/src/test/java/org/infinispan/loaders/decorators/BatchAsyncCacheStoreTest.java
index 6dc4336a0b7a..77049d9f10b5 100644
--- a/core/src/test/java/org/infinispan/loaders/decorators/BatchAsyncCacheStoreTest.java
+++ b/core/src/test/java/org/infinispan/loaders/decorators/BatchAsyncCacheStoreTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.decorators;
 
 import java.io.File;
diff --git a/core/src/test/java/org/infinispan/loaders/decorators/ChainingCacheLoaderTest.java b/core/src/test/java/org/infinispan/loaders/decorators/ChainingCacheLoaderTest.java
index 0c89e8925fdd..2a90a2e7fa1f 100644
--- a/core/src/test/java/org/infinispan/loaders/decorators/ChainingCacheLoaderTest.java
+++ b/core/src/test/java/org/infinispan/loaders/decorators/ChainingCacheLoaderTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.decorators;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/loaders/decorators/ReadOnlyCacheStoreTest.java b/core/src/test/java/org/infinispan/loaders/decorators/ReadOnlyCacheStoreTest.java
index 2ab126b7d83f..0aa4e2ab3dda 100644
--- a/core/src/test/java/org/infinispan/loaders/decorators/ReadOnlyCacheStoreTest.java
+++ b/core/src/test/java/org/infinispan/loaders/decorators/ReadOnlyCacheStoreTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.decorators;
 
 import static org.mockito.Matchers.eq;
diff --git a/core/src/test/java/org/infinispan/loaders/decorators/SingletonStoreTest.java b/core/src/test/java/org/infinispan/loaders/decorators/SingletonStoreTest.java
index 9f43364a2d13..3c9f31a4167a 100644
--- a/core/src/test/java/org/infinispan/loaders/decorators/SingletonStoreTest.java
+++ b/core/src/test/java/org/infinispan/loaders/decorators/SingletonStoreTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.decorators;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStore.java b/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStore.java
index 9511f106e183..fcae8851061b 100644
--- a/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStore.java
+++ b/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStore.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.dummy;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStoreConfiguration.java b/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStoreConfiguration.java
index d553e6a8b95f..b67265413699 100644
--- a/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStoreConfiguration.java
+++ b/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStoreConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.dummy;
 
 import org.infinispan.commons.configuration.BuiltBy;
diff --git a/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStoreConfigurationBuilder.java b/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStoreConfigurationBuilder.java
index e794f68470e5..2c7199fdece5 100644
--- a/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStoreConfigurationBuilder.java
+++ b/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStoreConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.loaders.dummy;
 
 import org.infinispan.commons.util.TypedProperties;
diff --git a/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStoreFunctionalTest.java b/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStoreFunctionalTest.java
index 1c234045f677..ddd6f8f52aab 100644
--- a/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStoreFunctionalTest.java
+++ b/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStoreFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.dummy;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStoreTest.java b/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStoreTest.java
index ed18829ba41d..82e453f0dddf 100644
--- a/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStoreTest.java
+++ b/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStoreTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.dummy;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/loaders/file/ClusterFileCacheStoreFunctionalTest.java b/core/src/test/java/org/infinispan/loaders/file/ClusterFileCacheStoreFunctionalTest.java
index 05a82f2371c8..09c3eff8c3f3 100644
--- a/core/src/test/java/org/infinispan/loaders/file/ClusterFileCacheStoreFunctionalTest.java
+++ b/core/src/test/java/org/infinispan/loaders/file/ClusterFileCacheStoreFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.file;
 
 import java.io.File;
diff --git a/core/src/test/java/org/infinispan/loaders/file/FileCacheStoreFunctionalTest.java b/core/src/test/java/org/infinispan/loaders/file/FileCacheStoreFunctionalTest.java
index 301d5737e8c1..33f3edb8bb56 100644
--- a/core/src/test/java/org/infinispan/loaders/file/FileCacheStoreFunctionalTest.java
+++ b/core/src/test/java/org/infinispan/loaders/file/FileCacheStoreFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.file;
 
 import java.io.File;
diff --git a/core/src/test/java/org/infinispan/loaders/file/FileCacheStorePerWriteTest.java b/core/src/test/java/org/infinispan/loaders/file/FileCacheStorePerWriteTest.java
index 77a805ab4445..1d3b8971afbe 100644
--- a/core/src/test/java/org/infinispan/loaders/file/FileCacheStorePerWriteTest.java
+++ b/core/src/test/java/org/infinispan/loaders/file/FileCacheStorePerWriteTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.file;
 
 import org.infinispan.loaders.bucket.Bucket;
diff --git a/core/src/test/java/org/infinispan/loaders/file/FileCacheStorePeriodicTest.java b/core/src/test/java/org/infinispan/loaders/file/FileCacheStorePeriodicTest.java
index 0cb8ea892c0b..cb50ce3af93c 100644
--- a/core/src/test/java/org/infinispan/loaders/file/FileCacheStorePeriodicTest.java
+++ b/core/src/test/java/org/infinispan/loaders/file/FileCacheStorePeriodicTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.file;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/loaders/file/FileCacheStoreTest.java b/core/src/test/java/org/infinispan/loaders/file/FileCacheStoreTest.java
index aca56da25e46..75cb617e9e98 100644
--- a/core/src/test/java/org/infinispan/loaders/file/FileCacheStoreTest.java
+++ b/core/src/test/java/org/infinispan/loaders/file/FileCacheStoreTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.file;
 
 import org.infinispan.container.entries.InternalCacheEntry;
diff --git a/core/src/test/java/org/infinispan/loaders/file/FileCacheStoreVamTest.java b/core/src/test/java/org/infinispan/loaders/file/FileCacheStoreVamTest.java
index dfdf37a07902..290218e54243 100644
--- a/core/src/test/java/org/infinispan/loaders/file/FileCacheStoreVamTest.java
+++ b/core/src/test/java/org/infinispan/loaders/file/FileCacheStoreVamTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.file;
 
 import org.infinispan.manager.EmbeddedCacheManager;
diff --git a/core/src/test/java/org/infinispan/loaders/keymappers/DefaultTwoWayKey2StringMapperTest.java b/core/src/test/java/org/infinispan/loaders/keymappers/DefaultTwoWayKey2StringMapperTest.java
index ed488b6a79db..cb22187baf64 100644
--- a/core/src/test/java/org/infinispan/loaders/keymappers/DefaultTwoWayKey2StringMapperTest.java
+++ b/core/src/test/java/org/infinispan/loaders/keymappers/DefaultTwoWayKey2StringMapperTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders.keymappers;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/lock/APIDistTest.java b/core/src/test/java/org/infinispan/lock/APIDistTest.java
index 2bcae48dcad7..7df65deeacf5 100644
--- a/core/src/test/java/org/infinispan/lock/APIDistTest.java
+++ b/core/src/test/java/org/infinispan/lock/APIDistTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lock;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/lock/APITest.java b/core/src/test/java/org/infinispan/lock/APITest.java
index 6e9e6a00ed82..662e8502e6c3 100644
--- a/core/src/test/java/org/infinispan/lock/APITest.java
+++ b/core/src/test/java/org/infinispan/lock/APITest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lock;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/test/java/org/infinispan/lock/CheckNoRemoteCallForLocalKeyDistTest.java b/core/src/test/java/org/infinispan/lock/CheckNoRemoteCallForLocalKeyDistTest.java
index 6e363753eab6..137013ae0c55 100644
--- a/core/src/test/java/org/infinispan/lock/CheckNoRemoteCallForLocalKeyDistTest.java
+++ b/core/src/test/java/org/infinispan/lock/CheckNoRemoteCallForLocalKeyDistTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/lock/CheckNoRemoteCallForLocalKeyTest.java b/core/src/test/java/org/infinispan/lock/CheckNoRemoteCallForLocalKeyTest.java
index ff154fba1830..8255b504e54d 100644
--- a/core/src/test/java/org/infinispan/lock/CheckNoRemoteCallForLocalKeyTest.java
+++ b/core/src/test/java/org/infinispan/lock/CheckNoRemoteCallForLocalKeyTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/lock/CheckRemoteLockAcquiredOnlyOnceDistTest.java b/core/src/test/java/org/infinispan/lock/CheckRemoteLockAcquiredOnlyOnceDistTest.java
index 7a707baf800a..f73efc4a4841 100644
--- a/core/src/test/java/org/infinispan/lock/CheckRemoteLockAcquiredOnlyOnceDistTest.java
+++ b/core/src/test/java/org/infinispan/lock/CheckRemoteLockAcquiredOnlyOnceDistTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/lock/CheckRemoteLockAcquiredOnlyOnceTest.java b/core/src/test/java/org/infinispan/lock/CheckRemoteLockAcquiredOnlyOnceTest.java
index 856f2a109f1c..1bc0a169c1b2 100644
--- a/core/src/test/java/org/infinispan/lock/CheckRemoteLockAcquiredOnlyOnceTest.java
+++ b/core/src/test/java/org/infinispan/lock/CheckRemoteLockAcquiredOnlyOnceTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock;
 
 import org.infinispan.commands.control.LockControlCommand;
diff --git a/core/src/test/java/org/infinispan/lock/ExplicitLockingAndOptimisticCachesTest.java b/core/src/test/java/org/infinispan/lock/ExplicitLockingAndOptimisticCachesTest.java
index bd716813ab09..a6a40bb415b9 100644
--- a/core/src/test/java/org/infinispan/lock/ExplicitLockingAndOptimisticCachesTest.java
+++ b/core/src/test/java/org/infinispan/lock/ExplicitLockingAndOptimisticCachesTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/test/java/org/infinispan/lock/FailInterceptor.java b/core/src/test/java/org/infinispan/lock/FailInterceptor.java
index a9c6c96b9cff..129b97d9d995 100644
--- a/core/src/test/java/org/infinispan/lock/FailInterceptor.java
+++ b/core/src/test/java/org/infinispan/lock/FailInterceptor.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.lock;
 
 import org.infinispan.commands.ReplicableCommand;
diff --git a/core/src/test/java/org/infinispan/lock/InvalidationModePessimisticLockReleaseTest.java b/core/src/test/java/org/infinispan/lock/InvalidationModePessimisticLockReleaseTest.java
index e6a2b195bcc9..d5012afd5c9f 100644
--- a/core/src/test/java/org/infinispan/lock/InvalidationModePessimisticLockReleaseTest.java
+++ b/core/src/test/java/org/infinispan/lock/InvalidationModePessimisticLockReleaseTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/lock/L1LockTest.java b/core/src/test/java/org/infinispan/lock/L1LockTest.java
index c2ea0010ed1e..1da1294e1ddc 100644
--- a/core/src/test/java/org/infinispan/lock/L1LockTest.java
+++ b/core/src/test/java/org/infinispan/lock/L1LockTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/lock/LockContainerHashingTest.java b/core/src/test/java/org/infinispan/lock/LockContainerHashingTest.java
index 7d529f3d56c8..ff0a6670bb3a 100644
--- a/core/src/test/java/org/infinispan/lock/LockContainerHashingTest.java
+++ b/core/src/test/java/org/infinispan/lock/LockContainerHashingTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lock;
 
 import org.infinispan.test.AbstractInfinispanTest;
diff --git a/core/src/test/java/org/infinispan/lock/SimpleLockContainerTest.java b/core/src/test/java/org/infinispan/lock/SimpleLockContainerTest.java
index 2ecaf2eda026..c7551e3f6b42 100644
--- a/core/src/test/java/org/infinispan/lock/SimpleLockContainerTest.java
+++ b/core/src/test/java/org/infinispan/lock/SimpleLockContainerTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock;
 
 import org.infinispan.interceptors.EntryWrappingInterceptor;
diff --git a/core/src/test/java/org/infinispan/lock/StaleEagerLocksOnPrepareFailureTest.java b/core/src/test/java/org/infinispan/lock/StaleEagerLocksOnPrepareFailureTest.java
index 0b6df116471a..6f026fd9edb5 100644
--- a/core/src/test/java/org/infinispan/lock/StaleEagerLocksOnPrepareFailureTest.java
+++ b/core/src/test/java/org/infinispan/lock/StaleEagerLocksOnPrepareFailureTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lock;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/lock/StaleLocksOnPrepareFailureTest.java b/core/src/test/java/org/infinispan/lock/StaleLocksOnPrepareFailureTest.java
index b2169b357830..aae874738317 100644
--- a/core/src/test/java/org/infinispan/lock/StaleLocksOnPrepareFailureTest.java
+++ b/core/src/test/java/org/infinispan/lock/StaleLocksOnPrepareFailureTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lock;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/lock/StaleLocksTransactionTest.java b/core/src/test/java/org/infinispan/lock/StaleLocksTransactionTest.java
index 3585c5487f2b..a311f940f8cc 100644
--- a/core/src/test/java/org/infinispan/lock/StaleLocksTransactionTest.java
+++ b/core/src/test/java/org/infinispan/lock/StaleLocksTransactionTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lock;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/lock/StripedLockTest.java b/core/src/test/java/org/infinispan/lock/StripedLockTest.java
index a840ac5ce226..53f7f65a91e8 100644
--- a/core/src/test/java/org/infinispan/lock/StripedLockTest.java
+++ b/core/src/test/java/org/infinispan/lock/StripedLockTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lock;
 
 import org.infinispan.test.AbstractInfinispanTest;
diff --git a/core/src/test/java/org/infinispan/lock/singlelock/AbstractCrashTest.java b/core/src/test/java/org/infinispan/lock/singlelock/AbstractCrashTest.java
index db3e8122377a..ca57deee1ca8 100644
--- a/core/src/test/java/org/infinispan/lock/singlelock/AbstractCrashTest.java
+++ b/core/src/test/java/org/infinispan/lock/singlelock/AbstractCrashTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock.singlelock;
 
 import org.infinispan.commands.ReplicableCommand;
diff --git a/core/src/test/java/org/infinispan/lock/singlelock/AbstractInitiatorCrashTest.java b/core/src/test/java/org/infinispan/lock/singlelock/AbstractInitiatorCrashTest.java
index 8ba88e5463aa..8e3512f10db6 100644
--- a/core/src/test/java/org/infinispan/lock/singlelock/AbstractInitiatorCrashTest.java
+++ b/core/src/test/java/org/infinispan/lock/singlelock/AbstractInitiatorCrashTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock.singlelock;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/lock/singlelock/AbstractLockOwnerCrashTest.java b/core/src/test/java/org/infinispan/lock/singlelock/AbstractLockOwnerCrashTest.java
index ea2969b99483..a0852b3f4ff7 100644
--- a/core/src/test/java/org/infinispan/lock/singlelock/AbstractLockOwnerCrashTest.java
+++ b/core/src/test/java/org/infinispan/lock/singlelock/AbstractLockOwnerCrashTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock.singlelock;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/lock/singlelock/AbstractNoCrashTest.java b/core/src/test/java/org/infinispan/lock/singlelock/AbstractNoCrashTest.java
index fde0745a704b..eb5f877d91c2 100644
--- a/core/src/test/java/org/infinispan/lock/singlelock/AbstractNoCrashTest.java
+++ b/core/src/test/java/org/infinispan/lock/singlelock/AbstractNoCrashTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock.singlelock;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/lock/singlelock/MainOwnerChangesLockTest.java b/core/src/test/java/org/infinispan/lock/singlelock/MainOwnerChangesLockTest.java
index b0666a3f4fb0..95eb3d9c1b1e 100644
--- a/core/src/test/java/org/infinispan/lock/singlelock/MainOwnerChangesLockTest.java
+++ b/core/src/test/java/org/infinispan/lock/singlelock/MainOwnerChangesLockTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock.singlelock;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/lock/singlelock/MainOwnerChangesPessimisticLockTest.java b/core/src/test/java/org/infinispan/lock/singlelock/MainOwnerChangesPessimisticLockTest.java
index 82d602f9afe3..feae82604d07 100644
--- a/core/src/test/java/org/infinispan/lock/singlelock/MainOwnerChangesPessimisticLockTest.java
+++ b/core/src/test/java/org/infinispan/lock/singlelock/MainOwnerChangesPessimisticLockTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock.singlelock;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/lock/singlelock/MinViewIdCalculusTest.java b/core/src/test/java/org/infinispan/lock/singlelock/MinViewIdCalculusTest.java
index e50c1dcb2346..bd655a5c248f 100644
--- a/core/src/test/java/org/infinispan/lock/singlelock/MinViewIdCalculusTest.java
+++ b/core/src/test/java/org/infinispan/lock/singlelock/MinViewIdCalculusTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock.singlelock;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/lock/singlelock/NoPrepareRpcForPessimisticTransactionsTest.java b/core/src/test/java/org/infinispan/lock/singlelock/NoPrepareRpcForPessimisticTransactionsTest.java
index 612aa0a1249f..c9a671a5ed1b 100644
--- a/core/src/test/java/org/infinispan/lock/singlelock/NoPrepareRpcForPessimisticTransactionsTest.java
+++ b/core/src/test/java/org/infinispan/lock/singlelock/NoPrepareRpcForPessimisticTransactionsTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock.singlelock;
 
 import org.infinispan.commands.tx.CommitCommand;
diff --git a/core/src/test/java/org/infinispan/lock/singlelock/OriginatorBecomesOwnerLockTest.java b/core/src/test/java/org/infinispan/lock/singlelock/OriginatorBecomesOwnerLockTest.java
index 9094500eb442..da7bf19c428e 100644
--- a/core/src/test/java/org/infinispan/lock/singlelock/OriginatorBecomesOwnerLockTest.java
+++ b/core/src/test/java/org/infinispan/lock/singlelock/OriginatorBecomesOwnerLockTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.lock.singlelock;
 
 import java.util.concurrent.Callable;
diff --git a/core/src/test/java/org/infinispan/lock/singlelock/SinglePhaseCommitForPessimisticCachesTest.java b/core/src/test/java/org/infinispan/lock/singlelock/SinglePhaseCommitForPessimisticCachesTest.java
index 0217510aaa42..8e934856419d 100644
--- a/core/src/test/java/org/infinispan/lock/singlelock/SinglePhaseCommitForPessimisticCachesTest.java
+++ b/core/src/test/java/org/infinispan/lock/singlelock/SinglePhaseCommitForPessimisticCachesTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock.singlelock;
 
 import org.infinispan.commands.control.LockControlCommand;
diff --git a/core/src/test/java/org/infinispan/lock/singlelock/optimistic/BasicSingleLockOptimisticTest.java b/core/src/test/java/org/infinispan/lock/singlelock/optimistic/BasicSingleLockOptimisticTest.java
index c34c9468af2e..ca91131f29cc 100644
--- a/core/src/test/java/org/infinispan/lock/singlelock/optimistic/BasicSingleLockOptimisticTest.java
+++ b/core/src/test/java/org/infinispan/lock/singlelock/optimistic/BasicSingleLockOptimisticTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock.singlelock.optimistic;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/lock/singlelock/optimistic/InitiatorCrashOptimisticTest.java b/core/src/test/java/org/infinispan/lock/singlelock/optimistic/InitiatorCrashOptimisticTest.java
index 9bdec108edd5..d5dbd17ff840 100644
--- a/core/src/test/java/org/infinispan/lock/singlelock/optimistic/InitiatorCrashOptimisticTest.java
+++ b/core/src/test/java/org/infinispan/lock/singlelock/optimistic/InitiatorCrashOptimisticTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock.singlelock.optimistic;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/lock/singlelock/optimistic/LockOwnerCrashOptimisticTest.java b/core/src/test/java/org/infinispan/lock/singlelock/optimistic/LockOwnerCrashOptimisticTest.java
index bacde6b34a41..b13c1f39c3f4 100644
--- a/core/src/test/java/org/infinispan/lock/singlelock/optimistic/LockOwnerCrashOptimisticTest.java
+++ b/core/src/test/java/org/infinispan/lock/singlelock/optimistic/LockOwnerCrashOptimisticTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock.singlelock.optimistic;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/lock/singlelock/optimistic/SyncBasicSingleLockOptimisticTest.java b/core/src/test/java/org/infinispan/lock/singlelock/optimistic/SyncBasicSingleLockOptimisticTest.java
index 3f48d8decf7c..e893bfc547b5 100644
--- a/core/src/test/java/org/infinispan/lock/singlelock/optimistic/SyncBasicSingleLockOptimisticTest.java
+++ b/core/src/test/java/org/infinispan/lock/singlelock/optimistic/SyncBasicSingleLockOptimisticTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock.singlelock.optimistic;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/lock/singlelock/pessimistic/BasicSingleLockPessimisticTest.java b/core/src/test/java/org/infinispan/lock/singlelock/pessimistic/BasicSingleLockPessimisticTest.java
index 914b9025ffc1..af595c630167 100644
--- a/core/src/test/java/org/infinispan/lock/singlelock/pessimistic/BasicSingleLockPessimisticTest.java
+++ b/core/src/test/java/org/infinispan/lock/singlelock/pessimistic/BasicSingleLockPessimisticTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock.singlelock.pessimistic;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/lock/singlelock/pessimistic/InitiatorCrashPessimisticTest.java b/core/src/test/java/org/infinispan/lock/singlelock/pessimistic/InitiatorCrashPessimisticTest.java
index 9724a4e7671b..b65682845502 100644
--- a/core/src/test/java/org/infinispan/lock/singlelock/pessimistic/InitiatorCrashPessimisticTest.java
+++ b/core/src/test/java/org/infinispan/lock/singlelock/pessimistic/InitiatorCrashPessimisticTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock.singlelock.pessimistic;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/lock/singlelock/pessimistic/LockOwnerCrashPessimisticTest.java b/core/src/test/java/org/infinispan/lock/singlelock/pessimistic/LockOwnerCrashPessimisticTest.java
index a8b4be6750c4..c0906379bc98 100644
--- a/core/src/test/java/org/infinispan/lock/singlelock/pessimistic/LockOwnerCrashPessimisticTest.java
+++ b/core/src/test/java/org/infinispan/lock/singlelock/pessimistic/LockOwnerCrashPessimisticTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock.singlelock.pessimistic;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/lock/singlelock/pessimistic/SyncBasicSingleLockPessimisticTest.java b/core/src/test/java/org/infinispan/lock/singlelock/pessimistic/SyncBasicSingleLockPessimisticTest.java
index 67cc5f07a495..42a35c89cc6c 100644
--- a/core/src/test/java/org/infinispan/lock/singlelock/pessimistic/SyncBasicSingleLockPessimisticTest.java
+++ b/core/src/test/java/org/infinispan/lock/singlelock/pessimistic/SyncBasicSingleLockPessimisticTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock.singlelock.pessimistic;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/lock/singlelock/replicated/optimistic/BasicSingleLockReplOptTest.java b/core/src/test/java/org/infinispan/lock/singlelock/replicated/optimistic/BasicSingleLockReplOptTest.java
index dc25a6812d7a..d634c62b2666 100644
--- a/core/src/test/java/org/infinispan/lock/singlelock/replicated/optimistic/BasicSingleLockReplOptTest.java
+++ b/core/src/test/java/org/infinispan/lock/singlelock/replicated/optimistic/BasicSingleLockReplOptTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock.singlelock.replicated.optimistic;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/lock/singlelock/replicated/optimistic/InitiatorCrashOptimisticReplTest.java b/core/src/test/java/org/infinispan/lock/singlelock/replicated/optimistic/InitiatorCrashOptimisticReplTest.java
index f77cdc35f1b7..2ded6fb99010 100644
--- a/core/src/test/java/org/infinispan/lock/singlelock/replicated/optimistic/InitiatorCrashOptimisticReplTest.java
+++ b/core/src/test/java/org/infinispan/lock/singlelock/replicated/optimistic/InitiatorCrashOptimisticReplTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock.singlelock.replicated.optimistic;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/lock/singlelock/replicated/optimistic/LockOwnerCrashOptimisticReplTest.java b/core/src/test/java/org/infinispan/lock/singlelock/replicated/optimistic/LockOwnerCrashOptimisticReplTest.java
index dc57ce08c4af..d7cc6f485e02 100644
--- a/core/src/test/java/org/infinispan/lock/singlelock/replicated/optimistic/LockOwnerCrashOptimisticReplTest.java
+++ b/core/src/test/java/org/infinispan/lock/singlelock/replicated/optimistic/LockOwnerCrashOptimisticReplTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock.singlelock.replicated.optimistic;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/lock/singlelock/replicated/pessimistic/BasicSingleLockRepPessimisticTest.java b/core/src/test/java/org/infinispan/lock/singlelock/replicated/pessimistic/BasicSingleLockRepPessimisticTest.java
index c63ad0c7de1d..696335cc4211 100644
--- a/core/src/test/java/org/infinispan/lock/singlelock/replicated/pessimistic/BasicSingleLockRepPessimisticTest.java
+++ b/core/src/test/java/org/infinispan/lock/singlelock/replicated/pessimistic/BasicSingleLockRepPessimisticTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock.singlelock.replicated.pessimistic;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/lock/singlelock/replicated/pessimistic/InitiatorCrashPessimisticReplTest.java b/core/src/test/java/org/infinispan/lock/singlelock/replicated/pessimistic/InitiatorCrashPessimisticReplTest.java
index a219452074c7..88449d764314 100644
--- a/core/src/test/java/org/infinispan/lock/singlelock/replicated/pessimistic/InitiatorCrashPessimisticReplTest.java
+++ b/core/src/test/java/org/infinispan/lock/singlelock/replicated/pessimistic/InitiatorCrashPessimisticReplTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock.singlelock.replicated.pessimistic;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/lock/singlelock/replicated/pessimistic/LockOwnerCrashPessimisticReplTest.java b/core/src/test/java/org/infinispan/lock/singlelock/replicated/pessimistic/LockOwnerCrashPessimisticReplTest.java
index 27e820cc2529..5eb889d6e428 100644
--- a/core/src/test/java/org/infinispan/lock/singlelock/replicated/pessimistic/LockOwnerCrashPessimisticReplTest.java
+++ b/core/src/test/java/org/infinispan/lock/singlelock/replicated/pessimistic/LockOwnerCrashPessimisticReplTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lock.singlelock.replicated.pessimistic;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/manager/CacheManagerComponentRegistryTest.java b/core/src/test/java/org/infinispan/manager/CacheManagerComponentRegistryTest.java
index 1068c74fa202..6aad51c50ba9 100644
--- a/core/src/test/java/org/infinispan/manager/CacheManagerComponentRegistryTest.java
+++ b/core/src/test/java/org/infinispan/manager/CacheManagerComponentRegistryTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.manager;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/manager/CacheManagerTest.java b/core/src/test/java/org/infinispan/manager/CacheManagerTest.java
index 0bc904fd55ae..f47a6b21f730 100644
--- a/core/src/test/java/org/infinispan/manager/CacheManagerTest.java
+++ b/core/src/test/java/org/infinispan/manager/CacheManagerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.manager;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/manager/CacheManagerXmlConfigurationTest.java b/core/src/test/java/org/infinispan/manager/CacheManagerXmlConfigurationTest.java
index a73b8d86684e..dce143fb8ceb 100644
--- a/core/src/test/java/org/infinispan/manager/CacheManagerXmlConfigurationTest.java
+++ b/core/src/test/java/org/infinispan/manager/CacheManagerXmlConfigurationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.manager;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/manager/ConcurrentCacheManagerTest.java b/core/src/test/java/org/infinispan/manager/ConcurrentCacheManagerTest.java
index 18fd7addfe20..8f31fe2b0bee 100644
--- a/core/src/test/java/org/infinispan/manager/ConcurrentCacheManagerTest.java
+++ b/core/src/test/java/org/infinispan/manager/ConcurrentCacheManagerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.manager;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/marshall/AdvancedExternalizerQuickConfigTest.java b/core/src/test/java/org/infinispan/marshall/AdvancedExternalizerQuickConfigTest.java
index 35573ce9a39c..12dd36d5d226 100644
--- a/core/src/test/java/org/infinispan/marshall/AdvancedExternalizerQuickConfigTest.java
+++ b/core/src/test/java/org/infinispan/marshall/AdvancedExternalizerQuickConfigTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.marshall;
 
 import org.infinispan.commons.marshall.AdvancedExternalizer;
diff --git a/core/src/test/java/org/infinispan/marshall/AdvancedExternalizerTest.java b/core/src/test/java/org/infinispan/marshall/AdvancedExternalizerTest.java
index 1c55348d1f52..d050bb11883f 100644
--- a/core/src/test/java/org/infinispan/marshall/AdvancedExternalizerTest.java
+++ b/core/src/test/java/org/infinispan/marshall/AdvancedExternalizerTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.marshall;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/marshall/ConcurrentMarshallerTest.java b/core/src/test/java/org/infinispan/marshall/ConcurrentMarshallerTest.java
index 31829d34471e..e7b4e3c488be 100644
--- a/core/src/test/java/org/infinispan/marshall/ConcurrentMarshallerTest.java
+++ b/core/src/test/java/org/infinispan/marshall/ConcurrentMarshallerTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.marshall;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/marshall/DefensiveCopyTest.java b/core/src/test/java/org/infinispan/marshall/DefensiveCopyTest.java
index e4d0a8aa00e1..9f80447c97a3 100644
--- a/core/src/test/java/org/infinispan/marshall/DefensiveCopyTest.java
+++ b/core/src/test/java/org/infinispan/marshall/DefensiveCopyTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.marshall;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/marshall/DuplicateIdTest.java b/core/src/test/java/org/infinispan/marshall/DuplicateIdTest.java
index 31e106092caa..d75043a9e951 100644
--- a/core/src/test/java/org/infinispan/marshall/DuplicateIdTest.java
+++ b/core/src/test/java/org/infinispan/marshall/DuplicateIdTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.marshall;
 
 import org.infinispan.marshall.core.Ids;
diff --git a/core/src/test/java/org/infinispan/marshall/InvalidatedMarshalledValueTest.java b/core/src/test/java/org/infinispan/marshall/InvalidatedMarshalledValueTest.java
index 10200c1ff210..67027554a8b3 100644
--- a/core/src/test/java/org/infinispan/marshall/InvalidatedMarshalledValueTest.java
+++ b/core/src/test/java/org/infinispan/marshall/InvalidatedMarshalledValueTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.marshall;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/marshall/MarshallExternalPojosTest.java b/core/src/test/java/org/infinispan/marshall/MarshallExternalPojosTest.java
index 3d7940212b1c..354a3d7bf110 100644
--- a/core/src/test/java/org/infinispan/marshall/MarshallExternalPojosTest.java
+++ b/core/src/test/java/org/infinispan/marshall/MarshallExternalPojosTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.marshall;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/marshall/MarshalledValueSingleNodeTest.java b/core/src/test/java/org/infinispan/marshall/MarshalledValueSingleNodeTest.java
index d5d674a7b137..74b2ac6e3760 100644
--- a/core/src/test/java/org/infinispan/marshall/MarshalledValueSingleNodeTest.java
+++ b/core/src/test/java/org/infinispan/marshall/MarshalledValueSingleNodeTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.marshall;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/test/java/org/infinispan/marshall/MarshalledValuesFineGrainedTest.java b/core/src/test/java/org/infinispan/marshall/MarshalledValuesFineGrainedTest.java
index 501d30b61f10..817c0eed16f7 100644
--- a/core/src/test/java/org/infinispan/marshall/MarshalledValuesFineGrainedTest.java
+++ b/core/src/test/java/org/infinispan/marshall/MarshalledValuesFineGrainedTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.marshall;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/marshall/MarshallerPickAfterCacheRestart.java b/core/src/test/java/org/infinispan/marshall/MarshallerPickAfterCacheRestart.java
index be1c300acc56..0e11a728f44c 100644
--- a/core/src/test/java/org/infinispan/marshall/MarshallerPickAfterCacheRestart.java
+++ b/core/src/test/java/org/infinispan/marshall/MarshallerPickAfterCacheRestart.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.marshall;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/marshall/SharedStreamMultiMarshallerTest.java b/core/src/test/java/org/infinispan/marshall/SharedStreamMultiMarshallerTest.java
index 7df9a25b4ffa..0481c52618a6 100644
--- a/core/src/test/java/org/infinispan/marshall/SharedStreamMultiMarshallerTest.java
+++ b/core/src/test/java/org/infinispan/marshall/SharedStreamMultiMarshallerTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.marshall;
 
 import org.infinispan.metadata.EmbeddedMetadata;
diff --git a/core/src/test/java/org/infinispan/marshall/StoreAsBinaryConfigTest.java b/core/src/test/java/org/infinispan/marshall/StoreAsBinaryConfigTest.java
index 589ec30b39e0..8445a953776f 100644
--- a/core/src/test/java/org/infinispan/marshall/StoreAsBinaryConfigTest.java
+++ b/core/src/test/java/org/infinispan/marshall/StoreAsBinaryConfigTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.marshall;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/marshall/TestObjectStreamMarshaller.java b/core/src/test/java/org/infinispan/marshall/TestObjectStreamMarshaller.java
index 0b0dc7161e88..2ca13e99b750 100644
--- a/core/src/test/java/org/infinispan/marshall/TestObjectStreamMarshaller.java
+++ b/core/src/test/java/org/infinispan/marshall/TestObjectStreamMarshaller.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.marshall;
 
 import java.io.ByteArrayInputStream;
diff --git a/core/src/test/java/org/infinispan/marshall/VersionAwareMarshallerTest.java b/core/src/test/java/org/infinispan/marshall/VersionAwareMarshallerTest.java
index 58970f195f0b..c13c111776d3 100644
--- a/core/src/test/java/org/infinispan/marshall/VersionAwareMarshallerTest.java
+++ b/core/src/test/java/org/infinispan/marshall/VersionAwareMarshallerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.marshall;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/marshall/core/JBossMarshallerTest.java b/core/src/test/java/org/infinispan/marshall/core/JBossMarshallerTest.java
index 9dc390ada57d..d2c3e902ed6c 100644
--- a/core/src/test/java/org/infinispan/marshall/core/JBossMarshallerTest.java
+++ b/core/src/test/java/org/infinispan/marshall/core/JBossMarshallerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.marshall.core;
 
 import org.infinispan.commons.CacheConfigurationException;
diff --git a/core/src/test/java/org/infinispan/marshall/core/JBossMarshallingTest.java b/core/src/test/java/org/infinispan/marshall/core/JBossMarshallingTest.java
index 422d36e541f8..35a8cd5fffc7 100644
--- a/core/src/test/java/org/infinispan/marshall/core/JBossMarshallingTest.java
+++ b/core/src/test/java/org/infinispan/marshall/core/JBossMarshallingTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.marshall.core;
 
 import java.io.ByteArrayInputStream;
diff --git a/core/src/test/java/org/infinispan/marshall/core/MarshalledValueTest.java b/core/src/test/java/org/infinispan/marshall/core/MarshalledValueTest.java
index f155130fccb5..5961578abeb4 100644
--- a/core/src/test/java/org/infinispan/marshall/core/MarshalledValueTest.java
+++ b/core/src/test/java/org/infinispan/marshall/core/MarshalledValueTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.marshall.core;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/marshall/multiversion/MultiPojoVersionMarshallTest.java b/core/src/test/java/org/infinispan/marshall/multiversion/MultiPojoVersionMarshallTest.java
index ead6dd90c7c2..9d58d211e683 100644
--- a/core/src/test/java/org/infinispan/marshall/multiversion/MultiPojoVersionMarshallTest.java
+++ b/core/src/test/java/org/infinispan/marshall/multiversion/MultiPojoVersionMarshallTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.marshall.multiversion;
 
 import javassist.ClassClassPath;
diff --git a/core/src/test/java/org/infinispan/notifications/AsyncNotificationTest.java b/core/src/test/java/org/infinispan/notifications/AsyncNotificationTest.java
index 185d07c0ba0c..754ebcdd0061 100644
--- a/core/src/test/java/org/infinispan/notifications/AsyncNotificationTest.java
+++ b/core/src/test/java/org/infinispan/notifications/AsyncNotificationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/notifications/CacheListenerCacheLoaderTest.java b/core/src/test/java/org/infinispan/notifications/CacheListenerCacheLoaderTest.java
index a35f0d2dde43..4e0f1617470e 100644
--- a/core/src/test/java/org/infinispan/notifications/CacheListenerCacheLoaderTest.java
+++ b/core/src/test/java/org/infinispan/notifications/CacheListenerCacheLoaderTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/notifications/CacheListenerRemovalTest.java b/core/src/test/java/org/infinispan/notifications/CacheListenerRemovalTest.java
index d538fe914e4a..bf62c50bb7f8 100644
--- a/core/src/test/java/org/infinispan/notifications/CacheListenerRemovalTest.java
+++ b/core/src/test/java/org/infinispan/notifications/CacheListenerRemovalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/notifications/ConcurrentNotificationTest.java b/core/src/test/java/org/infinispan/notifications/ConcurrentNotificationTest.java
index 31e638dbb52e..66ec7033da5e 100644
--- a/core/src/test/java/org/infinispan/notifications/ConcurrentNotificationTest.java
+++ b/core/src/test/java/org/infinispan/notifications/ConcurrentNotificationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/notifications/DistListenerTest.java b/core/src/test/java/org/infinispan/notifications/DistListenerTest.java
index 8379286acb04..41514348e93b 100644
--- a/core/src/test/java/org/infinispan/notifications/DistListenerTest.java
+++ b/core/src/test/java/org/infinispan/notifications/DistListenerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications;
 
 import java.util.List;
diff --git a/core/src/test/java/org/infinispan/notifications/MergeViewTest.java b/core/src/test/java/org/infinispan/notifications/MergeViewTest.java
index ec468f80d2e9..d684e597bed1 100644
--- a/core/src/test/java/org/infinispan/notifications/MergeViewTest.java
+++ b/core/src/test/java/org/infinispan/notifications/MergeViewTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/notifications/cachelistener/CacheListener.java b/core/src/test/java/org/infinispan/notifications/cachelistener/CacheListener.java
index 7ef2aaf77891..162046ade96b 100644
--- a/core/src/test/java/org/infinispan/notifications/cachelistener/CacheListener.java
+++ b/core/src/test/java/org/infinispan/notifications/cachelistener/CacheListener.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener;
 
 import org.infinispan.notifications.Listener;
diff --git a/core/src/test/java/org/infinispan/notifications/cachelistener/CacheListenerVisibilityTest.java b/core/src/test/java/org/infinispan/notifications/cachelistener/CacheListenerVisibilityTest.java
index f31a9fd6e431..47e58bc10034 100644
--- a/core/src/test/java/org/infinispan/notifications/cachelistener/CacheListenerVisibilityTest.java
+++ b/core/src/test/java/org/infinispan/notifications/cachelistener/CacheListenerVisibilityTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.notifications.cachelistener;
 
 import org.infinispan.manager.EmbeddedCacheManager;
diff --git a/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierImplTest.java b/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierImplTest.java
index eee89e95db9c..ca169526e451 100644
--- a/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierImplTest.java
+++ b/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierImplTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierTest.java b/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierTest.java
index c185debe50d3..372a458bda4e 100644
--- a/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierTest.java
+++ b/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.notifications.cachelistener;
 
 import static org.mockito.Matchers.any;
diff --git a/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierTxTest.java b/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierTxTest.java
index 2d0399cc1396..8703caec6ae2 100644
--- a/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierTxTest.java
+++ b/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierTxTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener;
 
 import static org.mockito.Matchers.*;
diff --git a/core/src/test/java/org/infinispan/notifications/cachelistener/CustomClassLoaderListenerTest.java b/core/src/test/java/org/infinispan/notifications/cachelistener/CustomClassLoaderListenerTest.java
index f0ee4519271f..a01fc931205a 100644
--- a/core/src/test/java/org/infinispan/notifications/cachelistener/CustomClassLoaderListenerTest.java
+++ b/core/src/test/java/org/infinispan/notifications/cachelistener/CustomClassLoaderListenerTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.notifications.cachelistener;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/notifications/cachelistener/ListenerExceptionTest.java b/core/src/test/java/org/infinispan/notifications/cachelistener/ListenerExceptionTest.java
index 4b941ef0aaae..7729cd2cf9c2 100644
--- a/core/src/test/java/org/infinispan/notifications/cachelistener/ListenerExceptionTest.java
+++ b/core/src/test/java/org/infinispan/notifications/cachelistener/ListenerExceptionTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.notifications.cachelistener;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/notifications/cachelistener/ListenerExceptionWithSynchronizationTest.java b/core/src/test/java/org/infinispan/notifications/cachelistener/ListenerExceptionWithSynchronizationTest.java
index 2f362a618918..cedcddc835e8 100644
--- a/core/src/test/java/org/infinispan/notifications/cachelistener/ListenerExceptionWithSynchronizationTest.java
+++ b/core/src/test/java/org/infinispan/notifications/cachelistener/ListenerExceptionWithSynchronizationTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.notifications.cachelistener;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/notifications/cachelistener/ListenerRegistrationTest.java b/core/src/test/java/org/infinispan/notifications/cachelistener/ListenerRegistrationTest.java
index 1b2c384e213e..8049772fe80c 100644
--- a/core/src/test/java/org/infinispan/notifications/cachelistener/ListenerRegistrationTest.java
+++ b/core/src/test/java/org/infinispan/notifications/cachelistener/ListenerRegistrationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachelistener;
 
 import org.infinispan.notifications.IncorrectListenerException;
diff --git a/core/src/test/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerListener.java b/core/src/test/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerListener.java
index 248e6532609b..aa5c8aed22fa 100644
--- a/core/src/test/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerListener.java
+++ b/core/src/test/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerListener.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachemanagerlistener;
 
 import org.infinispan.notifications.Listener;
diff --git a/core/src/test/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierImplTest.java b/core/src/test/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierImplTest.java
index dabc6909b119..ddf194651521 100644
--- a/core/src/test/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierImplTest.java
+++ b/core/src/test/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierImplTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachemanagerlistener;
 
 import org.infinispan.notifications.cachemanagerlistener.event.CacheStartedEvent;
diff --git a/core/src/test/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierTest.java b/core/src/test/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierTest.java
index 8e53de05582e..d60b460e9d1e 100644
--- a/core/src/test/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierTest.java
+++ b/core/src/test/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.notifications.cachemanagerlistener;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/profiling/AbstractProfileTest.java b/core/src/test/java/org/infinispan/profiling/AbstractProfileTest.java
index 43a1f6b3271a..574a75b3a035 100644
--- a/core/src/test/java/org/infinispan/profiling/AbstractProfileTest.java
+++ b/core/src/test/java/org/infinispan/profiling/AbstractProfileTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.profiling;
 
 import org.infinispan.commons.executors.ExecutorFactory;
diff --git a/core/src/test/java/org/infinispan/profiling/CacheCreationStressTest.java b/core/src/test/java/org/infinispan/profiling/CacheCreationStressTest.java
index 2ab162a1143a..8fa20ebd6313 100644
--- a/core/src/test/java/org/infinispan/profiling/CacheCreationStressTest.java
+++ b/core/src/test/java/org/infinispan/profiling/CacheCreationStressTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.profiling;
 
 import org.infinispan.test.AbstractInfinispanTest;
diff --git a/core/src/test/java/org/infinispan/profiling/DeadlockDetectionPerformanceTest.java b/core/src/test/java/org/infinispan/profiling/DeadlockDetectionPerformanceTest.java
index 9b015c05e37c..fc500fd25a99 100644
--- a/core/src/test/java/org/infinispan/profiling/DeadlockDetectionPerformanceTest.java
+++ b/core/src/test/java/org/infinispan/profiling/DeadlockDetectionPerformanceTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.profiling;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/profiling/MemConsumptionTest.java b/core/src/test/java/org/infinispan/profiling/MemConsumptionTest.java
index dbf8127d8360..8c62ad6382f3 100644
--- a/core/src/test/java/org/infinispan/profiling/MemConsumptionTest.java
+++ b/core/src/test/java/org/infinispan/profiling/MemConsumptionTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.profiling;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/profiling/ProfileTest.java b/core/src/test/java/org/infinispan/profiling/ProfileTest.java
index 0fb4f150d8a2..362f4c7470bb 100644
--- a/core/src/test/java/org/infinispan/profiling/ProfileTest.java
+++ b/core/src/test/java/org/infinispan/profiling/ProfileTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.profiling;
 
 import org.infinispan.profiling.testinternals.Generator;
diff --git a/core/src/test/java/org/infinispan/profiling/TestProfileSlave.java b/core/src/test/java/org/infinispan/profiling/TestProfileSlave.java
index 92be663a4052..7a8f4936abb2 100644
--- a/core/src/test/java/org/infinispan/profiling/TestProfileSlave.java
+++ b/core/src/test/java/org/infinispan/profiling/TestProfileSlave.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.profiling;
 
 import org.infinispan.notifications.Listener;
diff --git a/core/src/test/java/org/infinispan/profiling/testinternals/Generator.java b/core/src/test/java/org/infinispan/profiling/testinternals/Generator.java
index b78f8d6b2656..ab7baf3f6381 100644
--- a/core/src/test/java/org/infinispan/profiling/testinternals/Generator.java
+++ b/core/src/test/java/org/infinispan/profiling/testinternals/Generator.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.profiling.testinternals;
 
 //import org.infinispan.tree.Fqn;
diff --git a/core/src/test/java/org/infinispan/profiling/testinternals/TaskRunner.java b/core/src/test/java/org/infinispan/profiling/testinternals/TaskRunner.java
index da4a0c0ccd22..973d04689c86 100644
--- a/core/src/test/java/org/infinispan/profiling/testinternals/TaskRunner.java
+++ b/core/src/test/java/org/infinispan/profiling/testinternals/TaskRunner.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.profiling.testinternals;
 
 import java.util.concurrent.ExecutorService;
diff --git a/core/src/test/java/org/infinispan/remoting/AsynchronousInvocationTest.java b/core/src/test/java/org/infinispan/remoting/AsynchronousInvocationTest.java
index 91dd409af061..277347dad4b8 100644
--- a/core/src/test/java/org/infinispan/remoting/AsynchronousInvocationTest.java
+++ b/core/src/test/java/org/infinispan/remoting/AsynchronousInvocationTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.remoting;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/remoting/MessageSentToLeaverTest.java b/core/src/test/java/org/infinispan/remoting/MessageSentToLeaverTest.java
index 7ab32645cb55..287ec6fe0ad3 100644
--- a/core/src/test/java/org/infinispan/remoting/MessageSentToLeaverTest.java
+++ b/core/src/test/java/org/infinispan/remoting/MessageSentToLeaverTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source 
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.remoting;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/remoting/NonExistentCacheTest.java b/core/src/test/java/org/infinispan/remoting/NonExistentCacheTest.java
index 70185a8ed254..f7609c666a1e 100644
--- a/core/src/test/java/org/infinispan/remoting/NonExistentCacheTest.java
+++ b/core/src/test/java/org/infinispan/remoting/NonExistentCacheTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/test/java/org/infinispan/remoting/RemoteExceptionHandlingWithStateTransferTest.java b/core/src/test/java/org/infinispan/remoting/RemoteExceptionHandlingWithStateTransferTest.java
index 620b4add6cc0..4accd413ac24 100644
--- a/core/src/test/java/org/infinispan/remoting/RemoteExceptionHandlingWithStateTransferTest.java
+++ b/core/src/test/java/org/infinispan/remoting/RemoteExceptionHandlingWithStateTransferTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.remoting;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/remoting/SingleClusterMemberTransportInvokeTest.java b/core/src/test/java/org/infinispan/remoting/SingleClusterMemberTransportInvokeTest.java
index 22ea34fd800a..bdf2716ac832 100644
--- a/core/src/test/java/org/infinispan/remoting/SingleClusterMemberTransportInvokeTest.java
+++ b/core/src/test/java/org/infinispan/remoting/SingleClusterMemberTransportInvokeTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting;
 
 import static org.mockito.Mockito.mock;
diff --git a/core/src/test/java/org/infinispan/remoting/TransportSenderExceptionHandlingTest.java b/core/src/test/java/org/infinispan/remoting/TransportSenderExceptionHandlingTest.java
index 7575ad48722d..19f56cc86d8c 100644
--- a/core/src/test/java/org/infinispan/remoting/TransportSenderExceptionHandlingTest.java
+++ b/core/src/test/java/org/infinispan/remoting/TransportSenderExceptionHandlingTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/remoting/jgroups/ChannelLookupTest.java b/core/src/test/java/org/infinispan/remoting/jgroups/ChannelLookupTest.java
index 6aa60e7f1132..73acbf42f5f6 100644
--- a/core/src/test/java/org/infinispan/remoting/jgroups/ChannelLookupTest.java
+++ b/core/src/test/java/org/infinispan/remoting/jgroups/ChannelLookupTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.jgroups;
 
 import static org.mockito.Matchers.isA;
diff --git a/core/src/test/java/org/infinispan/remoting/jgroups/MissingRpcDispatcherTest.java b/core/src/test/java/org/infinispan/remoting/jgroups/MissingRpcDispatcherTest.java
index a74509054def..2d7d84c5d89c 100644
--- a/core/src/test/java/org/infinispan/remoting/jgroups/MissingRpcDispatcherTest.java
+++ b/core/src/test/java/org/infinispan/remoting/jgroups/MissingRpcDispatcherTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.jgroups;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/remoting/jgroups/NonExistingJGroupsConfigTest.java b/core/src/test/java/org/infinispan/remoting/jgroups/NonExistingJGroupsConfigTest.java
index dd40b5661787..2f6bfea720c4 100644
--- a/core/src/test/java/org/infinispan/remoting/jgroups/NonExistingJGroupsConfigTest.java
+++ b/core/src/test/java/org/infinispan/remoting/jgroups/NonExistingJGroupsConfigTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.remoting.jgroups;
 
 import static org.infinispan.test.TestingUtil.INFINISPAN_START_TAG;
diff --git a/core/src/test/java/org/infinispan/remoting/rpc/CustomCacheRpcCommand.java b/core/src/test/java/org/infinispan/remoting/rpc/CustomCacheRpcCommand.java
index d75c2b7f7138..b2469bd1415c 100644
--- a/core/src/test/java/org/infinispan/remoting/rpc/CustomCacheRpcCommand.java
+++ b/core/src/test/java/org/infinispan/remoting/rpc/CustomCacheRpcCommand.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.remoting.rpc;
 
 import org.infinispan.commands.VisitableCommand;
diff --git a/core/src/test/java/org/infinispan/remoting/rpc/CustomReplicableCommand.java b/core/src/test/java/org/infinispan/remoting/rpc/CustomReplicableCommand.java
index 733a2a8f0e0c..6cfd9a85538e 100644
--- a/core/src/test/java/org/infinispan/remoting/rpc/CustomReplicableCommand.java
+++ b/core/src/test/java/org/infinispan/remoting/rpc/CustomReplicableCommand.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.remoting.rpc;
 
 import org.infinispan.commands.VisitableCommand;
diff --git a/core/src/test/java/org/infinispan/remoting/rpc/RpcManagerCustomCacheRpcCommandTest.java b/core/src/test/java/org/infinispan/remoting/rpc/RpcManagerCustomCacheRpcCommandTest.java
index 48a263af6d8a..b01ac7c06b2b 100644
--- a/core/src/test/java/org/infinispan/remoting/rpc/RpcManagerCustomCacheRpcCommandTest.java
+++ b/core/src/test/java/org/infinispan/remoting/rpc/RpcManagerCustomCacheRpcCommandTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.remoting.rpc;
 
 import org.infinispan.commands.ReplicableCommand;
diff --git a/core/src/test/java/org/infinispan/remoting/rpc/RpcManagerCustomReplicableCommandTest.java b/core/src/test/java/org/infinispan/remoting/rpc/RpcManagerCustomReplicableCommandTest.java
index 5d9d54b7d304..02b2a5dc5b02 100644
--- a/core/src/test/java/org/infinispan/remoting/rpc/RpcManagerCustomReplicableCommandTest.java
+++ b/core/src/test/java/org/infinispan/remoting/rpc/RpcManagerCustomReplicableCommandTest.java
@@ -1,22 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.remoting.rpc;
 
 import org.infinispan.commands.ReplicableCommand;
diff --git a/core/src/test/java/org/infinispan/remoting/rpc/RpcManagerTimeoutTest.java b/core/src/test/java/org/infinispan/remoting/rpc/RpcManagerTimeoutTest.java
index 1c671cdbce83..16fe6884028c 100644
--- a/core/src/test/java/org/infinispan/remoting/rpc/RpcManagerTimeoutTest.java
+++ b/core/src/test/java/org/infinispan/remoting/rpc/RpcManagerTimeoutTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.remoting.rpc;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/remoting/rpc/SleepingCacheRpcCommand.java b/core/src/test/java/org/infinispan/remoting/rpc/SleepingCacheRpcCommand.java
index 383d2e4626cc..332093aa48d6 100644
--- a/core/src/test/java/org/infinispan/remoting/rpc/SleepingCacheRpcCommand.java
+++ b/core/src/test/java/org/infinispan/remoting/rpc/SleepingCacheRpcCommand.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.remoting.rpc;
 
 import org.infinispan.commands.remote.BaseRpcCommand;
diff --git a/core/src/test/java/org/infinispan/remoting/rpc/TestModuleCommandExtensions.java b/core/src/test/java/org/infinispan/remoting/rpc/TestModuleCommandExtensions.java
index 79d42b3a3707..ec8e5b564959 100644
--- a/core/src/test/java/org/infinispan/remoting/rpc/TestModuleCommandExtensions.java
+++ b/core/src/test/java/org/infinispan/remoting/rpc/TestModuleCommandExtensions.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.remoting.rpc;
 
 import org.infinispan.commands.ReplicableCommand;
diff --git a/core/src/test/java/org/infinispan/replication/AsyncAPINonTxAsyncReplTest.java b/core/src/test/java/org/infinispan/replication/AsyncAPINonTxAsyncReplTest.java
index 9dd1d3cc1c9b..957f262c0058 100644
--- a/core/src/test/java/org/infinispan/replication/AsyncAPINonTxAsyncReplTest.java
+++ b/core/src/test/java/org/infinispan/replication/AsyncAPINonTxAsyncReplTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.replication;
 
 import org.infinispan.test.ReplListener;
diff --git a/core/src/test/java/org/infinispan/replication/AsyncAPINonTxSyncReplTest.java b/core/src/test/java/org/infinispan/replication/AsyncAPINonTxSyncReplTest.java
index 7e131a00c454..b20828b9f55d 100644
--- a/core/src/test/java/org/infinispan/replication/AsyncAPINonTxSyncReplTest.java
+++ b/core/src/test/java/org/infinispan/replication/AsyncAPINonTxSyncReplTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.replication;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/test/java/org/infinispan/replication/AsyncAPITxAsyncReplTest.java b/core/src/test/java/org/infinispan/replication/AsyncAPITxAsyncReplTest.java
index 46281627f7c7..901c5dc6221b 100644
--- a/core/src/test/java/org/infinispan/replication/AsyncAPITxAsyncReplTest.java
+++ b/core/src/test/java/org/infinispan/replication/AsyncAPITxAsyncReplTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.replication;
 
 import org.infinispan.commands.write.WriteCommand;
diff --git a/core/src/test/java/org/infinispan/replication/AsyncAPITxSyncReplTest.java b/core/src/test/java/org/infinispan/replication/AsyncAPITxSyncReplTest.java
index 135800da1c12..cf8552d4ffa7 100644
--- a/core/src/test/java/org/infinispan/replication/AsyncAPITxSyncReplTest.java
+++ b/core/src/test/java/org/infinispan/replication/AsyncAPITxSyncReplTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.replication;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/replication/AsyncReplTest.java b/core/src/test/java/org/infinispan/replication/AsyncReplTest.java
index 333486b69fd1..21eba4f2b4ae 100644
--- a/core/src/test/java/org/infinispan/replication/AsyncReplTest.java
+++ b/core/src/test/java/org/infinispan/replication/AsyncReplTest.java
@@ -1,34 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-/*
- *
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
 package org.infinispan.replication;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/replication/AsyncReplicatedAPITest.java b/core/src/test/java/org/infinispan/replication/AsyncReplicatedAPITest.java
index 159444268393..8e1bf458e103 100644
--- a/core/src/test/java/org/infinispan/replication/AsyncReplicatedAPITest.java
+++ b/core/src/test/java/org/infinispan/replication/AsyncReplicatedAPITest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.replication;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/replication/BaseReplicatedAPITest.java b/core/src/test/java/org/infinispan/replication/BaseReplicatedAPITest.java
index c8283fd7f405..763b09eb645e 100644
--- a/core/src/test/java/org/infinispan/replication/BaseReplicatedAPITest.java
+++ b/core/src/test/java/org/infinispan/replication/BaseReplicatedAPITest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.replication;
 
 import static org.infinispan.context.Flag.CACHE_MODE_LOCAL;
diff --git a/core/src/test/java/org/infinispan/replication/ConcurrentFlushReplQueueTest.java b/core/src/test/java/org/infinispan/replication/ConcurrentFlushReplQueueTest.java
index f8e634633baf..cb2c0494106b 100644
--- a/core/src/test/java/org/infinispan/replication/ConcurrentFlushReplQueueTest.java
+++ b/core/src/test/java/org/infinispan/replication/ConcurrentFlushReplQueueTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.replication;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/replication/CustomReplQueueTest.java b/core/src/test/java/org/infinispan/replication/CustomReplQueueTest.java
index 783d8053e1a9..a354c3cfb300 100644
--- a/core/src/test/java/org/infinispan/replication/CustomReplQueueTest.java
+++ b/core/src/test/java/org/infinispan/replication/CustomReplQueueTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.replication;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/replication/FlagsReplicationTest.java b/core/src/test/java/org/infinispan/replication/FlagsReplicationTest.java
index 3de3a4562b4c..d0fae080f8d5 100644
--- a/core/src/test/java/org/infinispan/replication/FlagsReplicationTest.java
+++ b/core/src/test/java/org/infinispan/replication/FlagsReplicationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.replication;
 
 import java.util.concurrent.ExecutionException;
diff --git a/core/src/test/java/org/infinispan/replication/ForceSyncAsyncFlagsTest.java b/core/src/test/java/org/infinispan/replication/ForceSyncAsyncFlagsTest.java
index f58de842b2be..87e7c964847e 100644
--- a/core/src/test/java/org/infinispan/replication/ForceSyncAsyncFlagsTest.java
+++ b/core/src/test/java/org/infinispan/replication/ForceSyncAsyncFlagsTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.replication;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/test/java/org/infinispan/replication/InvokeRemotelyInFutureTest.java b/core/src/test/java/org/infinispan/replication/InvokeRemotelyInFutureTest.java
index 0159a08cddd3..8807387ea860 100644
--- a/core/src/test/java/org/infinispan/replication/InvokeRemotelyInFutureTest.java
+++ b/core/src/test/java/org/infinispan/replication/InvokeRemotelyInFutureTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.replication;
 
 import java.util.concurrent.Future;
diff --git a/core/src/test/java/org/infinispan/replication/ReplQueueRestartTest.java b/core/src/test/java/org/infinispan/replication/ReplQueueRestartTest.java
index 676278020a88..399b074f8373 100644
--- a/core/src/test/java/org/infinispan/replication/ReplQueueRestartTest.java
+++ b/core/src/test/java/org/infinispan/replication/ReplQueueRestartTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.replication;
 
 import static org.mockito.Matchers.any;
diff --git a/core/src/test/java/org/infinispan/replication/ReplicationExceptionTest.java b/core/src/test/java/org/infinispan/replication/ReplicationExceptionTest.java
index fc6a6ee41c2e..a11d030370f6 100644
--- a/core/src/test/java/org/infinispan/replication/ReplicationExceptionTest.java
+++ b/core/src/test/java/org/infinispan/replication/ReplicationExceptionTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.replication;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/test/java/org/infinispan/replication/ReplicationQueueTest.java b/core/src/test/java/org/infinispan/replication/ReplicationQueueTest.java
index e38e6b2b7a65..608f88652de1 100644
--- a/core/src/test/java/org/infinispan/replication/ReplicationQueueTest.java
+++ b/core/src/test/java/org/infinispan/replication/ReplicationQueueTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.replication;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java b/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java
index 0937d4f7fbd7..9a05c11ea4ae 100644
--- a/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java
+++ b/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java
@@ -1,33 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-/*
- *
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
 package org.infinispan.replication;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/replication/SyncReplLockingTest.java b/core/src/test/java/org/infinispan/replication/SyncReplLockingTest.java
index e085226c4b45..477c7e5e18a9 100644
--- a/core/src/test/java/org/infinispan/replication/SyncReplLockingTest.java
+++ b/core/src/test/java/org/infinispan/replication/SyncReplLockingTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.replication;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/replication/SyncReplPessimisticLockingTest.java b/core/src/test/java/org/infinispan/replication/SyncReplPessimisticLockingTest.java
index ec7d5c84b0f2..5b1341538e51 100644
--- a/core/src/test/java/org/infinispan/replication/SyncReplPessimisticLockingTest.java
+++ b/core/src/test/java/org/infinispan/replication/SyncReplPessimisticLockingTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.replication;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/replication/SyncReplTest.java b/core/src/test/java/org/infinispan/replication/SyncReplTest.java
index 2a46413977c7..47fdf7439762 100644
--- a/core/src/test/java/org/infinispan/replication/SyncReplTest.java
+++ b/core/src/test/java/org/infinispan/replication/SyncReplTest.java
@@ -1,32 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
 package org.infinispan.replication;
 
 import static org.mockito.Matchers.anyBoolean;
diff --git a/core/src/test/java/org/infinispan/replication/SyncReplicatedAPITest.java b/core/src/test/java/org/infinispan/replication/SyncReplicatedAPITest.java
index bace171130c6..ffced6034b13 100644
--- a/core/src/test/java/org/infinispan/replication/SyncReplicatedAPITest.java
+++ b/core/src/test/java/org/infinispan/replication/SyncReplicatedAPITest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.replication;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/statetransfer/BaseOperationsDuringStateTransferTest.java b/core/src/test/java/org/infinispan/statetransfer/BaseOperationsDuringStateTransferTest.java
index 53d150bf9f01..8a7024c59cff 100644
--- a/core/src/test/java/org/infinispan/statetransfer/BaseOperationsDuringStateTransferTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/BaseOperationsDuringStateTransferTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.statetransfer;
 
 import org.infinispan.commands.VisitableCommand;
diff --git a/core/src/test/java/org/infinispan/statetransfer/BigObject.java b/core/src/test/java/org/infinispan/statetransfer/BigObject.java
index 794a9aebb1e7..e37755cb962f 100644
--- a/core/src/test/java/org/infinispan/statetransfer/BigObject.java
+++ b/core/src/test/java/org/infinispan/statetransfer/BigObject.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.statetransfer;
 
 import java.io.Serializable;
diff --git a/core/src/test/java/org/infinispan/statetransfer/ClusterTopologyManagerTest.java b/core/src/test/java/org/infinispan/statetransfer/ClusterTopologyManagerTest.java
index f7f75aa82661..80f3abf796e3 100644
--- a/core/src/test/java/org/infinispan/statetransfer/ClusterTopologyManagerTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/ClusterTopologyManagerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.statetransfer;
 
 import java.util.ArrayList;
diff --git a/core/src/test/java/org/infinispan/statetransfer/DataRehashedEventTest.java b/core/src/test/java/org/infinispan/statetransfer/DataRehashedEventTest.java
index 2f32dd2f9fd5..5ed51ca35fcc 100644
--- a/core/src/test/java/org/infinispan/statetransfer/DataRehashedEventTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/DataRehashedEventTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.statetransfer;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/statetransfer/DistNonTxOperationsDuringStateTransferTest.java b/core/src/test/java/org/infinispan/statetransfer/DistNonTxOperationsDuringStateTransferTest.java
index e2e3d1aabce4..53c3f9a50b20 100644
--- a/core/src/test/java/org/infinispan/statetransfer/DistNonTxOperationsDuringStateTransferTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/DistNonTxOperationsDuringStateTransferTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.statetransfer;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/statetransfer/DistOptimisticTxOperationsDuringStateTransferTest.java b/core/src/test/java/org/infinispan/statetransfer/DistOptimisticTxOperationsDuringStateTransferTest.java
index 7ba2564bb0ee..af3f43fc18f4 100644
--- a/core/src/test/java/org/infinispan/statetransfer/DistOptimisticTxOperationsDuringStateTransferTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/DistOptimisticTxOperationsDuringStateTransferTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.statetransfer;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/statetransfer/DistPessimisticTxOperationsDuringStateTransferTest.java b/core/src/test/java/org/infinispan/statetransfer/DistPessimisticTxOperationsDuringStateTransferTest.java
index 2a0ddd114065..69c626418473 100644
--- a/core/src/test/java/org/infinispan/statetransfer/DistPessimisticTxOperationsDuringStateTransferTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/DistPessimisticTxOperationsDuringStateTransferTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.statetransfer;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/statetransfer/DistStateTransferOnJoinConsistencyTest.java b/core/src/test/java/org/infinispan/statetransfer/DistStateTransferOnJoinConsistencyTest.java
index 0f56d5da2a07..8bf70d99046a 100644
--- a/core/src/test/java/org/infinispan/statetransfer/DistStateTransferOnJoinConsistencyTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/DistStateTransferOnJoinConsistencyTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.statetransfer;
 
 import org.infinispan.commands.VisitableCommand;
diff --git a/core/src/test/java/org/infinispan/statetransfer/DistStateTransferOnLeaveConsistencyTest.java b/core/src/test/java/org/infinispan/statetransfer/DistStateTransferOnLeaveConsistencyTest.java
index d12998fb44b1..d779f33cfec9 100644
--- a/core/src/test/java/org/infinispan/statetransfer/DistStateTransferOnLeaveConsistencyTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/DistStateTransferOnLeaveConsistencyTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.statetransfer;
 
 import org.infinispan.commands.VisitableCommand;
diff --git a/core/src/test/java/org/infinispan/statetransfer/InitialStateTransferCompletionTest.java b/core/src/test/java/org/infinispan/statetransfer/InitialStateTransferCompletionTest.java
index 53f3d09b4733..c00fcad27408 100644
--- a/core/src/test/java/org/infinispan/statetransfer/InitialStateTransferCompletionTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/InitialStateTransferCompletionTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.statetransfer;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/statetransfer/JoiningNode.java b/core/src/test/java/org/infinispan/statetransfer/JoiningNode.java
index 0321a0e83e5c..73fa61ac072a 100644
--- a/core/src/test/java/org/infinispan/statetransfer/JoiningNode.java
+++ b/core/src/test/java/org/infinispan/statetransfer/JoiningNode.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.statetransfer;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/statetransfer/MergeDuringReplaceTest.java b/core/src/test/java/org/infinispan/statetransfer/MergeDuringReplaceTest.java
index ad4b397f58c9..f35f35f122d8 100644
--- a/core/src/test/java/org/infinispan/statetransfer/MergeDuringReplaceTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/MergeDuringReplaceTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.statetransfer;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/statetransfer/MergeOrViewChangeListener.java b/core/src/test/java/org/infinispan/statetransfer/MergeOrViewChangeListener.java
index 2fd1f02cb959..d7418b5960f7 100644
--- a/core/src/test/java/org/infinispan/statetransfer/MergeOrViewChangeListener.java
+++ b/core/src/test/java/org/infinispan/statetransfer/MergeOrViewChangeListener.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.statetransfer;
 
 import org.infinispan.notifications.Listener;
diff --git a/core/src/test/java/org/infinispan/statetransfer/RebalancePolicyJmxTest.java b/core/src/test/java/org/infinispan/statetransfer/RebalancePolicyJmxTest.java
index 138f67268f59..93d99ee356f3 100644
--- a/core/src/test/java/org/infinispan/statetransfer/RebalancePolicyJmxTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/RebalancePolicyJmxTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.statetransfer;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/statetransfer/ReplCommandForwardingTest.java b/core/src/test/java/org/infinispan/statetransfer/ReplCommandForwardingTest.java
index f9dd39705688..2691337bc950 100644
--- a/core/src/test/java/org/infinispan/statetransfer/ReplCommandForwardingTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/ReplCommandForwardingTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.statetransfer;
 
 import java.util.concurrent.BrokenBarrierException;
diff --git a/core/src/test/java/org/infinispan/statetransfer/ReplNonTxOperationsDuringStateTransferTest.java b/core/src/test/java/org/infinispan/statetransfer/ReplNonTxOperationsDuringStateTransferTest.java
index 93670b7b036c..e9e6a3c602db 100644
--- a/core/src/test/java/org/infinispan/statetransfer/ReplNonTxOperationsDuringStateTransferTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/ReplNonTxOperationsDuringStateTransferTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.statetransfer;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/statetransfer/ReplOptimisticTxOperationsDuringStateTransferTest.java b/core/src/test/java/org/infinispan/statetransfer/ReplOptimisticTxOperationsDuringStateTransferTest.java
index bc69107d30c9..3e12bdac2d30 100644
--- a/core/src/test/java/org/infinispan/statetransfer/ReplOptimisticTxOperationsDuringStateTransferTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/ReplOptimisticTxOperationsDuringStateTransferTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.statetransfer;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/statetransfer/ReplPessimisticOperationsDuringStateTransferTest.java b/core/src/test/java/org/infinispan/statetransfer/ReplPessimisticOperationsDuringStateTransferTest.java
index 5bbba3c9160c..118107b96c55 100644
--- a/core/src/test/java/org/infinispan/statetransfer/ReplPessimisticOperationsDuringStateTransferTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/ReplPessimisticOperationsDuringStateTransferTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.statetransfer;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/statetransfer/ReplStateTransferCacheLoaderTest.java b/core/src/test/java/org/infinispan/statetransfer/ReplStateTransferCacheLoaderTest.java
index fab7364fbd09..2ce702f3f96a 100644
--- a/core/src/test/java/org/infinispan/statetransfer/ReplStateTransferCacheLoaderTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/ReplStateTransferCacheLoaderTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.statetransfer;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/statetransfer/ReplStateTransferOnJoinConsistencyTest.java b/core/src/test/java/org/infinispan/statetransfer/ReplStateTransferOnJoinConsistencyTest.java
index 2e168ae86c94..99a137fecfe3 100644
--- a/core/src/test/java/org/infinispan/statetransfer/ReplStateTransferOnJoinConsistencyTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/ReplStateTransferOnJoinConsistencyTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.statetransfer;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/statetransfer/StaleLocksWithCommitDuringStateTransferTest.java b/core/src/test/java/org/infinispan/statetransfer/StaleLocksWithCommitDuringStateTransferTest.java
index a53f4be61e34..5f5c5dbf5ca5 100644
--- a/core/src/test/java/org/infinispan/statetransfer/StaleLocksWithCommitDuringStateTransferTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/StaleLocksWithCommitDuringStateTransferTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.statetransfer;
 
 import java.util.concurrent.CountDownLatch;
diff --git a/core/src/test/java/org/infinispan/statetransfer/StateConsumerTest.java b/core/src/test/java/org/infinispan/statetransfer/StateConsumerTest.java
index 065327023207..54444bb8d9a1 100644
--- a/core/src/test/java/org/infinispan/statetransfer/StateConsumerTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/StateConsumerTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.statetransfer;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/statetransfer/StateProviderTest.java b/core/src/test/java/org/infinispan/statetransfer/StateProviderTest.java
index b401521c832b..a1de41c646de 100644
--- a/core/src/test/java/org/infinispan/statetransfer/StateProviderTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/StateProviderTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.statetransfer;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/statetransfer/StateTransferCacheLoaderFunctionalTest.java b/core/src/test/java/org/infinispan/statetransfer/StateTransferCacheLoaderFunctionalTest.java
index 96e28ae5564c..bd78a3d4af19 100644
--- a/core/src/test/java/org/infinispan/statetransfer/StateTransferCacheLoaderFunctionalTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/StateTransferCacheLoaderFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.statetransfer;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/statetransfer/StateTransferFetchOnlyPersistentStateTest.java b/core/src/test/java/org/infinispan/statetransfer/StateTransferFetchOnlyPersistentStateTest.java
index c24b4d76a67f..47b5ed853680 100644
--- a/core/src/test/java/org/infinispan/statetransfer/StateTransferFetchOnlyPersistentStateTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/StateTransferFetchOnlyPersistentStateTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.statetransfer;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/statetransfer/StateTransferFileCacheLoaderFunctionalTest.java b/core/src/test/java/org/infinispan/statetransfer/StateTransferFileCacheLoaderFunctionalTest.java
index d36ee3094a68..fd30e7443801 100644
--- a/core/src/test/java/org/infinispan/statetransfer/StateTransferFileCacheLoaderFunctionalTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/StateTransferFileCacheLoaderFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.statetransfer;
 
 import java.io.*;
diff --git a/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java b/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java
index e0a12f8571f9..ff5374bac754 100644
--- a/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.statetransfer;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/statetransfer/StateTransferLargeObjectTest.java b/core/src/test/java/org/infinispan/statetransfer/StateTransferLargeObjectTest.java
index 828901e4dcd9..5185f428ce71 100644
--- a/core/src/test/java/org/infinispan/statetransfer/StateTransferLargeObjectTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/StateTransferLargeObjectTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.statetransfer;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/statetransfer/StateTransferPessimisticTest.java b/core/src/test/java/org/infinispan/statetransfer/StateTransferPessimisticTest.java
index 16ff9017325d..0048792f7fc8 100644
--- a/core/src/test/java/org/infinispan/statetransfer/StateTransferPessimisticTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/StateTransferPessimisticTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.statetransfer;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/statetransfer/StateTransferReplicationQueueTest.java b/core/src/test/java/org/infinispan/statetransfer/StateTransferReplicationQueueTest.java
index 710a1bbb15aa..b22dd32ae035 100644
--- a/core/src/test/java/org/infinispan/statetransfer/StateTransferReplicationQueueTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/StateTransferReplicationQueueTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.statetransfer;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/statetransfer/StateTransferRestartTest.java b/core/src/test/java/org/infinispan/statetransfer/StateTransferRestartTest.java
index 4d32b814bcf8..99a81fc023da 100644
--- a/core/src/test/java/org/infinispan/statetransfer/StateTransferRestartTest.java
+++ b/core/src/test/java/org/infinispan/statetransfer/StateTransferRestartTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- *  Copyright 2013 Red Hat Inc. and/or its affiliates and other
- *  contributors as indicated by the @author tags. All rights reserved
- *  See the copyright.txt in the distribution for a full listing of
- *  individual contributors.
- *
- *  This is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU Lesser General Public License as
- *  published by the Free Software Foundation; either version 2.1 of
- *  the License, or (at your option) any later version.
- *
- *  This software is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this software; if not, write to the Free
- *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- *  02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.statetransfer;
 
 import java.util.Collection;
diff --git a/core/src/test/java/org/infinispan/statetransfer/StateTransferTestingUtil.java b/core/src/test/java/org/infinispan/statetransfer/StateTransferTestingUtil.java
index 4001c124becf..d0ebe99cf136 100644
--- a/core/src/test/java/org/infinispan/statetransfer/StateTransferTestingUtil.java
+++ b/core/src/test/java/org/infinispan/statetransfer/StateTransferTestingUtil.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.statetransfer;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/statetransfer/TestKey.java b/core/src/test/java/org/infinispan/statetransfer/TestKey.java
index 6d7403619414..6f7af9760d29 100644
--- a/core/src/test/java/org/infinispan/statetransfer/TestKey.java
+++ b/core/src/test/java/org/infinispan/statetransfer/TestKey.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.statetransfer;
 
 import org.infinispan.distribution.ch.ConsistentHash;
diff --git a/core/src/test/java/org/infinispan/stress/AsyncStoreStressTest.java b/core/src/test/java/org/infinispan/stress/AsyncStoreStressTest.java
index 44cdb85eb9e5..787a412e0c8a 100644
--- a/core/src/test/java/org/infinispan/stress/AsyncStoreStressTest.java
+++ b/core/src/test/java/org/infinispan/stress/AsyncStoreStressTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.stress;
 
 import org.infinispan.marshall.TestObjectStreamMarshaller;
diff --git a/core/src/test/java/org/infinispan/stress/DataContainerStressTest.java b/core/src/test/java/org/infinispan/stress/DataContainerStressTest.java
index 003d00001083..2a8887d4e55f 100644
--- a/core/src/test/java/org/infinispan/stress/DataContainerStressTest.java
+++ b/core/src/test/java/org/infinispan/stress/DataContainerStressTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.stress;
 
 import org.infinispan.metadata.EmbeddedMetadata;
diff --git a/core/src/test/java/org/infinispan/stress/LargeClusterStressTest.java b/core/src/test/java/org/infinispan/stress/LargeClusterStressTest.java
index c58a69e65cea..003488414044 100644
--- a/core/src/test/java/org/infinispan/stress/LargeClusterStressTest.java
+++ b/core/src/test/java/org/infinispan/stress/LargeClusterStressTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.stress;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/stress/MapStressTest.java b/core/src/test/java/org/infinispan/stress/MapStressTest.java
index 777169930321..e24212104b49 100644
--- a/core/src/test/java/org/infinispan/stress/MapStressTest.java
+++ b/core/src/test/java/org/infinispan/stress/MapStressTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.stress;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/stress/MemoryCleanupTest.java b/core/src/test/java/org/infinispan/stress/MemoryCleanupTest.java
index 5cb800e6e614..89d99c4cd3c8 100644
--- a/core/src/test/java/org/infinispan/stress/MemoryCleanupTest.java
+++ b/core/src/test/java/org/infinispan/stress/MemoryCleanupTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.stress;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/stress/PutIfAbsentStressTest.java b/core/src/test/java/org/infinispan/stress/PutIfAbsentStressTest.java
index 37301aa81493..5d072d54989b 100644
--- a/core/src/test/java/org/infinispan/stress/PutIfAbsentStressTest.java
+++ b/core/src/test/java/org/infinispan/stress/PutIfAbsentStressTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.stress;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tasks/GlobalKeySetTaskTest.java b/core/src/test/java/org/infinispan/tasks/GlobalKeySetTaskTest.java
index 890561689b1f..fb68d724cc2a 100644
--- a/core/src/test/java/org/infinispan/tasks/GlobalKeySetTaskTest.java
+++ b/core/src/test/java/org/infinispan/tasks/GlobalKeySetTaskTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.tasks;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/core/src/test/java/org/infinispan/test/AbstractCacheTest.java b/core/src/test/java/org/infinispan/test/AbstractCacheTest.java
index cb998e3bc33b..e1fcd8ef87b4 100644
--- a/core/src/test/java/org/infinispan/test/AbstractCacheTest.java
+++ b/core/src/test/java/org/infinispan/test/AbstractCacheTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.test;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/test/AbstractInfinispanTest.java b/core/src/test/java/org/infinispan/test/AbstractInfinispanTest.java
index eeca8e8c53e7..0d878104df70 100644
--- a/core/src/test/java/org/infinispan/test/AbstractInfinispanTest.java
+++ b/core/src/test/java/org/infinispan/test/AbstractInfinispanTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.test;
 
 import org.infinispan.util.DefaultTimeService;
diff --git a/core/src/test/java/org/infinispan/test/CacheManagerCallable.java b/core/src/test/java/org/infinispan/test/CacheManagerCallable.java
index f989e66fa9ee..f96dbc8f5121 100644
--- a/core/src/test/java/org/infinispan/test/CacheManagerCallable.java
+++ b/core/src/test/java/org/infinispan/test/CacheManagerCallable.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.test;
 
 import org.infinispan.manager.EmbeddedCacheManager;
diff --git a/core/src/test/java/org/infinispan/test/CherryPickClassLoader.java b/core/src/test/java/org/infinispan/test/CherryPickClassLoader.java
index f13e7f0aca05..a4696f6a0641 100644
--- a/core/src/test/java/org/infinispan/test/CherryPickClassLoader.java
+++ b/core/src/test/java/org/infinispan/test/CherryPickClassLoader.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.test;
 
 import org.jboss.logging.Logger;
diff --git a/core/src/test/java/org/infinispan/test/MultiCacheManagerCallable.java b/core/src/test/java/org/infinispan/test/MultiCacheManagerCallable.java
index e12b58b63904..eb69c65844ef 100644
--- a/core/src/test/java/org/infinispan/test/MultiCacheManagerCallable.java
+++ b/core/src/test/java/org/infinispan/test/MultiCacheManagerCallable.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.test;
 
 import org.infinispan.manager.EmbeddedCacheManager;
diff --git a/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java b/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java
index d2c858799a4d..10e0f7d18e7f 100644
--- a/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java
+++ b/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.test;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/test/java/org/infinispan/test/PerCacheExecutorThread.java b/core/src/test/java/org/infinispan/test/PerCacheExecutorThread.java
index 6122c846e4a8..4d9333db1354 100644
--- a/core/src/test/java/org/infinispan/test/PerCacheExecutorThread.java
+++ b/core/src/test/java/org/infinispan/test/PerCacheExecutorThread.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.test;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/test/ReplListener.java b/core/src/test/java/org/infinispan/test/ReplListener.java
index 08c4569bfe41..460489f68684 100644
--- a/core/src/test/java/org/infinispan/test/ReplListener.java
+++ b/core/src/test/java/org/infinispan/test/ReplListener.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.test;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java b/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java
index c59df5c2c9b3..bbfc2a3b1d2f 100644
--- a/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java
+++ b/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.test;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/test/TestingUtil.java b/core/src/test/java/org/infinispan/test/TestingUtil.java
index 754b2456dde8..e54b628ae4d4 100644
--- a/core/src/test/java/org/infinispan/test/TestingUtil.java
+++ b/core/src/test/java/org/infinispan/test/TestingUtil.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.test;
 
 import static java.io.File.separator;
diff --git a/core/src/test/java/org/infinispan/test/ValueFuture.java b/core/src/test/java/org/infinispan/test/ValueFuture.java
index 210a645ba35a..275986c47d32 100644
--- a/core/src/test/java/org/infinispan/test/ValueFuture.java
+++ b/core/src/test/java/org/infinispan/test/ValueFuture.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.test;
 
 import java.util.concurrent.CountDownLatch;
diff --git a/core/src/test/java/org/infinispan/test/ViewChangeListener.java b/core/src/test/java/org/infinispan/test/ViewChangeListener.java
index 411b4e5b931a..151531e1066b 100644
--- a/core/src/test/java/org/infinispan/test/ViewChangeListener.java
+++ b/core/src/test/java/org/infinispan/test/ViewChangeListener.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.test;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/test/arquillian/DatagridManager.java b/core/src/test/java/org/infinispan/test/arquillian/DatagridManager.java
index b58a2dd19095..bd9398084206 100644
--- a/core/src/test/java/org/infinispan/test/arquillian/DatagridManager.java
+++ b/core/src/test/java/org/infinispan/test/arquillian/DatagridManager.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.test.arquillian;
 
 import java.util.List;
diff --git a/core/src/test/java/org/infinispan/test/data/Address.java b/core/src/test/java/org/infinispan/test/data/Address.java
index ed71cdab3831..4db46117c570 100644
--- a/core/src/test/java/org/infinispan/test/data/Address.java
+++ b/core/src/test/java/org/infinispan/test/data/Address.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.test.data;
 
 import java.io.Serializable;
diff --git a/core/src/test/java/org/infinispan/test/data/Key.java b/core/src/test/java/org/infinispan/test/data/Key.java
index 55d271504eb7..b499684b17cb 100644
--- a/core/src/test/java/org/infinispan/test/data/Key.java
+++ b/core/src/test/java/org/infinispan/test/data/Key.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.test.data;
 
 import org.infinispan.util.concurrent.ReclosableLatch;
diff --git a/core/src/test/java/org/infinispan/test/data/Person.java b/core/src/test/java/org/infinispan/test/data/Person.java
index 5c015cc58b39..fbeb28ed68f8 100644
--- a/core/src/test/java/org/infinispan/test/data/Person.java
+++ b/core/src/test/java/org/infinispan/test/data/Person.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.test.data;
 
 import java.io.Serializable;
diff --git a/core/src/test/java/org/infinispan/test/fwk/CheckPoint.java b/core/src/test/java/org/infinispan/test/fwk/CheckPoint.java
index 1b86d51c2267..0a195f523407 100644
--- a/core/src/test/java/org/infinispan/test/fwk/CheckPoint.java
+++ b/core/src/test/java/org/infinispan/test/fwk/CheckPoint.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.test.fwk;
 
 import java.util.Arrays;
diff --git a/core/src/test/java/org/infinispan/test/fwk/CleanupAfterMethod.java b/core/src/test/java/org/infinispan/test/fwk/CleanupAfterMethod.java
index 79fbf928d32e..f6785e46bba5 100644
--- a/core/src/test/java/org/infinispan/test/fwk/CleanupAfterMethod.java
+++ b/core/src/test/java/org/infinispan/test/fwk/CleanupAfterMethod.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.test.fwk;
 
 import java.lang.annotation.Retention;
diff --git a/core/src/test/java/org/infinispan/test/fwk/CleanupAfterTest.java b/core/src/test/java/org/infinispan/test/fwk/CleanupAfterTest.java
index ac4d6dc69136..2c0f9af774e2 100644
--- a/core/src/test/java/org/infinispan/test/fwk/CleanupAfterTest.java
+++ b/core/src/test/java/org/infinispan/test/fwk/CleanupAfterTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.test.fwk;
 
 import java.lang.annotation.Retention;
diff --git a/core/src/test/java/org/infinispan/test/fwk/DebuggingUnitTestNGListener.java b/core/src/test/java/org/infinispan/test/fwk/DebuggingUnitTestNGListener.java
index 69a5fa516a7d..d8cf5956307d 100644
--- a/core/src/test/java/org/infinispan/test/fwk/DebuggingUnitTestNGListener.java
+++ b/core/src/test/java/org/infinispan/test/fwk/DebuggingUnitTestNGListener.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.test.fwk;
 
 import java.util.Set;
diff --git a/core/src/test/java/org/infinispan/test/fwk/JBossTransactionsUtils.java b/core/src/test/java/org/infinispan/test/fwk/JBossTransactionsUtils.java
index 0265b0a962e4..963734daa5e0 100644
--- a/core/src/test/java/org/infinispan/test/fwk/JBossTransactionsUtils.java
+++ b/core/src/test/java/org/infinispan/test/fwk/JBossTransactionsUtils.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.test.fwk;
 
 import com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean;
diff --git a/core/src/test/java/org/infinispan/test/fwk/JGroupsConfigBuilder.java b/core/src/test/java/org/infinispan/test/fwk/JGroupsConfigBuilder.java
index 09b2353585c4..d40bd71a7d45 100644
--- a/core/src/test/java/org/infinispan/test/fwk/JGroupsConfigBuilder.java
+++ b/core/src/test/java/org/infinispan/test/fwk/JGroupsConfigBuilder.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.test.fwk;
 
 import org.infinispan.commons.util.LegacyKeySupportSystemProperties;
diff --git a/core/src/test/java/org/infinispan/test/fwk/SuiteResourcesAndLogTest.java b/core/src/test/java/org/infinispan/test/fwk/SuiteResourcesAndLogTest.java
index a3818b416655..15d5d7f2c2f5 100644
--- a/core/src/test/java/org/infinispan/test/fwk/SuiteResourcesAndLogTest.java
+++ b/core/src/test/java/org/infinispan/test/fwk/SuiteResourcesAndLogTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.test.fwk;
 
 import org.infinispan.util.logging.Log;
diff --git a/core/src/test/java/org/infinispan/test/fwk/TcpMPingEnvironmentTest.java b/core/src/test/java/org/infinispan/test/fwk/TcpMPingEnvironmentTest.java
index 5fb963dc7cc2..ea9ea2b23828 100644
--- a/core/src/test/java/org/infinispan/test/fwk/TcpMPingEnvironmentTest.java
+++ b/core/src/test/java/org/infinispan/test/fwk/TcpMPingEnvironmentTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.test.fwk;
 
 import org.infinispan.util.logging.Log;
diff --git a/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java b/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
index d443b0f68bba..229dbe9adbd0 100644
--- a/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
+++ b/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.test.fwk;
 
 import static org.infinispan.test.fwk.JGroupsConfigBuilder.getJGroupsConfig;
diff --git a/core/src/test/java/org/infinispan/test/fwk/TestInternalCacheEntryFactory.java b/core/src/test/java/org/infinispan/test/fwk/TestInternalCacheEntryFactory.java
index 0c976dc2eb45..7053527d71ae 100644
--- a/core/src/test/java/org/infinispan/test/fwk/TestInternalCacheEntryFactory.java
+++ b/core/src/test/java/org/infinispan/test/fwk/TestInternalCacheEntryFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.test.fwk;
 
 import org.infinispan.metadata.EmbeddedMetadata;
diff --git a/core/src/test/java/org/infinispan/test/fwk/TransactionSetup.java b/core/src/test/java/org/infinispan/test/fwk/TransactionSetup.java
index b770b7d189df..cfb1f0f03991 100644
--- a/core/src/test/java/org/infinispan/test/fwk/TransactionSetup.java
+++ b/core/src/test/java/org/infinispan/test/fwk/TransactionSetup.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.test.fwk;
 
 import org.infinispan.commons.util.LegacyKeySupportSystemProperties;
diff --git a/core/src/test/java/org/infinispan/test/fwk/TransportFlags.java b/core/src/test/java/org/infinispan/test/fwk/TransportFlags.java
index cd11245c982d..788ef0d0ba38 100644
--- a/core/src/test/java/org/infinispan/test/fwk/TransportFlags.java
+++ b/core/src/test/java/org/infinispan/test/fwk/TransportFlags.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.test.fwk;
 
 /**
diff --git a/core/src/test/java/org/infinispan/test/fwk/UnitTestTestNGListener.java b/core/src/test/java/org/infinispan/test/fwk/UnitTestTestNGListener.java
index f93223de1ab9..862122cef2cd 100644
--- a/core/src/test/java/org/infinispan/test/fwk/UnitTestTestNGListener.java
+++ b/core/src/test/java/org/infinispan/test/fwk/UnitTestTestNGListener.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.test.fwk;
 
 import org.infinispan.util.logging.Log;
diff --git a/core/src/test/java/org/infinispan/test/jndi/DummyContext.java b/core/src/test/java/org/infinispan/test/jndi/DummyContext.java
index dc92eb5a5218..7ddf51db39a0 100644
--- a/core/src/test/java/org/infinispan/test/jndi/DummyContext.java
+++ b/core/src/test/java/org/infinispan/test/jndi/DummyContext.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.test.jndi;
 
 import javax.naming.*;
diff --git a/core/src/test/java/org/infinispan/test/jndi/DummyContextFactory.java b/core/src/test/java/org/infinispan/test/jndi/DummyContextFactory.java
index c19ee51410ad..72f47aeec2bb 100644
--- a/core/src/test/java/org/infinispan/test/jndi/DummyContextFactory.java
+++ b/core/src/test/java/org/infinispan/test/jndi/DummyContextFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.test.jndi;
 
 import javax.naming.Context;
diff --git a/core/src/test/java/org/infinispan/tx/DefaultEnlistmentModeTest.java b/core/src/test/java/org/infinispan/tx/DefaultEnlistmentModeTest.java
index ab36bffda151..1dbc2198fe9e 100644
--- a/core/src/test/java/org/infinispan/tx/DefaultEnlistmentModeTest.java
+++ b/core/src/test/java/org/infinispan/tx/DefaultEnlistmentModeTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.tx;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/DummyTxTest.java b/core/src/test/java/org/infinispan/tx/DummyTxTest.java
index 04c629c23bdf..d1b3e3f8f62e 100644
--- a/core/src/test/java/org/infinispan/tx/DummyTxTest.java
+++ b/core/src/test/java/org/infinispan/tx/DummyTxTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/tx/FailureDuringPrepareTest.java b/core/src/test/java/org/infinispan/tx/FailureDuringPrepareTest.java
index ed30be8c1de5..0b41e2cfa7ef 100644
--- a/core/src/test/java/org/infinispan/tx/FailureDuringPrepareTest.java
+++ b/core/src/test/java/org/infinispan/tx/FailureDuringPrepareTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx;
 
 import org.infinispan.commands.tx.PrepareCommand;
diff --git a/core/src/test/java/org/infinispan/tx/FailureWith1PCTest.java b/core/src/test/java/org/infinispan/tx/FailureWith1PCTest.java
index 242595d9c797..c3d14b02bd36 100644
--- a/core/src/test/java/org/infinispan/tx/FailureWith1PCTest.java
+++ b/core/src/test/java/org/infinispan/tx/FailureWith1PCTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx;
 
 import org.infinispan.commands.tx.PrepareCommand;
diff --git a/core/src/test/java/org/infinispan/tx/LargeTransactionTest.java b/core/src/test/java/org/infinispan/tx/LargeTransactionTest.java
index 2a260fcb3cbb..c9d91c3a27ba 100644
--- a/core/src/test/java/org/infinispan/tx/LargeTransactionTest.java
+++ b/core/src/test/java/org/infinispan/tx/LargeTransactionTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/LocalModeTxTest.java b/core/src/test/java/org/infinispan/tx/LocalModeTxTest.java
index 5df5ee35e3e1..c9b00d799622 100644
--- a/core/src/test/java/org/infinispan/tx/LocalModeTxTest.java
+++ b/core/src/test/java/org/infinispan/tx/LocalModeTxTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx;
 
 import org.infinispan.manager.EmbeddedCacheManager;
diff --git a/core/src/test/java/org/infinispan/tx/LockAfterNodesLeftTest.java b/core/src/test/java/org/infinispan/tx/LockAfterNodesLeftTest.java
index daf2bccba342..d6e25d58a9b0 100644
--- a/core/src/test/java/org/infinispan/tx/LockAfterNodesLeftTest.java
+++ b/core/src/test/java/org/infinispan/tx/LockAfterNodesLeftTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 
 package org.infinispan.tx;
 
diff --git a/core/src/test/java/org/infinispan/tx/LockCleanupStateTransferTest.java b/core/src/test/java/org/infinispan/tx/LockCleanupStateTransferTest.java
index 7218a0ac54dc..81dba285d8b0 100644
--- a/core/src/test/java/org/infinispan/tx/LockCleanupStateTransferTest.java
+++ b/core/src/test/java/org/infinispan/tx/LockCleanupStateTransferTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- *  Copyright 2012 Red Hat Inc. and/or its affiliates and other
- *  contributors as indicated by the @author tags. All rights reserved
- *  See the copyright.txt in the distribution for a full listing of
- *  individual contributors.
- *
- *  This is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU Lesser General Public License as
- *  published by the Free Software Foundation; either version 2.1 of
- *  the License, or (at your option) any later version.
- *
- *  This software is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this software; if not, write to the Free
- *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- *  02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx;
 
 
diff --git a/core/src/test/java/org/infinispan/tx/LockReleaseWithNoWriteTest.java b/core/src/test/java/org/infinispan/tx/LockReleaseWithNoWriteTest.java
index 6f9f6d097903..e72549fe44b1 100644
--- a/core/src/test/java/org/infinispan/tx/LockReleaseWithNoWriteTest.java
+++ b/core/src/test/java/org/infinispan/tx/LockReleaseWithNoWriteTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/tx/MarkAsRollbackTest.java b/core/src/test/java/org/infinispan/tx/MarkAsRollbackTest.java
index e3ac7e9ba4e6..19c19f50211d 100644
--- a/core/src/test/java/org/infinispan/tx/MarkAsRollbackTest.java
+++ b/core/src/test/java/org/infinispan/tx/MarkAsRollbackTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/tx/NoAutoCommitAndPferTest.java b/core/src/test/java/org/infinispan/tx/NoAutoCommitAndPferTest.java
index 488dcee46245..97c4dfdfd6f4 100644
--- a/core/src/test/java/org/infinispan/tx/NoAutoCommitAndPferTest.java
+++ b/core/src/test/java/org/infinispan/tx/NoAutoCommitAndPferTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.tx;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/tx/NoRecoveryManagerByDefaultTest.java b/core/src/test/java/org/infinispan/tx/NoRecoveryManagerByDefaultTest.java
index f6e2bfbcd045..6e367f5262e2 100644
--- a/core/src/test/java/org/infinispan/tx/NoRecoveryManagerByDefaultTest.java
+++ b/core/src/test/java/org/infinispan/tx/NoRecoveryManagerByDefaultTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.tx;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/tx/NoTxLeakInCacheStoreInterceptorTest.java b/core/src/test/java/org/infinispan/tx/NoTxLeakInCacheStoreInterceptorTest.java
index 1567663de9d6..368edcd21322 100644
--- a/core/src/test/java/org/infinispan/tx/NoTxLeakInCacheStoreInterceptorTest.java
+++ b/core/src/test/java/org/infinispan/tx/NoTxLeakInCacheStoreInterceptorTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.tx;
 
 import static org.testng.Assert.*;
diff --git a/core/src/test/java/org/infinispan/tx/NonTxCacheInterceptorTest.java b/core/src/test/java/org/infinispan/tx/NonTxCacheInterceptorTest.java
index b9a4ca2e8ba2..2073febf48ca 100644
--- a/core/src/test/java/org/infinispan/tx/NonTxCacheInterceptorTest.java
+++ b/core/src/test/java/org/infinispan/tx/NonTxCacheInterceptorTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx;
 
 import org.infinispan.interceptors.TxInterceptor;
diff --git a/core/src/test/java/org/infinispan/tx/OnePhaseXATest.java b/core/src/test/java/org/infinispan/tx/OnePhaseXATest.java
index 5c73c7824604..3bbe063513f4 100644
--- a/core/src/test/java/org/infinispan/tx/OnePhaseXATest.java
+++ b/core/src/test/java/org/infinispan/tx/OnePhaseXATest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/ParticipantFailsAfterPrepareTest.java b/core/src/test/java/org/infinispan/tx/ParticipantFailsAfterPrepareTest.java
index 76b95f2f3649..0feea575af02 100644
--- a/core/src/test/java/org/infinispan/tx/ParticipantFailsAfterPrepareTest.java
+++ b/core/src/test/java/org/infinispan/tx/ParticipantFailsAfterPrepareTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/PrepareProcessedAfterOriginatorCrashTest.java b/core/src/test/java/org/infinispan/tx/PrepareProcessedAfterOriginatorCrashTest.java
index 228fd3925af1..2d8ee20328eb 100644
--- a/core/src/test/java/org/infinispan/tx/PrepareProcessedAfterOriginatorCrashTest.java
+++ b/core/src/test/java/org/infinispan/tx/PrepareProcessedAfterOriginatorCrashTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- *  Copyright 2012 Red Hat Inc. and/or its affiliates and other
- *  contributors as indicated by the @author tags. All rights reserved
- *  See the copyright.txt in the distribution for a full listing of
- *  individual contributors.
- *
- *  This is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU Lesser General Public License as
- *  published by the Free Software Foundation; either version 2.1 of
- *  the License, or (at your option) any later version.
- *
- *  This software is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this software; if not, write to the Free
- *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- *  02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/ReadOnlyTxCleanupTest.java b/core/src/test/java/org/infinispan/tx/ReadOnlyTxCleanupTest.java
index 439ce9f43a30..13689edfef79 100644
--- a/core/src/test/java/org/infinispan/tx/ReadOnlyTxCleanupTest.java
+++ b/core/src/test/java/org/infinispan/tx/ReadOnlyTxCleanupTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/ReadOnlyTxTest.java b/core/src/test/java/org/infinispan/tx/ReadOnlyTxTest.java
index e13a38410cf0..fb77a1c754a6 100644
--- a/core/src/test/java/org/infinispan/tx/ReadOnlyTxTest.java
+++ b/core/src/test/java/org/infinispan/tx/ReadOnlyTxTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/tx/RemoteLockCleanupStressTest.java b/core/src/test/java/org/infinispan/tx/RemoteLockCleanupStressTest.java
index 1cf0aa7f4748..bf3ce9de19ce 100644
--- a/core/src/test/java/org/infinispan/tx/RemoteLockCleanupStressTest.java
+++ b/core/src/test/java/org/infinispan/tx/RemoteLockCleanupStressTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/RemoteLockCleanupTest.java b/core/src/test/java/org/infinispan/tx/RemoteLockCleanupTest.java
index 5cd3dcc70ccd..42e15ca90fa6 100644
--- a/core/src/test/java/org/infinispan/tx/RemoteLockCleanupTest.java
+++ b/core/src/test/java/org/infinispan/tx/RemoteLockCleanupTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx;
 
 import org.infinispan.commands.control.LockControlCommand;
diff --git a/core/src/test/java/org/infinispan/tx/RollbackBeforePrepareDistTest.java b/core/src/test/java/org/infinispan/tx/RollbackBeforePrepareDistTest.java
index dc6b566699ac..19b0e605a222 100644
--- a/core/src/test/java/org/infinispan/tx/RollbackBeforePrepareDistTest.java
+++ b/core/src/test/java/org/infinispan/tx/RollbackBeforePrepareDistTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.tx;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/tx/RollbackBeforePrepareTest.java b/core/src/test/java/org/infinispan/tx/RollbackBeforePrepareTest.java
index 18b5ecc16af1..4fdccc908628 100644
--- a/core/src/test/java/org/infinispan/tx/RollbackBeforePrepareTest.java
+++ b/core/src/test/java/org/infinispan/tx/RollbackBeforePrepareTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- *  Copyright 2012 Red Hat Inc. and/or its affiliates and other
- *  contributors as indicated by the @author tags. All rights reserved.
- *  See the copyright.txt in the distribution for a full listing of
- *  individual contributors.
- *
- *  This is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU Lesser General Public License as
- *  published by the Free Software Foundation; either version 2.1 of
- *  the License, or (at your option) any later version.
- *
- *  This software is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this software; if not, write to the Free
- *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- *  02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx;
 
 import org.infinispan.commands.tx.PrepareCommand;
diff --git a/core/src/test/java/org/infinispan/tx/StaleLockAfterTxAbortTest.java b/core/src/test/java/org/infinispan/tx/StaleLockAfterTxAbortTest.java
index ed489500f01b..f755824ab962 100644
--- a/core/src/test/java/org/infinispan/tx/StaleLockAfterTxAbortTest.java
+++ b/core/src/test/java/org/infinispan/tx/StaleLockAfterTxAbortTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/StaleLockRecoveryTest.java b/core/src/test/java/org/infinispan/tx/StaleLockRecoveryTest.java
index 8535a2be632d..2db054af2606 100644
--- a/core/src/test/java/org/infinispan/tx/StaleLockRecoveryTest.java
+++ b/core/src/test/java/org/infinispan/tx/StaleLockRecoveryTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/TerminatedCacheWhileInTxTest.java b/core/src/test/java/org/infinispan/tx/TerminatedCacheWhileInTxTest.java
index 2e86d6ce99e1..0243a6e851f6 100644
--- a/core/src/test/java/org/infinispan/tx/TerminatedCacheWhileInTxTest.java
+++ b/core/src/test/java/org/infinispan/tx/TerminatedCacheWhileInTxTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/TransactionCleanupWithAsync2ndPhaseTest.java b/core/src/test/java/org/infinispan/tx/TransactionCleanupWithAsync2ndPhaseTest.java
index b5a4927d4738..d3ff02304d53 100644
--- a/core/src/test/java/org/infinispan/tx/TransactionCleanupWithAsync2ndPhaseTest.java
+++ b/core/src/test/java/org/infinispan/tx/TransactionCleanupWithAsync2ndPhaseTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/tx/TransactionManagerLookupTest.java b/core/src/test/java/org/infinispan/tx/TransactionManagerLookupTest.java
index d9f416dc11af..ea9aeeb152b9 100644
--- a/core/src/test/java/org/infinispan/tx/TransactionManagerLookupTest.java
+++ b/core/src/test/java/org/infinispan/tx/TransactionManagerLookupTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx;
 
 import org.infinispan.configuration.cache.Configuration;
diff --git a/core/src/test/java/org/infinispan/tx/TransactionXaAdapterTmIntegrationTest.java b/core/src/test/java/org/infinispan/tx/TransactionXaAdapterTmIntegrationTest.java
index ff609ad74762..db7e26c6cb1e 100644
--- a/core/src/test/java/org/infinispan/tx/TransactionXaAdapterTmIntegrationTest.java
+++ b/core/src/test/java/org/infinispan/tx/TransactionXaAdapterTmIntegrationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx;
 
 import org.infinispan.commons.equivalence.AnyEquivalence;
diff --git a/core/src/test/java/org/infinispan/tx/TransactionsSpanningCaches.java b/core/src/test/java/org/infinispan/tx/TransactionsSpanningCaches.java
index 9fa6e4548650..0e5c9f0d36f6 100644
--- a/core/src/test/java/org/infinispan/tx/TransactionsSpanningCaches.java
+++ b/core/src/test/java/org/infinispan/tx/TransactionsSpanningCaches.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/TransactionsSpanningDistributedCachesTest.java b/core/src/test/java/org/infinispan/tx/TransactionsSpanningDistributedCachesTest.java
index be181408e670..ee20a208c151 100644
--- a/core/src/test/java/org/infinispan/tx/TransactionsSpanningDistributedCachesTest.java
+++ b/core/src/test/java/org/infinispan/tx/TransactionsSpanningDistributedCachesTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/tx/TransactionsSpanningReplicatedCachesTest.java b/core/src/test/java/org/infinispan/tx/TransactionsSpanningReplicatedCachesTest.java
index 2ac99ec930c1..cdee49d33770 100644
--- a/core/src/test/java/org/infinispan/tx/TransactionsSpanningReplicatedCachesTest.java
+++ b/core/src/test/java/org/infinispan/tx/TransactionsSpanningReplicatedCachesTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/TxCleanupServiceTest.java b/core/src/test/java/org/infinispan/tx/TxCleanupServiceTest.java
index 0d840f4fbf82..43c61b1fd130 100644
--- a/core/src/test/java/org/infinispan/tx/TxCleanupServiceTest.java
+++ b/core/src/test/java/org/infinispan/tx/TxCleanupServiceTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- *  Copyright 2012 Red Hat Inc. and/or its affiliates and other
- *  contributors as indicated by the @author tags. All rights reserved
- *  See the copyright.txt in the distribution for a full listing of
- *  individual contributors.
- *
- *  This is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU Lesser General Public License as
- *  published by the Free Software Foundation; either version 2.1 of
- *  the License, or (at your option) any later version.
- *
- *  This software is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this software; if not, write to the Free
- *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- *  02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx;
 
 
diff --git a/core/src/test/java/org/infinispan/tx/TxCompletionForRolledBackTxOptTest.java b/core/src/test/java/org/infinispan/tx/TxCompletionForRolledBackTxOptTest.java
index cd792fde5806..0e640b26a8ed 100644
--- a/core/src/test/java/org/infinispan/tx/TxCompletionForRolledBackTxOptTest.java
+++ b/core/src/test/java/org/infinispan/tx/TxCompletionForRolledBackTxOptTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.tx;
 
 import org.infinispan.commands.remote.recovery.TxCompletionNotificationCommand;
diff --git a/core/src/test/java/org/infinispan/tx/TxCompletionForRolledBackTxTest.java b/core/src/test/java/org/infinispan/tx/TxCompletionForRolledBackTxTest.java
index 1c39293fccd0..f4e2497abdba 100644
--- a/core/src/test/java/org/infinispan/tx/TxCompletionForRolledBackTxTest.java
+++ b/core/src/test/java/org/infinispan/tx/TxCompletionForRolledBackTxTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.tx;
 
 import org.infinispan.commands.remote.recovery.TxCompletionNotificationCommand;
diff --git a/core/src/test/java/org/infinispan/tx/TxCompletionForRolledBackXaTxTest.java b/core/src/test/java/org/infinispan/tx/TxCompletionForRolledBackXaTxTest.java
index 4be639eafda1..d102b1adb0cf 100644
--- a/core/src/test/java/org/infinispan/tx/TxCompletionForRolledBackXaTxTest.java
+++ b/core/src/test/java/org/infinispan/tx/TxCompletionForRolledBackXaTxTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.tx;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/tx/Use1PcForInducedTransactionTest.java b/core/src/test/java/org/infinispan/tx/Use1PcForInducedTransactionTest.java
index d51691cdd902..7f98e6081223 100644
--- a/core/src/test/java/org/infinispan/tx/Use1PcForInducedTransactionTest.java
+++ b/core/src/test/java/org/infinispan/tx/Use1PcForInducedTransactionTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx;
 
 import org.infinispan.commands.tx.CommitCommand;
diff --git a/core/src/test/java/org/infinispan/tx/dld/BaseDldPessimisticLockingTest.java b/core/src/test/java/org/infinispan/tx/dld/BaseDldPessimisticLockingTest.java
index 00aabebd6427..8d0425a78bd2 100644
--- a/core/src/test/java/org/infinispan/tx/dld/BaseDldPessimisticLockingTest.java
+++ b/core/src/test/java/org/infinispan/tx/dld/BaseDldPessimisticLockingTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx.dld;
 
 import org.infinispan.test.MultipleCacheManagersTest;
diff --git a/core/src/test/java/org/infinispan/tx/dld/ControlledRpcManager.java b/core/src/test/java/org/infinispan/tx/dld/ControlledRpcManager.java
index 4ba3b3b8dca6..7ab25d519553 100644
--- a/core/src/test/java/org/infinispan/tx/dld/ControlledRpcManager.java
+++ b/core/src/test/java/org/infinispan/tx/dld/ControlledRpcManager.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx.dld;
 
 import org.infinispan.commands.ReplicableCommand;
diff --git a/core/src/test/java/org/infinispan/tx/dld/DldPessimisticLockingDistributedTest.java b/core/src/test/java/org/infinispan/tx/dld/DldPessimisticLockingDistributedTest.java
index 58f8bc4c1821..d97573dffecf 100644
--- a/core/src/test/java/org/infinispan/tx/dld/DldPessimisticLockingDistributedTest.java
+++ b/core/src/test/java/org/infinispan/tx/dld/DldPessimisticLockingDistributedTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx.dld;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/tx/dld/DldPessimisticLockingReplicationTest.java b/core/src/test/java/org/infinispan/tx/dld/DldPessimisticLockingReplicationTest.java
index c284ef279faf..f54ea938f808 100644
--- a/core/src/test/java/org/infinispan/tx/dld/DldPessimisticLockingReplicationTest.java
+++ b/core/src/test/java/org/infinispan/tx/dld/DldPessimisticLockingReplicationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx.dld;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/tx/dld/LocalDeadlockDetectionTest.java b/core/src/test/java/org/infinispan/tx/dld/LocalDeadlockDetectionTest.java
index b659fd1b3e67..ddba76d649ea 100644
--- a/core/src/test/java/org/infinispan/tx/dld/LocalDeadlockDetectionTest.java
+++ b/core/src/test/java/org/infinispan/tx/dld/LocalDeadlockDetectionTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx.dld;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/tx/exception/CustomInterceptorException.java b/core/src/test/java/org/infinispan/tx/exception/CustomInterceptorException.java
index 55ad7d23e3b4..fe19cde734b4 100644
--- a/core/src/test/java/org/infinispan/tx/exception/CustomInterceptorException.java
+++ b/core/src/test/java/org/infinispan/tx/exception/CustomInterceptorException.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx.exception;
 
 import org.infinispan.commands.write.PutKeyValueCommand;
diff --git a/core/src/test/java/org/infinispan/tx/exception/ExceptionInCommandTest.java b/core/src/test/java/org/infinispan/tx/exception/ExceptionInCommandTest.java
index c7d4a387cda2..4ff3f965f555 100644
--- a/core/src/test/java/org/infinispan/tx/exception/ExceptionInCommandTest.java
+++ b/core/src/test/java/org/infinispan/tx/exception/ExceptionInCommandTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx.exception;
 
 import org.infinispan.atomic.AtomicHashMap;
diff --git a/core/src/test/java/org/infinispan/tx/exception/ReplicationTxExceptionTest.java b/core/src/test/java/org/infinispan/tx/exception/ReplicationTxExceptionTest.java
index b8b9cfca6ad4..ef21fee460c5 100644
--- a/core/src/test/java/org/infinispan/tx/exception/ReplicationTxExceptionTest.java
+++ b/core/src/test/java/org/infinispan/tx/exception/ReplicationTxExceptionTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx.exception;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/exception/TxAndRemoteTimeoutExceptionTest.java b/core/src/test/java/org/infinispan/tx/exception/TxAndRemoteTimeoutExceptionTest.java
index e73c7b36ef99..b496ab92a589 100644
--- a/core/src/test/java/org/infinispan/tx/exception/TxAndRemoteTimeoutExceptionTest.java
+++ b/core/src/test/java/org/infinispan/tx/exception/TxAndRemoteTimeoutExceptionTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx.exception;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/tx/exception/TxAndTimeoutExceptionTest.java b/core/src/test/java/org/infinispan/tx/exception/TxAndTimeoutExceptionTest.java
index 872a74949932..f1087ea540ce 100644
--- a/core/src/test/java/org/infinispan/tx/exception/TxAndTimeoutExceptionTest.java
+++ b/core/src/test/java/org/infinispan/tx/exception/TxAndTimeoutExceptionTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx.exception;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/tx/locking/AbstractClusteredTxTest.java b/core/src/test/java/org/infinispan/tx/locking/AbstractClusteredTxTest.java
index 44f2c5e53e9f..833fac9fc209 100644
--- a/core/src/test/java/org/infinispan/tx/locking/AbstractClusteredTxTest.java
+++ b/core/src/test/java/org/infinispan/tx/locking/AbstractClusteredTxTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.locking;
 
 import java.util.Collections;
diff --git a/core/src/test/java/org/infinispan/tx/locking/AbstractLocalTest.java b/core/src/test/java/org/infinispan/tx/locking/AbstractLocalTest.java
index 17c11600303d..93c2917c3660 100644
--- a/core/src/test/java/org/infinispan/tx/locking/AbstractLocalTest.java
+++ b/core/src/test/java/org/infinispan/tx/locking/AbstractLocalTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.locking;
 
 import org.infinispan.test.SingleCacheManagerTest;
diff --git a/core/src/test/java/org/infinispan/tx/locking/LocalOptimisticTxTest.java b/core/src/test/java/org/infinispan/tx/locking/LocalOptimisticTxTest.java
index e78f073f9fea..e8669577bcbb 100644
--- a/core/src/test/java/org/infinispan/tx/locking/LocalOptimisticTxTest.java
+++ b/core/src/test/java/org/infinispan/tx/locking/LocalOptimisticTxTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.locking;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/tx/locking/LocalPessimisticTxTest.java b/core/src/test/java/org/infinispan/tx/locking/LocalPessimisticTxTest.java
index 942082ccafbc..6010a9619deb 100644
--- a/core/src/test/java/org/infinispan/tx/locking/LocalPessimisticTxTest.java
+++ b/core/src/test/java/org/infinispan/tx/locking/LocalPessimisticTxTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.locking;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/tx/locking/OptimisticDistTxTest.java b/core/src/test/java/org/infinispan/tx/locking/OptimisticDistTxTest.java
index 5b34dbf4ac2b..35e2488950d0 100644
--- a/core/src/test/java/org/infinispan/tx/locking/OptimisticDistTxTest.java
+++ b/core/src/test/java/org/infinispan/tx/locking/OptimisticDistTxTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.locking;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/tx/locking/OptimisticReplTxTest.java b/core/src/test/java/org/infinispan/tx/locking/OptimisticReplTxTest.java
index 717f37245314..428dc6bc2ca4 100644
--- a/core/src/test/java/org/infinispan/tx/locking/OptimisticReplTxTest.java
+++ b/core/src/test/java/org/infinispan/tx/locking/OptimisticReplTxTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.locking;
 
 import javax.transaction.Transaction;
diff --git a/core/src/test/java/org/infinispan/tx/locking/PessimisticDistTxTest.java b/core/src/test/java/org/infinispan/tx/locking/PessimisticDistTxTest.java
index 92fd932b6c00..8f946f6c524b 100644
--- a/core/src/test/java/org/infinispan/tx/locking/PessimisticDistTxTest.java
+++ b/core/src/test/java/org/infinispan/tx/locking/PessimisticDistTxTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.locking;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/tx/locking/PessimisticReplTxTest.java b/core/src/test/java/org/infinispan/tx/locking/PessimisticReplTxTest.java
index b89aa7b3bb0a..3ff4abffde3f 100644
--- a/core/src/test/java/org/infinispan/tx/locking/PessimisticReplTxTest.java
+++ b/core/src/test/java/org/infinispan/tx/locking/PessimisticReplTxTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.locking;
 
 import javax.transaction.Transaction;
diff --git a/core/src/test/java/org/infinispan/tx/lockreordering/ReplicatedLockReorderingTest.java b/core/src/test/java/org/infinispan/tx/lockreordering/ReplicatedLockReorderingTest.java
index 410fbe406439..f7b5c950f315 100644
--- a/core/src/test/java/org/infinispan/tx/lockreordering/ReplicatedLockReorderingTest.java
+++ b/core/src/test/java/org/infinispan/tx/lockreordering/ReplicatedLockReorderingTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.lockreordering;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/tx/recovery/DldEagerLockingAndRecoveryReplicationTest.java b/core/src/test/java/org/infinispan/tx/recovery/DldEagerLockingAndRecoveryReplicationTest.java
index 48305f80cc70..a21da0f69d29 100644
--- a/core/src/test/java/org/infinispan/tx/recovery/DldEagerLockingAndRecoveryReplicationTest.java
+++ b/core/src/test/java/org/infinispan/tx/recovery/DldEagerLockingAndRecoveryReplicationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx.recovery;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/tx/recovery/DldPessimisticLockingAndRecoveryDistributedTest.java b/core/src/test/java/org/infinispan/tx/recovery/DldPessimisticLockingAndRecoveryDistributedTest.java
index e265703570d0..8d563b3d8568 100644
--- a/core/src/test/java/org/infinispan/tx/recovery/DldPessimisticLockingAndRecoveryDistributedTest.java
+++ b/core/src/test/java/org/infinispan/tx/recovery/DldPessimisticLockingAndRecoveryDistributedTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx.recovery;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/tx/recovery/InDoubtXidReturnedOnceTest.java b/core/src/test/java/org/infinispan/tx/recovery/InDoubtXidReturnedOnceTest.java
index c48ea5836967..20f0368d22e5 100644
--- a/core/src/test/java/org/infinispan/tx/recovery/InDoubtXidReturnedOnceTest.java
+++ b/core/src/test/java/org/infinispan/tx/recovery/InDoubtXidReturnedOnceTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.recovery;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/tx/recovery/LocalRecoveryTest.java b/core/src/test/java/org/infinispan/tx/recovery/LocalRecoveryTest.java
index 436eded28e31..e9aaab3fb1b7 100644
--- a/core/src/test/java/org/infinispan/tx/recovery/LocalRecoveryTest.java
+++ b/core/src/test/java/org/infinispan/tx/recovery/LocalRecoveryTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx.recovery;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/tx/recovery/PostCommitRecoveryStateTest.java b/core/src/test/java/org/infinispan/tx/recovery/PostCommitRecoveryStateTest.java
index 3a6843482428..21f5fff41af0 100644
--- a/core/src/test/java/org/infinispan/tx/recovery/PostCommitRecoveryStateTest.java
+++ b/core/src/test/java/org/infinispan/tx/recovery/PostCommitRecoveryStateTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.recovery;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/tx/recovery/RecoveryConfigTest.java b/core/src/test/java/org/infinispan/tx/recovery/RecoveryConfigTest.java
index 8e3426a927ca..9ea25ba28358 100644
--- a/core/src/test/java/org/infinispan/tx/recovery/RecoveryConfigTest.java
+++ b/core/src/test/java/org/infinispan/tx/recovery/RecoveryConfigTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx.recovery;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/recovery/RecoveryHandlerTest.java b/core/src/test/java/org/infinispan/tx/recovery/RecoveryHandlerTest.java
index 88d23137952c..d3156798f2ed 100644
--- a/core/src/test/java/org/infinispan/tx/recovery/RecoveryHandlerTest.java
+++ b/core/src/test/java/org/infinispan/tx/recovery/RecoveryHandlerTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.recovery;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/tx/recovery/RecoveryTestUtil.java b/core/src/test/java/org/infinispan/tx/recovery/RecoveryTestUtil.java
index b67fdecdbe30..f58f3a3ac1c0 100644
--- a/core/src/test/java/org/infinispan/tx/recovery/RecoveryTestUtil.java
+++ b/core/src/test/java/org/infinispan/tx/recovery/RecoveryTestUtil.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.recovery;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/recovery/RecoveryWithCustomCacheDistTest.java b/core/src/test/java/org/infinispan/tx/recovery/RecoveryWithCustomCacheDistTest.java
index 48b7572a4c71..2be58eb85b14 100644
--- a/core/src/test/java/org/infinispan/tx/recovery/RecoveryWithCustomCacheDistTest.java
+++ b/core/src/test/java/org/infinispan/tx/recovery/RecoveryWithCustomCacheDistTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx.recovery;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/tx/recovery/RecoveryWithDefaultCacheDistTest.java b/core/src/test/java/org/infinispan/tx/recovery/RecoveryWithDefaultCacheDistTest.java
index c95e29a8cd5a..b2878975b8ce 100644
--- a/core/src/test/java/org/infinispan/tx/recovery/RecoveryWithDefaultCacheDistTest.java
+++ b/core/src/test/java/org/infinispan/tx/recovery/RecoveryWithDefaultCacheDistTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx.recovery;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/tx/recovery/RecoveryWithDefaultCacheReplTest.java b/core/src/test/java/org/infinispan/tx/recovery/RecoveryWithDefaultCacheReplTest.java
index 67c3a8b9a7b4..075bc59073a5 100644
--- a/core/src/test/java/org/infinispan/tx/recovery/RecoveryWithDefaultCacheReplTest.java
+++ b/core/src/test/java/org/infinispan/tx/recovery/RecoveryWithDefaultCacheReplTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx.recovery;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/tx/recovery/admin/AbstractRecoveryTest.java b/core/src/test/java/org/infinispan/tx/recovery/admin/AbstractRecoveryTest.java
index fdb4069a0433..fbb5cad92925 100644
--- a/core/src/test/java/org/infinispan/tx/recovery/admin/AbstractRecoveryTest.java
+++ b/core/src/test/java/org/infinispan/tx/recovery/admin/AbstractRecoveryTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.recovery.admin;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/tx/recovery/admin/CommitFailsReplicatedTest.java b/core/src/test/java/org/infinispan/tx/recovery/admin/CommitFailsReplicatedTest.java
index 06a956ae67f4..24d5729b3fe7 100644
--- a/core/src/test/java/org/infinispan/tx/recovery/admin/CommitFailsReplicatedTest.java
+++ b/core/src/test/java/org/infinispan/tx/recovery/admin/CommitFailsReplicatedTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.recovery.admin;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/tx/recovery/admin/CommitFailsTest.java b/core/src/test/java/org/infinispan/tx/recovery/admin/CommitFailsTest.java
index 5355628a2814..a4ba1f50fb93 100644
--- a/core/src/test/java/org/infinispan/tx/recovery/admin/CommitFailsTest.java
+++ b/core/src/test/java/org/infinispan/tx/recovery/admin/CommitFailsTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.recovery.admin;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/recovery/admin/ForgetReplicationTest.java b/core/src/test/java/org/infinispan/tx/recovery/admin/ForgetReplicationTest.java
index af4c044e000b..e14ad7db34c2 100644
--- a/core/src/test/java/org/infinispan/tx/recovery/admin/ForgetReplicationTest.java
+++ b/core/src/test/java/org/infinispan/tx/recovery/admin/ForgetReplicationTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.recovery.admin;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/tx/recovery/admin/ForgetTest.java b/core/src/test/java/org/infinispan/tx/recovery/admin/ForgetTest.java
index b81e95cd8bcf..46a3ff9e14f7 100644
--- a/core/src/test/java/org/infinispan/tx/recovery/admin/ForgetTest.java
+++ b/core/src/test/java/org/infinispan/tx/recovery/admin/ForgetTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.recovery.admin;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/tx/recovery/admin/InDoubtWithCommitFailsTest.java b/core/src/test/java/org/infinispan/tx/recovery/admin/InDoubtWithCommitFailsTest.java
index cf745a043396..302f89ac7b09 100644
--- a/core/src/test/java/org/infinispan/tx/recovery/admin/InDoubtWithCommitFailsTest.java
+++ b/core/src/test/java/org/infinispan/tx/recovery/admin/InDoubtWithCommitFailsTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.recovery.admin;
 
 import org.infinispan.commands.tx.CommitCommand;
diff --git a/core/src/test/java/org/infinispan/tx/recovery/admin/OriginatorAndOwnerFailureReplicationTest.java b/core/src/test/java/org/infinispan/tx/recovery/admin/OriginatorAndOwnerFailureReplicationTest.java
index d26a480631ed..53473f36319c 100644
--- a/core/src/test/java/org/infinispan/tx/recovery/admin/OriginatorAndOwnerFailureReplicationTest.java
+++ b/core/src/test/java/org/infinispan/tx/recovery/admin/OriginatorAndOwnerFailureReplicationTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.recovery.admin;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/tx/recovery/admin/OriginatorAndOwnerFailureTest.java b/core/src/test/java/org/infinispan/tx/recovery/admin/OriginatorAndOwnerFailureTest.java
index 22462e8d66ca..971f4ff036f9 100644
--- a/core/src/test/java/org/infinispan/tx/recovery/admin/OriginatorAndOwnerFailureTest.java
+++ b/core/src/test/java/org/infinispan/tx/recovery/admin/OriginatorAndOwnerFailureTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.recovery.admin;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/tx/recovery/admin/SimpleCacheRecoveryAdminTest.java b/core/src/test/java/org/infinispan/tx/recovery/admin/SimpleCacheRecoveryAdminTest.java
index 9cbc99c741fb..ddbe1c8da112 100644
--- a/core/src/test/java/org/infinispan/tx/recovery/admin/SimpleCacheRecoveryAdminTest.java
+++ b/core/src/test/java/org/infinispan/tx/recovery/admin/SimpleCacheRecoveryAdminTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.recovery.admin;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/tx/synchronisation/APIDistWithSyncTest.java b/core/src/test/java/org/infinispan/tx/synchronisation/APIDistWithSyncTest.java
index 16baf76da401..9c85c5df4a24 100644
--- a/core/src/test/java/org/infinispan/tx/synchronisation/APIDistWithSyncTest.java
+++ b/core/src/test/java/org/infinispan/tx/synchronisation/APIDistWithSyncTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.synchronisation;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/tx/synchronisation/DldEagerLockingDistributedWithSyncTest.java b/core/src/test/java/org/infinispan/tx/synchronisation/DldEagerLockingDistributedWithSyncTest.java
index 848735ea4ab3..1cc8ba1d336e 100644
--- a/core/src/test/java/org/infinispan/tx/synchronisation/DldEagerLockingDistributedWithSyncTest.java
+++ b/core/src/test/java/org/infinispan/tx/synchronisation/DldEagerLockingDistributedWithSyncTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.synchronisation;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/tx/synchronisation/DldEagerLockingReplicationWithSyncTest.java b/core/src/test/java/org/infinispan/tx/synchronisation/DldEagerLockingReplicationWithSyncTest.java
index c7a327e67b46..4cfb5b536f75 100644
--- a/core/src/test/java/org/infinispan/tx/synchronisation/DldEagerLockingReplicationWithSyncTest.java
+++ b/core/src/test/java/org/infinispan/tx/synchronisation/DldEagerLockingReplicationWithSyncTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.synchronisation;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/tx/synchronisation/LocalDldWithSyncTest.java b/core/src/test/java/org/infinispan/tx/synchronisation/LocalDldWithSyncTest.java
index a05d384c510c..fb5d06f0367d 100644
--- a/core/src/test/java/org/infinispan/tx/synchronisation/LocalDldWithSyncTest.java
+++ b/core/src/test/java/org/infinispan/tx/synchronisation/LocalDldWithSyncTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.synchronisation;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/tx/synchronisation/LocalModeWithSyncTxTest.java b/core/src/test/java/org/infinispan/tx/synchronisation/LocalModeWithSyncTxTest.java
index def88de4bc76..4002bb286441 100644
--- a/core/src/test/java/org/infinispan/tx/synchronisation/LocalModeWithSyncTxTest.java
+++ b/core/src/test/java/org/infinispan/tx/synchronisation/LocalModeWithSyncTxTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.synchronisation;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/tx/synchronisation/NoXaConfigTest.java b/core/src/test/java/org/infinispan/tx/synchronisation/NoXaConfigTest.java
index 5b14d0900997..ba9447109c42 100644
--- a/core/src/test/java/org/infinispan/tx/synchronisation/NoXaConfigTest.java
+++ b/core/src/test/java/org/infinispan/tx/synchronisation/NoXaConfigTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.synchronisation;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/tx/synchronisation/TransactionsSpanningCachesSyncTest.java b/core/src/test/java/org/infinispan/tx/synchronisation/TransactionsSpanningCachesSyncTest.java
index 887548c6b36c..b8027c92fc1a 100644
--- a/core/src/test/java/org/infinispan/tx/synchronisation/TransactionsSpanningCachesSyncTest.java
+++ b/core/src/test/java/org/infinispan/tx/synchronisation/TransactionsSpanningCachesSyncTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tx.synchronisation;
 
 import org.infinispan.config.Configuration;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/BaseSimpleTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/BaseSimpleTotalOrderTest.java
index 7f3b6407fd01..08de51a87988 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/BaseSimpleTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/BaseSimpleTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/FullAsyncTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/FullAsyncTotalOrderTest.java
index 7ccc9cba1cb6..311ffcf45652 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/FullAsyncTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/FullAsyncTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.dist;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/FullSyncTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/FullSyncTotalOrderTest.java
index eab60a849b25..7e4ca683163a 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/FullSyncTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/FullSyncTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.dist;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/FullSyncUseSynchronizationTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/FullSyncUseSynchronizationTotalOrderTest.java
index 680e9847cfd2..ffc8ed5435ef 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/FullSyncUseSynchronizationTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/FullSyncUseSynchronizationTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.dist;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/FullSyncWriteSkewTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/FullSyncWriteSkewTotalOrderTest.java
index 625e4fdc1d32..c0921501bd0d 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/FullSyncWriteSkewTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/FullSyncWriteSkewTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.dist;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeFullAsyncTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeFullAsyncTotalOrderTest.java
index fdcbca34f9e5..a9ba9ed707df 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeFullAsyncTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeFullAsyncTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.dist;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeFullSyncTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeFullSyncTotalOrderTest.java
index 2c36f2aec589..305168601b01 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeFullSyncTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeFullSyncTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.dist;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeFullSyncUseSynchronizationTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeFullSyncUseSynchronizationTotalOrderTest.java
index 60b7aec85191..c5c133437549 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeFullSyncUseSynchronizationTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeFullSyncUseSynchronizationTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.dist;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeFullSyncWriteSkewTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeFullSyncWriteSkewTotalOrderTest.java
index ce550570b873..69d51d40ba52 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeFullSyncWriteSkewTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeFullSyncWriteSkewTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.dist;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeSyncPrepareTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeSyncPrepareTotalOrderTest.java
index 29dd0487eeef..f5d6182996e3 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeSyncPrepareTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeSyncPrepareTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.dist;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeSyncPrepareUseSynchronizationTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeSyncPrepareUseSynchronizationTotalOrderTest.java
index 08061c6e75df..a328d35d2166 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeSyncPrepareUseSynchronizationTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeSyncPrepareUseSynchronizationTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.dist;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeSyncPrepareWriteSkewTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeSyncPrepareWriteSkewTotalOrderTest.java
index 0cc4a0999fce..f99895802478 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeSyncPrepareWriteSkewTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SingleNodeSyncPrepareWriteSkewTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.dist;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SyncPrepareTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SyncPrepareTotalOrderTest.java
index ff53cbad60d3..72a94d35e7e0 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SyncPrepareTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SyncPrepareTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.dist;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SyncPrepareUseSynchronizationTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SyncPrepareUseSynchronizationTotalOrderTest.java
index dc0a8fc540eb..2287356e5eaa 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SyncPrepareUseSynchronizationTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SyncPrepareUseSynchronizationTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.dist;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SyncPrepareWriteSkewTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SyncPrepareWriteSkewTotalOrderTest.java
index 0c51aad18d14..36422cb27887 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SyncPrepareWriteSkewTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/dist/SyncPrepareWriteSkewTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.dist;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/FullAsyncTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/FullAsyncTotalOrderTest.java
index fc524786201b..f9694e65c5c0 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/FullAsyncTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/FullAsyncTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.repl;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/FullSyncTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/FullSyncTotalOrderTest.java
index 8ff1d7fbbe25..a1ceac725a32 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/FullSyncTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/FullSyncTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.repl;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/FullSyncUseSynchronizationTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/FullSyncUseSynchronizationTotalOrderTest.java
index b8d18323f5e7..b0d9fe1b67ec 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/FullSyncUseSynchronizationTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/FullSyncUseSynchronizationTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.repl;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/FullSyncWriteSkewTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/FullSyncWriteSkewTotalOrderTest.java
index 0639970f4115..75011bf13853 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/FullSyncWriteSkewTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/FullSyncWriteSkewTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.repl;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/FullSyncWriteSkewUseSynchronizationTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/FullSyncWriteSkewUseSynchronizationTotalOrderTest.java
index aa0bd31b842a..85833c2318c2 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/FullSyncWriteSkewUseSynchronizationTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/FullSyncWriteSkewUseSynchronizationTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.repl;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeFullAsyncTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeFullAsyncTotalOrderTest.java
index 09a4ad2cd8d3..7e2e80875b40 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeFullAsyncTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeFullAsyncTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.repl;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeFullSyncTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeFullSyncTotalOrderTest.java
index 5803f277c9dd..b25d52c7f8af 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeFullSyncTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeFullSyncTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.repl;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeFullSyncUseSynchronizationTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeFullSyncUseSynchronizationTotalOrderTest.java
index b63086f56fc7..ad114e950702 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeFullSyncUseSynchronizationTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeFullSyncUseSynchronizationTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.repl;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeFullSyncWriteSkewTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeFullSyncWriteSkewTotalOrderTest.java
index ebda1ff1808e..deace6eed075 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeFullSyncWriteSkewTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeFullSyncWriteSkewTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.repl;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeFullSyncWriteSkewUseSynchronizationTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeFullSyncWriteSkewUseSynchronizationTotalOrderTest.java
index e7dd8840831d..34f439d73880 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeFullSyncWriteSkewUseSynchronizationTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeFullSyncWriteSkewUseSynchronizationTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.repl;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeSyncPrepareTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeSyncPrepareTotalOrderTest.java
index fb1240ea030e..42a4a6895d1f 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeSyncPrepareTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeSyncPrepareTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.repl;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeSyncPrepareUseSynchronizationTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeSyncPrepareUseSynchronizationTotalOrderTest.java
index 48c0afffb11d..405dd786df1a 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeSyncPrepareUseSynchronizationTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeSyncPrepareUseSynchronizationTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.repl;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeSyncPrepareWriteSkewTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeSyncPrepareWriteSkewTotalOrderTest.java
index 795eb37b3d97..2ea1b5e11ffd 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeSyncPrepareWriteSkewTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeSyncPrepareWriteSkewTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.repl;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeSyncPrepareWriteSkewUseSynchronizationTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeSyncPrepareWriteSkewUseSynchronizationTotalOrderTest.java
index 19fe62b1a742..2442afb41403 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeSyncPrepareWriteSkewUseSynchronizationTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SingleNodeSyncPrepareWriteSkewUseSynchronizationTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.repl;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SyncPrepareTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SyncPrepareTotalOrderTest.java
index 863793215d8d..5f85ab2d28b0 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SyncPrepareTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SyncPrepareTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.repl;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SyncPrepareUseSynchronizationTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SyncPrepareUseSynchronizationTotalOrderTest.java
index 035328ec0d9f..8bd920dab232 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SyncPrepareUseSynchronizationTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SyncPrepareUseSynchronizationTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.repl;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SyncPrepareWriteSkewTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SyncPrepareWriteSkewTotalOrderTest.java
index 2b8afa2c4cab..90fecbec805f 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SyncPrepareWriteSkewTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SyncPrepareWriteSkewTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.repl;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SyncPrepareWriteSkewUseSynchronizationTotalOrderTest.java b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SyncPrepareWriteSkewUseSynchronizationTotalOrderTest.java
index 335ce1181a57..beb233056dd4 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SyncPrepareWriteSkewUseSynchronizationTotalOrderTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/simple/repl/SyncPrepareWriteSkewUseSynchronizationTotalOrderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.simple.repl;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/statetransfer/DistTotalOrderStateTransferFunctional1PcTest.java b/core/src/test/java/org/infinispan/tx/totalorder/statetransfer/DistTotalOrderStateTransferFunctional1PcTest.java
index 28ae2325b7e4..54501500f871 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/statetransfer/DistTotalOrderStateTransferFunctional1PcTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/statetransfer/DistTotalOrderStateTransferFunctional1PcTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.statetransfer;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/statetransfer/DistTotalOrderStateTransferFunctional2PcTest.java b/core/src/test/java/org/infinispan/tx/totalorder/statetransfer/DistTotalOrderStateTransferFunctional2PcTest.java
index be3dc4664391..3d6158458ae0 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/statetransfer/DistTotalOrderStateTransferFunctional2PcTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/statetransfer/DistTotalOrderStateTransferFunctional2PcTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.statetransfer;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/statetransfer/DistTotalOrderVersionedStateTransferTest.java b/core/src/test/java/org/infinispan/tx/totalorder/statetransfer/DistTotalOrderVersionedStateTransferTest.java
index 4cf97cb1aa38..458ce314108c 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/statetransfer/DistTotalOrderVersionedStateTransferTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/statetransfer/DistTotalOrderVersionedStateTransferTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.statetransfer;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/statetransfer/ReplTotalOrderStateTransferFunctional1PcTest.java b/core/src/test/java/org/infinispan/tx/totalorder/statetransfer/ReplTotalOrderStateTransferFunctional1PcTest.java
index 06d5cdd97253..72fdf0008304 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/statetransfer/ReplTotalOrderStateTransferFunctional1PcTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/statetransfer/ReplTotalOrderStateTransferFunctional1PcTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.statetransfer;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/statetransfer/ReplTotalOrderStateTransferFunctional2PcTest.java b/core/src/test/java/org/infinispan/tx/totalorder/statetransfer/ReplTotalOrderStateTransferFunctional2PcTest.java
index 359f239d437e..643113d4df4a 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/statetransfer/ReplTotalOrderStateTransferFunctional2PcTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/statetransfer/ReplTotalOrderStateTransferFunctional2PcTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.statetransfer;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/statetransfer/ReplTotalOrderVersionedStateTransferTest.java b/core/src/test/java/org/infinispan/tx/totalorder/statetransfer/ReplTotalOrderVersionedStateTransferTest.java
index 42d8567612de..01be1a840cf5 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/statetransfer/ReplTotalOrderVersionedStateTransferTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/statetransfer/ReplTotalOrderVersionedStateTransferTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.statetransfer;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/writeskew/DistTotalOrderL1WriteSkewTest.java b/core/src/test/java/org/infinispan/tx/totalorder/writeskew/DistTotalOrderL1WriteSkewTest.java
index 7a976faed9bf..7bd0fa2f5e2b 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/writeskew/DistTotalOrderL1WriteSkewTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/writeskew/DistTotalOrderL1WriteSkewTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.writeskew;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/writeskew/DistTotalOrderWriteSkewTest.java b/core/src/test/java/org/infinispan/tx/totalorder/writeskew/DistTotalOrderWriteSkewTest.java
index 3c06e2b23dfe..43d16fdc0b01 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/writeskew/DistTotalOrderWriteSkewTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/writeskew/DistTotalOrderWriteSkewTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.writeskew;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/tx/totalorder/writeskew/TotalOrderWriteSkewTest.java b/core/src/test/java/org/infinispan/tx/totalorder/writeskew/TotalOrderWriteSkewTest.java
index 37ee5876e8f4..16496ae82e27 100644
--- a/core/src/test/java/org/infinispan/tx/totalorder/writeskew/TotalOrderWriteSkewTest.java
+++ b/core/src/test/java/org/infinispan/tx/totalorder/writeskew/TotalOrderWriteSkewTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
 package org.infinispan.tx.totalorder.writeskew;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/core/src/test/java/org/infinispan/util/ClassFinderTest.java b/core/src/test/java/org/infinispan/util/ClassFinderTest.java
index 8d4007ea5914..a06a7276490d 100644
--- a/core/src/test/java/org/infinispan/util/ClassFinderTest.java
+++ b/core/src/test/java/org/infinispan/util/ClassFinderTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.util;
 
 import org.infinispan.commons.util.ClassFinder;
diff --git a/core/src/test/java/org/infinispan/util/CountingRpcManager.java b/core/src/test/java/org/infinispan/util/CountingRpcManager.java
index fe05c57e650b..0e5d89a2cd6a 100644
--- a/core/src/test/java/org/infinispan/util/CountingRpcManager.java
+++ b/core/src/test/java/org/infinispan/util/CountingRpcManager.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.util;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/test/java/org/infinispan/util/DeadlockDetectingLockManagerTest.java b/core/src/test/java/org/infinispan/util/DeadlockDetectingLockManagerTest.java
index aaf19e9c59a3..c67596639c35 100644
--- a/core/src/test/java/org/infinispan/util/DeadlockDetectingLockManagerTest.java
+++ b/core/src/test/java/org/infinispan/util/DeadlockDetectingLockManagerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util;
 
 import static org.mockito.Mockito.mock;
diff --git a/core/src/test/java/org/infinispan/util/DefaultTimeServiceTest.java b/core/src/test/java/org/infinispan/util/DefaultTimeServiceTest.java
index 8968a6447254..2e74551caf94 100644
--- a/core/src/test/java/org/infinispan/util/DefaultTimeServiceTest.java
+++ b/core/src/test/java/org/infinispan/util/DefaultTimeServiceTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.util;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/util/EquivalentHashMapTest.java b/core/src/test/java/org/infinispan/util/EquivalentHashMapTest.java
index 3b2e6941b217..4ff229c6c71a 100644
--- a/core/src/test/java/org/infinispan/util/EquivalentHashMapTest.java
+++ b/core/src/test/java/org/infinispan/util/EquivalentHashMapTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.util;
 
 import org.infinispan.commons.equivalence.ByteArrayEquivalence;
diff --git a/core/src/test/java/org/infinispan/util/EquivalentHashSetTest.java b/core/src/test/java/org/infinispan/util/EquivalentHashSetTest.java
index cc2056d8e3e0..ef1cbb9e1125 100644
--- a/core/src/test/java/org/infinispan/util/EquivalentHashSetTest.java
+++ b/core/src/test/java/org/infinispan/util/EquivalentHashSetTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.util;
 
 import org.infinispan.commons.equivalence.ByteArrayEquivalence;
diff --git a/core/src/test/java/org/infinispan/util/HashFunctionTest.java b/core/src/test/java/org/infinispan/util/HashFunctionTest.java
index 778f4e431e27..1b8e672d1334 100644
--- a/core/src/test/java/org/infinispan/util/HashFunctionTest.java
+++ b/core/src/test/java/org/infinispan/util/HashFunctionTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.util;
 
 import org.infinispan.commons.hash.Hash;
diff --git a/core/src/test/java/org/infinispan/util/InfinispanCollectionsTest.java b/core/src/test/java/org/infinispan/util/InfinispanCollectionsTest.java
index 01c9a15d6599..18beb78fc84e 100644
--- a/core/src/test/java/org/infinispan/util/InfinispanCollectionsTest.java
+++ b/core/src/test/java/org/infinispan/util/InfinispanCollectionsTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.util;
 
 import org.infinispan.commons.util.InfinispanCollections;
diff --git a/core/src/test/java/org/infinispan/util/ThreadLocalLeakTest.java b/core/src/test/java/org/infinispan/util/ThreadLocalLeakTest.java
index 04ebbf9fb906..bfeca20b4bd4 100644
--- a/core/src/test/java/org/infinispan/util/ThreadLocalLeakTest.java
+++ b/core/src/test/java/org/infinispan/util/ThreadLocalLeakTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.util;
 
 import org.apache.log4j.helpers.ThreadLocalMap;
diff --git a/core/src/test/java/org/infinispan/util/TransactionTrackInterceptor.java b/core/src/test/java/org/infinispan/util/TransactionTrackInterceptor.java
index 7f7bc319cace..b4eca15d6353 100644
--- a/core/src/test/java/org/infinispan/util/TransactionTrackInterceptor.java
+++ b/core/src/test/java/org/infinispan/util/TransactionTrackInterceptor.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.util;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/util/UtilTest.java b/core/src/test/java/org/infinispan/util/UtilTest.java
index de394791fa40..b8398a247746 100644
--- a/core/src/test/java/org/infinispan/util/UtilTest.java
+++ b/core/src/test/java/org/infinispan/util/UtilTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.util;
 
 import org.infinispan.commons.util.Util;
diff --git a/core/src/test/java/org/infinispan/util/concurrent/BoundedConcurrentHashMapTest.java b/core/src/test/java/org/infinispan/util/concurrent/BoundedConcurrentHashMapTest.java
index 1f4ff7c9f7ad..9709609fd07a 100644
--- a/core/src/test/java/org/infinispan/util/concurrent/BoundedConcurrentHashMapTest.java
+++ b/core/src/test/java/org/infinispan/util/concurrent/BoundedConcurrentHashMapTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.util.concurrent;
 
 import org.infinispan.util.EquivalentHashMapTest;
diff --git a/core/src/test/java/org/infinispan/util/logging/log4j/CompressedFileAppender.java b/core/src/test/java/org/infinispan/util/logging/log4j/CompressedFileAppender.java
index 7ae0a090309e..37e00a286122 100644
--- a/core/src/test/java/org/infinispan/util/logging/log4j/CompressedFileAppender.java
+++ b/core/src/test/java/org/infinispan/util/logging/log4j/CompressedFileAppender.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.util.logging.log4j;
 
 import org.apache.log4j.FileAppender;
diff --git a/core/src/test/java/org/infinispan/util/logging/log4j/ThreadNameFilter.java b/core/src/test/java/org/infinispan/util/logging/log4j/ThreadNameFilter.java
index 7c27f5628271..ef7b6a22bc5c 100644
--- a/core/src/test/java/org/infinispan/util/logging/log4j/ThreadNameFilter.java
+++ b/core/src/test/java/org/infinispan/util/logging/log4j/ThreadNameFilter.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.util.logging.log4j;
 
 import java.util.regex.Pattern;
diff --git a/core/src/test/java/org/infinispan/util/mocks/ControlledCommandFactory.java b/core/src/test/java/org/infinispan/util/mocks/ControlledCommandFactory.java
index 58947667fb1b..7b5ae3aaff3e 100644
--- a/core/src/test/java/org/infinispan/util/mocks/ControlledCommandFactory.java
+++ b/core/src/test/java/org/infinispan/util/mocks/ControlledCommandFactory.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.util.mocks;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/xsite/AbstractTwoSitesTest.java b/core/src/test/java/org/infinispan/xsite/AbstractTwoSitesTest.java
index 0ad3685443a2..e788fb746be3 100644
--- a/core/src/test/java/org/infinispan/xsite/AbstractTwoSitesTest.java
+++ b/core/src/test/java/org/infinispan/xsite/AbstractTwoSitesTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/xsite/AbstractXSiteTest.java b/core/src/test/java/org/infinispan/xsite/AbstractXSiteTest.java
index 0ff599aae70b..77ee9901c787 100644
--- a/core/src/test/java/org/infinispan/xsite/AbstractXSiteTest.java
+++ b/core/src/test/java/org/infinispan/xsite/AbstractXSiteTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.AdvancedCache;
diff --git a/core/src/test/java/org/infinispan/xsite/AtomicMapBackupTest.java b/core/src/test/java/org/infinispan/xsite/AtomicMapBackupTest.java
index df4626406c94..9c8b73566c31 100644
--- a/core/src/test/java/org/infinispan/xsite/AtomicMapBackupTest.java
+++ b/core/src/test/java/org/infinispan/xsite/AtomicMapBackupTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.atomic.AtomicMap;
diff --git a/core/src/test/java/org/infinispan/xsite/BackupCacheStoppedTest.java b/core/src/test/java/org/infinispan/xsite/BackupCacheStoppedTest.java
index 8eff01b00cf5..e401f4ed9c13 100644
--- a/core/src/test/java/org/infinispan/xsite/BackupCacheStoppedTest.java
+++ b/core/src/test/java/org/infinispan/xsite/BackupCacheStoppedTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/xsite/BackupForConfigTest.java b/core/src/test/java/org/infinispan/xsite/BackupForConfigTest.java
index 90c1e47c91f9..dd7aa2a9f39e 100644
--- a/core/src/test/java/org/infinispan/xsite/BackupForConfigTest.java
+++ b/core/src/test/java/org/infinispan/xsite/BackupForConfigTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.configuration.cache.BackupConfiguration;
diff --git a/core/src/test/java/org/infinispan/xsite/BackupForNotSpecifiedTest.java b/core/src/test/java/org/infinispan/xsite/BackupForNotSpecifiedTest.java
index 1d0b829865ff..a5a3ff89e88e 100644
--- a/core/src/test/java/org/infinispan/xsite/BackupForNotSpecifiedTest.java
+++ b/core/src/test/java/org/infinispan/xsite/BackupForNotSpecifiedTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.configuration.cache.BackupConfiguration;
diff --git a/core/src/test/java/org/infinispan/xsite/BaseCacheOperationsTest.java b/core/src/test/java/org/infinispan/xsite/BaseCacheOperationsTest.java
index 8f96a08ab775..0420b913b8db 100644
--- a/core/src/test/java/org/infinispan/xsite/BaseCacheOperationsTest.java
+++ b/core/src/test/java/org/infinispan/xsite/BaseCacheOperationsTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/xsite/BaseDistCacheOperationsTest.java b/core/src/test/java/org/infinispan/xsite/BaseDistCacheOperationsTest.java
index c0ad13dd7b7a..0428fa93e452 100644
--- a/core/src/test/java/org/infinispan/xsite/BaseDistCacheOperationsTest.java
+++ b/core/src/test/java/org/infinispan/xsite/BaseDistCacheOperationsTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.distribution.MagicKey;
diff --git a/core/src/test/java/org/infinispan/xsite/BaseSiteUnreachableTest.java b/core/src/test/java/org/infinispan/xsite/BaseSiteUnreachableTest.java
index bfaf1f391a83..6fcee491857c 100644
--- a/core/src/test/java/org/infinispan/xsite/BaseSiteUnreachableTest.java
+++ b/core/src/test/java/org/infinispan/xsite/BaseSiteUnreachableTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.configuration.cache.BackupConfiguration;
diff --git a/core/src/test/java/org/infinispan/xsite/CountingCustomFailurePolicy.java b/core/src/test/java/org/infinispan/xsite/CountingCustomFailurePolicy.java
index 55cf9bf72716..28beef50683c 100644
--- a/core/src/test/java/org/infinispan/xsite/CountingCustomFailurePolicy.java
+++ b/core/src/test/java/org/infinispan/xsite/CountingCustomFailurePolicy.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import javax.transaction.Transaction;
diff --git a/core/src/test/java/org/infinispan/xsite/ImplicitBackupCacheStoppedTest.java b/core/src/test/java/org/infinispan/xsite/ImplicitBackupCacheStoppedTest.java
index 0a858444b9d0..996be6c1cca5 100644
--- a/core/src/test/java/org/infinispan/xsite/ImplicitBackupCacheStoppedTest.java
+++ b/core/src/test/java/org/infinispan/xsite/ImplicitBackupCacheStoppedTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- *  Copyright 2013 Red Hat Inc. and/or its affiliates and other
- *  contributors as indicated by the @author tags. All rights reserved
- *  See the copyright.txt in the distribution for a full listing of
- *  individual contributors.
- *
- *  This is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU Lesser General Public License as
- *  published by the Free Software Foundation; either version 2.1 of
- *  the License, or (at your option) any later version.
- *
- *  This software is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this software; if not, write to the Free
- *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- *  02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.xsite;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/xsite/NoFailureAsyncReplWarnFailurePolicyTest.java b/core/src/test/java/org/infinispan/xsite/NoFailureAsyncReplWarnFailurePolicyTest.java
index 9a568e65dab3..1eb364e5a854 100644
--- a/core/src/test/java/org/infinispan/xsite/NoFailureAsyncReplWarnFailurePolicyTest.java
+++ b/core/src/test/java/org/infinispan/xsite/NoFailureAsyncReplWarnFailurePolicyTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.configuration.cache.BackupConfiguration;
diff --git a/core/src/test/java/org/infinispan/xsite/NoTxDistCacheOperationsTest.java b/core/src/test/java/org/infinispan/xsite/NoTxDistCacheOperationsTest.java
index 99c1abf83eb7..c122b6f43373 100644
--- a/core/src/test/java/org/infinispan/xsite/NoTxDistCacheOperationsTest.java
+++ b/core/src/test/java/org/infinispan/xsite/NoTxDistCacheOperationsTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/xsite/NonTxAsyncBackupTest.java b/core/src/test/java/org/infinispan/xsite/NonTxAsyncBackupTest.java
index 7da2d06ee7fb..2afb7dc9fe12 100644
--- a/core/src/test/java/org/infinispan/xsite/NonTxAsyncBackupTest.java
+++ b/core/src/test/java/org/infinispan/xsite/NonTxAsyncBackupTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.commands.VisitableCommand;
diff --git a/core/src/test/java/org/infinispan/xsite/NonTxReplCacheOperationsTest.java b/core/src/test/java/org/infinispan/xsite/NonTxReplCacheOperationsTest.java
index 5e42fcb74385..de1d3cce8456 100644
--- a/core/src/test/java/org/infinispan/xsite/NonTxReplCacheOperationsTest.java
+++ b/core/src/test/java/org/infinispan/xsite/NonTxReplCacheOperationsTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/xsite/OptDistCache2PcOperationsTest.java b/core/src/test/java/org/infinispan/xsite/OptDistCache2PcOperationsTest.java
index 978faa7e324a..9972b5ed0cc8 100644
--- a/core/src/test/java/org/infinispan/xsite/OptDistCache2PcOperationsTest.java
+++ b/core/src/test/java/org/infinispan/xsite/OptDistCache2PcOperationsTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- *  Copyright 2012 Red Hat Inc. and/or its affiliates and other
- *  contributors as indicated by the @author tags. All rights reserved
- *  See the copyright.txt in the distribution for a full listing of
- *  individual contributors.
- *
- *  This is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU Lesser General Public License as
- *  published by the Free Software Foundation; either version 2.1 of
- *  the License, or (at your option) any later version.
- *
- *  This software is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this software; if not, write to the Free
- *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- *  02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.xsite;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/xsite/OptDistCacheOperationsTest.java b/core/src/test/java/org/infinispan/xsite/OptDistCacheOperationsTest.java
index fb69b9a2c9e6..d6348a4e4379 100644
--- a/core/src/test/java/org/infinispan/xsite/OptDistCacheOperationsTest.java
+++ b/core/src/test/java/org/infinispan/xsite/OptDistCacheOperationsTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/xsite/OptRepl2PcCacheOperationsTest.java b/core/src/test/java/org/infinispan/xsite/OptRepl2PcCacheOperationsTest.java
index 9c731526bf2a..3d817efb8089 100644
--- a/core/src/test/java/org/infinispan/xsite/OptRepl2PcCacheOperationsTest.java
+++ b/core/src/test/java/org/infinispan/xsite/OptRepl2PcCacheOperationsTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- *  Copyright 2012 Red Hat Inc. and/or its affiliates and other
- *  contributors as indicated by the @author tags. All rights reserved
- *  See the copyright.txt in the distribution for a full listing of
- *  individual contributors.
- *
- *  This is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU Lesser General Public License as
- *  published by the Free Software Foundation; either version 2.1 of
- *  the License, or (at your option) any later version.
- *
- *  This software is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this software; if not, write to the Free
- *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- *  02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.xsite;
 
 import org.testng.annotations.Test;
diff --git a/core/src/test/java/org/infinispan/xsite/OptReplCacheOperationsTest.java b/core/src/test/java/org/infinispan/xsite/OptReplCacheOperationsTest.java
index 8c71f7881626..50ee0dd31b6a 100644
--- a/core/src/test/java/org/infinispan/xsite/OptReplCacheOperationsTest.java
+++ b/core/src/test/java/org/infinispan/xsite/OptReplCacheOperationsTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/xsite/PessDistCacheOperationsTest.java b/core/src/test/java/org/infinispan/xsite/PessDistCacheOperationsTest.java
index 75e5168897f5..be4907f1f888 100644
--- a/core/src/test/java/org/infinispan/xsite/PessDistCacheOperationsTest.java
+++ b/core/src/test/java/org/infinispan/xsite/PessDistCacheOperationsTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/xsite/PessReplCacheOperationsTest.java b/core/src/test/java/org/infinispan/xsite/PessReplCacheOperationsTest.java
index 31d064b1a413..c50130e6e14a 100644
--- a/core/src/test/java/org/infinispan/xsite/PessReplCacheOperationsTest.java
+++ b/core/src/test/java/org/infinispan/xsite/PessReplCacheOperationsTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/xsite/RollbackNoPrepareOptimisticTest.java b/core/src/test/java/org/infinispan/xsite/RollbackNoPrepareOptimisticTest.java
index 7b17e0b0955c..9c53bea80a46 100644
--- a/core/src/test/java/org/infinispan/xsite/RollbackNoPrepareOptimisticTest.java
+++ b/core/src/test/java/org/infinispan/xsite/RollbackNoPrepareOptimisticTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.Cache;
diff --git a/core/src/test/java/org/infinispan/xsite/RollbackNoPreparePessimisticTest.java b/core/src/test/java/org/infinispan/xsite/RollbackNoPreparePessimisticTest.java
index 3327f6012f28..54fed193171d 100644
--- a/core/src/test/java/org/infinispan/xsite/RollbackNoPreparePessimisticTest.java
+++ b/core/src/test/java/org/infinispan/xsite/RollbackNoPreparePessimisticTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/xsite/TxAsyncBackupTest.java b/core/src/test/java/org/infinispan/xsite/TxAsyncBackupTest.java
index 56baf02c423e..f94049bc2969 100644
--- a/core/src/test/java/org/infinispan/xsite/TxAsyncBackupTest.java
+++ b/core/src/test/java/org/infinispan/xsite/TxAsyncBackupTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/xsite/XSiteAdminOperationsTest.java b/core/src/test/java/org/infinispan/xsite/XSiteAdminOperationsTest.java
index 00b7bf4f93cb..0284392b4bbd 100644
--- a/core/src/test/java/org/infinispan/xsite/XSiteAdminOperationsTest.java
+++ b/core/src/test/java/org/infinispan/xsite/XSiteAdminOperationsTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- *  Copyright 2012 Red Hat Inc. and/or its affiliates and other
- *  contributors as indicated by the @author tags. All rights reserved
- *  See the copyright.txt in the distribution for a full listing of
- *  individual contributors.
- *
- *  This is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU Lesser General Public License as
- *  published by the Free Software Foundation; either version 2.1 of
- *  the License, or (at your option) any later version.
- *
- *  This software is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this software; if not, write to the Free
- *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- *  02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/xsite/XSiteCacheConfigurationTest.java b/core/src/test/java/org/infinispan/xsite/XSiteCacheConfigurationTest.java
index df4c44464efc..a766915697bb 100644
--- a/core/src/test/java/org/infinispan/xsite/XSiteCacheConfigurationTest.java
+++ b/core/src/test/java/org/infinispan/xsite/XSiteCacheConfigurationTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.commons.CacheConfigurationException;
diff --git a/core/src/test/java/org/infinispan/xsite/XSiteFileParsing2Test.java b/core/src/test/java/org/infinispan/xsite/XSiteFileParsing2Test.java
index 8c9a5ec1ac1d..2123f7baff50 100644
--- a/core/src/test/java/org/infinispan/xsite/XSiteFileParsing2Test.java
+++ b/core/src/test/java/org/infinispan/xsite/XSiteFileParsing2Test.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.configuration.cache.BackupConfiguration;
diff --git a/core/src/test/java/org/infinispan/xsite/XSiteFileParsing3Test.java b/core/src/test/java/org/infinispan/xsite/XSiteFileParsing3Test.java
index 561aef7e91c9..e015ff25a787 100644
--- a/core/src/test/java/org/infinispan/xsite/XSiteFileParsing3Test.java
+++ b/core/src/test/java/org/infinispan/xsite/XSiteFileParsing3Test.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.configuration.cache.BackupConfiguration;
diff --git a/core/src/test/java/org/infinispan/xsite/XSiteFileParsingTest.java b/core/src/test/java/org/infinispan/xsite/XSiteFileParsingTest.java
index b32dca13c1d6..e3ab11cc6962 100644
--- a/core/src/test/java/org/infinispan/xsite/XSiteFileParsingTest.java
+++ b/core/src/test/java/org/infinispan/xsite/XSiteFileParsingTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite;
 
 import org.infinispan.configuration.cache.BackupConfiguration;
diff --git a/core/src/test/java/org/infinispan/xsite/backupfailure/BaseBackupFailureTest.java b/core/src/test/java/org/infinispan/xsite/backupfailure/BaseBackupFailureTest.java
index f4838be4c5dc..1ba858dbccec 100644
--- a/core/src/test/java/org/infinispan/xsite/backupfailure/BaseBackupFailureTest.java
+++ b/core/src/test/java/org/infinispan/xsite/backupfailure/BaseBackupFailureTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite.backupfailure;
 
 import org.infinispan.commands.tx.CommitCommand;
diff --git a/core/src/test/java/org/infinispan/xsite/backupfailure/CustomFailurePolicyTest.java b/core/src/test/java/org/infinispan/xsite/backupfailure/CustomFailurePolicyTest.java
index c9708e92ac4a..aae28e225ffb 100644
--- a/core/src/test/java/org/infinispan/xsite/backupfailure/CustomFailurePolicyTest.java
+++ b/core/src/test/java/org/infinispan/xsite/backupfailure/CustomFailurePolicyTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite.backupfailure;
 
 import org.infinispan.configuration.cache.BackupFailurePolicy;
diff --git a/core/src/test/java/org/infinispan/xsite/backupfailure/NonTxBackupFailureTest.java b/core/src/test/java/org/infinispan/xsite/backupfailure/NonTxBackupFailureTest.java
index 5d3cfd473806..d9fc2fb49b07 100644
--- a/core/src/test/java/org/infinispan/xsite/backupfailure/NonTxBackupFailureTest.java
+++ b/core/src/test/java/org/infinispan/xsite/backupfailure/NonTxBackupFailureTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite.backupfailure;
 
 import org.infinispan.commons.CacheException;
diff --git a/core/src/test/java/org/infinispan/xsite/backupfailure/OptDistBackupFailure2Test.java b/core/src/test/java/org/infinispan/xsite/backupfailure/OptDistBackupFailure2Test.java
index 3a35e75e3a5c..8165884ca163 100644
--- a/core/src/test/java/org/infinispan/xsite/backupfailure/OptDistBackupFailure2Test.java
+++ b/core/src/test/java/org/infinispan/xsite/backupfailure/OptDistBackupFailure2Test.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite.backupfailure;
 
 import org.infinispan.configuration.cache.BackupFailurePolicy;
diff --git a/core/src/test/java/org/infinispan/xsite/backupfailure/OptDistBackupFailureTest.java b/core/src/test/java/org/infinispan/xsite/backupfailure/OptDistBackupFailureTest.java
index cb29e52ae9ff..8d8cf29d18d0 100644
--- a/core/src/test/java/org/infinispan/xsite/backupfailure/OptDistBackupFailureTest.java
+++ b/core/src/test/java/org/infinispan/xsite/backupfailure/OptDistBackupFailureTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite.backupfailure;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/xsite/backupfailure/OptReplBackupFailure2Test.java b/core/src/test/java/org/infinispan/xsite/backupfailure/OptReplBackupFailure2Test.java
index 44f0a3410e03..e2bc996fed05 100644
--- a/core/src/test/java/org/infinispan/xsite/backupfailure/OptReplBackupFailure2Test.java
+++ b/core/src/test/java/org/infinispan/xsite/backupfailure/OptReplBackupFailure2Test.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite.backupfailure;
 
 import org.infinispan.configuration.cache.BackupFailurePolicy;
diff --git a/core/src/test/java/org/infinispan/xsite/backupfailure/OptReplBackupFailureTest.java b/core/src/test/java/org/infinispan/xsite/backupfailure/OptReplBackupFailureTest.java
index f8790c0397bc..142150354139 100644
--- a/core/src/test/java/org/infinispan/xsite/backupfailure/OptReplBackupFailureTest.java
+++ b/core/src/test/java/org/infinispan/xsite/backupfailure/OptReplBackupFailureTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite.backupfailure;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/xsite/backupfailure/tx/BaseBackupTxFailureTest.java b/core/src/test/java/org/infinispan/xsite/backupfailure/tx/BaseBackupTxFailureTest.java
index bfc49d6b3ea3..5f8aed9b0aea 100644
--- a/core/src/test/java/org/infinispan/xsite/backupfailure/tx/BaseBackupTxFailureTest.java
+++ b/core/src/test/java/org/infinispan/xsite/backupfailure/tx/BaseBackupTxFailureTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite.backupfailure.tx;
 
 import org.infinispan.configuration.cache.BackupFailurePolicy;
diff --git a/core/src/test/java/org/infinispan/xsite/backupfailure/tx/BaseLocalClusterTxFailureTest.java b/core/src/test/java/org/infinispan/xsite/backupfailure/tx/BaseLocalClusterTxFailureTest.java
index e1ed3c964a42..2bb69add77ae 100644
--- a/core/src/test/java/org/infinispan/xsite/backupfailure/tx/BaseLocalClusterTxFailureTest.java
+++ b/core/src/test/java/org/infinispan/xsite/backupfailure/tx/BaseLocalClusterTxFailureTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite.backupfailure.tx;
 
 import org.infinispan.xsite.AbstractTwoSitesTest;
diff --git a/core/src/test/java/org/infinispan/xsite/backupfailure/tx/CustomFailurePolicyTxTest.java b/core/src/test/java/org/infinispan/xsite/backupfailure/tx/CustomFailurePolicyTxTest.java
index a478c54f1748..9c10c179e0ce 100644
--- a/core/src/test/java/org/infinispan/xsite/backupfailure/tx/CustomFailurePolicyTxTest.java
+++ b/core/src/test/java/org/infinispan/xsite/backupfailure/tx/CustomFailurePolicyTxTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite.backupfailure.tx;
 
 import org.infinispan.configuration.cache.BackupFailurePolicy;
diff --git a/core/src/test/java/org/infinispan/xsite/backupfailure/tx/DistBackupTxFailureTest.java b/core/src/test/java/org/infinispan/xsite/backupfailure/tx/DistBackupTxFailureTest.java
index 3006c9fe3021..060a315bd42d 100644
--- a/core/src/test/java/org/infinispan/xsite/backupfailure/tx/DistBackupTxFailureTest.java
+++ b/core/src/test/java/org/infinispan/xsite/backupfailure/tx/DistBackupTxFailureTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite.backupfailure.tx;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/xsite/backupfailure/tx/DistLocalClusterFailureTest.java b/core/src/test/java/org/infinispan/xsite/backupfailure/tx/DistLocalClusterFailureTest.java
index 33a2cd481ac0..ea155d9920c8 100644
--- a/core/src/test/java/org/infinispan/xsite/backupfailure/tx/DistLocalClusterFailureTest.java
+++ b/core/src/test/java/org/infinispan/xsite/backupfailure/tx/DistLocalClusterFailureTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite.backupfailure.tx;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/xsite/backupfailure/tx/DistLocalClusterTxBackupFailureTest.java b/core/src/test/java/org/infinispan/xsite/backupfailure/tx/DistLocalClusterTxBackupFailureTest.java
index b3c446618ce8..5eef50cb2ca8 100644
--- a/core/src/test/java/org/infinispan/xsite/backupfailure/tx/DistLocalClusterTxBackupFailureTest.java
+++ b/core/src/test/java/org/infinispan/xsite/backupfailure/tx/DistLocalClusterTxBackupFailureTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite.backupfailure.tx;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/xsite/backupfailure/tx/ReplBackupTxFailureTest.java b/core/src/test/java/org/infinispan/xsite/backupfailure/tx/ReplBackupTxFailureTest.java
index 0aa30220f2bb..cac8af1599c7 100644
--- a/core/src/test/java/org/infinispan/xsite/backupfailure/tx/ReplBackupTxFailureTest.java
+++ b/core/src/test/java/org/infinispan/xsite/backupfailure/tx/ReplBackupTxFailureTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite.backupfailure.tx;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/xsite/backupfailure/tx/ReplLocalClusterFailureTest.java b/core/src/test/java/org/infinispan/xsite/backupfailure/tx/ReplLocalClusterFailureTest.java
index 478434e8a513..20a694127511 100644
--- a/core/src/test/java/org/infinispan/xsite/backupfailure/tx/ReplLocalClusterFailureTest.java
+++ b/core/src/test/java/org/infinispan/xsite/backupfailure/tx/ReplLocalClusterFailureTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite.backupfailure.tx;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/java/org/infinispan/xsite/backupfailure/tx/SinglePhaseCommitFailureTest.java b/core/src/test/java/org/infinispan/xsite/backupfailure/tx/SinglePhaseCommitFailureTest.java
index 0d23c9e8eea1..4591fa00591a 100644
--- a/core/src/test/java/org/infinispan/xsite/backupfailure/tx/SinglePhaseCommitFailureTest.java
+++ b/core/src/test/java/org/infinispan/xsite/backupfailure/tx/SinglePhaseCommitFailureTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- *  Copyright 2012 Red Hat Inc. and/or its affiliates and other
- *  contributors as indicated by the @author tags. All rights reserved
- *  See the copyright.txt in the distribution for a full listing of
- *  individual contributors.
- *
- *  This is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU Lesser General Public License as
- *  published by the Free Software Foundation; either version 2.1 of
- *  the License, or (at your option) any later version.
- *
- *  This software is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this software; if not, write to the Free
- *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- *  02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.xsite.backupfailure.tx;
 
 import org.infinispan.configuration.cache.BackupFailurePolicy;
diff --git a/core/src/test/java/org/infinispan/xsite/offline/DelegatingTransport.java b/core/src/test/java/org/infinispan/xsite/offline/DelegatingTransport.java
index 879b0bf37ff9..597a18fdf149 100644
--- a/core/src/test/java/org/infinispan/xsite/offline/DelegatingTransport.java
+++ b/core/src/test/java/org/infinispan/xsite/offline/DelegatingTransport.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite.offline;
 
 import org.infinispan.commands.ReplicableCommand;
diff --git a/core/src/test/java/org/infinispan/xsite/offline/NonTxOfflineTest.java b/core/src/test/java/org/infinispan/xsite/offline/NonTxOfflineTest.java
index 9cf97d73a57b..64c8b5f4ac0d 100644
--- a/core/src/test/java/org/infinispan/xsite/offline/NonTxOfflineTest.java
+++ b/core/src/test/java/org/infinispan/xsite/offline/NonTxOfflineTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite.offline;
 
 import org.infinispan.configuration.cache.BackupFailurePolicy;
diff --git a/core/src/test/java/org/infinispan/xsite/offline/OfflineStatusTest.java b/core/src/test/java/org/infinispan/xsite/offline/OfflineStatusTest.java
index b3cde4977d3c..78cdaff98ffa 100644
--- a/core/src/test/java/org/infinispan/xsite/offline/OfflineStatusTest.java
+++ b/core/src/test/java/org/infinispan/xsite/offline/OfflineStatusTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite.offline;
 
 import org.infinispan.configuration.cache.TakeOfflineConfiguration;
diff --git a/core/src/test/java/org/infinispan/xsite/offline/ResetOfflineStatusTest.java b/core/src/test/java/org/infinispan/xsite/offline/ResetOfflineStatusTest.java
index 46dd1500b487..896b6bbb1e21 100644
--- a/core/src/test/java/org/infinispan/xsite/offline/ResetOfflineStatusTest.java
+++ b/core/src/test/java/org/infinispan/xsite/offline/ResetOfflineStatusTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite.offline;
 
 import org.infinispan.configuration.cache.BackupFailurePolicy;
diff --git a/core/src/test/java/org/infinispan/xsite/offline/TxOfflineTest.java b/core/src/test/java/org/infinispan/xsite/offline/TxOfflineTest.java
index e3cf664273a6..ac07426416ee 100644
--- a/core/src/test/java/org/infinispan/xsite/offline/TxOfflineTest.java
+++ b/core/src/test/java/org/infinispan/xsite/offline/TxOfflineTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.xsite.offline;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/core/src/test/resources/configs/all.xml b/core/src/test/resources/configs/all.xml
index 411287d96b11..f100f39da0f0 100644
--- a/core/src/test/resources/configs/all.xml
+++ b/core/src/test/resources/configs/all.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <infinispan
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:infinispan:config:5.3 http://www.infinispan.org/schemas/infinispan-config-5.3.xsd"
diff --git a/core/src/test/resources/configs/batching.xml b/core/src/test/resources/configs/batching.xml
index 9ef4c9ea39c2..5d83eada3149 100644
--- a/core/src/test/resources/configs/batching.xml
+++ b/core/src/test/resources/configs/batching.xml
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2011 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-
 <infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="urn:infinispan:config:5.3 http://www.infinispan.org/schemas/infinispan-config-5.3.xsd"
     xmlns="urn:infinispan:config:5.3">
diff --git a/core/src/test/resources/configs/coherence/cache-config.dtd b/core/src/test/resources/configs/coherence/cache-config.dtd
index 54ff57c1e85b..fab274796b61 100644
--- a/core/src/test/resources/configs/coherence/cache-config.dtd
+++ b/core/src/test/resources/configs/coherence/cache-config.dtd
@@ -1,26 +1,3 @@
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-
 <!--
 This is the XML DTD for the coherence-cache-config.xml configuration file.
 The configuration file should include a DOCTYPE of the following form:
diff --git a/core/src/test/resources/configs/coherence/default-config.xml b/core/src/test/resources/configs/coherence/default-config.xml
index 583b6b3036f7..b2eee3f82935 100644
--- a/core/src/test/resources/configs/coherence/default-config.xml
+++ b/core/src/test/resources/configs/coherence/default-config.xml
@@ -1,28 +1,4 @@
 <?xml version="1.0"?>
-
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-
 <!--
 Note: This XML document is an example Coherence Cache Configuration deployment
 descriptor that should be customized (or replaced) for your particular caching
diff --git a/core/src/test/resources/configs/deprecated-elements.xml b/core/src/test/resources/configs/deprecated-elements.xml
index de9f38d552eb..f1d5619f2f97 100644
--- a/core/src/test/resources/configs/deprecated-elements.xml
+++ b/core/src/test/resources/configs/deprecated-elements.xml
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-   ~ JBoss, Home of Professional Open Source
-   ~ Copyright 2011 Red Hat Inc. and/or its affiliates and other
-   ~ contributors as indicated by the @author tags. All rights reserved.
-   ~ See the copyright.txt in the distribution for a full listing of
-   ~ individual contributors.
-   ~
-   ~ This is free software; you can redistribute it and/or modify it
-   ~ under the terms of the GNU Lesser General Public License as
-   ~ published by the Free Software Foundation; either version 2.1 of
-   ~ the License, or (at your option) any later version.
-   ~
-   ~ This software is distributed in the hope that it will be useful,
-   ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   ~ Lesser General Public License for more details.
-   ~
-   ~ You should have received a copy of the GNU Lesser General Public
-   ~ License along with this software; if not, write to the Free
-   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
-
 <infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:infinispan:config:5.1 http://www.infinispan.org/schemas/infinispan-config-5.1.xsd" xmlns="urn:infinispan:config:5.1">
 
    <global />
diff --git a/core/src/test/resources/configs/ehcache/ehcache-1.5.xml b/core/src/test/resources/configs/ehcache/ehcache-1.5.xml
index fcaaf1cf4610..2434f93aaaa6 100644
--- a/core/src/test/resources/configs/ehcache/ehcache-1.5.xml
+++ b/core/src/test/resources/configs/ehcache/ehcache-1.5.xml
@@ -1,25 +1,3 @@
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="ehcache-1.5.xsd">
 
diff --git a/core/src/test/resources/configs/ehcache/ehcache-1.5.xsd b/core/src/test/resources/configs/ehcache/ehcache-1.5.xsd
index 70a7ec25faca..5be42f059cac 100644
--- a/core/src/test/resources/configs/ehcache/ehcache-1.5.xsd
+++ b/core/src/test/resources/configs/ehcache/ehcache-1.5.xsd
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
     <xs:element name="ehcache" >
         <xs:complexType>
diff --git a/core/src/test/resources/configs/ehcache/ehcache-1.6.xml b/core/src/test/resources/configs/ehcache/ehcache-1.6.xml
index 6b6e2188816a..8780dc26c687 100644
--- a/core/src/test/resources/configs/ehcache/ehcache-1.6.xml
+++ b/core/src/test/resources/configs/ehcache/ehcache-1.6.xml
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="ehcache-1.6.xsd" >
 
diff --git a/core/src/test/resources/configs/ehcache/ehcache-1.6.xsd b/core/src/test/resources/configs/ehcache/ehcache-1.6.xsd
index c34f63da2f25..de211893d44b 100644
--- a/core/src/test/resources/configs/ehcache/ehcache-1.6.xsd
+++ b/core/src/test/resources/configs/ehcache/ehcache-1.6.xsd
@@ -1,25 +1,3 @@
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="1.6">
     <xs:element name="ehcache" >
         <xs:complexType>
diff --git a/core/src/test/resources/configs/jbosscache3x/all.xml b/core/src/test/resources/configs/jbosscache3x/all.xml
index 729e526a1448..8f764dc363ff 100644
--- a/core/src/test/resources/configs/jbosscache3x/all.xml
+++ b/core/src/test/resources/configs/jbosscache3x/all.xml
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0">
 
 
diff --git a/core/src/test/resources/configs/jbosscache3x/buddy-replication.xml b/core/src/test/resources/configs/jbosscache3x/buddy-replication.xml
index 1dee46307005..27e66c81013a 100644
--- a/core/src/test/resources/configs/jbosscache3x/buddy-replication.xml
+++ b/core/src/test/resources/configs/jbosscache3x/buddy-replication.xml
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0">
 
    <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
diff --git a/core/src/test/resources/configs/jbosscache3x/cacheloader-enabled.xml b/core/src/test/resources/configs/jbosscache3x/cacheloader-enabled.xml
index 3b159d75aceb..ae6b1ba18863 100644
--- a/core/src/test/resources/configs/jbosscache3x/cacheloader-enabled.xml
+++ b/core/src/test/resources/configs/jbosscache3x/cacheloader-enabled.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0">
 
     <!-- Configure the TransactionManager -->
diff --git a/core/src/test/resources/configs/jbosscache3x/eviction-enabled.xml b/core/src/test/resources/configs/jbosscache3x/eviction-enabled.xml
index e7e72e200944..b30cbfd6ce4b 100644
--- a/core/src/test/resources/configs/jbosscache3x/eviction-enabled.xml
+++ b/core/src/test/resources/configs/jbosscache3x/eviction-enabled.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0">
 
    <!-- Configure the TransactionManager -->
diff --git a/core/src/test/resources/configs/jbosscache3x/external-jgroups-file.xml b/core/src/test/resources/configs/jbosscache3x/external-jgroups-file.xml
index d390f85b78a9..22b2805e7daf 100644
--- a/core/src/test/resources/configs/jbosscache3x/external-jgroups-file.xml
+++ b/core/src/test/resources/configs/jbosscache3x/external-jgroups-file.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0">
 
    <!-- Configure the TransactionManager -->
diff --git a/core/src/test/resources/configs/jbosscache3x/invalidation-async.xml b/core/src/test/resources/configs/jbosscache3x/invalidation-async.xml
index b422db7e9053..231a722e3e65 100644
--- a/core/src/test/resources/configs/jbosscache3x/invalidation-async.xml
+++ b/core/src/test/resources/configs/jbosscache3x/invalidation-async.xml
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0">
 
    <!-- Configure the TransactionManager -->
diff --git a/core/src/test/resources/configs/jbosscache3x/total-replication.xml b/core/src/test/resources/configs/jbosscache3x/total-replication.xml
index 55856b941cd8..233640bdeca4 100644
--- a/core/src/test/resources/configs/jbosscache3x/total-replication.xml
+++ b/core/src/test/resources/configs/jbosscache3x/total-replication.xml
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0">
 
    <!-- Configure the TransactionManager -->
diff --git a/core/src/test/resources/configs/local-singlenamedcache-test.xml b/core/src/test/resources/configs/local-singlenamedcache-test.xml
index 88b5d602b251..08f5dbccbfb4 100644
--- a/core/src/test/resources/configs/local-singlenamedcache-test.xml
+++ b/core/src/test/resources/configs/local-singlenamedcache-test.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <infinispan
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:infinispan:config:5.3 http://www.infinispan.org/schemas/infinispan-config-5.3.xsd"
diff --git a/core/src/test/resources/configs/named-cache-override-test.xml b/core/src/test/resources/configs/named-cache-override-test.xml
index 40654de459fe..bf3d6708dd22 100644
--- a/core/src/test/resources/configs/named-cache-override-test.xml
+++ b/core/src/test/resources/configs/named-cache-override-test.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <infinispan
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:infinispan:config:5.3 http://www.infinispan.org/schemas/infinispan-config-5.3.xsd"
diff --git a/core/src/test/resources/configs/named-cache-test-51.xml b/core/src/test/resources/configs/named-cache-test-51.xml
index 719f245c65b8..af9c12b21130 100644
--- a/core/src/test/resources/configs/named-cache-test-51.xml
+++ b/core/src/test/resources/configs/named-cache-test-51.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <infinispan
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:infinispan:config:5.1 http://www.infinispan.org/schemas/infinispan-config-5.1.xsd"
diff --git a/core/src/test/resources/configs/named-cache-test.xml b/core/src/test/resources/configs/named-cache-test.xml
index 6bca50b95101..cb880676b47e 100644
--- a/core/src/test/resources/configs/named-cache-test.xml
+++ b/core/src/test/resources/configs/named-cache-test.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <infinispan
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:infinispan:config:5.3 http://www.infinispan.org/schemas/infinispan-config-5.3.xsd"
diff --git a/core/src/test/resources/configs/no-xa-config.xml b/core/src/test/resources/configs/no-xa-config.xml
index c282f86c9d23..92d836f01125 100644
--- a/core/src/test/resources/configs/no-xa-config.xml
+++ b/core/src/test/resources/configs/no-xa-config.xml
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2011 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-
 <infinispan
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:infinispan:config:5.3 http://www.infinispan.org/schemas/infinispan-config-5.3.xsd"
diff --git a/core/src/test/resources/configs/recovery-enabled-config.xml b/core/src/test/resources/configs/recovery-enabled-config.xml
index c647b402e4a7..8e260e3795c9 100644
--- a/core/src/test/resources/configs/recovery-enabled-config.xml
+++ b/core/src/test/resources/configs/recovery-enabled-config.xml
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2011 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-
 <infinispan
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:infinispan:config:5.3 http://www.infinispan.org/schemas/infinispan-config-5.3.xsd"
diff --git a/core/src/test/resources/configs/string-property-replaced.xml b/core/src/test/resources/configs/string-property-replaced.xml
index 68be73037ecc..36dc30429173 100644
--- a/core/src/test/resources/configs/string-property-replaced.xml
+++ b/core/src/test/resources/configs/string-property-replaced.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <infinispan
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:infinispan:config:5.3 http://www.infinispan.org/schemas/infinispan-config-5.3.xsd"
diff --git a/core/src/test/resources/configs/xsite/bridge.xml b/core/src/test/resources/configs/xsite/bridge.xml
index e5cdadd94827..1982ac2bccc1 100644
--- a/core/src/test/resources/configs/xsite/bridge.xml
+++ b/core/src/test/resources/configs/xsite/bridge.xml
@@ -1,23 +1,3 @@
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
-  ~ as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a
-  ~ full listing of individual contributors.
-  ~
-  ~ This copyrighted material is made available to anyone wishing to use,
-  ~ modify, copy, or redistribute it subject to the terms and conditions
-  ~ of the GNU Lesser General Public License, v. 2.1.
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT A
-  ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  ~ PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
-  ~ You should have received a copy of the GNU Lesser General Public License,
-  ~ v.2.1 along with this distribution; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-  ~ MA  02110-1301, USA.
-  -->
-
-
 <config>
 
     <TCP bind_addr="127.0.0.1"
diff --git a/core/src/test/resources/configs/xsite/relay-config.xml b/core/src/test/resources/configs/xsite/relay-config.xml
index 2e02d030645e..66232c4a8d64 100644
--- a/core/src/test/resources/configs/xsite/relay-config.xml
+++ b/core/src/test/resources/configs/xsite/relay-config.xml
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2011 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-
 <RelayConfiguration xmlns="urn:jgroups:relay:1.0">
 
     <sites>
diff --git a/core/src/test/resources/configs/xsite/xsite-offline-test.xml b/core/src/test/resources/configs/xsite/xsite-offline-test.xml
index 23f389c99536..1fd26695353e 100644
--- a/core/src/test/resources/configs/xsite/xsite-offline-test.xml
+++ b/core/src/test/resources/configs/xsite/xsite-offline-test.xml
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2011 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-
 <infinispan
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="urn:infinispan:config:5.3 http://www.infinispan.org/schemas/infinispan-config-5.3.xsd"
diff --git a/core/src/test/resources/configs/xsite/xsite-test.xml b/core/src/test/resources/configs/xsite/xsite-test.xml
index 130f2a82f340..430c2906c7f0 100644
--- a/core/src/test/resources/configs/xsite/xsite-test.xml
+++ b/core/src/test/resources/configs/xsite/xsite-test.xml
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2011 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-
 <infinispan
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="urn:infinispan:config:5.3 http://www.infinispan.org/schemas/infinispan-config-5.3.xsd"
diff --git a/core/src/test/resources/configs/xsite/xsite-test2.xml b/core/src/test/resources/configs/xsite/xsite-test2.xml
index 5a8803795df5..0bb2db2bb5d9 100644
--- a/core/src/test/resources/configs/xsite/xsite-test2.xml
+++ b/core/src/test/resources/configs/xsite/xsite-test2.xml
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2011 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-
 <infinispan
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="urn:infinispan:config:5.3 http://www.infinispan.org/schemas/infinispan-config-5.3.xsd"
diff --git a/core/src/test/resources/jbossts-properties.xml b/core/src/test/resources/jbossts-properties.xml
index 17aed6ca6f33..73d329badb56 100644
--- a/core/src/test/resources/jbossts-properties.xml
+++ b/core/src/test/resources/jbossts-properties.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties>
     <!--
diff --git a/core/src/test/resources/log4j-trace.xml b/core/src/test/resources/log4j-trace.xml
index d3a7fac9e6f1..731865c824e9 100644
--- a/core/src/test/resources/log4j-trace.xml
+++ b/core/src/test/resources/log4j-trace.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 
 <!--
diff --git a/core/src/test/resources/log4j.xml b/core/src/test/resources/log4j.xml
index e88c5e71eaf0..afbaae8d4280 100644
--- a/core/src/test/resources/log4j.xml
+++ b/core/src/test/resources/log4j.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 
 <!--
diff --git a/core/src/test/resources/stacks/tcp.xml b/core/src/test/resources/stacks/tcp.xml
index 67adf359cc3d..9ddbd74e5733 100644
--- a/core/src/test/resources/stacks/tcp.xml
+++ b/core/src/test/resources/stacks/tcp.xml
@@ -1,25 +1,3 @@
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <config xmlns="urn:org:jgroups"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="urn:org:jgroups file:schema/JGroups-3.2.xsd">
diff --git a/core/src/test/resources/stacks/tcp_mping/tcp1.xml b/core/src/test/resources/stacks/tcp_mping/tcp1.xml
index 10d8c41b7aa9..b6479458b59d 100644
--- a/core/src/test/resources/stacks/tcp_mping/tcp1.xml
+++ b/core/src/test/resources/stacks/tcp_mping/tcp1.xml
@@ -1,25 +1,3 @@
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <config xmlns="urn:org:jgroups"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="urn:org:jgroups file:schema/JGroups-3.1.xsd">
diff --git a/core/src/test/resources/stacks/tcp_mping/tcp2.xml b/core/src/test/resources/stacks/tcp_mping/tcp2.xml
index 656c521dcc05..d0acb9f44965 100644
--- a/core/src/test/resources/stacks/tcp_mping/tcp2.xml
+++ b/core/src/test/resources/stacks/tcp_mping/tcp2.xml
@@ -1,25 +1,3 @@
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <config xmlns="urn:org:jgroups"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="urn:org:jgroups file:schema/JGroups-3.1.xsd">
diff --git a/core/src/test/resources/stacks/udp.xml b/core/src/test/resources/stacks/udp.xml
index c4595e4d70fd..053357d1cb4f 100644
--- a/core/src/test/resources/stacks/udp.xml
+++ b/core/src/test/resources/stacks/udp.xml
@@ -1,25 +1,3 @@
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <config xmlns="urn:org:jgroups"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="urn:org:jgroups file:schema/JGroups-3.2.xsd">
diff --git a/demos/directory/pom.xml b/demos/directory/pom.xml
index f9f77aa36f1f..c8fd24c130e4 100644
--- a/demos/directory/pom.xml
+++ b/demos/directory/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
diff --git a/demos/directory/src/main/java/org/infinispan/demos/directory/FilesystemDirectory.java b/demos/directory/src/main/java/org/infinispan/demos/directory/FilesystemDirectory.java
index 4ddcd5b33a5a..49f38adb9bc8 100644
--- a/demos/directory/src/main/java/org/infinispan/demos/directory/FilesystemDirectory.java
+++ b/demos/directory/src/main/java/org/infinispan/demos/directory/FilesystemDirectory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.demos.directory;
 
 import java.io.File;
diff --git a/demos/distexec/pom.xml b/demos/distexec/pom.xml
index 52a19a604702..934db442b22b 100644
--- a/demos/distexec/pom.xml
+++ b/demos/distexec/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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>
 
diff --git a/demos/distexec/src/main/java/org/infinispan/demo/CacheBuilder.java b/demos/distexec/src/main/java/org/infinispan/demo/CacheBuilder.java
index f40c722eeae2..fb929d02ef6c 100644
--- a/demos/distexec/src/main/java/org/infinispan/demo/CacheBuilder.java
+++ b/demos/distexec/src/main/java/org/infinispan/demo/CacheBuilder.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.demo;
 
 import org.infinispan.manager.DefaultCacheManager;
diff --git a/demos/distexec/src/main/java/org/infinispan/demo/Demo.java b/demos/distexec/src/main/java/org/infinispan/demo/Demo.java
index f98e16d28f0d..d77927625834 100644
--- a/demos/distexec/src/main/java/org/infinispan/demo/Demo.java
+++ b/demos/distexec/src/main/java/org/infinispan/demo/Demo.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.demo;
 
 import com.martiansoftware.jsap.JSAPException;
diff --git a/demos/distexec/src/main/java/org/infinispan/demo/mapreduce/WordCountCollator.java b/demos/distexec/src/main/java/org/infinispan/demo/mapreduce/WordCountCollator.java
index 61e19ff7c223..2f7fe663754c 100644
--- a/demos/distexec/src/main/java/org/infinispan/demo/mapreduce/WordCountCollator.java
+++ b/demos/distexec/src/main/java/org/infinispan/demo/mapreduce/WordCountCollator.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.demo.mapreduce;
 
 import org.infinispan.distexec.mapreduce.Collator;
diff --git a/demos/distexec/src/main/java/org/infinispan/demo/mapreduce/WordCountDemo.java b/demos/distexec/src/main/java/org/infinispan/demo/mapreduce/WordCountDemo.java
index 0aeeff2c970a..03bf2d706d58 100644
--- a/demos/distexec/src/main/java/org/infinispan/demo/mapreduce/WordCountDemo.java
+++ b/demos/distexec/src/main/java/org/infinispan/demo/mapreduce/WordCountDemo.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.demo.mapreduce;
 
 import com.martiansoftware.jsap.FlaggedOption;
diff --git a/demos/distexec/src/main/java/org/infinispan/demo/mapreduce/WordCountMapper.java b/demos/distexec/src/main/java/org/infinispan/demo/mapreduce/WordCountMapper.java
index 60a3495aeb45..e01fe38df983 100644
--- a/demos/distexec/src/main/java/org/infinispan/demo/mapreduce/WordCountMapper.java
+++ b/demos/distexec/src/main/java/org/infinispan/demo/mapreduce/WordCountMapper.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.demo.mapreduce;
 
 import org.infinispan.distexec.mapreduce.Collector;
diff --git a/demos/distexec/src/main/java/org/infinispan/demo/mapreduce/WordCountReducer.java b/demos/distexec/src/main/java/org/infinispan/demo/mapreduce/WordCountReducer.java
index d2d2f78caeed..886b4967d4ff 100644
--- a/demos/distexec/src/main/java/org/infinispan/demo/mapreduce/WordCountReducer.java
+++ b/demos/distexec/src/main/java/org/infinispan/demo/mapreduce/WordCountReducer.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.demo.mapreduce;
 
 import org.infinispan.distexec.mapreduce.Reducer;
diff --git a/demos/ec2-ui/pom.xml b/demos/ec2-ui/pom.xml
index af28a4e5db11..0d2649e10727 100644
--- a/demos/ec2-ui/pom.xml
+++ b/demos/ec2-ui/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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>
 
diff --git a/demos/ec2-ui/src/main/java/org/infinispan/ec2demo/web/CacheSearchServlet.java b/demos/ec2-ui/src/main/java/org/infinispan/ec2demo/web/CacheSearchServlet.java
index aee10b9faad2..657d2cf1fbd9 100644
--- a/demos/ec2-ui/src/main/java/org/infinispan/ec2demo/web/CacheSearchServlet.java
+++ b/demos/ec2-ui/src/main/java/org/infinispan/ec2demo/web/CacheSearchServlet.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.ec2demo.web;
 
 import org.infinispan.Cache;
diff --git a/demos/ec2-ui/src/main/java/org/infinispan/ec2demo/web/CacheServletListener.java b/demos/ec2-ui/src/main/java/org/infinispan/ec2demo/web/CacheServletListener.java
index 015db3d71251..7b825d027b74 100644
--- a/demos/ec2-ui/src/main/java/org/infinispan/ec2demo/web/CacheServletListener.java
+++ b/demos/ec2-ui/src/main/java/org/infinispan/ec2demo/web/CacheServletListener.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.ec2demo.web;
 
 import org.infinispan.ec2demo.CacheBuilder;
diff --git a/demos/ec2-ui/src/main/webapp/WEB-INF/web.xml b/demos/ec2-ui/src/main/webapp/WEB-INF/web.xml
index b51b7b444452..89288e79d835 100644
--- a/demos/ec2-ui/src/main/webapp/WEB-INF/web.xml
+++ b/demos/ec2-ui/src/main/webapp/WEB-INF/web.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee"
          xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
          xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
diff --git a/demos/ec2/pom.xml b/demos/ec2/pom.xml
index b353648d2930..5f2c6481a8fb 100644
--- a/demos/ec2/pom.xml
+++ b/demos/ec2/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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>
 
diff --git a/demos/ec2/src/main/java/org/infinispan/ec2demo/CacheBuilder.java b/demos/ec2/src/main/java/org/infinispan/ec2demo/CacheBuilder.java
index 50687c94aca3..ee4ff4ed15ed 100644
--- a/demos/ec2/src/main/java/org/infinispan/ec2demo/CacheBuilder.java
+++ b/demos/ec2/src/main/java/org/infinispan/ec2demo/CacheBuilder.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.ec2demo;
 
 import java.io.IOException;
diff --git a/demos/ec2/src/main/java/org/infinispan/ec2demo/InfinispanFluDemo.java b/demos/ec2/src/main/java/org/infinispan/ec2demo/InfinispanFluDemo.java
index 52b56a2e0a39..489234fd72bb 100644
--- a/demos/ec2/src/main/java/org/infinispan/ec2demo/InfinispanFluDemo.java
+++ b/demos/ec2/src/main/java/org/infinispan/ec2demo/InfinispanFluDemo.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.ec2demo;
 
 import com.martiansoftware.jsap.FlaggedOption;
diff --git a/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaDataLoader.java b/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaDataLoader.java
index 3f199ccd44db..b664d0805cfd 100644
--- a/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaDataLoader.java
+++ b/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaDataLoader.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.ec2demo;
 
 import com.martiansoftware.jsap.JSAPResult;
diff --git a/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaVirusCache.java b/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaVirusCache.java
index 31d446546ce5..0c0b7c4c9e2c 100644
--- a/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaVirusCache.java
+++ b/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaVirusCache.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.ec2demo;
 
 import org.infinispan.Cache;
diff --git a/demos/ec2/src/main/java/org/infinispan/ec2demo/Influenza_N_P_CR_Element.java b/demos/ec2/src/main/java/org/infinispan/ec2demo/Influenza_N_P_CR_Element.java
index 8265e11992f3..d04f1ec2107d 100644
--- a/demos/ec2/src/main/java/org/infinispan/ec2demo/Influenza_N_P_CR_Element.java
+++ b/demos/ec2/src/main/java/org/infinispan/ec2demo/Influenza_N_P_CR_Element.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.ec2demo;
 
 import java.io.Serializable;
diff --git a/demos/ec2/src/main/java/org/infinispan/ec2demo/Influenza_Parser.java b/demos/ec2/src/main/java/org/infinispan/ec2demo/Influenza_Parser.java
index 9b322dc5fbdf..ba53929fb4ea 100644
--- a/demos/ec2/src/main/java/org/infinispan/ec2demo/Influenza_Parser.java
+++ b/demos/ec2/src/main/java/org/infinispan/ec2demo/Influenza_Parser.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.ec2demo;
 
 import org.infinispan.commons.util.SysPropertyActions;
diff --git a/demos/ec2/src/main/java/org/infinispan/ec2demo/NucleotideCache.java b/demos/ec2/src/main/java/org/infinispan/ec2demo/NucleotideCache.java
index 8d99b1f2cb6a..ac46a93ff93a 100644
--- a/demos/ec2/src/main/java/org/infinispan/ec2demo/NucleotideCache.java
+++ b/demos/ec2/src/main/java/org/infinispan/ec2demo/NucleotideCache.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.ec2demo;
 
 import java.io.IOException;
diff --git a/demos/ec2/src/main/java/org/infinispan/ec2demo/Nucleotide_Protein_Element.java b/demos/ec2/src/main/java/org/infinispan/ec2demo/Nucleotide_Protein_Element.java
index ab2080f43350..b5e03507cf88 100644
--- a/demos/ec2/src/main/java/org/infinispan/ec2demo/Nucleotide_Protein_Element.java
+++ b/demos/ec2/src/main/java/org/infinispan/ec2demo/Nucleotide_Protein_Element.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.ec2demo;
 
 import java.io.Serializable;
diff --git a/demos/ec2/src/main/java/org/infinispan/ec2demo/Nucleotide_Protein_Parser.java b/demos/ec2/src/main/java/org/infinispan/ec2demo/Nucleotide_Protein_Parser.java
index 18c8d0b0dece..3c9cbf70081b 100644
--- a/demos/ec2/src/main/java/org/infinispan/ec2demo/Nucleotide_Protein_Parser.java
+++ b/demos/ec2/src/main/java/org/infinispan/ec2demo/Nucleotide_Protein_Parser.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.ec2demo;
 
 import org.infinispan.commons.util.Util;
diff --git a/demos/ec2/src/main/java/org/infinispan/ec2demo/ProteinCache.java b/demos/ec2/src/main/java/org/infinispan/ec2demo/ProteinCache.java
index 0aa0ae358e6e..6a8fe039c2ac 100644
--- a/demos/ec2/src/main/java/org/infinispan/ec2demo/ProteinCache.java
+++ b/demos/ec2/src/main/java/org/infinispan/ec2demo/ProteinCache.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.ec2demo;
 
 import org.infinispan.Cache;
diff --git a/demos/ec2/src/main/release/etc/config-samples/ec2-demo/infinispan-ec2-config.xml b/demos/ec2/src/main/release/etc/config-samples/ec2-demo/infinispan-ec2-config.xml
index ca5f8fb2af8f..61ef5320060d 100644
--- a/demos/ec2/src/main/release/etc/config-samples/ec2-demo/infinispan-ec2-config.xml
+++ b/demos/ec2/src/main/release/etc/config-samples/ec2-demo/infinispan-ec2-config.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:infinispan:config:5.3 http://www.infinispan.org/schemas/infinispan-config-5.3.xsd"
             xmlns="urn:infinispan:config:5.3">
diff --git a/demos/ec2/src/main/release/etc/config-samples/ec2-demo/jgroups-gossiprouter-aws.xml b/demos/ec2/src/main/release/etc/config-samples/ec2-demo/jgroups-gossiprouter-aws.xml
index 5ede7db0bfc0..cb9dcd9faac4 100644
--- a/demos/ec2/src/main/release/etc/config-samples/ec2-demo/jgroups-gossiprouter-aws.xml
+++ b/demos/ec2/src/main/release/etc/config-samples/ec2-demo/jgroups-gossiprouter-aws.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <config>
    <TCP bind_port="7800"/>
    <TCPGOSSIP timeout="3000" initial_hosts="localhost[5555]" num_initial_members="3"/>
diff --git a/demos/ec2/src/main/release/etc/config-samples/ec2-demo/jgroups-s3_ping-aws.xml b/demos/ec2/src/main/release/etc/config-samples/ec2-demo/jgroups-s3_ping-aws.xml
index b9e503bad2fe..2b91aaf3f582 100644
--- a/demos/ec2/src/main/release/etc/config-samples/ec2-demo/jgroups-s3_ping-aws.xml
+++ b/demos/ec2/src/main/release/etc/config-samples/ec2-demo/jgroups-s3_ping-aws.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <config>
    <TCP bind_port="7800"/>
    <S3_PING secret_access_key="replace with your secret access key" access_key="replace with your access key"
diff --git a/demos/ec2/src/main/release/etc/config-samples/ec2-demo/smooks-config.xml b/demos/ec2/src/main/release/etc/config-samples/ec2-demo/smooks-config.xml
index e7d242f599ec..3430a89f3632 100644
--- a/demos/ec2/src/main/release/etc/config-samples/ec2-demo/smooks-config.xml
+++ b/demos/ec2/src/main/release/etc/config-samples/ec2-demo/smooks-config.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
                       xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.2.xsd">
     <csv:reader fields="GenbankAccessionNumber,Host,GenomeSequenceNumber,SubType,country,YearFound,SequenceLength,VirusName,HostAge,HostGender,FullLengthSequence" separator="&#009;">
diff --git a/demos/gridfs-webdav/pom.xml b/demos/gridfs-webdav/pom.xml
index c3c6646f70d0..6fd9366e29e7 100644
--- a/demos/gridfs-webdav/pom.xml
+++ b/demos/gridfs-webdav/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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>
diff --git a/demos/gridfs-webdav/src/main/java/org/infinispan/demos/gridfs/CacheManagerHolder.java b/demos/gridfs-webdav/src/main/java/org/infinispan/demos/gridfs/CacheManagerHolder.java
index 10e4894c036b..9da705a1418d 100644
--- a/demos/gridfs-webdav/src/main/java/org/infinispan/demos/gridfs/CacheManagerHolder.java
+++ b/demos/gridfs-webdav/src/main/java/org/infinispan/demos/gridfs/CacheManagerHolder.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.demos.gridfs;
 
 import org.infinispan.manager.CacheContainer;
diff --git a/demos/gridfs-webdav/src/main/java/org/infinispan/demos/gridfs/GridStore.java b/demos/gridfs-webdav/src/main/java/org/infinispan/demos/gridfs/GridStore.java
index 648b6456d4da..48c4f25dac27 100644
--- a/demos/gridfs-webdav/src/main/java/org/infinispan/demos/gridfs/GridStore.java
+++ b/demos/gridfs-webdav/src/main/java/org/infinispan/demos/gridfs/GridStore.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.demos.gridfs;
 
 
diff --git a/demos/gridfs-webdav/src/main/webapp/WEB-INF/classes/infinispan.xml b/demos/gridfs-webdav/src/main/webapp/WEB-INF/classes/infinispan.xml
index 4f6430139400..3047a62e93c5 100644
--- a/demos/gridfs-webdav/src/main/webapp/WEB-INF/classes/infinispan.xml
+++ b/demos/gridfs-webdav/src/main/webapp/WEB-INF/classes/infinispan.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <infinispan
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:infinispan:config:5.3 http://www.infinispan.org/schemas/infinispan-config-5.3.xsd"
diff --git a/demos/gridfs-webdav/src/main/webapp/WEB-INF/web.xml b/demos/gridfs-webdav/src/main/webapp/WEB-INF/web.xml
index 2a3e3f228c0f..155f3e2ffcbf 100644
--- a/demos/gridfs-webdav/src/main/webapp/WEB-INF/web.xml
+++ b/demos/gridfs-webdav/src/main/webapp/WEB-INF/web.xml
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <!DOCTYPE web-app
       PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
       "http://java.sun.com/dtd/web-app_2_3.dtd">
diff --git a/demos/gui/pom.xml b/demos/gui/pom.xml
index e44986ae1ce6..8d91a40b7c55 100644
--- a/demos/gui/pom.xml
+++ b/demos/gui/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
diff --git a/demos/gui/src/main/java/org/infinispan/demo/InfinispanDemo.java b/demos/gui/src/main/java/org/infinispan/demo/InfinispanDemo.java
index 8c11717fbf9a..ff5ac80cd797 100644
--- a/demos/gui/src/main/java/org/infinispan/demo/InfinispanDemo.java
+++ b/demos/gui/src/main/java/org/infinispan/demo/InfinispanDemo.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.demo;
 
 import org.infinispan.Cache;
diff --git a/demos/gui/src/main/java/org/infinispan/demo/package-info.java b/demos/gui/src/main/java/org/infinispan/demo/package-info.java
index 60de19dd2a9c..b05a815a47a8 100644
--- a/demos/gui/src/main/java/org/infinispan/demo/package-info.java
+++ b/demos/gui/src/main/java/org/infinispan/demo/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Classes, programs and applications that help demonstrate how Infinispan can be used.
  */
diff --git a/demos/gui/src/main/release/etc/config-samples/gui-demo-cache-config.xml b/demos/gui/src/main/release/etc/config-samples/gui-demo-cache-config.xml
index 079183a106c0..d9efea09ff9f 100644
--- a/demos/gui/src/main/release/etc/config-samples/gui-demo-cache-config.xml
+++ b/demos/gui/src/main/release/etc/config-samples/gui-demo-cache-config.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <infinispan
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:infinispan:config:5.3 http://www.infinispan.org/schemas/infinispan-config-5.3.xsd"
diff --git a/demos/lucene-directory-demo/pom.xml b/demos/lucene-directory-demo/pom.xml
index 569b4d3edb1a..6562f085ff45 100644
--- a/demos/lucene-directory-demo/pom.xml
+++ b/demos/lucene-directory-demo/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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>
diff --git a/demos/lucene-directory-demo/src/main/java/org/infinispan/lucenedemo/DemoActions.java b/demos/lucene-directory-demo/src/main/java/org/infinispan/lucenedemo/DemoActions.java
index cf3834279932..1849a2f1424b 100644
--- a/demos/lucene-directory-demo/src/main/java/org/infinispan/lucenedemo/DemoActions.java
+++ b/demos/lucene-directory-demo/src/main/java/org/infinispan/lucenedemo/DemoActions.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucenedemo;
 
 import java.io.IOException;
diff --git a/demos/lucene-directory-demo/src/main/java/org/infinispan/lucenedemo/DemoDriver.java b/demos/lucene-directory-demo/src/main/java/org/infinispan/lucenedemo/DemoDriver.java
index 4ad0a19d5d3f..0fc708eee682 100644
--- a/demos/lucene-directory-demo/src/main/java/org/infinispan/lucenedemo/DemoDriver.java
+++ b/demos/lucene-directory-demo/src/main/java/org/infinispan/lucenedemo/DemoDriver.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucenedemo;
 
 import java.io.IOException;
diff --git a/demos/lucene-directory-demo/src/main/release/etc/config-samples/lucene-demo-cache-config.xml b/demos/lucene-directory-demo/src/main/release/etc/config-samples/lucene-demo-cache-config.xml
index a61ca8004db0..5eb49934b97e 100644
--- a/demos/lucene-directory-demo/src/main/release/etc/config-samples/lucene-demo-cache-config.xml
+++ b/demos/lucene-directory-demo/src/main/release/etc/config-samples/lucene-demo-cache-config.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <infinispan
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="urn:infinispan:config:5.3 http://www.infinispan.org/schemas/infinispan-config-5.3.xsd"
diff --git a/demos/lucene-directory-demo/src/test/java/org/infinispan/lucenedemo/CacheConfigurationTest.java b/demos/lucene-directory-demo/src/test/java/org/infinispan/lucenedemo/CacheConfigurationTest.java
index a61291c0712a..4b28ba724b66 100644
--- a/demos/lucene-directory-demo/src/test/java/org/infinispan/lucenedemo/CacheConfigurationTest.java
+++ b/demos/lucene-directory-demo/src/test/java/org/infinispan/lucenedemo/CacheConfigurationTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucenedemo;
 
 import java.io.IOException;
diff --git a/demos/lucene-directory-demo/src/test/resources/config-samples/lucene-demo-cache-config.xml b/demos/lucene-directory-demo/src/test/resources/config-samples/lucene-demo-cache-config.xml
index a61ca8004db0..5eb49934b97e 100644
--- a/demos/lucene-directory-demo/src/test/resources/config-samples/lucene-demo-cache-config.xml
+++ b/demos/lucene-directory-demo/src/test/resources/config-samples/lucene-demo-cache-config.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <infinispan
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="urn:infinispan:config:5.3 http://www.infinispan.org/schemas/infinispan-config-5.3.xsd"
diff --git a/demos/nearcache-client/pom.xml b/demos/nearcache-client/pom.xml
index ecd3d0728627..ced3efc35afd 100644
--- a/demos/nearcache-client/pom.xml
+++ b/demos/nearcache-client/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
diff --git a/demos/nearcache-client/src/main/java/org/infinispan/nearcache/cdi/Address.java b/demos/nearcache-client/src/main/java/org/infinispan/nearcache/cdi/Address.java
index b1111479c9a5..72d599d90477 100644
--- a/demos/nearcache-client/src/main/java/org/infinispan/nearcache/cdi/Address.java
+++ b/demos/nearcache-client/src/main/java/org/infinispan/nearcache/cdi/Address.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.nearcache.cdi;
 
 import java.io.Externalizable;
diff --git a/demos/nearcache-client/src/main/java/org/infinispan/nearcache/cdi/AddressCache.java b/demos/nearcache-client/src/main/java/org/infinispan/nearcache/cdi/AddressCache.java
index 7d680c94559f..cc7ed82a5c42 100644
--- a/demos/nearcache-client/src/main/java/org/infinispan/nearcache/cdi/AddressCache.java
+++ b/demos/nearcache-client/src/main/java/org/infinispan/nearcache/cdi/AddressCache.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.nearcache.cdi;
 
 import javax.inject.Qualifier;
diff --git a/demos/nearcache-client/src/main/java/org/infinispan/nearcache/cdi/AddressCacheManager.java b/demos/nearcache-client/src/main/java/org/infinispan/nearcache/cdi/AddressCacheManager.java
index 6834d8302e3d..3c626a66471e 100644
--- a/demos/nearcache-client/src/main/java/org/infinispan/nearcache/cdi/AddressCacheManager.java
+++ b/demos/nearcache-client/src/main/java/org/infinispan/nearcache/cdi/AddressCacheManager.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.nearcache.cdi;
 
 import org.infinispan.Cache;
diff --git a/demos/nearcache-client/src/main/java/org/infinispan/nearcache/cdi/AddressController.java b/demos/nearcache-client/src/main/java/org/infinispan/nearcache/cdi/AddressController.java
index b80cbc266765..886390c2f39e 100644
--- a/demos/nearcache-client/src/main/java/org/infinispan/nearcache/cdi/AddressController.java
+++ b/demos/nearcache-client/src/main/java/org/infinispan/nearcache/cdi/AddressController.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.nearcache.cdi;
 
 import javax.enterprise.context.RequestScoped;
diff --git a/demos/nearcache-client/src/main/java/org/infinispan/nearcache/cdi/AddressDao.java b/demos/nearcache-client/src/main/java/org/infinispan/nearcache/cdi/AddressDao.java
index a2c8c2a5d2c8..b1c5315eef27 100644
--- a/demos/nearcache-client/src/main/java/org/infinispan/nearcache/cdi/AddressDao.java
+++ b/demos/nearcache-client/src/main/java/org/infinispan/nearcache/cdi/AddressDao.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.nearcache.cdi;
 
 import javax.cache.annotation.CachePut;
diff --git a/demos/nearcache-client/src/main/java/org/infinispan/nearcache/cdi/Config.java b/demos/nearcache-client/src/main/java/org/infinispan/nearcache/cdi/Config.java
index e466d057e331..cb6958a2791d 100644
--- a/demos/nearcache-client/src/main/java/org/infinispan/nearcache/cdi/Config.java
+++ b/demos/nearcache-client/src/main/java/org/infinispan/nearcache/cdi/Config.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.nearcache.cdi;
 
 import org.infinispan.cdi.ConfigureCache;
diff --git a/demos/nearcache-client/src/main/java/org/infinispan/nearcache/jms/RemoteEventCacheStore.java b/demos/nearcache-client/src/main/java/org/infinispan/nearcache/jms/RemoteEventCacheStore.java
index 7110a06156a1..8e26385f339f 100644
--- a/demos/nearcache-client/src/main/java/org/infinispan/nearcache/jms/RemoteEventCacheStore.java
+++ b/demos/nearcache-client/src/main/java/org/infinispan/nearcache/jms/RemoteEventCacheStore.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.nearcache.jms;
 
 import org.infinispan.loaders.CacheLoaderException;
diff --git a/demos/nearcache-client/src/main/java/org/infinispan/nearcache/jms/RemoteEventListener.java b/demos/nearcache-client/src/main/java/org/infinispan/nearcache/jms/RemoteEventListener.java
index 424fd1cdbbbb..f33b162415fc 100644
--- a/demos/nearcache-client/src/main/java/org/infinispan/nearcache/jms/RemoteEventListener.java
+++ b/demos/nearcache-client/src/main/java/org/infinispan/nearcache/jms/RemoteEventListener.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.nearcache.jms;
 
 import org.infinispan.Cache;
diff --git a/demos/nearcache-client/src/main/webapp/WEB-INF/beans.xml b/demos/nearcache-client/src/main/webapp/WEB-INF/beans.xml
index d496f3329437..b3656fb74af4 100644
--- a/demos/nearcache-client/src/main/webapp/WEB-INF/beans.xml
+++ b/demos/nearcache-client/src/main/webapp/WEB-INF/beans.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  JBoss, Home of Professional Open Source
-  Copyright 2011 Red Hat Inc. and/or its affiliates and other
-  contributors as indicated by the @author tags. All rights reserved.
-  See the copyright.txt in the distribution for a full listing of
-  individual contributors.
-
-  This is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as
-  published by the Free Software Foundation; either version 2.1 of
-  the License, or (at your option) any later version.
-
-  This software is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this software; if not, write to the Free
-  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <beans xmlns="http://java.sun.com/xml/ns/javaee"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
diff --git a/demos/nearcache-client/src/main/webapp/WEB-INF/faces-config.xml b/demos/nearcache-client/src/main/webapp/WEB-INF/faces-config.xml
index cb602ada6d69..18789e603c8a 100644
--- a/demos/nearcache-client/src/main/webapp/WEB-INF/faces-config.xml
+++ b/demos/nearcache-client/src/main/webapp/WEB-INF/faces-config.xml
@@ -1,24 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ Copyright 2011 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <faces-config
     xmlns="http://java.sun.com/xml/ns/javaee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/demos/nearcache-client/src/main/webapp/index.html b/demos/nearcache-client/src/main/webapp/index.html
index 03899abec37d..0c8f2aa8ba0c 100644
--- a/demos/nearcache-client/src/main/webapp/index.html
+++ b/demos/nearcache-client/src/main/webapp/index.html
@@ -1,22 +1,3 @@
-<!--
-  ~ Copyright 2011 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <!-- Plain HTML page that kicks us into the app -->
 
 <html>
diff --git a/demos/nearcache-client/src/main/webapp/index.xhtml b/demos/nearcache-client/src/main/webapp/index.xhtml
index c51b6d30172b..5ffdb94388ce 100644
--- a/demos/nearcache-client/src/main/webapp/index.xhtml
+++ b/demos/nearcache-client/src/main/webapp/index.xhtml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2011 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:h="http://java.sun.com/jsf/html"
       xmlns:f="http://java.sun.com/jsf/core">
diff --git a/demos/nearcache-client/src/main/webapp/resources/css/styles.css b/demos/nearcache-client/src/main/webapp/resources/css/styles.css
index cda0989ee209..c5df58910393 100644
--- a/demos/nearcache-client/src/main/webapp/resources/css/styles.css
+++ b/demos/nearcache-client/src/main/webapp/resources/css/styles.css
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 @import url(http://fonts.googleapis.com/css?family=Istok+Web);
 
 body {
diff --git a/demos/nearcache/pom.xml b/demos/nearcache/pom.xml
index b0e43220f37a..d55649526bd8 100644
--- a/demos/nearcache/pom.xml
+++ b/demos/nearcache/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
diff --git a/demos/nearcache/src/main/java/org/infinispan/demo/nearcache/client/TestingJmsClient.java b/demos/nearcache/src/main/java/org/infinispan/demo/nearcache/client/TestingJmsClient.java
index af8a1e79f49b..4d67286588c9 100644
--- a/demos/nearcache/src/main/java/org/infinispan/demo/nearcache/client/TestingJmsClient.java
+++ b/demos/nearcache/src/main/java/org/infinispan/demo/nearcache/client/TestingJmsClient.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.demo.nearcache.client;
 
 import javax.jms.Connection;
diff --git a/demos/nearcache/src/main/java/org/infinispan/demo/nearcache/server/MessagingHotRodDemo.java b/demos/nearcache/src/main/java/org/infinispan/demo/nearcache/server/MessagingHotRodDemo.java
index ebf28b95b1e1..4ce651baf483 100644
--- a/demos/nearcache/src/main/java/org/infinispan/demo/nearcache/server/MessagingHotRodDemo.java
+++ b/demos/nearcache/src/main/java/org/infinispan/demo/nearcache/server/MessagingHotRodDemo.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.demo.nearcache.server;
 
 import org.hornetq.integration.bootstrap.HornetQBootstrapServer;
diff --git a/demos/nearcache/src/main/resources/hornetq-beans.xml b/demos/nearcache/src/main/resources/hornetq-beans.xml
index bd1ebdf68385..ccc3eb680a10 100644
--- a/demos/nearcache/src/main/resources/hornetq-beans.xml
+++ b/demos/nearcache/src/main/resources/hornetq-beans.xml
@@ -1,24 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ Copyright 2011 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
    <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
diff --git a/demos/nearcache/src/main/resources/hornetq-configuration.xml b/demos/nearcache/src/main/resources/hornetq-configuration.xml
index b6a53f594306..2d8edc531265 100644
--- a/demos/nearcache/src/main/resources/hornetq-configuration.xml
+++ b/demos/nearcache/src/main/resources/hornetq-configuration.xml
@@ -1,22 +1,3 @@
-<!--
-  ~ Copyright 2011 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <configuration xmlns="urn:hornetq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
diff --git a/demos/nearcache/src/main/resources/jndi.properties b/demos/nearcache/src/main/resources/jndi.properties
index 9901dfa5ed9c..e2a9832f8ec7 100644
--- a/demos/nearcache/src/main/resources/jndi.properties
+++ b/demos/nearcache/src/main/resources/jndi.properties
@@ -1,21 +1,2 @@
-#
-# Copyright 2011 Red Hat, Inc. and/or its affiliates.
-#
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA
-#
-
 java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
 java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
\ No newline at end of file
diff --git a/ide-settings/eclipse/codetemplates.xml b/ide-settings/eclipse/codetemplates.xml
index ec6a3a50206a..fd6f6a2e966f 100644
--- a/ide-settings/eclipse/codetemplates.xml
+++ b/ide-settings/eclipse/codetemplates.xml
@@ -14,25 +14,8 @@
  */</template><template autoinsert="true" context="overridecomment_context" deleted="false" description="Comment for overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name="overridecomment"/><template autoinsert="true" context="delegatecomment_context" deleted="false" description="Comment for delegate methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name="delegatecomment">/**
  * ${tags}
  * ${see_to_target}
- */</template><template autoinsert="false" context="newtype_context" deleted="false" description="Newly created files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.newtype" name="newtype">/* 
- * JBoss, Home of Professional Open Source
- * Copyright ${year} Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-${package_declaration}
+ */</template><template autoinsert="false" context="newtype_context" deleted="false" description="Newly created files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.newtype" name="newtype">
+ ${package_declaration}
 
 ${typecomment}
 ${type_declaration}</template><template autoinsert="true" context="classbody_context" deleted="false" description="Code in new class type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.classbody" name="classbody">
diff --git a/integrationtests/as-integration/src/test/java/org/infinispan/test/integration/as/InfinispanCacheStoreJdbcIT.java b/integrationtests/as-integration/src/test/java/org/infinispan/test/integration/as/InfinispanCacheStoreJdbcIT.java
index 83c872732b54..570701bc662d 100644
--- a/integrationtests/as-integration/src/test/java/org/infinispan/test/integration/as/InfinispanCacheStoreJdbcIT.java
+++ b/integrationtests/as-integration/src/test/java/org/infinispan/test/integration/as/InfinispanCacheStoreJdbcIT.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.test.integration.as;
 
 import static org.junit.Assert.assertEquals;
diff --git a/integrationtests/as-integration/src/test/java/org/infinispan/test/integration/as/InfinispanCoreIT.java b/integrationtests/as-integration/src/test/java/org/infinispan/test/integration/as/InfinispanCoreIT.java
index 592e9bf24345..3d211df23940 100644
--- a/integrationtests/as-integration/src/test/java/org/infinispan/test/integration/as/InfinispanCoreIT.java
+++ b/integrationtests/as-integration/src/test/java/org/infinispan/test/integration/as/InfinispanCoreIT.java
@@ -1,23 +1,3 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.test.integration.as;
 
 import org.infinispan.Cache;
diff --git a/integrationtests/as-integration/src/test/java/org/infinispan/test/integration/as/InfinispanTreeIT.java b/integrationtests/as-integration/src/test/java/org/infinispan/test/integration/as/InfinispanTreeIT.java
index 80bd48af9a48..7556c9ed1b73 100644
--- a/integrationtests/as-integration/src/test/java/org/infinispan/test/integration/as/InfinispanTreeIT.java
+++ b/integrationtests/as-integration/src/test/java/org/infinispan/test/integration/as/InfinispanTreeIT.java
@@ -1,23 +1,3 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.test.integration.as;
 
 import org.infinispan.Cache;
diff --git a/integrationtests/compatibility-mode-it/pom.xml b/integrationtests/compatibility-mode-it/pom.xml
index 4fd3f523027d..7331feb611ca 100644
--- a/integrationtests/compatibility-mode-it/pom.xml
+++ b/integrationtests/compatibility-mode-it/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2013 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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>
diff --git a/integrationtests/compatibility-mode-it/src/test/java/org/infinispan/it/compatibility/CompatibilityCacheFactory.java b/integrationtests/compatibility-mode-it/src/test/java/org/infinispan/it/compatibility/CompatibilityCacheFactory.java
index cd884e7c6c82..a5e9c454796f 100644
--- a/integrationtests/compatibility-mode-it/src/test/java/org/infinispan/it/compatibility/CompatibilityCacheFactory.java
+++ b/integrationtests/compatibility-mode-it/src/test/java/org/infinispan/it/compatibility/CompatibilityCacheFactory.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.it.compatibility;
 
 import net.spy.memcached.MemcachedClient;
diff --git a/integrationtests/compatibility-mode-it/src/test/java/org/infinispan/it/compatibility/CustomMemcachedHotRodTest.java b/integrationtests/compatibility-mode-it/src/test/java/org/infinispan/it/compatibility/CustomMemcachedHotRodTest.java
index 88ede4130c5c..505e0088575f 100644
--- a/integrationtests/compatibility-mode-it/src/test/java/org/infinispan/it/compatibility/CustomMemcachedHotRodTest.java
+++ b/integrationtests/compatibility-mode-it/src/test/java/org/infinispan/it/compatibility/CustomMemcachedHotRodTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.it.compatibility;
 
 import org.infinispan.client.hotrod.Flag;
diff --git a/integrationtests/compatibility-mode-it/src/test/java/org/infinispan/it/compatibility/EmbeddedHotRodTest.java b/integrationtests/compatibility-mode-it/src/test/java/org/infinispan/it/compatibility/EmbeddedHotRodTest.java
index 173d889e1af5..bd46139c2c85 100644
--- a/integrationtests/compatibility-mode-it/src/test/java/org/infinispan/it/compatibility/EmbeddedHotRodTest.java
+++ b/integrationtests/compatibility-mode-it/src/test/java/org/infinispan/it/compatibility/EmbeddedHotRodTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.it.compatibility;
 
 import org.infinispan.Cache;
diff --git a/integrationtests/compatibility-mode-it/src/test/java/org/infinispan/it/compatibility/EmbeddedRestHotRodTest.java b/integrationtests/compatibility-mode-it/src/test/java/org/infinispan/it/compatibility/EmbeddedRestHotRodTest.java
index b1e0289bd962..abaf0daa30f4 100644
--- a/integrationtests/compatibility-mode-it/src/test/java/org/infinispan/it/compatibility/EmbeddedRestHotRodTest.java
+++ b/integrationtests/compatibility-mode-it/src/test/java/org/infinispan/it/compatibility/EmbeddedRestHotRodTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.it.compatibility;
 
 import org.apache.commons.httpclient.Header;
diff --git a/integrationtests/compatibility-mode-it/src/test/java/org/infinispan/it/compatibility/EmbeddedRestMemcachedHotRodTest.java b/integrationtests/compatibility-mode-it/src/test/java/org/infinispan/it/compatibility/EmbeddedRestMemcachedHotRodTest.java
index 5c36fa5839c9..295bca4fbbc1 100644
--- a/integrationtests/compatibility-mode-it/src/test/java/org/infinispan/it/compatibility/EmbeddedRestMemcachedHotRodTest.java
+++ b/integrationtests/compatibility-mode-it/src/test/java/org/infinispan/it/compatibility/EmbeddedRestMemcachedHotRodTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.it.compatibility;
 
 import net.spy.memcached.CASValue;
diff --git a/integrationtests/compatibility-mode-it/src/test/java/org/infinispan/it/compatibility/ReplEmbeddedRestHotRodTest.java b/integrationtests/compatibility-mode-it/src/test/java/org/infinispan/it/compatibility/ReplEmbeddedRestHotRodTest.java
index 54d40811a3a0..b37dff817f79 100644
--- a/integrationtests/compatibility-mode-it/src/test/java/org/infinispan/it/compatibility/ReplEmbeddedRestHotRodTest.java
+++ b/integrationtests/compatibility-mode-it/src/test/java/org/infinispan/it/compatibility/ReplEmbeddedRestHotRodTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.it.compatibility;
 
 import org.apache.commons.httpclient.HttpClient;
diff --git a/integrationtests/luceneintegration/pom.xml b/integrationtests/luceneintegration/pom.xml
index be1d6e3ad2ed..f008b91b5b91 100644
--- a/integrationtests/luceneintegration/pom.xml
+++ b/integrationtests/luceneintegration/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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>
diff --git a/integrationtests/luceneintegration/src/test/java/org/infinispan/it/lucenedirectoryquery/IndexStoredIndexedCacheTest.java b/integrationtests/luceneintegration/src/test/java/org/infinispan/it/lucenedirectoryquery/IndexStoredIndexedCacheTest.java
index 29b6eeb45404..32be20aeb2d3 100644
--- a/integrationtests/luceneintegration/src/test/java/org/infinispan/it/lucenedirectoryquery/IndexStoredIndexedCacheTest.java
+++ b/integrationtests/luceneintegration/src/test/java/org/infinispan/it/lucenedirectoryquery/IndexStoredIndexedCacheTest.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.it.lucenedirectoryquery;
 
 import static org.infinispan.lucene.CacheTestSupport.assertTextIsFoundInIds;
diff --git a/jcache/pom.xml b/jcache/pom.xml
index 1aec358291f9..f128b863b426 100644
--- a/jcache/pom.xml
+++ b/jcache/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2013 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
diff --git a/jcache/src/it/tck-runner/pom.xml b/jcache/src/it/tck-runner/pom.xml
index 9f4278808b26..d04e6cd65979 100644
--- a/jcache/src/it/tck-runner/pom.xml
+++ b/jcache/src/it/tck-runner/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2013 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
diff --git a/jcache/src/it/tck-runner/src/test/java/org/infinispan/jcache/test/tck/CDIBeanProvider.java b/jcache/src/it/tck-runner/src/test/java/org/infinispan/jcache/test/tck/CDIBeanProvider.java
index 7dfc955fb415..522e97524d14 100644
--- a/jcache/src/it/tck-runner/src/test/java/org/infinispan/jcache/test/tck/CDIBeanProvider.java
+++ b/jcache/src/it/tck-runner/src/test/java/org/infinispan/jcache/test/tck/CDIBeanProvider.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jcache.test.tck;
 
 import org.jboss.weld.environment.se.Weld;
diff --git a/jcache/src/it/tck-runner/src/test/java/org/infinispan/jcache/test/tck/DummyTestListener.java b/jcache/src/it/tck-runner/src/test/java/org/infinispan/jcache/test/tck/DummyTestListener.java
index d3bf534d8311..18d33da83dea 100644
--- a/jcache/src/it/tck-runner/src/test/java/org/infinispan/jcache/test/tck/DummyTestListener.java
+++ b/jcache/src/it/tck-runner/src/test/java/org/infinispan/jcache/test/tck/DummyTestListener.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jcache.test.tck;
 
 import org.junit.runner.notification.RunListener;
diff --git a/jcache/src/it/tck-runner/src/test/resources/META-INF/services/javax.cache.annotation.BeanProvider b/jcache/src/it/tck-runner/src/test/resources/META-INF/services/javax.cache.annotation.BeanProvider
index e1f24647f533..4691867aae68 100644
--- a/jcache/src/it/tck-runner/src/test/resources/META-INF/services/javax.cache.annotation.BeanProvider
+++ b/jcache/src/it/tck-runner/src/test/resources/META-INF/services/javax.cache.annotation.BeanProvider
@@ -1,23 +1 @@
-#
-# JBoss, Home of Professional Open Source
-# Copyright 2011 Red Hat Inc. and/or its affiliates and other
-# contributors as indicated by the @author tags. All rights reserved.
-# See the copyright.txt in the distribution for a full listing of
-# individual contributors.
-#
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
 org.infinispan.jcache.test.tck.CDIBeanProvider
diff --git a/jcache/src/main/java/org/infinispan/jcache/ConfigurationAdapter.java b/jcache/src/main/java/org/infinispan/jcache/ConfigurationAdapter.java
index adce8e732c2d..a818e41a091d 100644
--- a/jcache/src/main/java/org/infinispan/jcache/ConfigurationAdapter.java
+++ b/jcache/src/main/java/org/infinispan/jcache/ConfigurationAdapter.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.jcache;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/jcache/src/main/java/org/infinispan/jcache/JCache.java b/jcache/src/main/java/org/infinispan/jcache/JCache.java
index 893e0bf160e2..a880302016b1 100644
--- a/jcache/src/main/java/org/infinispan/jcache/JCache.java
+++ b/jcache/src/main/java/org/infinispan/jcache/JCache.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.jcache;
 
 import java.util.ArrayList;
diff --git a/jcache/src/main/java/org/infinispan/jcache/JCacheEntry.java b/jcache/src/main/java/org/infinispan/jcache/JCacheEntry.java
index fc5255e0425e..a3c2c36712db 100644
--- a/jcache/src/main/java/org/infinispan/jcache/JCacheEntry.java
+++ b/jcache/src/main/java/org/infinispan/jcache/JCacheEntry.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.jcache;
 
 import javax.cache.Cache.Entry;
diff --git a/jcache/src/main/java/org/infinispan/jcache/JCacheEventFilteringIterable.java b/jcache/src/main/java/org/infinispan/jcache/JCacheEventFilteringIterable.java
index 8d72e948d9ef..d60f5c38caf9 100644
--- a/jcache/src/main/java/org/infinispan/jcache/JCacheEventFilteringIterable.java
+++ b/jcache/src/main/java/org/infinispan/jcache/JCacheEventFilteringIterable.java
@@ -1,19 +1,3 @@
-/**
- *  Copyright 2011 Terracotta, Inc.
- *  Copyright 2011 Oracle America Incorporated
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this 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 org.infinispan.jcache;
 
 import java.util.Iterator;
diff --git a/jcache/src/main/java/org/infinispan/jcache/JCacheEventFilteringIterator.java b/jcache/src/main/java/org/infinispan/jcache/JCacheEventFilteringIterator.java
index c8716eb39aa8..7844e3b24780 100644
--- a/jcache/src/main/java/org/infinispan/jcache/JCacheEventFilteringIterator.java
+++ b/jcache/src/main/java/org/infinispan/jcache/JCacheEventFilteringIterator.java
@@ -1,19 +1,3 @@
-/**
- *  Copyright 2011 Terracotta, Inc.
- *  Copyright 2011 Oracle America Incorporated
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this 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 org.infinispan.jcache;
 
 import java.util.Iterator;
diff --git a/jcache/src/main/java/org/infinispan/jcache/JCacheListenerAdapter.java b/jcache/src/main/java/org/infinispan/jcache/JCacheListenerAdapter.java
index 3272878270b4..f1e7646a9d47 100644
--- a/jcache/src/main/java/org/infinispan/jcache/JCacheListenerAdapter.java
+++ b/jcache/src/main/java/org/infinispan/jcache/JCacheListenerAdapter.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.jcache;
 
 import javax.cache.Cache;
diff --git a/jcache/src/main/java/org/infinispan/jcache/JCacheListenerRegistration.java b/jcache/src/main/java/org/infinispan/jcache/JCacheListenerRegistration.java
index 4a4bc6fa09e9..5d2e9eb8e327 100644
--- a/jcache/src/main/java/org/infinispan/jcache/JCacheListenerRegistration.java
+++ b/jcache/src/main/java/org/infinispan/jcache/JCacheListenerRegistration.java
@@ -1,20 +1,3 @@
-/**
- *  Copyright 2011 Terracotta, Inc.
- *  Copyright 2011 Oracle America Incorporated
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this 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 org.infinispan.jcache;
 
 import javax.cache.event.CacheEntryEventFilter;
diff --git a/jcache/src/main/java/org/infinispan/jcache/JCacheLoaderAdapter.java b/jcache/src/main/java/org/infinispan/jcache/JCacheLoaderAdapter.java
index c86979db1a70..35916e95c8f8 100644
--- a/jcache/src/main/java/org/infinispan/jcache/JCacheLoaderAdapter.java
+++ b/jcache/src/main/java/org/infinispan/jcache/JCacheLoaderAdapter.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.jcache;
 
 import java.io.ObjectInput;
diff --git a/jcache/src/main/java/org/infinispan/jcache/JCacheManager.java b/jcache/src/main/java/org/infinispan/jcache/JCacheManager.java
index f03927b8bfe9..bff059da88bb 100644
--- a/jcache/src/main/java/org/infinispan/jcache/JCacheManager.java
+++ b/jcache/src/main/java/org/infinispan/jcache/JCacheManager.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.jcache;
 
 import java.io.FileNotFoundException;
diff --git a/jcache/src/main/java/org/infinispan/jcache/JCacheNotifier.java b/jcache/src/main/java/org/infinispan/jcache/JCacheNotifier.java
index 457c8c61ace1..6d56cc317548 100644
--- a/jcache/src/main/java/org/infinispan/jcache/JCacheNotifier.java
+++ b/jcache/src/main/java/org/infinispan/jcache/JCacheNotifier.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.jcache;
 
 import org.infinispan.jcache.logging.Log;
diff --git a/jcache/src/main/java/org/infinispan/jcache/JCacheUserTransaction.java b/jcache/src/main/java/org/infinispan/jcache/JCacheUserTransaction.java
index c94788d6df63..32c5ee0877f3 100644
--- a/jcache/src/main/java/org/infinispan/jcache/JCacheUserTransaction.java
+++ b/jcache/src/main/java/org/infinispan/jcache/JCacheUserTransaction.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.jcache;
 
 import javax.transaction.HeuristicMixedException;
diff --git a/jcache/src/main/java/org/infinispan/jcache/JCacheWriterAdapter.java b/jcache/src/main/java/org/infinispan/jcache/JCacheWriterAdapter.java
index 9bc7858b4a13..10ba2c401ba5 100644
--- a/jcache/src/main/java/org/infinispan/jcache/JCacheWriterAdapter.java
+++ b/jcache/src/main/java/org/infinispan/jcache/JCacheWriterAdapter.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.jcache;
 
 import java.io.ObjectInput;
diff --git a/jcache/src/main/java/org/infinispan/jcache/JCachingProvider.java b/jcache/src/main/java/org/infinispan/jcache/JCachingProvider.java
index 01e76de4d6c6..c7f574d5b7f8 100644
--- a/jcache/src/main/java/org/infinispan/jcache/JCachingProvider.java
+++ b/jcache/src/main/java/org/infinispan/jcache/JCachingProvider.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.jcache;
 
 import org.infinispan.manager.DefaultCacheManager;
diff --git a/jcache/src/main/java/org/infinispan/jcache/JStatusConverter.java b/jcache/src/main/java/org/infinispan/jcache/JStatusConverter.java
index b44d64e52e18..a213704940fc 100644
--- a/jcache/src/main/java/org/infinispan/jcache/JStatusConverter.java
+++ b/jcache/src/main/java/org/infinispan/jcache/JStatusConverter.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.jcache;
 
 import javax.cache.Status;
diff --git a/jcache/src/main/java/org/infinispan/jcache/MutableJCacheEntry.java b/jcache/src/main/java/org/infinispan/jcache/MutableJCacheEntry.java
index bacd86c93875..319a947fd573 100644
--- a/jcache/src/main/java/org/infinispan/jcache/MutableJCacheEntry.java
+++ b/jcache/src/main/java/org/infinispan/jcache/MutableJCacheEntry.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.jcache;
 
 import org.infinispan.AdvancedCache;
diff --git a/jcache/src/main/java/org/infinispan/jcache/RICacheEntryEvent.java b/jcache/src/main/java/org/infinispan/jcache/RICacheEntryEvent.java
index 0265eada91b1..0bb8441517c7 100644
--- a/jcache/src/main/java/org/infinispan/jcache/RICacheEntryEvent.java
+++ b/jcache/src/main/java/org/infinispan/jcache/RICacheEntryEvent.java
@@ -1,20 +1,3 @@
-/**
- *  Copyright 2011 Terracotta, Inc.
- *  Copyright 2011 Oracle America Incorporated
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this 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 org.infinispan.jcache;
 
 import javax.cache.Cache;
diff --git a/jcache/src/main/java/org/infinispan/jcache/RICacheStatistics.java b/jcache/src/main/java/org/infinispan/jcache/RICacheStatistics.java
index c2b3f0adf8b6..352729dff183 100644
--- a/jcache/src/main/java/org/infinispan/jcache/RICacheStatistics.java
+++ b/jcache/src/main/java/org/infinispan/jcache/RICacheStatistics.java
@@ -1,20 +1,3 @@
-/**
- *  Copyright 2011 Terracotta, Inc.
- *  Copyright 2011 Oracle America Incorporated
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this 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 org.infinispan.jcache;
 
 import org.infinispan.AdvancedCache;
diff --git a/jcache/src/main/java/org/infinispan/jcache/RIDelegatingCacheMXBean.java b/jcache/src/main/java/org/infinispan/jcache/RIDelegatingCacheMXBean.java
index 8b238dc87656..f79eb9cb6865 100644
--- a/jcache/src/main/java/org/infinispan/jcache/RIDelegatingCacheMXBean.java
+++ b/jcache/src/main/java/org/infinispan/jcache/RIDelegatingCacheMXBean.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.jcache;
 
 import javax.cache.Cache;
diff --git a/jcache/src/main/java/org/infinispan/jcache/RIMBeanServerRegistrationUtility.java b/jcache/src/main/java/org/infinispan/jcache/RIMBeanServerRegistrationUtility.java
index d24e1bd6280a..f0d6d396c818 100644
--- a/jcache/src/main/java/org/infinispan/jcache/RIMBeanServerRegistrationUtility.java
+++ b/jcache/src/main/java/org/infinispan/jcache/RIMBeanServerRegistrationUtility.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.jcache;
 
 import javax.cache.Cache;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/AggregatedParameterMetaData.java b/jcache/src/main/java/org/infinispan/jcache/annotation/AggregatedParameterMetaData.java
index 10fa57d2f2e6..e3f56141e547 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/AggregatedParameterMetaData.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/AggregatedParameterMetaData.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jcache.annotation;
 
 import java.util.List;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/AnnotationInjectExtension.java b/jcache/src/main/java/org/infinispan/jcache/annotation/AnnotationInjectExtension.java
index e152b4946855..b0f6338aa41d 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/AnnotationInjectExtension.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/AnnotationInjectExtension.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.jcache.annotation;
 
 import org.infinispan.jcache.annotation.solder.AnnotatedTypeBuilder;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/CacheAnnotationProvider.java b/jcache/src/main/java/org/infinispan/jcache/annotation/CacheAnnotationProvider.java
index 9285db68fb83..73677c2ae623 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/CacheAnnotationProvider.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/CacheAnnotationProvider.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jcache.annotation;
 
 import javax.cache.spi.AnnotationProvider;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/CacheInvocationParameterImpl.java b/jcache/src/main/java/org/infinispan/jcache/annotation/CacheInvocationParameterImpl.java
index 78fb1989bc2e..e9b482601a66 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/CacheInvocationParameterImpl.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/CacheInvocationParameterImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jcache.annotation;
 
 import javax.cache.annotation.CacheInvocationParameter;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/CacheKeyInvocationContextFactory.java b/jcache/src/main/java/org/infinispan/jcache/annotation/CacheKeyInvocationContextFactory.java
index c2a1874c3da1..fed4d076327f 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/CacheKeyInvocationContextFactory.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/CacheKeyInvocationContextFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jcache.annotation;
 
 import org.infinispan.jcache.logging.Log;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/CacheKeyInvocationContextImpl.java b/jcache/src/main/java/org/infinispan/jcache/annotation/CacheKeyInvocationContextImpl.java
index a7277678d41e..ddcba05bde7d 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/CacheKeyInvocationContextImpl.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/CacheKeyInvocationContextImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jcache.annotation;
 
 import org.infinispan.jcache.logging.Log;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/CacheLookupHelper.java b/jcache/src/main/java/org/infinispan/jcache/annotation/CacheLookupHelper.java
index 494739bb519f..7bd3172285a6 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/CacheLookupHelper.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/CacheLookupHelper.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jcache.annotation;
 
 import org.infinispan.jcache.logging.Log;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/CachePutInterceptor.java b/jcache/src/main/java/org/infinispan/jcache/annotation/CachePutInterceptor.java
index 2e835d605da1..01a2333e5bfe 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/CachePutInterceptor.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/CachePutInterceptor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jcache.annotation;
 
 import org.infinispan.jcache.logging.Log;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/CachePutLiteral.java b/jcache/src/main/java/org/infinispan/jcache/annotation/CachePutLiteral.java
index a527e7383516..fb72c0b4e9d5 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/CachePutLiteral.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/CachePutLiteral.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jcache.annotation;
 
 import javax.cache.annotation.CacheKeyGenerator;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/CacheRemoveAllInterceptor.java b/jcache/src/main/java/org/infinispan/jcache/annotation/CacheRemoveAllInterceptor.java
index fc8b93355790..fd214c2bd788 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/CacheRemoveAllInterceptor.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/CacheRemoveAllInterceptor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jcache.annotation;
 
 import org.infinispan.jcache.logging.Log;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/CacheRemoveAllLiteral.java b/jcache/src/main/java/org/infinispan/jcache/annotation/CacheRemoveAllLiteral.java
index b95a750453d0..8ab96b34ecfa 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/CacheRemoveAllLiteral.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/CacheRemoveAllLiteral.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jcache.annotation;
 
 import javax.cache.annotation.CacheRemoveAll;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/CacheRemoveEntryInterceptor.java b/jcache/src/main/java/org/infinispan/jcache/annotation/CacheRemoveEntryInterceptor.java
index 776032f367bc..aa2bd786838e 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/CacheRemoveEntryInterceptor.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/CacheRemoveEntryInterceptor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jcache.annotation;
 
 import org.infinispan.jcache.logging.Log;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/CacheRemoveEntryLiteral.java b/jcache/src/main/java/org/infinispan/jcache/annotation/CacheRemoveEntryLiteral.java
index 9830f083b27f..f179894a46b6 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/CacheRemoveEntryLiteral.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/CacheRemoveEntryLiteral.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jcache.annotation;
 
 import javax.cache.annotation.CacheKeyGenerator;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/CacheResultInterceptor.java b/jcache/src/main/java/org/infinispan/jcache/annotation/CacheResultInterceptor.java
index 680a1b527dee..46abf9dca232 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/CacheResultInterceptor.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/CacheResultInterceptor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jcache.annotation;
 
 import org.infinispan.jcache.logging.Log;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/CacheResultLiteral.java b/jcache/src/main/java/org/infinispan/jcache/annotation/CacheResultLiteral.java
index 4c8056bbf0c2..f36eda87f792 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/CacheResultLiteral.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/CacheResultLiteral.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jcache.annotation;
 
 import javax.cache.annotation.CacheKeyGenerator;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/CollectionsHelper.java b/jcache/src/main/java/org/infinispan/jcache/annotation/CollectionsHelper.java
index d77d85af63ba..aac293debf38 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/CollectionsHelper.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/CollectionsHelper.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jcache.annotation;
 
 import java.util.LinkedHashSet;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/Contracts.java b/jcache/src/main/java/org/infinispan/jcache/annotation/Contracts.java
index 7875ea815344..1e76ba4a8767 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/Contracts.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/Contracts.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jcache.annotation;
 
 /**
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/DefaultCacheKey.java b/jcache/src/main/java/org/infinispan/jcache/annotation/DefaultCacheKey.java
index 47a0d295a673..449a3df82300 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/DefaultCacheKey.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/DefaultCacheKey.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jcache.annotation;
 
 import javax.cache.annotation.GeneratedCacheKey;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/DefaultCacheKeyGenerator.java b/jcache/src/main/java/org/infinispan/jcache/annotation/DefaultCacheKeyGenerator.java
index 64baf02db01c..f0c710ff2234 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/DefaultCacheKeyGenerator.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/DefaultCacheKeyGenerator.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jcache.annotation;
 
 import javax.cache.annotation.CacheInvocationParameter;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/DefaultCacheResolver.java b/jcache/src/main/java/org/infinispan/jcache/annotation/DefaultCacheResolver.java
index 8fe0a4c6cde8..62e9ed17922c 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/DefaultCacheResolver.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/DefaultCacheResolver.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jcache.annotation;
 
 import javax.cache.Cache;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/MethodMetaData.java b/jcache/src/main/java/org/infinispan/jcache/annotation/MethodMetaData.java
index 1779f75681de..83e98cceedbc 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/MethodMetaData.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/MethodMetaData.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jcache.annotation;
 
 import javax.cache.annotation.CacheKeyGenerator;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/ParameterMetaData.java b/jcache/src/main/java/org/infinispan/jcache/annotation/ParameterMetaData.java
index def614641e4e..e311021affb4 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/ParameterMetaData.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/ParameterMetaData.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jcache.annotation;
 
 import java.lang.annotation.Annotation;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedCallableImpl.java b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedCallableImpl.java
index b1ec32a31ebe..81304b53e588 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedCallableImpl.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedCallableImpl.java
@@ -1,19 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and/or its affiliates, and individual
- * contributors by the @authors tag. See the copyright.txt in the
- * distribution for a full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this 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 org.infinispan.jcache.annotation.solder;
 
 import java.lang.reflect.Member;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedConstructorImpl.java b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedConstructorImpl.java
index 0061c191cb06..514b358318de 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedConstructorImpl.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedConstructorImpl.java
@@ -1,19 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and/or its affiliates, and individual
- * contributors by the @authors tag. See the copyright.txt in the
- * distribution for a full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this 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 org.infinispan.jcache.annotation.solder;
 
 import java.lang.reflect.Constructor;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedFieldImpl.java b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedFieldImpl.java
index ef4425143a55..40e2db00b57a 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedFieldImpl.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedFieldImpl.java
@@ -1,19 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and/or its affiliates, and individual
- * contributors by the @authors tag. See the copyright.txt in the
- * distribution for a full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this 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 org.infinispan.jcache.annotation.solder;
 
 import java.lang.reflect.Field;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedImpl.java b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedImpl.java
index c674215c5ebf..cf55c6ec89c5 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedImpl.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedImpl.java
@@ -1,19 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and/or its affiliates, and individual
- * contributors by the @authors tag. See the copyright.txt in the
- * distribution for a full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this 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 org.infinispan.jcache.annotation.solder;
 
 import java.lang.annotation.Annotation;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedMemberImpl.java b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedMemberImpl.java
index c1842f2e7b7e..011ab38c5208 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedMemberImpl.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedMemberImpl.java
@@ -1,19 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and/or its affiliates, and individual
- * contributors by the @authors tag. See the copyright.txt in the
- * distribution for a full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this 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 org.infinispan.jcache.annotation.solder;
 
 import java.lang.reflect.Member;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedMethodImpl.java b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedMethodImpl.java
index fc744823f662..41a354f36aa2 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedMethodImpl.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedMethodImpl.java
@@ -1,19 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and/or its affiliates, and individual
- * contributors by the @authors tag. See the copyright.txt in the
- * distribution for a full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this 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 org.infinispan.jcache.annotation.solder;
 
 import java.lang.reflect.Method;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedParameterImpl.java b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedParameterImpl.java
index 9f3d0dba4d12..de587e508c7a 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedParameterImpl.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedParameterImpl.java
@@ -1,19 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and/or its affiliates, and individual
- * contributors by the @authors tag. See the copyright.txt in the
- * distribution for a full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this 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 org.infinispan.jcache.annotation.solder;
 
 import java.lang.reflect.Type;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedTypeBuilder.java b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedTypeBuilder.java
index e6f6ff587a45..24511856a30a 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedTypeBuilder.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedTypeBuilder.java
@@ -1,19 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and/or its affiliates, and individual
- * contributors by the @authors tag. See the copyright.txt in the
- * distribution for a full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this 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 org.infinispan.jcache.annotation.solder;
 
 import org.infinispan.jcache.logging.Log;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedTypeImpl.java b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedTypeImpl.java
index 54fb92f22dd0..203c288337c2 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedTypeImpl.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotatedTypeImpl.java
@@ -1,19 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and/or its affiliates, and individual
- * contributors by the @authors tag. See the copyright.txt in the
- * distribution for a full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this 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 org.infinispan.jcache.annotation.solder;
 
 import java.lang.reflect.Constructor;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotationBuilder.java b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotationBuilder.java
index a4edcb0fafdc..bf795b17f7ef 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotationBuilder.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotationBuilder.java
@@ -1,19 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and/or its affiliates, and individual
- * contributors by the @authors tag. See the copyright.txt in the
- * distribution for a full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this 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 org.infinispan.jcache.annotation.solder;
 
 import org.infinispan.jcache.logging.Log;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotationStore.java b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotationStore.java
index f6b07599327c..2e80ba807c05 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotationStore.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/AnnotationStore.java
@@ -1,19 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and/or its affiliates, and individual
- * contributors by the @authors tag. See the copyright.txt in the
- * distribution for a full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this 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 org.infinispan.jcache.annotation.solder;
 
 import java.lang.annotation.Annotation;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/HierarchyDiscovery.java b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/HierarchyDiscovery.java
index 8ca1637bcd6f..8efbeef0e3a1 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/HierarchyDiscovery.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/HierarchyDiscovery.java
@@ -1,19 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and/or its affiliates, and individual
- * contributors by the @authors tag. See the copyright.txt in the
- * distribution for a full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this 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 org.infinispan.jcache.annotation.solder;
 
 import java.lang.reflect.ParameterizedType;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/ParameterizedTypeImpl.java b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/ParameterizedTypeImpl.java
index 825feca24fe1..b64218ed5a41 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/ParameterizedTypeImpl.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/ParameterizedTypeImpl.java
@@ -1,19 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and/or its affiliates, and individual
- * contributors by the @authors tag. See the copyright.txt in the
- * distribution for a full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this 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 org.infinispan.jcache.annotation.solder;
 
 import java.lang.reflect.ParameterizedType;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/Reflections.java b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/Reflections.java
index c0d24294876c..a9294b9427be 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/Reflections.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/Reflections.java
@@ -1,19 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and/or its affiliates, and individual
- * contributors by the @authors tag. See the copyright.txt in the
- * distribution for a full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this 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 org.infinispan.jcache.annotation.solder;
 
 import javax.enterprise.inject.spi.Annotated;
diff --git a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/Types.java b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/Types.java
index 099c812b017b..87bb23cd29ca 100644
--- a/jcache/src/main/java/org/infinispan/jcache/annotation/solder/Types.java
+++ b/jcache/src/main/java/org/infinispan/jcache/annotation/solder/Types.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jcache.annotation.solder;
 
 /**
diff --git a/jcache/src/main/java/org/infinispan/jcache/interceptor/ExpirationTrackingInterceptor.java b/jcache/src/main/java/org/infinispan/jcache/interceptor/ExpirationTrackingInterceptor.java
index ba071d976881..a18c0fa564e3 100644
--- a/jcache/src/main/java/org/infinispan/jcache/interceptor/ExpirationTrackingInterceptor.java
+++ b/jcache/src/main/java/org/infinispan/jcache/interceptor/ExpirationTrackingInterceptor.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.jcache.interceptor;
 
 import org.infinispan.commands.read.GetKeyValueCommand;
diff --git a/jcache/src/main/java/org/infinispan/jcache/logging/Log.java b/jcache/src/main/java/org/infinispan/jcache/logging/Log.java
index 8f98abfe5c8f..7644719fab59 100644
--- a/jcache/src/main/java/org/infinispan/jcache/logging/Log.java
+++ b/jcache/src/main/java/org/infinispan/jcache/logging/Log.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.jcache.logging;
 
 import org.jboss.logging.Cause;
diff --git a/jcache/src/main/resources/META-INF/beans.xml b/jcache/src/main/resources/META-INF/beans.xml
index 80e484da9416..a0c6e213eca7 100644
--- a/jcache/src/main/resources/META-INF/beans.xml
+++ b/jcache/src/main/resources/META-INF/beans.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2011 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <beans xmlns="http://java.sun.com/xml/ns/javaee"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
diff --git a/jcache/src/main/resources/META-INF/services/javax.cache.spi.AnnotationProvider b/jcache/src/main/resources/META-INF/services/javax.cache.spi.AnnotationProvider
index 14949235a2a6..776eaa2b1dfd 100644
--- a/jcache/src/main/resources/META-INF/services/javax.cache.spi.AnnotationProvider
+++ b/jcache/src/main/resources/META-INF/services/javax.cache.spi.AnnotationProvider
@@ -1,23 +1 @@
-#
-# JBoss, Home of Professional Open Source
-# Copyright 2011 Red Hat Inc. and/or its affiliates and other
-# contributors as indicated by the @author tags. All rights reserved.
-# See the copyright.txt in the distribution for a full listing of
-# individual contributors.
-#
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
 org.infinispan.jcache.annotation.CacheAnnotationProvider
diff --git a/jcache/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/jcache/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
index f2d04b72efd4..00f3dd562654 100644
--- a/jcache/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
+++ b/jcache/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
@@ -1,23 +1 @@
-#
-# JBoss, Home of Professional Open Source
-# Copyright 2011 Red Hat Inc. and/or its affiliates and other
-# contributors as indicated by the @author tags. All rights reserved.
-# See the copyright.txt in the distribution for a full listing of
-# individual contributors.
-#
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
 org.infinispan.jcache.annotation.AnnotationInjectExtension
diff --git a/jcache/src/test/java/org/infinispan/jcache/CacheLookupHelperTest.java b/jcache/src/test/java/org/infinispan/jcache/CacheLookupHelperTest.java
index df429fbe3823..23d7c93d711d 100644
--- a/jcache/src/test/java/org/infinispan/jcache/CacheLookupHelperTest.java
+++ b/jcache/src/test/java/org/infinispan/jcache/CacheLookupHelperTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jcache;
 
 import org.infinispan.jcache.annotation.CacheLookupHelper;
diff --git a/jcache/src/test/java/org/infinispan/jcache/JCacheExpiryTest.java b/jcache/src/test/java/org/infinispan/jcache/JCacheExpiryTest.java
index 3cbaef9b21d8..60123bc259c8 100644
--- a/jcache/src/test/java/org/infinispan/jcache/JCacheExpiryTest.java
+++ b/jcache/src/test/java/org/infinispan/jcache/JCacheExpiryTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.jcache;
 
 import org.infinispan.jcache.util.JCacheRunnable;
diff --git a/jcache/src/test/java/org/infinispan/jcache/util/Deployments.java b/jcache/src/test/java/org/infinispan/jcache/util/Deployments.java
index dcb714f78100..57103473382e 100644
--- a/jcache/src/test/java/org/infinispan/jcache/util/Deployments.java
+++ b/jcache/src/test/java/org/infinispan/jcache/util/Deployments.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.jcache.util;
 
 import org.infinispan.jcache.JCache;
diff --git a/jcache/src/test/java/org/infinispan/jcache/util/JCacheRunnable.java b/jcache/src/test/java/org/infinispan/jcache/util/JCacheRunnable.java
index 5555d209b81e..3ea87dc88643 100644
--- a/jcache/src/test/java/org/infinispan/jcache/util/JCacheRunnable.java
+++ b/jcache/src/test/java/org/infinispan/jcache/util/JCacheRunnable.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.jcache.util;
 
 import javax.cache.spi.CachingProvider;
diff --git a/jcache/src/test/java/org/infinispan/jcache/util/JCacheTestingUtil.java b/jcache/src/test/java/org/infinispan/jcache/util/JCacheTestingUtil.java
index 7037f631d959..4eaffad87865 100644
--- a/jcache/src/test/java/org/infinispan/jcache/util/JCacheTestingUtil.java
+++ b/jcache/src/test/java/org/infinispan/jcache/util/JCacheTestingUtil.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.jcache.util;
 
 import javax.cache.CacheManager;
diff --git a/jcache/src/test/resources/beans.xml b/jcache/src/test/resources/beans.xml
index 80e484da9416..a0c6e213eca7 100644
--- a/jcache/src/test/resources/beans.xml
+++ b/jcache/src/test/resources/beans.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2011 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <beans xmlns="http://java.sun.com/xml/ns/javaee"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
diff --git a/license/pom.xml b/license/pom.xml
index 662054a36e75..137b5882145c 100644
--- a/license/pom.xml
+++ b/license/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
    <version>2-SNAPSHOT</version>
    <modelVersion>4.0.0</modelVersion>
diff --git a/lucene/lucene-directory/pom.xml b/lucene/lucene-directory/pom.xml
index 094629236a3e..d6c2fb69d8af 100644
--- a/lucene/lucene-directory/pom.xml
+++ b/lucene/lucene-directory/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2013 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
 
diff --git a/lucene/lucene-v3/pom.xml b/lucene/lucene-v3/pom.xml
index e45b88ea99a0..0f51f645e9b5 100644
--- a/lucene/lucene-v3/pom.xml
+++ b/lucene/lucene-v3/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
 
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/ChunkCacheKey.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/ChunkCacheKey.java
index bb11874f1499..f896b131ee67 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/ChunkCacheKey.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/ChunkCacheKey.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/ExternalizerIds.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/ExternalizerIds.java
index b8dba36b2628..777c6ff1bfa8 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/ExternalizerIds.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/ExternalizerIds.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene;
 
 /**
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/FileCacheKey.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/FileCacheKey.java
index 54a1e28935a4..60f32c11c3ef 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/FileCacheKey.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/FileCacheKey.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/FileListCacheKey.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/FileListCacheKey.java
index 93cdaaec384b..9d3ac262ed54 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/FileListCacheKey.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/FileListCacheKey.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/FileMetadata.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/FileMetadata.java
index 3f3bf471bd6d..0664db1d0b0b 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/FileMetadata.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/FileMetadata.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/FileReadLockKey.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/FileReadLockKey.java
index 2723fa325424..2c3bc36cbaba 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/FileReadLockKey.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/FileReadLockKey.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/IndexScopedKey.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/IndexScopedKey.java
index 9f4d541ddd9f..9e8d9ebe8aae 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/IndexScopedKey.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/IndexScopedKey.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.lucene;
 
 /**
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/InfinispanDirectory.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/InfinispanDirectory.java
index 6048ef7e00f4..632404e69803 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/InfinispanDirectory.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/InfinispanDirectory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene;
 
 import java.io.FileNotFoundException;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/KeyVisitor.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/KeyVisitor.java
index 31628ed0d3e0..54d4c9df149b 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/KeyVisitor.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/KeyVisitor.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.lucene;
 
 /**
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/LifecycleCallbacks.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/LifecycleCallbacks.java
index ef79a63d6c95..da29067ec066 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/LifecycleCallbacks.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/LifecycleCallbacks.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lucene;
 
 import org.infinispan.configuration.global.GlobalConfiguration;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/LuceneKey2StringMapper.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/LuceneKey2StringMapper.java
index 2273e302f228..1fb3b56e34a2 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/LuceneKey2StringMapper.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/LuceneKey2StringMapper.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene;
 
 import java.util.regex.Pattern;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/cachestore/ContractAdaptorFactory.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/cachestore/ContractAdaptorFactory.java
index 7ba7a602d0c1..01ad1e3c7c16 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/cachestore/ContractAdaptorFactory.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/cachestore/ContractAdaptorFactory.java
@@ -1,22 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.lucene.cachestore;
 
 import org.apache.lucene.store.Directory;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/cachestore/DirectoryLoaderAdaptor.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/cachestore/DirectoryLoaderAdaptor.java
index 6116ec9077a9..e1189d59c262 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/cachestore/DirectoryLoaderAdaptor.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/cachestore/DirectoryLoaderAdaptor.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.lucene.cachestore;
 
 import java.io.FileNotFoundException;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/cachestore/DirectoryV3Adaptor.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/cachestore/DirectoryV3Adaptor.java
index b185c6f57b8e..b5b507f17bbd 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/cachestore/DirectoryV3Adaptor.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/cachestore/DirectoryV3Adaptor.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.lucene.cachestore;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/cachestore/InternalDirectoryContract.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/cachestore/InternalDirectoryContract.java
index 2703217383ba..d94a3d3443a1 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/cachestore/InternalDirectoryContract.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/cachestore/InternalDirectoryContract.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.lucene.cachestore;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/cachestore/LuceneCacheLoader.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/cachestore/LuceneCacheLoader.java
index a4350839f5bc..82a11f473252 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/cachestore/LuceneCacheLoader.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/cachestore/LuceneCacheLoader.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.lucene.cachestore;
 
 import java.io.File;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/cachestore/LuceneCacheLoaderConfig.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/cachestore/LuceneCacheLoaderConfig.java
index 404296c2f56f..83c0dce9e65a 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/cachestore/LuceneCacheLoaderConfig.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/cachestore/LuceneCacheLoaderConfig.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.lucene.cachestore;
 
 import org.infinispan.config.ConfigurationBeanVisitor;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/directory/BuildContext.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/directory/BuildContext.java
index b205e8a909ee..3d15fdb9a7cd 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/directory/BuildContext.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/directory/BuildContext.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.directory;
 
 import org.apache.lucene.store.Directory;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/directory/DirectoryBuilder.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/directory/DirectoryBuilder.java
index c830e1f7b607..6211977bedd6 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/directory/DirectoryBuilder.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/directory/DirectoryBuilder.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.directory;
 
 import org.apache.lucene.store.Directory;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/DirectoryBuilderImpl.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/DirectoryBuilderImpl.java
index 69588b090688..64a78e780b60 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/DirectoryBuilderImpl.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/DirectoryBuilderImpl.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lucene.impl;
 
 import org.apache.lucene.store.Directory;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/DirectoryExtensions.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/DirectoryExtensions.java
index df0db68d1b7f..9ac06a4173de 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/DirectoryExtensions.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/DirectoryExtensions.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.impl;
 
 /**
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/DirectoryImplementor.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/DirectoryImplementor.java
index d09bbde4666a..444fc96ef004 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/DirectoryImplementor.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/DirectoryImplementor.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lucene.impl;
 
 import java.io.FileNotFoundException;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/DirectoryLuceneV3.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/DirectoryLuceneV3.java
index ac99e07e163e..1a8d254229a4 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/DirectoryLuceneV3.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/DirectoryLuceneV3.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.impl;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/FileListOperations.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/FileListOperations.java
index f276bae886dc..3b43ee2e3f46 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/FileListOperations.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/FileListOperations.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.impl;
 
 import java.util.Set;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/IndexInputContext.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/IndexInputContext.java
index 80bb31bd6297..179e5e037546 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/IndexInputContext.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/IndexInputContext.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lucene.impl;
 
 import org.infinispan.AdvancedCache;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/InfinispanIndexInput.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/InfinispanIndexInput.java
index a4b164c7a546..c488a57eebba 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/InfinispanIndexInput.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/InfinispanIndexInput.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.impl;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/InfinispanIndexInputV3.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/InfinispanIndexInputV3.java
index 08b4930c9872..69bb300dc553 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/InfinispanIndexInputV3.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/InfinispanIndexInputV3.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lucene.impl;
 
 
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/InfinispanIndexOutput.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/InfinispanIndexOutput.java
index fd4a674bd083..6357f1b42813 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/InfinispanIndexOutput.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/InfinispanIndexOutput.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.impl;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/LuceneVersionDetector.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/LuceneVersionDetector.java
index 46265d1408bd..08aa8e0d6db6 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/LuceneVersionDetector.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/LuceneVersionDetector.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.impl;
 
 import org.infinispan.lucene.logging.Log;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/SingleChunkIndexInput.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/SingleChunkIndexInput.java
index a08fbef6cdc4..5b5f3b564faf 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/SingleChunkIndexInput.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/impl/SingleChunkIndexInput.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.impl;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/locking/BaseLockFactory.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/locking/BaseLockFactory.java
index 878247a31853..a0e9e4c97712 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/locking/BaseLockFactory.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/locking/BaseLockFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.locking;
 
 import org.apache.lucene.index.IndexWriter;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/locking/BaseLuceneLock.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/locking/BaseLuceneLock.java
index 21735f4ada6f..ef6ac897fc1b 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/locking/BaseLuceneLock.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/locking/BaseLuceneLock.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.locking;
 
 import org.apache.lucene.store.Lock;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/locking/TransactionalLockFactory.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/locking/TransactionalLockFactory.java
index d88a72f1b252..d5e0ac25be61 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/locking/TransactionalLockFactory.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/locking/TransactionalLockFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.locking;
 
 import org.apache.lucene.index.IndexWriter;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/locking/TransactionalSharedLuceneLock.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/locking/TransactionalSharedLuceneLock.java
index 953cc893078a..0859f44e9a73 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/locking/TransactionalSharedLuceneLock.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/locking/TransactionalSharedLuceneLock.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.locking;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/locking/package-info.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/locking/package-info.java
index 935b8e165611..cc8f4b1eda90 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/locking/package-info.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/locking/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Lucene's IndexWriter instances are threadsafe but you can have only one open on the index, so when opening an IndexWriter an
  * index-wide lock needs to be acquired. When using Infinispan this lock needs reliable distribution, so two implementations
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/logging/Log.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/logging/Log.java
index 5f57c8cec6bd..96b91ce5faee 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/logging/Log.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/logging/Log.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lucene.logging;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/package-info.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/package-info.java
index 8f1d0543eacc..5537c6e07b21 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/package-info.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Lucene Directory implementation which stores the index in Infinispan.
  * For information about Apache Lucene (Java) see <a href="http://lucene.apache.org/java/docs/index.html">the Lucene homepage</a>.
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/readlocks/DistributedSegmentReadLocker.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/readlocks/DistributedSegmentReadLocker.java
index 67bf59bec617..72b42f22baf7 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/readlocks/DistributedSegmentReadLocker.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/readlocks/DistributedSegmentReadLocker.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.readlocks;
 
 import org.infinispan.AdvancedCache;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/readlocks/LocalLockMergingSegmentReadLocker.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/readlocks/LocalLockMergingSegmentReadLocker.java
index 8ce5fa67eb88..aa9b85408701 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/readlocks/LocalLockMergingSegmentReadLocker.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/readlocks/LocalLockMergingSegmentReadLocker.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.readlocks;
 
 import org.infinispan.Cache;
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/readlocks/NoopSegmentReadLocker.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/readlocks/NoopSegmentReadLocker.java
index 4f8c778da085..ca67e97b1c5c 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/readlocks/NoopSegmentReadLocker.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/readlocks/NoopSegmentReadLocker.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.readlocks;
 
 /**
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/readlocks/SegmentReadLocker.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/readlocks/SegmentReadLocker.java
index 3b5eaf966ec1..e831f21235aa 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/readlocks/SegmentReadLocker.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/readlocks/SegmentReadLocker.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.readlocks;
 
 /**
diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/readlocks/package-info.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/readlocks/package-info.java
index c2222fb8e606..bc7b762446ab 100644
--- a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/readlocks/package-info.java
+++ b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/readlocks/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * Several implementations for a SegmentReadLocker, pick one depending on your use case.
  * Lucene's default IndexDeletionPolicy could remove a segment while it's still used by another IndexReader;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/CacheTestSupport.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/CacheTestSupport.java
index 6a8fbb343c98..7a42c22896f5 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/CacheTestSupport.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/CacheTestSupport.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene;
 
 import org.apache.lucene.document.DateTools;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/DatabaseStoredIndexTest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/DatabaseStoredIndexTest.java
index ffa58cd810e8..00fe9a124146 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/DatabaseStoredIndexTest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/DatabaseStoredIndexTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/DirectoryIntegrityCheck.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/DirectoryIntegrityCheck.java
index 427e819088c4..885cedafb9e4 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/DirectoryIntegrityCheck.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/DirectoryIntegrityCheck.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene;
 
 import java.util.Set;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/DirectoryOnMultipleCachesTest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/DirectoryOnMultipleCachesTest.java
index a0b480361e4b..038133e40a5e 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/DirectoryOnMultipleCachesTest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/DirectoryOnMultipleCachesTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene;
 
 import static org.infinispan.lucene.CacheTestSupport.assertTextIsFoundInIds;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/DynamicBufferSizeTest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/DynamicBufferSizeTest.java
index d71bd756cc0b..ce078b12766a 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/DynamicBufferSizeTest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/DynamicBufferSizeTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene;
 
 import static org.infinispan.lucene.CacheTestSupport.assertTextIsFoundInIds;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/ExternalizersEnabledTest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/ExternalizersEnabledTest.java
index d7fe10a362b9..ecc71d5aa74a 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/ExternalizersEnabledTest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/ExternalizersEnabledTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lucene;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/InfinispanDirectoryIOTest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/InfinispanDirectoryIOTest.java
index dc940cad04b8..60cf7d6127c5 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/InfinispanDirectoryIOTest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/InfinispanDirectoryIOTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene;
 
 import java.io.ByteArrayOutputStream;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/InfinispanDirectoryStressTest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/InfinispanDirectoryStressTest.java
index d0ff4270fcfa..4d25ac65bf5d 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/InfinispanDirectoryStressTest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/InfinispanDirectoryStressTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene;
 
 import java.io.File;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/InfinispanDirectoryTest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/InfinispanDirectoryTest.java
index 7df89a69bc75..2fb8ac8b23eb 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/InfinispanDirectoryTest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/InfinispanDirectoryTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.lucene;
 
 import org.apache.lucene.store.Directory;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/Key2StringMapperTest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/Key2StringMapperTest.java
index c1292a574856..b51e0fe271e2 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/Key2StringMapperTest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/Key2StringMapperTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene;
 
 import java.util.Arrays;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/SimpleLuceneTest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/SimpleLuceneTest.java
index 27cb3b93bab8..d4511be56e56 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/SimpleLuceneTest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/SimpleLuceneTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene;
 
 import static org.infinispan.lucene.CacheTestSupport.assertTextIsFoundInIds;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/SkipIndexingGuaranteed.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/SkipIndexingGuaranteed.java
index d9bad9deb9ae..d238794409d0 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/SkipIndexingGuaranteed.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/SkipIndexingGuaranteed.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.lucene;
 
 import junit.framework.AssertionFailedError;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/cachestore/CacheLoaderAPITest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/cachestore/CacheLoaderAPITest.java
index 0c29d2ee09f6..25a125dbf8ec 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/cachestore/CacheLoaderAPITest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/cachestore/CacheLoaderAPITest.java
@@ -1,22 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.lucene.cachestore;
 
 import java.io.File;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/cachestore/IndexCacheLoaderTest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/cachestore/IndexCacheLoaderTest.java
index 5f3583b32777..1b54a0548098 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/cachestore/IndexCacheLoaderTest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/cachestore/IndexCacheLoaderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.lucene.cachestore;
 
 import java.io.File;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/cachestore/LargeIndexesTest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/cachestore/LargeIndexesTest.java
index e11abca8bd14..5055559f2a12 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/cachestore/LargeIndexesTest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/cachestore/LargeIndexesTest.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.lucene.cachestore;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/cachestore/LuceneCacheLoaderTest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/cachestore/LuceneCacheLoaderTest.java
index 43d7113e5099..934d4ef255d7 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/cachestore/LuceneCacheLoaderTest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/cachestore/LuceneCacheLoaderTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.lucene.cachestore;
 
 import org.apache.lucene.store.Directory;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/cachestore/TestHelper.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/cachestore/TestHelper.java
index cd3431544b43..e8d87de56c0f 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/cachestore/TestHelper.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/cachestore/TestHelper.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.lucene.cachestore;
 
 import org.apache.lucene.document.Document;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/impl/V3DirectoryImplementerTests.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/impl/V3DirectoryImplementerTests.java
index 8558131ff1a1..95171737e226 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/impl/V3DirectoryImplementerTests.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/impl/V3DirectoryImplementerTests.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lucene.impl;
 
 import org.apache.lucene.store.Directory;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/locking/LockManagerFunctionalTest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/locking/LockManagerFunctionalTest.java
index 080b9f69c5c6..699f4fef5c98 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/locking/LockManagerFunctionalTest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/locking/LockManagerFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.locking;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerExcFunctionalTest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerExcFunctionalTest.java
index f6b6f6d1f0e4..87ebaab2b948 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerExcFunctionalTest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerExcFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.locking;
 
 import org.infinispan.Cache;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerFunctionalTest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerFunctionalTest.java
index 7ef479830096..9665299d91b0 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerFunctionalTest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.locking;
 
 import org.apache.lucene.store.LockFactory;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerUsingBaseLockFactoryTest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerUsingBaseLockFactoryTest.java
index f290702cc6cd..e735cde3216c 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerUsingBaseLockFactoryTest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerUsingBaseLockFactoryTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.locking;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/CacheStoreStressTest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/CacheStoreStressTest.java
index 2525f8fe787f..8299bd50238a 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/CacheStoreStressTest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/CacheStoreStressTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.profiling;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/DynamicTopologyStressTest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/DynamicTopologyStressTest.java
index 4416c54fb3f7..26b9bb0d52fd 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/DynamicTopologyStressTest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/DynamicTopologyStressTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.profiling;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/IndexReadingStressTest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/IndexReadingStressTest.java
index d5e2fe119193..fca8311f9346 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/IndexReadingStressTest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/IndexReadingStressTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.profiling;
 
 import java.io.File;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/LuceneReaderThread.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/LuceneReaderThread.java
index cab4f80bd655..ac48867d13b5 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/LuceneReaderThread.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/LuceneReaderThread.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.profiling;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/LuceneUserThread.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/LuceneUserThread.java
index 30e44fc1ac0f..13326de0a314 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/LuceneUserThread.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/LuceneUserThread.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.profiling;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/LuceneWriterThread.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/LuceneWriterThread.java
index 1b98fafa82e2..132be5b6c216 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/LuceneWriterThread.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/LuceneWriterThread.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.profiling;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/PerformanceCompareStressTest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/PerformanceCompareStressTest.java
index f817660bb5d7..e546a984d8b8 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/PerformanceCompareStressTest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/PerformanceCompareStressTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.profiling;
 
 import java.io.File;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/SharedState.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/SharedState.java
index d5dff2683804..a947764c72c6 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/SharedState.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/profiling/SharedState.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.profiling;
 
 import java.util.HashSet;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/readlocks/ConfigurationCheckTest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/readlocks/ConfigurationCheckTest.java
index a6f792250376..e5cef1140221 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/readlocks/ConfigurationCheckTest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/readlocks/ConfigurationCheckTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.readlocks;
 
 import org.infinispan.Cache;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/readlocks/DistributedSegmentReadLockerTest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/readlocks/DistributedSegmentReadLockerTest.java
index 6f3803ebb05d..6c7b40991da0 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/readlocks/DistributedSegmentReadLockerTest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/readlocks/DistributedSegmentReadLockerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.readlocks;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/readlocks/LocalLockMergingSegmentReadLockerTest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/readlocks/LocalLockMergingSegmentReadLockerTest.java
index 4959be2e41f7..b6f75063e2dc 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/readlocks/LocalLockMergingSegmentReadLockerTest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/readlocks/LocalLockMergingSegmentReadLockerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.readlocks;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/readlocks/NoopSegmentReadLockerTest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/readlocks/NoopSegmentReadLockerTest.java
index 6ee20f611942..dcaa15821082 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/readlocks/NoopSegmentReadLockerTest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/readlocks/NoopSegmentReadLockerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.readlocks;
 
 import org.apache.lucene.store.Directory;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/testutils/ClusteredCacheFactory.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/testutils/ClusteredCacheFactory.java
index 484e9e3ac35a..cf6ddb2073ea 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/testutils/ClusteredCacheFactory.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/testutils/ClusteredCacheFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.testutils;
 
 import java.util.concurrent.BlockingQueue;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/testutils/LuceneSettings.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/testutils/LuceneSettings.java
index 8da63846b29d..137ba4583dc0 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/testutils/LuceneSettings.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/testutils/LuceneSettings.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.testutils;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/testutils/RepeatableLongByteSequence.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/testutils/RepeatableLongByteSequence.java
index c1e711591a09..b7328b8cd76f 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/testutils/RepeatableLongByteSequence.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/testutils/RepeatableLongByteSequence.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.testutils;
 
 import org.testng.annotations.Test;
diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/testutils/RepeatableLongByteSequenceTest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/testutils/RepeatableLongByteSequenceTest.java
index 504ed9262140..d8d754058e24 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/testutils/RepeatableLongByteSequenceTest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/testutils/RepeatableLongByteSequenceTest.java
@@ -1,21 +1,4 @@
-package org.infinispan.lucene.testutils;/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
+package org.infinispan.lucene.testutils;
 
 import org.infinispan.lucene.testutils.RepeatableLongByteSequence;
 import org.testng.annotations.Test;
diff --git a/lucene/lucene-v3/src/test/resources/custom-lucene-log4j.xml b/lucene/lucene-v3/src/test/resources/custom-lucene-log4j.xml
index 5adf67331dc9..9ec5064fa0e9 100644
--- a/lucene/lucene-v3/src/test/resources/custom-lucene-log4j.xml
+++ b/lucene/lucene-v3/src/test/resources/custom-lucene-log4j.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
 
diff --git a/lucene/lucene-v3/src/test/resources/jbossts-properties.xml b/lucene/lucene-v3/src/test/resources/jbossts-properties.xml
index fdccd9ff735c..380b7a65f117 100644
--- a/lucene/lucene-v3/src/test/resources/jbossts-properties.xml
+++ b/lucene/lucene-v3/src/test/resources/jbossts-properties.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties>
     <!--
diff --git a/lucene/lucene-v4/pom.xml b/lucene/lucene-v4/pom.xml
index 2bb9158040cb..b5456d3e6513 100644
--- a/lucene/lucene-v4/pom.xml
+++ b/lucene/lucene-v4/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
 
diff --git a/lucene/lucene-v4/src/main/java/org/infinispan/lucene/cachestore/DirectoryV4Adaptor.java b/lucene/lucene-v4/src/main/java/org/infinispan/lucene/cachestore/DirectoryV4Adaptor.java
index a958690221bb..d97c38d94146 100644
--- a/lucene/lucene-v4/src/main/java/org/infinispan/lucene/cachestore/DirectoryV4Adaptor.java
+++ b/lucene/lucene-v4/src/main/java/org/infinispan/lucene/cachestore/DirectoryV4Adaptor.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.lucene.cachestore;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v4/src/main/java/org/infinispan/lucene/impl/DirectoryLuceneV4.java b/lucene/lucene-v4/src/main/java/org/infinispan/lucene/impl/DirectoryLuceneV4.java
index 6b5c4081769a..4f9d31c793e2 100644
--- a/lucene/lucene-v4/src/main/java/org/infinispan/lucene/impl/DirectoryLuceneV4.java
+++ b/lucene/lucene-v4/src/main/java/org/infinispan/lucene/impl/DirectoryLuceneV4.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.impl;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v4/src/main/java/org/infinispan/lucene/impl/InfinispanIndexInputV4.java b/lucene/lucene-v4/src/main/java/org/infinispan/lucene/impl/InfinispanIndexInputV4.java
index 9025d17706e0..fc6f087399d3 100644
--- a/lucene/lucene-v4/src/main/java/org/infinispan/lucene/impl/InfinispanIndexInputV4.java
+++ b/lucene/lucene-v4/src/main/java/org/infinispan/lucene/impl/InfinispanIndexInputV4.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lucene.impl;
 
 
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/CacheTestSupport.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/CacheTestSupport.java
index e84842594a2b..17fc0f2f4630 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/CacheTestSupport.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/CacheTestSupport.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene;
 
 import org.apache.lucene.document.DateTools;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/DatabaseStoredIndexTest.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/DatabaseStoredIndexTest.java
index ffa58cd810e8..00fe9a124146 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/DatabaseStoredIndexTest.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/DatabaseStoredIndexTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/DirectoryIntegrityCheck.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/DirectoryIntegrityCheck.java
index 88e144c2b7da..d2a7297ae393 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/DirectoryIntegrityCheck.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/DirectoryIntegrityCheck.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene;
 
 import java.util.Set;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/DirectoryOnMultipleCachesTest.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/DirectoryOnMultipleCachesTest.java
index c8ede46830c6..227a5c06d828 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/DirectoryOnMultipleCachesTest.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/DirectoryOnMultipleCachesTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene;
 
 import static org.infinispan.lucene.CacheTestSupport.assertTextIsFoundInIds;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/DynamicBufferSizeTest.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/DynamicBufferSizeTest.java
index d71bd756cc0b..ce078b12766a 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/DynamicBufferSizeTest.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/DynamicBufferSizeTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene;
 
 import static org.infinispan.lucene.CacheTestSupport.assertTextIsFoundInIds;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/ExternalizersEnabledTest.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/ExternalizersEnabledTest.java
index ce43f7fd9c18..cb0943df4681 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/ExternalizersEnabledTest.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/ExternalizersEnabledTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lucene;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/InfinispanDirectoryIOTest.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/InfinispanDirectoryIOTest.java
index 84235de44391..129398f04610 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/InfinispanDirectoryIOTest.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/InfinispanDirectoryIOTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene;
 
 import java.io.ByteArrayOutputStream;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/InfinispanDirectoryStressTest.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/InfinispanDirectoryStressTest.java
index cc58d289c4af..0f5e425ef940 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/InfinispanDirectoryStressTest.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/InfinispanDirectoryStressTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene;
 
 import java.io.File;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/Key2StringMapperTest.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/Key2StringMapperTest.java
index c1292a574856..b51e0fe271e2 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/Key2StringMapperTest.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/Key2StringMapperTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene;
 
 import java.util.Arrays;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/SimpleLuceneTest.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/SimpleLuceneTest.java
index 27cb3b93bab8..d4511be56e56 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/SimpleLuceneTest.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/SimpleLuceneTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene;
 
 import static org.infinispan.lucene.CacheTestSupport.assertTextIsFoundInIds;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/SkipIndexingGuaranteed.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/SkipIndexingGuaranteed.java
index d9bad9deb9ae..d238794409d0 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/SkipIndexingGuaranteed.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/SkipIndexingGuaranteed.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.lucene;
 
 import junit.framework.AssertionFailedError;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/cachestore/CacheLoaderAPITest.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/cachestore/CacheLoaderAPITest.java
index aedfabace2e8..7dd4f9c5997e 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/cachestore/CacheLoaderAPITest.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/cachestore/CacheLoaderAPITest.java
@@ -1,22 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.lucene.cachestore;
 
 import java.io.File;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/cachestore/IndexCacheLoaderTest.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/cachestore/IndexCacheLoaderTest.java
index 9fe753e57dfb..de87a4c70f36 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/cachestore/IndexCacheLoaderTest.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/cachestore/IndexCacheLoaderTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.lucene.cachestore;
 
 import java.io.File;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/cachestore/LargeIndexesTest.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/cachestore/LargeIndexesTest.java
index e2595fc04038..269d22129a74 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/cachestore/LargeIndexesTest.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/cachestore/LargeIndexesTest.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.lucene.cachestore;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/cachestore/LuceneCacheLoaderTest.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/cachestore/LuceneCacheLoaderTest.java
index dd07dbcf024a..5c95f12c65dd 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/cachestore/LuceneCacheLoaderTest.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/cachestore/LuceneCacheLoaderTest.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.lucene.cachestore;
 
 import org.apache.lucene.store.Directory;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/cachestore/TestHelper.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/cachestore/TestHelper.java
index cd3431544b43..e8d87de56c0f 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/cachestore/TestHelper.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/cachestore/TestHelper.java
@@ -1,22 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.lucene.cachestore;
 
 import org.apache.lucene.document.Document;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/impl/DirectoryImplementerTests.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/impl/DirectoryImplementerTests.java
index 6fc8db229011..b51b4ba09d0d 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/impl/DirectoryImplementerTests.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/impl/DirectoryImplementerTests.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.lucene.impl;
 
 import org.apache.lucene.store.Directory;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/locking/LockManagerFunctionalTest.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/locking/LockManagerFunctionalTest.java
index 080b9f69c5c6..699f4fef5c98 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/locking/LockManagerFunctionalTest.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/locking/LockManagerFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.locking;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerExcFunctionalTest.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerExcFunctionalTest.java
index f6b6f6d1f0e4..87ebaab2b948 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerExcFunctionalTest.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerExcFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.locking;
 
 import org.infinispan.Cache;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerFunctionalTest.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerFunctionalTest.java
index 7ef479830096..9665299d91b0 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerFunctionalTest.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerFunctionalTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.locking;
 
 import org.apache.lucene.store.LockFactory;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerUsingBaseLockFactoryTest.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerUsingBaseLockFactoryTest.java
index f290702cc6cd..e735cde3216c 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerUsingBaseLockFactoryTest.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/locking/TransactionalLockManagerUsingBaseLockFactoryTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.locking;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/CacheStoreStressTest.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/CacheStoreStressTest.java
index 2525f8fe787f..8299bd50238a 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/CacheStoreStressTest.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/CacheStoreStressTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.profiling;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/DynamicTopologyStressTest.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/DynamicTopologyStressTest.java
index afcbf0815d5e..62993c914e37 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/DynamicTopologyStressTest.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/DynamicTopologyStressTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.profiling;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/IndexReadingStressTest.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/IndexReadingStressTest.java
index 4a187cda4fe3..919a33052551 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/IndexReadingStressTest.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/IndexReadingStressTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.profiling;
 
 import java.io.File;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/LuceneReaderThread.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/LuceneReaderThread.java
index aa53b31b1fdc..52f86b64e425 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/LuceneReaderThread.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/LuceneReaderThread.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.profiling;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/LuceneUserThread.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/LuceneUserThread.java
index 30e44fc1ac0f..13326de0a314 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/LuceneUserThread.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/LuceneUserThread.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.profiling;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/LuceneWriterThread.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/LuceneWriterThread.java
index 1b98fafa82e2..132be5b6c216 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/LuceneWriterThread.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/LuceneWriterThread.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.profiling;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/PerformanceCompareStressTest.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/PerformanceCompareStressTest.java
index f817660bb5d7..e546a984d8b8 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/PerformanceCompareStressTest.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/PerformanceCompareStressTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.profiling;
 
 import java.io.File;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/SharedState.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/SharedState.java
index d5dff2683804..a947764c72c6 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/SharedState.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/profiling/SharedState.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.profiling;
 
 import java.util.HashSet;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/readlocks/ConfigurationCheckTest.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/readlocks/ConfigurationCheckTest.java
index a6f792250376..e5cef1140221 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/readlocks/ConfigurationCheckTest.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/readlocks/ConfigurationCheckTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.readlocks;
 
 import org.infinispan.Cache;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/readlocks/DistributedSegmentReadLockerTest.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/readlocks/DistributedSegmentReadLockerTest.java
index d7bac9d5d251..87f1f4100672 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/readlocks/DistributedSegmentReadLockerTest.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/readlocks/DistributedSegmentReadLockerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.readlocks;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/readlocks/LocalLockMergingSegmentReadLockerTest.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/readlocks/LocalLockMergingSegmentReadLockerTest.java
index f88784326f2c..12f96d215990 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/readlocks/LocalLockMergingSegmentReadLockerTest.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/readlocks/LocalLockMergingSegmentReadLockerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.readlocks;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/readlocks/NoopSegmentReadLockerTest.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/readlocks/NoopSegmentReadLockerTest.java
index 3356b076ff84..a7388a86d13a 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/readlocks/NoopSegmentReadLockerTest.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/readlocks/NoopSegmentReadLockerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.readlocks;
 
 import org.apache.lucene.store.Directory;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/testutils/ClusteredCacheFactory.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/testutils/ClusteredCacheFactory.java
index 484e9e3ac35a..cf6ddb2073ea 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/testutils/ClusteredCacheFactory.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/testutils/ClusteredCacheFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.testutils;
 
 import java.util.concurrent.BlockingQueue;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/testutils/LuceneSettings.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/testutils/LuceneSettings.java
index 1fca8be39c7a..39ef65cfeef3 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/testutils/LuceneSettings.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/testutils/LuceneSettings.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.testutils;
 
 import java.io.IOException;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/testutils/RepeatableLongByteSequence.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/testutils/RepeatableLongByteSequence.java
index c1e711591a09..b7328b8cd76f 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/testutils/RepeatableLongByteSequence.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/testutils/RepeatableLongByteSequence.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.lucene.testutils;
 
 import org.testng.annotations.Test;
diff --git a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/testutils/RepeatableLongByteSequenceTest.java b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/testutils/RepeatableLongByteSequenceTest.java
index 504ed9262140..d8d754058e24 100644
--- a/lucene/lucene-v4/src/test/java/org/infinispan/lucene/testutils/RepeatableLongByteSequenceTest.java
+++ b/lucene/lucene-v4/src/test/java/org/infinispan/lucene/testutils/RepeatableLongByteSequenceTest.java
@@ -1,21 +1,4 @@
-package org.infinispan.lucene.testutils;/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
+package org.infinispan.lucene.testutils;
 
 import org.infinispan.lucene.testutils.RepeatableLongByteSequence;
 import org.testng.annotations.Test;
diff --git a/lucene/lucene-v4/src/test/resources/custom-lucene-log4j.xml b/lucene/lucene-v4/src/test/resources/custom-lucene-log4j.xml
index 19b2b44b6c6f..f0c31c991331 100644
--- a/lucene/lucene-v4/src/test/resources/custom-lucene-log4j.xml
+++ b/lucene/lucene-v4/src/test/resources/custom-lucene-log4j.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
 
diff --git a/lucene/lucene-v4/src/test/resources/jbossts-properties.xml b/lucene/lucene-v4/src/test/resources/jbossts-properties.xml
index fdccd9ff735c..380b7a65f117 100644
--- a/lucene/lucene-v4/src/test/resources/jbossts-properties.xml
+++ b/lucene/lucene-v4/src/test/resources/jbossts-properties.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties>
     <!--
diff --git a/lucene/pom.xml b/lucene/pom.xml
index 4eda9f8753ac..26ea9c791e02 100644
--- a/lucene/pom.xml
+++ b/lucene/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2013 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
diff --git a/parent/pom.xml b/parent/pom.xml
index eee3b2d8443d..c581a7ff93eb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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>
    <groupId>org.infinispan</groupId>
@@ -36,8 +14,8 @@
    </organization>
    <licenses>
       <license>
-         <name>GNU Lesser General Public License</name>
-         <url>http://repository.jboss.org/licenses/lgpl-2.1.txt</url>
+         <name>Apache License</name>
+         <url>http://www.apache.org/licenses/LICENSE-2.0</url>
          <distribution>repo</distribution>
       </license>
    </licenses>
diff --git a/pom.xml b/pom.xml
index a7fb30e246b7..8d8b1bf03973 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
diff --git a/query/pom.xml b/query/pom.xml
index 1104ca2ce36e..78a04ce250f4 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
diff --git a/query/src/main/java/org/infinispan/query/CacheQuery.java b/query/src/main/java/org/infinispan/query/CacheQuery.java
index 622633255a97..79cf04505447 100644
--- a/query/src/main/java/org/infinispan/query/CacheQuery.java
+++ b/query/src/main/java/org/infinispan/query/CacheQuery.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query;
 
 import org.apache.lucene.search.Explanation;
diff --git a/query/src/main/java/org/infinispan/query/CommandFactory.java b/query/src/main/java/org/infinispan/query/CommandFactory.java
index 810fd82fb0a0..ab0c42197ea2 100644
--- a/query/src/main/java/org/infinispan/query/CommandFactory.java
+++ b/query/src/main/java/org/infinispan/query/CommandFactory.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query;
 
 import java.util.HashMap;
diff --git a/query/src/main/java/org/infinispan/query/CommandInitializer.java b/query/src/main/java/org/infinispan/query/CommandInitializer.java
index 61b616cfe8e1..0cac6073387e 100644
--- a/query/src/main/java/org/infinispan/query/CommandInitializer.java
+++ b/query/src/main/java/org/infinispan/query/CommandInitializer.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query;
 
 import org.hibernate.search.SearchFactory;
diff --git a/query/src/main/java/org/infinispan/query/CustomQueryCommand.java b/query/src/main/java/org/infinispan/query/CustomQueryCommand.java
index 56623411a228..c783b2218fb6 100644
--- a/query/src/main/java/org/infinispan/query/CustomQueryCommand.java
+++ b/query/src/main/java/org/infinispan/query/CustomQueryCommand.java
@@ -1,23 +1,3 @@
-/* 
- * Hibernate, Relational Persistence for Idiomatic Java
- * 
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query;
 
 /**
diff --git a/query/src/main/java/org/infinispan/query/DefaultTransformer.java b/query/src/main/java/org/infinispan/query/DefaultTransformer.java
index fd6c2660ba83..9d97cf3e36e0 100644
--- a/query/src/main/java/org/infinispan/query/DefaultTransformer.java
+++ b/query/src/main/java/org/infinispan/query/DefaultTransformer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query;
 
 import java.io.Serializable;
diff --git a/query/src/main/java/org/infinispan/query/FetchOptions.java b/query/src/main/java/org/infinispan/query/FetchOptions.java
index f3d0ac4878c2..68b16dda5702 100644
--- a/query/src/main/java/org/infinispan/query/FetchOptions.java
+++ b/query/src/main/java/org/infinispan/query/FetchOptions.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query;
 
 /**
diff --git a/query/src/main/java/org/infinispan/query/MassIndexer.java b/query/src/main/java/org/infinispan/query/MassIndexer.java
index 5c056945a6ce..954fa9b678d8 100644
--- a/query/src/main/java/org/infinispan/query/MassIndexer.java
+++ b/query/src/main/java/org/infinispan/query/MassIndexer.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query;
 
 import org.infinispan.jmx.annotations.MBean;
diff --git a/query/src/main/java/org/infinispan/query/ModuleCommandIds.java b/query/src/main/java/org/infinispan/query/ModuleCommandIds.java
index fba28d215469..bde3cc4e704c 100644
--- a/query/src/main/java/org/infinispan/query/ModuleCommandIds.java
+++ b/query/src/main/java/org/infinispan/query/ModuleCommandIds.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query;
 
 /**
diff --git a/query/src/main/java/org/infinispan/query/ProjectionConstants.java b/query/src/main/java/org/infinispan/query/ProjectionConstants.java
index dd20d4f2f633..850c08581c9c 100644
--- a/query/src/main/java/org/infinispan/query/ProjectionConstants.java
+++ b/query/src/main/java/org/infinispan/query/ProjectionConstants.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query;
 
 /**
diff --git a/query/src/main/java/org/infinispan/query/QueryMetadataFileFinder.java b/query/src/main/java/org/infinispan/query/QueryMetadataFileFinder.java
index 4fc6c1f3edf1..279a8343d315 100644
--- a/query/src/main/java/org/infinispan/query/QueryMetadataFileFinder.java
+++ b/query/src/main/java/org/infinispan/query/QueryMetadataFileFinder.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.query;
 
 import org.infinispan.factories.components.ModuleMetadataFileFinder;
diff --git a/query/src/main/java/org/infinispan/query/QueryModuleCommandExtensions.java b/query/src/main/java/org/infinispan/query/QueryModuleCommandExtensions.java
index 7b6d9424f71c..d7570af067f3 100644
--- a/query/src/main/java/org/infinispan/query/QueryModuleCommandExtensions.java
+++ b/query/src/main/java/org/infinispan/query/QueryModuleCommandExtensions.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.query;
 
 import org.infinispan.commands.module.ExtendedModuleCommandFactory;
diff --git a/query/src/main/java/org/infinispan/query/ResultIterator.java b/query/src/main/java/org/infinispan/query/ResultIterator.java
index 4b8e50063a10..54daef53b35c 100644
--- a/query/src/main/java/org/infinispan/query/ResultIterator.java
+++ b/query/src/main/java/org/infinispan/query/ResultIterator.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query;
 
 import java.util.Iterator;
diff --git a/query/src/main/java/org/infinispan/query/Search.java b/query/src/main/java/org/infinispan/query/Search.java
index c873f8856340..83cd386a6350 100644
--- a/query/src/main/java/org/infinispan/query/Search.java
+++ b/query/src/main/java/org/infinispan/query/Search.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query;
 
 import org.infinispan.Cache;
diff --git a/query/src/main/java/org/infinispan/query/SearchManager.java b/query/src/main/java/org/infinispan/query/SearchManager.java
index 731327835b63..04e2507a8fd8 100644
--- a/query/src/main/java/org/infinispan/query/SearchManager.java
+++ b/query/src/main/java/org/infinispan/query/SearchManager.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query;
 
 import org.apache.lucene.search.Query;
diff --git a/query/src/main/java/org/infinispan/query/SearchManagerImpl.java b/query/src/main/java/org/infinispan/query/SearchManagerImpl.java
index 98634bd87318..fe687970bd95 100644
--- a/query/src/main/java/org/infinispan/query/SearchManagerImpl.java
+++ b/query/src/main/java/org/infinispan/query/SearchManagerImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query;
 
 import java.util.concurrent.ExecutorService;
diff --git a/query/src/main/java/org/infinispan/query/Transformable.java b/query/src/main/java/org/infinispan/query/Transformable.java
index 6a37192b51cb..3de45060846a 100644
--- a/query/src/main/java/org/infinispan/query/Transformable.java
+++ b/query/src/main/java/org/infinispan/query/Transformable.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query;
 
 import java.lang.annotation.Target;
diff --git a/query/src/main/java/org/infinispan/query/Transformer.java b/query/src/main/java/org/infinispan/query/Transformer.java
index 33c903a2efa0..b95ad9ed7442 100644
--- a/query/src/main/java/org/infinispan/query/Transformer.java
+++ b/query/src/main/java/org/infinispan/query/Transformer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query;
 
 /**
diff --git a/query/src/main/java/org/infinispan/query/backend/ComponentRegistryServiceProvider.java b/query/src/main/java/org/infinispan/query/backend/ComponentRegistryServiceProvider.java
index ffe7883c5129..893b281f3bab 100644
--- a/query/src/main/java/org/infinispan/query/backend/ComponentRegistryServiceProvider.java
+++ b/query/src/main/java/org/infinispan/query/backend/ComponentRegistryServiceProvider.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.backend;
 
 import java.util.Properties;
diff --git a/query/src/main/java/org/infinispan/query/backend/KeyTransformationHandler.java b/query/src/main/java/org/infinispan/query/backend/KeyTransformationHandler.java
index 9583a79b1157..68cce72e6aa3 100644
--- a/query/src/main/java/org/infinispan/query/backend/KeyTransformationHandler.java
+++ b/query/src/main/java/org/infinispan/query/backend/KeyTransformationHandler.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.backend;
 
 import org.infinispan.AdvancedCache;
diff --git a/query/src/main/java/org/infinispan/query/backend/LocalQueryInterceptor.java b/query/src/main/java/org/infinispan/query/backend/LocalQueryInterceptor.java
index e7da8c1ad600..8e0f192e4995 100644
--- a/query/src/main/java/org/infinispan/query/backend/LocalQueryInterceptor.java
+++ b/query/src/main/java/org/infinispan/query/backend/LocalQueryInterceptor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.backend;
 
 import org.hibernate.search.spi.SearchFactoryIntegrator;
diff --git a/query/src/main/java/org/infinispan/query/backend/QueryInterceptor.java b/query/src/main/java/org/infinispan/query/backend/QueryInterceptor.java
index dd263002ba1a..8b5aad19f4c0 100644
--- a/query/src/main/java/org/infinispan/query/backend/QueryInterceptor.java
+++ b/query/src/main/java/org/infinispan/query/backend/QueryInterceptor.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.backend;
 
 import java.io.Serializable;
diff --git a/query/src/main/java/org/infinispan/query/backend/SearchWorkCreator.java b/query/src/main/java/org/infinispan/query/backend/SearchWorkCreator.java
index f4b1563c3b8d..bc1ffdf77bc4 100644
--- a/query/src/main/java/org/infinispan/query/backend/SearchWorkCreator.java
+++ b/query/src/main/java/org/infinispan/query/backend/SearchWorkCreator.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.backend;
 
 import org.hibernate.search.backend.spi.Work;
diff --git a/query/src/main/java/org/infinispan/query/backend/SearchableCacheConfiguration.java b/query/src/main/java/org/infinispan/query/backend/SearchableCacheConfiguration.java
index 2c4c2537769f..44bc4caac422 100644
--- a/query/src/main/java/org/infinispan/query/backend/SearchableCacheConfiguration.java
+++ b/query/src/main/java/org/infinispan/query/backend/SearchableCacheConfiguration.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.backend;
 
 import org.hibernate.annotations.common.reflection.ReflectionManager;
diff --git a/query/src/main/java/org/infinispan/query/backend/TransactionalEventTransactionContext.java b/query/src/main/java/org/infinispan/query/backend/TransactionalEventTransactionContext.java
index 6fb6fa4965a8..342a6c3c2724 100644
--- a/query/src/main/java/org/infinispan/query/backend/TransactionalEventTransactionContext.java
+++ b/query/src/main/java/org/infinispan/query/backend/TransactionalEventTransactionContext.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.backend;
 
 import org.hibernate.search.backend.TransactionContext;
diff --git a/query/src/main/java/org/infinispan/query/clustered/ClusteredCacheQueryImpl.java b/query/src/main/java/org/infinispan/query/clustered/ClusteredCacheQueryImpl.java
index 76d4e5333204..b02839cd7509 100644
--- a/query/src/main/java/org/infinispan/query/clustered/ClusteredCacheQueryImpl.java
+++ b/query/src/main/java/org/infinispan/query/clustered/ClusteredCacheQueryImpl.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.clustered;
 
 import java.util.ArrayList;
diff --git a/query/src/main/java/org/infinispan/query/clustered/ClusteredDoc.java b/query/src/main/java/org/infinispan/query/clustered/ClusteredDoc.java
index dcc345304fb1..746610c7a94a 100644
--- a/query/src/main/java/org/infinispan/query/clustered/ClusteredDoc.java
+++ b/query/src/main/java/org/infinispan/query/clustered/ClusteredDoc.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.clustered;
 
 import java.util.UUID;
diff --git a/query/src/main/java/org/infinispan/query/clustered/ClusteredFieldDoc.java b/query/src/main/java/org/infinispan/query/clustered/ClusteredFieldDoc.java
index d5493fcf3863..a835aed2777c 100644
--- a/query/src/main/java/org/infinispan/query/clustered/ClusteredFieldDoc.java
+++ b/query/src/main/java/org/infinispan/query/clustered/ClusteredFieldDoc.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.clustered;
 
 import java.util.UUID;
diff --git a/query/src/main/java/org/infinispan/query/clustered/ClusteredQueryCommand.java b/query/src/main/java/org/infinispan/query/clustered/ClusteredQueryCommand.java
index b1ff50c6a76c..8be92b04c028 100644
--- a/query/src/main/java/org/infinispan/query/clustered/ClusteredQueryCommand.java
+++ b/query/src/main/java/org/infinispan/query/clustered/ClusteredQueryCommand.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.clustered;
 
 import org.hibernate.search.query.engine.spi.HSQuery;
diff --git a/query/src/main/java/org/infinispan/query/clustered/ClusteredQueryCommandType.java b/query/src/main/java/org/infinispan/query/clustered/ClusteredQueryCommandType.java
index ed5f89327d07..2f35430d2c4a 100644
--- a/query/src/main/java/org/infinispan/query/clustered/ClusteredQueryCommandType.java
+++ b/query/src/main/java/org/infinispan/query/clustered/ClusteredQueryCommandType.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.clustered;
 
 import java.util.UUID;
diff --git a/query/src/main/java/org/infinispan/query/clustered/ClusteredQueryInvoker.java b/query/src/main/java/org/infinispan/query/clustered/ClusteredQueryInvoker.java
index ecf2673aa2ad..1b0af8a06fae 100644
--- a/query/src/main/java/org/infinispan/query/clustered/ClusteredQueryInvoker.java
+++ b/query/src/main/java/org/infinispan/query/clustered/ClusteredQueryInvoker.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.clustered;
 
 import java.util.ArrayList;
diff --git a/query/src/main/java/org/infinispan/query/clustered/ClusteredScoreDoc.java b/query/src/main/java/org/infinispan/query/clustered/ClusteredScoreDoc.java
index b491f843888b..a3ab1ab2eec3 100644
--- a/query/src/main/java/org/infinispan/query/clustered/ClusteredScoreDoc.java
+++ b/query/src/main/java/org/infinispan/query/clustered/ClusteredScoreDoc.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.clustered;
 
 import java.util.UUID;
diff --git a/query/src/main/java/org/infinispan/query/clustered/ClusteredTopDocs.java b/query/src/main/java/org/infinispan/query/clustered/ClusteredTopDocs.java
index 432b88e288d7..8f9d07e9694a 100644
--- a/query/src/main/java/org/infinispan/query/clustered/ClusteredTopDocs.java
+++ b/query/src/main/java/org/infinispan/query/clustered/ClusteredTopDocs.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.clustered;
 
 import java.util.UUID;
diff --git a/query/src/main/java/org/infinispan/query/clustered/DistributedIterator.java b/query/src/main/java/org/infinispan/query/clustered/DistributedIterator.java
index d303693e6044..db927ff4a1d2 100644
--- a/query/src/main/java/org/infinispan/query/clustered/DistributedIterator.java
+++ b/query/src/main/java/org/infinispan/query/clustered/DistributedIterator.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.clustered;
 
 import org.apache.lucene.search.ScoreDoc;
diff --git a/query/src/main/java/org/infinispan/query/clustered/DistributedLazyIterator.java b/query/src/main/java/org/infinispan/query/clustered/DistributedLazyIterator.java
index 6d94cc2ea308..d2db089d420a 100644
--- a/query/src/main/java/org/infinispan/query/clustered/DistributedLazyIterator.java
+++ b/query/src/main/java/org/infinispan/query/clustered/DistributedLazyIterator.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.clustered;
 
 import java.util.HashMap;
diff --git a/query/src/main/java/org/infinispan/query/clustered/ISPNEagerTopDocs.java b/query/src/main/java/org/infinispan/query/clustered/ISPNEagerTopDocs.java
index b69f87fe0800..c9e404c0a993 100644
--- a/query/src/main/java/org/infinispan/query/clustered/ISPNEagerTopDocs.java
+++ b/query/src/main/java/org/infinispan/query/clustered/ISPNEagerTopDocs.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.clustered;
 
 import org.apache.lucene.search.TopDocs;
diff --git a/query/src/main/java/org/infinispan/query/clustered/ISPNPriorityQueueFactory.java b/query/src/main/java/org/infinispan/query/clustered/ISPNPriorityQueueFactory.java
index fffcc751b2ac..9b379498e9ef 100644
--- a/query/src/main/java/org/infinispan/query/clustered/ISPNPriorityQueueFactory.java
+++ b/query/src/main/java/org/infinispan/query/clustered/ISPNPriorityQueueFactory.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.clustered;
 
 import java.lang.reflect.Constructor;
diff --git a/query/src/main/java/org/infinispan/query/clustered/QueryBox.java b/query/src/main/java/org/infinispan/query/clustered/QueryBox.java
index 9fa94b62d73a..e3391361e4d9 100644
--- a/query/src/main/java/org/infinispan/query/clustered/QueryBox.java
+++ b/query/src/main/java/org/infinispan/query/clustered/QueryBox.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.clustered;
 
 import org.hibernate.search.query.engine.spi.DocumentExtractor;
diff --git a/query/src/main/java/org/infinispan/query/clustered/QueryResponse.java b/query/src/main/java/org/infinispan/query/clustered/QueryResponse.java
index a2c631d9fa7c..374637659adb 100644
--- a/query/src/main/java/org/infinispan/query/clustered/QueryResponse.java
+++ b/query/src/main/java/org/infinispan/query/clustered/QueryResponse.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.clustered;
 
 import java.io.Serializable;
diff --git a/query/src/main/java/org/infinispan/query/clustered/commandworkers/CQCreateEagerQuery.java b/query/src/main/java/org/infinispan/query/clustered/commandworkers/CQCreateEagerQuery.java
index 97bfedd94af4..530ef7934b39 100644
--- a/query/src/main/java/org/infinispan/query/clustered/commandworkers/CQCreateEagerQuery.java
+++ b/query/src/main/java/org/infinispan/query/clustered/commandworkers/CQCreateEagerQuery.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.clustered.commandworkers;
 
 import org.apache.lucene.search.TopDocs;
diff --git a/query/src/main/java/org/infinispan/query/clustered/commandworkers/CQCreateLazyQuery.java b/query/src/main/java/org/infinispan/query/clustered/commandworkers/CQCreateLazyQuery.java
index cf72b97260cb..c2448fc22ce6 100644
--- a/query/src/main/java/org/infinispan/query/clustered/commandworkers/CQCreateLazyQuery.java
+++ b/query/src/main/java/org/infinispan/query/clustered/commandworkers/CQCreateLazyQuery.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.clustered.commandworkers;
 
 import org.apache.lucene.search.TopDocs;
diff --git a/query/src/main/java/org/infinispan/query/clustered/commandworkers/CQGetResultSize.java b/query/src/main/java/org/infinispan/query/clustered/commandworkers/CQGetResultSize.java
index 4662a9398f95..330647c47ff1 100644
--- a/query/src/main/java/org/infinispan/query/clustered/commandworkers/CQGetResultSize.java
+++ b/query/src/main/java/org/infinispan/query/clustered/commandworkers/CQGetResultSize.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.clustered.commandworkers;
 
 import org.hibernate.search.engine.spi.SearchFactoryImplementor;
diff --git a/query/src/main/java/org/infinispan/query/clustered/commandworkers/CQKillLazyIterator.java b/query/src/main/java/org/infinispan/query/clustered/commandworkers/CQKillLazyIterator.java
index 26b14ef39fd7..5ee4d96287a8 100644
--- a/query/src/main/java/org/infinispan/query/clustered/commandworkers/CQKillLazyIterator.java
+++ b/query/src/main/java/org/infinispan/query/clustered/commandworkers/CQKillLazyIterator.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.clustered.commandworkers;
 
 import org.infinispan.query.clustered.QueryResponse;
diff --git a/query/src/main/java/org/infinispan/query/clustered/commandworkers/CQLazyFetcher.java b/query/src/main/java/org/infinispan/query/clustered/commandworkers/CQLazyFetcher.java
index 92fc6eaf6099..5edc672cbb1e 100644
--- a/query/src/main/java/org/infinispan/query/clustered/commandworkers/CQLazyFetcher.java
+++ b/query/src/main/java/org/infinispan/query/clustered/commandworkers/CQLazyFetcher.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.clustered.commandworkers;
 
 import org.infinispan.query.clustered.QueryBox;
diff --git a/query/src/main/java/org/infinispan/query/clustered/commandworkers/ClusteredQueryCommandWorker.java b/query/src/main/java/org/infinispan/query/clustered/commandworkers/ClusteredQueryCommandWorker.java
index 45cc2e5eba8e..91641ae6cebe 100644
--- a/query/src/main/java/org/infinispan/query/clustered/commandworkers/ClusteredQueryCommandWorker.java
+++ b/query/src/main/java/org/infinispan/query/clustered/commandworkers/ClusteredQueryCommandWorker.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.clustered.commandworkers;
 
 import java.util.UUID;
diff --git a/query/src/main/java/org/infinispan/query/clustered/commandworkers/QueryExtractorUtil.java b/query/src/main/java/org/infinispan/query/clustered/commandworkers/QueryExtractorUtil.java
index 8eae81a247d0..0b9c7f389244 100644
--- a/query/src/main/java/org/infinispan/query/clustered/commandworkers/QueryExtractorUtil.java
+++ b/query/src/main/java/org/infinispan/query/clustered/commandworkers/QueryExtractorUtil.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.clustered.commandworkers;
 
 import java.io.IOException;
diff --git a/query/src/main/java/org/infinispan/query/impl/AbstractIterator.java b/query/src/main/java/org/infinispan/query/impl/AbstractIterator.java
index ab12a6c9f65a..7a10f8acb036 100644
--- a/query/src/main/java/org/infinispan/query/impl/AbstractIterator.java
+++ b/query/src/main/java/org/infinispan/query/impl/AbstractIterator.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.impl;
 
 import org.hibernate.search.query.engine.spi.EntityInfo;
diff --git a/query/src/main/java/org/infinispan/query/impl/CacheQueryImpl.java b/query/src/main/java/org/infinispan/query/impl/CacheQueryImpl.java
index bf7783148aa4..fe815f0f2997 100644
--- a/query/src/main/java/org/infinispan/query/impl/CacheQueryImpl.java
+++ b/query/src/main/java/org/infinispan/query/impl/CacheQueryImpl.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.impl;
 
 import java.util.Arrays;
diff --git a/query/src/main/java/org/infinispan/query/impl/ComponentRegistryUtils.java b/query/src/main/java/org/infinispan/query/impl/ComponentRegistryUtils.java
index 33bb8aa9559c..b70b58b43256 100644
--- a/query/src/main/java/org/infinispan/query/impl/ComponentRegistryUtils.java
+++ b/query/src/main/java/org/infinispan/query/impl/ComponentRegistryUtils.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.impl;
 
 import org.infinispan.Cache;
diff --git a/query/src/main/java/org/infinispan/query/impl/DefaultSearchWorkCreator.java b/query/src/main/java/org/infinispan/query/impl/DefaultSearchWorkCreator.java
index ae2b3e72b4fd..e38e1a1770ac 100644
--- a/query/src/main/java/org/infinispan/query/impl/DefaultSearchWorkCreator.java
+++ b/query/src/main/java/org/infinispan/query/impl/DefaultSearchWorkCreator.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.impl;
 
 import org.hibernate.search.backend.spi.Work;
diff --git a/query/src/main/java/org/infinispan/query/impl/EagerIterator.java b/query/src/main/java/org/infinispan/query/impl/EagerIterator.java
index 0d964ae9bb51..8c7960f8c9b1 100644
--- a/query/src/main/java/org/infinispan/query/impl/EagerIterator.java
+++ b/query/src/main/java/org/infinispan/query/impl/EagerIterator.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.impl;
 
 import java.util.List;
diff --git a/query/src/main/java/org/infinispan/query/impl/EntityLoader.java b/query/src/main/java/org/infinispan/query/impl/EntityLoader.java
index add368eb0981..276953cc6cbb 100644
--- a/query/src/main/java/org/infinispan/query/impl/EntityLoader.java
+++ b/query/src/main/java/org/infinispan/query/impl/EntityLoader.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.impl;
 
 import java.util.ArrayList;
diff --git a/query/src/main/java/org/infinispan/query/impl/LazyIterator.java b/query/src/main/java/org/infinispan/query/impl/LazyIterator.java
index c1a82f14e17e..08c1fc35fd76 100644
--- a/query/src/main/java/org/infinispan/query/impl/LazyIterator.java
+++ b/query/src/main/java/org/infinispan/query/impl/LazyIterator.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.impl;
 
 import java.io.IOException;
diff --git a/query/src/main/java/org/infinispan/query/impl/LifecycleManager.java b/query/src/main/java/org/infinispan/query/impl/LifecycleManager.java
index 28e30c765062..8338048ba157 100644
--- a/query/src/main/java/org/infinispan/query/impl/LifecycleManager.java
+++ b/query/src/main/java/org/infinispan/query/impl/LifecycleManager.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.impl;
 
 import java.util.Map;
diff --git a/query/src/main/java/org/infinispan/query/impl/NullFilteringIterator.java b/query/src/main/java/org/infinispan/query/impl/NullFilteringIterator.java
index 3b8e2c51fa88..3f14cd9d33c3 100644
--- a/query/src/main/java/org/infinispan/query/impl/NullFilteringIterator.java
+++ b/query/src/main/java/org/infinispan/query/impl/NullFilteringIterator.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.impl;
 
 import java.util.Iterator;
diff --git a/query/src/main/java/org/infinispan/query/impl/NullFilteringResultIterator.java b/query/src/main/java/org/infinispan/query/impl/NullFilteringResultIterator.java
index f1b67c35c1eb..bef565050c03 100644
--- a/query/src/main/java/org/infinispan/query/impl/NullFilteringResultIterator.java
+++ b/query/src/main/java/org/infinispan/query/impl/NullFilteringResultIterator.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.impl;
 
 import org.infinispan.query.ResultIterator;
diff --git a/query/src/main/java/org/infinispan/query/impl/ProjectionConverter.java b/query/src/main/java/org/infinispan/query/impl/ProjectionConverter.java
index 48d714eedea4..3dbaa0ae7883 100644
--- a/query/src/main/java/org/infinispan/query/impl/ProjectionConverter.java
+++ b/query/src/main/java/org/infinispan/query/impl/ProjectionConverter.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.impl;
 
 import org.infinispan.AdvancedCache;
diff --git a/query/src/main/java/org/infinispan/query/impl/ProjectionLoader.java b/query/src/main/java/org/infinispan/query/impl/ProjectionLoader.java
index 9d31acd6c516..571c55b8e057 100644
--- a/query/src/main/java/org/infinispan/query/impl/ProjectionLoader.java
+++ b/query/src/main/java/org/infinispan/query/impl/ProjectionLoader.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.impl;
 
 import org.hibernate.search.query.engine.spi.EntityInfo;
diff --git a/query/src/main/java/org/infinispan/query/impl/QueryResultLoader.java b/query/src/main/java/org/infinispan/query/impl/QueryResultLoader.java
index 150a396721e3..3ebf1e9457a8 100644
--- a/query/src/main/java/org/infinispan/query/impl/QueryResultLoader.java
+++ b/query/src/main/java/org/infinispan/query/impl/QueryResultLoader.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.impl;
 
 import org.hibernate.search.query.engine.spi.EntityInfo;
diff --git a/query/src/main/java/org/infinispan/query/impl/massindex/DefaultMassIndexerProgressMonitor.java b/query/src/main/java/org/infinispan/query/impl/massindex/DefaultMassIndexerProgressMonitor.java
index 6ba128a25f09..18d768f4b932 100644
--- a/query/src/main/java/org/infinispan/query/impl/massindex/DefaultMassIndexerProgressMonitor.java
+++ b/query/src/main/java/org/infinispan/query/impl/massindex/DefaultMassIndexerProgressMonitor.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.impl.massindex;
 
 import java.util.concurrent.TimeUnit;
diff --git a/query/src/main/java/org/infinispan/query/impl/massindex/IndexingMapper.java b/query/src/main/java/org/infinispan/query/impl/massindex/IndexingMapper.java
index 36d7feb600b7..430deeff0317 100644
--- a/query/src/main/java/org/infinispan/query/impl/massindex/IndexingMapper.java
+++ b/query/src/main/java/org/infinispan/query/impl/massindex/IndexingMapper.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.impl.massindex;
 
 import org.hibernate.search.backend.LuceneWork;
diff --git a/query/src/main/java/org/infinispan/query/impl/massindex/IndexingReducer.java b/query/src/main/java/org/infinispan/query/impl/massindex/IndexingReducer.java
index 1bb4f7d64289..87716c685904 100644
--- a/query/src/main/java/org/infinispan/query/impl/massindex/IndexingReducer.java
+++ b/query/src/main/java/org/infinispan/query/impl/massindex/IndexingReducer.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.impl.massindex;
 
 import java.util.Iterator;
diff --git a/query/src/main/java/org/infinispan/query/impl/massindex/MapReduceInitializer.java b/query/src/main/java/org/infinispan/query/impl/massindex/MapReduceInitializer.java
index c552fd227d22..e6cd0f99835b 100644
--- a/query/src/main/java/org/infinispan/query/impl/massindex/MapReduceInitializer.java
+++ b/query/src/main/java/org/infinispan/query/impl/massindex/MapReduceInitializer.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.impl.massindex;
 
 import org.infinispan.Cache;
diff --git a/query/src/main/java/org/infinispan/query/impl/massindex/MapReduceMassIndexer.java b/query/src/main/java/org/infinispan/query/impl/massindex/MapReduceMassIndexer.java
index ea7a3f0b0937..0dbe844399ac 100644
--- a/query/src/main/java/org/infinispan/query/impl/massindex/MapReduceMassIndexer.java
+++ b/query/src/main/java/org/infinispan/query/impl/massindex/MapReduceMassIndexer.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.impl.massindex;
 
 import org.hibernate.search.backend.LuceneWork;
diff --git a/query/src/main/java/org/infinispan/query/indexmanager/IndexUpdateCommand.java b/query/src/main/java/org/infinispan/query/indexmanager/IndexUpdateCommand.java
index e5d481507e0d..e9ae60c2d585 100644
--- a/query/src/main/java/org/infinispan/query/indexmanager/IndexUpdateCommand.java
+++ b/query/src/main/java/org/infinispan/query/indexmanager/IndexUpdateCommand.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.indexmanager;
 
 import java.util.ArrayList;
diff --git a/query/src/main/java/org/infinispan/query/indexmanager/InfinispanCommandsBackend.java b/query/src/main/java/org/infinispan/query/indexmanager/InfinispanCommandsBackend.java
index 1d19d65eaf03..6833b57011cc 100644
--- a/query/src/main/java/org/infinispan/query/indexmanager/InfinispanCommandsBackend.java
+++ b/query/src/main/java/org/infinispan/query/indexmanager/InfinispanCommandsBackend.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.indexmanager;
 
 import java.util.Collection;
diff --git a/query/src/main/java/org/infinispan/query/indexmanager/InfinispanIndexManager.java b/query/src/main/java/org/infinispan/query/indexmanager/InfinispanIndexManager.java
index 8bce35ee4de6..b2dc58e9d78e 100644
--- a/query/src/main/java/org/infinispan/query/indexmanager/InfinispanIndexManager.java
+++ b/query/src/main/java/org/infinispan/query/indexmanager/InfinispanIndexManager.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.indexmanager;
 
 import java.util.Properties;
diff --git a/query/src/main/java/org/infinispan/query/indexmanager/LuceneWorkIdTransformer.java b/query/src/main/java/org/infinispan/query/indexmanager/LuceneWorkIdTransformer.java
index 2363d0f75660..8092f52cf080 100644
--- a/query/src/main/java/org/infinispan/query/indexmanager/LuceneWorkIdTransformer.java
+++ b/query/src/main/java/org/infinispan/query/indexmanager/LuceneWorkIdTransformer.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.indexmanager;
 
 import org.hibernate.search.backend.LuceneWork;
diff --git a/query/src/main/java/org/infinispan/query/indexmanager/LuceneWorkTransformationVisitor.java b/query/src/main/java/org/infinispan/query/indexmanager/LuceneWorkTransformationVisitor.java
index a7889e1ba2f0..f14caa46cf90 100644
--- a/query/src/main/java/org/infinispan/query/indexmanager/LuceneWorkTransformationVisitor.java
+++ b/query/src/main/java/org/infinispan/query/indexmanager/LuceneWorkTransformationVisitor.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.indexmanager;
 
 import java.io.Serializable;
diff --git a/query/src/main/java/org/infinispan/query/indexmanager/MasterSwitchDelegatingQueueProcessor.java b/query/src/main/java/org/infinispan/query/indexmanager/MasterSwitchDelegatingQueueProcessor.java
index 5a872dce8012..4265872a0116 100644
--- a/query/src/main/java/org/infinispan/query/indexmanager/MasterSwitchDelegatingQueueProcessor.java
+++ b/query/src/main/java/org/infinispan/query/indexmanager/MasterSwitchDelegatingQueueProcessor.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.indexmanager;
 
 import java.util.List;
diff --git a/query/src/main/java/org/infinispan/query/logging/Log.java b/query/src/main/java/org/infinispan/query/logging/Log.java
index 8d0db02b41be..6b8dde5d8cfa 100644
--- a/query/src/main/java/org/infinispan/query/logging/Log.java
+++ b/query/src/main/java/org/infinispan/query/logging/Log.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.logging;
 
 import java.util.List;
diff --git a/query/src/main/resources/infinispan-module.properties b/query/src/main/resources/infinispan-module.properties
index e786f45f3047..a6afb2a53548 100644
--- a/query/src/main/resources/infinispan-module.properties
+++ b/query/src/main/resources/infinispan-module.properties
@@ -1,27 +1,2 @@
-#
-# JBoss, Home of Professional Open Source
-# Copyright 2009 Red Hat Inc. and/or its affiliates and other
-# contributors as indicated by the @author tags. All rights reserved.
-# See the copyright.txt in the distribution for a full listing of
-# individual contributors.
-#
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
-infinispan.module.name=query
-infinispan.module.lifecycle=org.infinispan.query.impl.LifecycleManager
-
 infinispan.module.command.initializer=org.infinispan.query.CommandInitializer
 infinispan.module.command.factory=org.infinispan.query.CommandFactory
\ No newline at end of file
diff --git a/query/src/test/java/org/infinispan/query/analysis/SolrAnalyzerTest.java b/query/src/test/java/org/infinispan/query/analysis/SolrAnalyzerTest.java
index 5db3a4aefad9..4c01956b6416 100644
--- a/query/src/test/java/org/infinispan/query/analysis/SolrAnalyzerTest.java
+++ b/query/src/test/java/org/infinispan/query/analysis/SolrAnalyzerTest.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.analysis;
 
 import junit.framework.Assert;
diff --git a/query/src/test/java/org/infinispan/query/analysis/Team.java b/query/src/test/java/org/infinispan/query/analysis/Team.java
index 85f18e4e5f95..235cd01ca526 100644
--- a/query/src/test/java/org/infinispan/query/analysis/Team.java
+++ b/query/src/test/java/org/infinispan/query/analysis/Team.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.analysis;
 
 import org.apache.solr.analysis.ASCIIFoldingFilterFactory;
diff --git a/query/src/test/java/org/infinispan/query/api/AnotherTestEntity.java b/query/src/test/java/org/infinispan/query/api/AnotherTestEntity.java
index d4a516db24f3..07cc3b576067 100644
--- a/query/src/test/java/org/infinispan/query/api/AnotherTestEntity.java
+++ b/query/src/test/java/org/infinispan/query/api/AnotherTestEntity.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.api;
 
 import org.hibernate.search.annotations.Analyze;
diff --git a/query/src/test/java/org/infinispan/query/api/InfinispanDirectoryNonIndexedValuesTest.java b/query/src/test/java/org/infinispan/query/api/InfinispanDirectoryNonIndexedValuesTest.java
index 0576220fc1ed..eea4aaea0d0b 100644
--- a/query/src/test/java/org/infinispan/query/api/InfinispanDirectoryNonIndexedValuesTest.java
+++ b/query/src/test/java/org/infinispan/query/api/InfinispanDirectoryNonIndexedValuesTest.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.api;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/query/src/test/java/org/infinispan/query/api/MapReduceInitializerTest.java b/query/src/test/java/org/infinispan/query/api/MapReduceInitializerTest.java
index 6db0e99d57e2..c3b709806828 100644
--- a/query/src/test/java/org/infinispan/query/api/MapReduceInitializerTest.java
+++ b/query/src/test/java/org/infinispan/query/api/MapReduceInitializerTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.api;
 
 import org.hibernate.search.backend.LuceneWork;
diff --git a/query/src/test/java/org/infinispan/query/api/NonIndexedValuesTest.java b/query/src/test/java/org/infinispan/query/api/NonIndexedValuesTest.java
index be45a410575c..a0b7982f15fe 100644
--- a/query/src/test/java/org/infinispan/query/api/NonIndexedValuesTest.java
+++ b/query/src/test/java/org/infinispan/query/api/NonIndexedValuesTest.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.api;
 
 import static junit.framework.Assert.assertEquals;
diff --git a/query/src/test/java/org/infinispan/query/api/NotIndexedType.java b/query/src/test/java/org/infinispan/query/api/NotIndexedType.java
index 2fa3edad50f6..f9ad9d9ee450 100644
--- a/query/src/test/java/org/infinispan/query/api/NotIndexedType.java
+++ b/query/src/test/java/org/infinispan/query/api/NotIndexedType.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.api;
 
 import java.io.Serializable;
diff --git a/query/src/test/java/org/infinispan/query/api/ReplaceTest.java b/query/src/test/java/org/infinispan/query/api/ReplaceTest.java
index d4e7ccd6ce87..0178713112de 100644
--- a/query/src/test/java/org/infinispan/query/api/ReplaceTest.java
+++ b/query/src/test/java/org/infinispan/query/api/ReplaceTest.java
@@ -1,23 +1,3 @@
-/* 
- * Hibernate, Relational Persistence for Idiomatic Java
- * 
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.api;
 
 import org.infinispan.Cache;
diff --git a/query/src/test/java/org/infinispan/query/api/TestEntity.java b/query/src/test/java/org/infinispan/query/api/TestEntity.java
index 8f1723200ce3..db39fac905a4 100644
--- a/query/src/test/java/org/infinispan/query/api/TestEntity.java
+++ b/query/src/test/java/org/infinispan/query/api/TestEntity.java
@@ -1,23 +1,3 @@
-/* 
- * Hibernate, Relational Persistence for Idiomatic Java
- * 
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.api;
 
 import org.hibernate.search.annotations.Analyze;
diff --git a/query/src/test/java/org/infinispan/query/api/TransactionalInfinispanDirectoryNonIndexedValuesTest.java b/query/src/test/java/org/infinispan/query/api/TransactionalInfinispanDirectoryNonIndexedValuesTest.java
index 9bdcc4081613..f061cb7d4ec8 100644
--- a/query/src/test/java/org/infinispan/query/api/TransactionalInfinispanDirectoryNonIndexedValuesTest.java
+++ b/query/src/test/java/org/infinispan/query/api/TransactionalInfinispanDirectoryNonIndexedValuesTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.api;
 
 import org.testng.annotations.Test;
diff --git a/query/src/test/java/org/infinispan/query/backend/KeyTransformationHandlerTest.java b/query/src/test/java/org/infinispan/query/backend/KeyTransformationHandlerTest.java
index b9c6bb4fe6f4..6ded7c530bac 100644
--- a/query/src/test/java/org/infinispan/query/backend/KeyTransformationHandlerTest.java
+++ b/query/src/test/java/org/infinispan/query/backend/KeyTransformationHandlerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.backend;
 
 import java.util.UUID;
diff --git a/query/src/test/java/org/infinispan/query/blackbox/ClusteredCacheFSDirectoryTest.java b/query/src/test/java/org/infinispan/query/blackbox/ClusteredCacheFSDirectoryTest.java
index fee118b7f776..ba5a7a685024 100644
--- a/query/src/test/java/org/infinispan/query/blackbox/ClusteredCacheFSDirectoryTest.java
+++ b/query/src/test/java/org/infinispan/query/blackbox/ClusteredCacheFSDirectoryTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.blackbox;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/query/src/test/java/org/infinispan/query/blackbox/ClusteredCacheTest.java b/query/src/test/java/org/infinispan/query/blackbox/ClusteredCacheTest.java
index 425059e42fed..77ae4ab0396a 100644
--- a/query/src/test/java/org/infinispan/query/blackbox/ClusteredCacheTest.java
+++ b/query/src/test/java/org/infinispan/query/blackbox/ClusteredCacheTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.blackbox;
 
 import org.apache.lucene.queryParser.QueryParser;
diff --git a/query/src/test/java/org/infinispan/query/blackbox/ClusteredCacheWithInfinispanDirectoryTest.java b/query/src/test/java/org/infinispan/query/blackbox/ClusteredCacheWithInfinispanDirectoryTest.java
index 1a05967a4c81..6c8240c61e07 100644
--- a/query/src/test/java/org/infinispan/query/blackbox/ClusteredCacheWithInfinispanDirectoryTest.java
+++ b/query/src/test/java/org/infinispan/query/blackbox/ClusteredCacheWithInfinispanDirectoryTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.blackbox;
 
 import org.hibernate.search.infinispan.InfinispanIntegration;
diff --git a/query/src/test/java/org/infinispan/query/blackbox/ClusteredCacheWithRamDirIndexManagerTest.java b/query/src/test/java/org/infinispan/query/blackbox/ClusteredCacheWithRamDirIndexManagerTest.java
index 33249360f251..8fc50ac8feb2 100644
--- a/query/src/test/java/org/infinispan/query/blackbox/ClusteredCacheWithRamDirIndexManagerTest.java
+++ b/query/src/test/java/org/infinispan/query/blackbox/ClusteredCacheWithRamDirIndexManagerTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.blackbox;
 
 import org.testng.annotations.Test;
diff --git a/query/src/test/java/org/infinispan/query/blackbox/ClusteredPessimisticLockingCacheTest.java b/query/src/test/java/org/infinispan/query/blackbox/ClusteredPessimisticLockingCacheTest.java
index 2b24c28670f0..717baebfe70c 100644
--- a/query/src/test/java/org/infinispan/query/blackbox/ClusteredPessimisticLockingCacheTest.java
+++ b/query/src/test/java/org/infinispan/query/blackbox/ClusteredPessimisticLockingCacheTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.blackbox;
 
 import org.infinispan.Cache;
diff --git a/query/src/test/java/org/infinispan/query/blackbox/ClusteredQueryMultipleCachesTest.java b/query/src/test/java/org/infinispan/query/blackbox/ClusteredQueryMultipleCachesTest.java
index e96d61e55caa..4297a37ce719 100644
--- a/query/src/test/java/org/infinispan/query/blackbox/ClusteredQueryMultipleCachesTest.java
+++ b/query/src/test/java/org/infinispan/query/blackbox/ClusteredQueryMultipleCachesTest.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.blackbox;
 
 import java.util.List;
diff --git a/query/src/test/java/org/infinispan/query/blackbox/ClusteredQueryTest.java b/query/src/test/java/org/infinispan/query/blackbox/ClusteredQueryTest.java
index 48dd4d784275..9516b8f29a76 100644
--- a/query/src/test/java/org/infinispan/query/blackbox/ClusteredQueryTest.java
+++ b/query/src/test/java/org/infinispan/query/blackbox/ClusteredQueryTest.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.blackbox;
 
 import static org.infinispan.query.helper.TestQueryHelperFactory.createQueryParser;
diff --git a/query/src/test/java/org/infinispan/query/blackbox/DistributedCacheClusteredQueryTest.java b/query/src/test/java/org/infinispan/query/blackbox/DistributedCacheClusteredQueryTest.java
index bc0b314a430c..6b80952e22f5 100644
--- a/query/src/test/java/org/infinispan/query/blackbox/DistributedCacheClusteredQueryTest.java
+++ b/query/src/test/java/org/infinispan/query/blackbox/DistributedCacheClusteredQueryTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.blackbox;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/query/src/test/java/org/infinispan/query/blackbox/KeyTypeTest.java b/query/src/test/java/org/infinispan/query/blackbox/KeyTypeTest.java
index 9abff0d20e6b..0bef94abb43b 100644
--- a/query/src/test/java/org/infinispan/query/blackbox/KeyTypeTest.java
+++ b/query/src/test/java/org/infinispan/query/blackbox/KeyTypeTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.blackbox;
 
 import org.apache.lucene.index.Term;
diff --git a/query/src/test/java/org/infinispan/query/blackbox/LocalCacheFSDirectoryTest.java b/query/src/test/java/org/infinispan/query/blackbox/LocalCacheFSDirectoryTest.java
index 2901ca603bb4..6a6a3278f65f 100644
--- a/query/src/test/java/org/infinispan/query/blackbox/LocalCacheFSDirectoryTest.java
+++ b/query/src/test/java/org/infinispan/query/blackbox/LocalCacheFSDirectoryTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.blackbox;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/query/src/test/java/org/infinispan/query/blackbox/LocalCacheTest.java b/query/src/test/java/org/infinispan/query/blackbox/LocalCacheTest.java
index 578ec8707be5..e020214dc876 100644
--- a/query/src/test/java/org/infinispan/query/blackbox/LocalCacheTest.java
+++ b/query/src/test/java/org/infinispan/query/blackbox/LocalCacheTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.blackbox;
 
 import java.util.Arrays;
diff --git a/query/src/test/java/org/infinispan/query/blackbox/MarshalledValueClusteredQueryCacheTest.java b/query/src/test/java/org/infinispan/query/blackbox/MarshalledValueClusteredQueryCacheTest.java
index d05a13887cb3..20971eef99dc 100644
--- a/query/src/test/java/org/infinispan/query/blackbox/MarshalledValueClusteredQueryCacheTest.java
+++ b/query/src/test/java/org/infinispan/query/blackbox/MarshalledValueClusteredQueryCacheTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.blackbox;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/query/src/test/java/org/infinispan/query/blackbox/MarshalledValueClusteredQueryTest.java b/query/src/test/java/org/infinispan/query/blackbox/MarshalledValueClusteredQueryTest.java
index 4d826d3f1f72..eb66f6714935 100644
--- a/query/src/test/java/org/infinispan/query/blackbox/MarshalledValueClusteredQueryTest.java
+++ b/query/src/test/java/org/infinispan/query/blackbox/MarshalledValueClusteredQueryTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.blackbox;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/query/src/test/java/org/infinispan/query/blackbox/MarshalledValueQueryTest.java b/query/src/test/java/org/infinispan/query/blackbox/MarshalledValueQueryTest.java
index 863914aee510..a9d7bf1e1a11 100644
--- a/query/src/test/java/org/infinispan/query/blackbox/MarshalledValueQueryTest.java
+++ b/query/src/test/java/org/infinispan/query/blackbox/MarshalledValueQueryTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.blackbox;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/query/src/test/java/org/infinispan/query/blackbox/QueryCacheRestartTest.java b/query/src/test/java/org/infinispan/query/blackbox/QueryCacheRestartTest.java
index 5ac05f37469a..6ca9654cd260 100644
--- a/query/src/test/java/org/infinispan/query/blackbox/QueryCacheRestartTest.java
+++ b/query/src/test/java/org/infinispan/query/blackbox/QueryCacheRestartTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.query.blackbox;
 
 import java.util.List;
diff --git a/query/src/test/java/org/infinispan/query/blackbox/SearchFactoryShutdownTest.java b/query/src/test/java/org/infinispan/query/blackbox/SearchFactoryShutdownTest.java
index 6acd55d2057f..f4a866c68057 100644
--- a/query/src/test/java/org/infinispan/query/blackbox/SearchFactoryShutdownTest.java
+++ b/query/src/test/java/org/infinispan/query/blackbox/SearchFactoryShutdownTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.blackbox;
 
 import org.hibernate.search.spi.SearchFactoryIntegrator;
diff --git a/query/src/test/java/org/infinispan/query/blackbox/TopologyAwareClusteredCacheTest.java b/query/src/test/java/org/infinispan/query/blackbox/TopologyAwareClusteredCacheTest.java
index 0ebc7a3ccf9e..4d9958c7fe40 100644
--- a/query/src/test/java/org/infinispan/query/blackbox/TopologyAwareClusteredCacheTest.java
+++ b/query/src/test/java/org/infinispan/query/blackbox/TopologyAwareClusteredCacheTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.blackbox;
 
 import org.infinispan.Cache;
diff --git a/query/src/test/java/org/infinispan/query/blackbox/TopologyAwareClusteredQueryTest.java b/query/src/test/java/org/infinispan/query/blackbox/TopologyAwareClusteredQueryTest.java
index bd8159a1f430..39c2a380e1e7 100644
--- a/query/src/test/java/org/infinispan/query/blackbox/TopologyAwareClusteredQueryTest.java
+++ b/query/src/test/java/org/infinispan/query/blackbox/TopologyAwareClusteredQueryTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.blackbox;
 
 import org.infinispan.Cache;
diff --git a/query/src/test/java/org/infinispan/query/blackbox/TopologyAwareDistributedCacheTest.java b/query/src/test/java/org/infinispan/query/blackbox/TopologyAwareDistributedCacheTest.java
index df97423a8baa..c05c65575a8b 100644
--- a/query/src/test/java/org/infinispan/query/blackbox/TopologyAwareDistributedCacheTest.java
+++ b/query/src/test/java/org/infinispan/query/blackbox/TopologyAwareDistributedCacheTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.blackbox;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/query/src/test/java/org/infinispan/query/cacheloaders/EntryActivatingTest.java b/query/src/test/java/org/infinispan/query/cacheloaders/EntryActivatingTest.java
index 49ddaf0279c8..cc5fd91b4e47 100644
--- a/query/src/test/java/org/infinispan/query/cacheloaders/EntryActivatingTest.java
+++ b/query/src/test/java/org/infinispan/query/cacheloaders/EntryActivatingTest.java
@@ -1,22 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.query.cacheloaders;
 
 import java.util.List;
diff --git a/query/src/test/java/org/infinispan/query/cacheloaders/InconsistentIndexesAfterRestartTest.java b/query/src/test/java/org/infinispan/query/cacheloaders/InconsistentIndexesAfterRestartTest.java
index e258cbd24dce..11f39ede714b 100644
--- a/query/src/test/java/org/infinispan/query/cacheloaders/InconsistentIndexesAfterRestartTest.java
+++ b/query/src/test/java/org/infinispan/query/cacheloaders/InconsistentIndexesAfterRestartTest.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.cacheloaders;
 
 import org.apache.lucene.index.Term;
diff --git a/query/src/test/java/org/infinispan/query/cacheloaders/SharedCacheLoaderQueryDistributedIndexTest.java b/query/src/test/java/org/infinispan/query/cacheloaders/SharedCacheLoaderQueryDistributedIndexTest.java
index 69da25f7047e..a50f10bff3c8 100644
--- a/query/src/test/java/org/infinispan/query/cacheloaders/SharedCacheLoaderQueryDistributedIndexTest.java
+++ b/query/src/test/java/org/infinispan/query/cacheloaders/SharedCacheLoaderQueryDistributedIndexTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.query.cacheloaders;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/query/src/test/java/org/infinispan/query/cacheloaders/SharedCacheLoaderQueryIndexTest.java b/query/src/test/java/org/infinispan/query/cacheloaders/SharedCacheLoaderQueryIndexTest.java
index cb5e79a45f82..1223a56995dd 100644
--- a/query/src/test/java/org/infinispan/query/cacheloaders/SharedCacheLoaderQueryIndexTest.java
+++ b/query/src/test/java/org/infinispan/query/cacheloaders/SharedCacheLoaderQueryIndexTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.query.cacheloaders;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/query/src/test/java/org/infinispan/query/classloading/CountingClassLoader.java b/query/src/test/java/org/infinispan/query/classloading/CountingClassLoader.java
index 5e877e0dcae3..3cada30fbcbb 100644
--- a/query/src/test/java/org/infinispan/query/classloading/CountingClassLoader.java
+++ b/query/src/test/java/org/infinispan/query/classloading/CountingClassLoader.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.classloading;
 
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/query/src/test/java/org/infinispan/query/classloading/KeyTransformationUsingClassloadersTest.java b/query/src/test/java/org/infinispan/query/classloading/KeyTransformationUsingClassloadersTest.java
index 6c3c262726f7..18e3c0ed583c 100644
--- a/query/src/test/java/org/infinispan/query/classloading/KeyTransformationUsingClassloadersTest.java
+++ b/query/src/test/java/org/infinispan/query/classloading/KeyTransformationUsingClassloadersTest.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.classloading;
 
 import java.util.List;
diff --git a/query/src/test/java/org/infinispan/query/config/CacheModeTest.java b/query/src/test/java/org/infinispan/query/config/CacheModeTest.java
index 123f25246447..29000dc9cff5 100644
--- a/query/src/test/java/org/infinispan/query/config/CacheModeTest.java
+++ b/query/src/test/java/org/infinispan/query/config/CacheModeTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.config;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/query/src/test/java/org/infinispan/query/config/DeclarativeConfigTest.java b/query/src/test/java/org/infinispan/query/config/DeclarativeConfigTest.java
index b6c00c2db570..a2c55cd0d88b 100644
--- a/query/src/test/java/org/infinispan/query/config/DeclarativeConfigTest.java
+++ b/query/src/test/java/org/infinispan/query/config/DeclarativeConfigTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.config;
 
 import org.apache.lucene.queryParser.ParseException;
diff --git a/query/src/test/java/org/infinispan/query/config/DefaultCacheInheritancePreventedTest.java b/query/src/test/java/org/infinispan/query/config/DefaultCacheInheritancePreventedTest.java
index 4ac3be081524..fe018c4e3e4d 100644
--- a/query/src/test/java/org/infinispan/query/config/DefaultCacheInheritancePreventedTest.java
+++ b/query/src/test/java/org/infinispan/query/config/DefaultCacheInheritancePreventedTest.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.config;
 
 import java.io.IOException;
diff --git a/query/src/test/java/org/infinispan/query/config/IndexingConfigurationIgnoredTest.java b/query/src/test/java/org/infinispan/query/config/IndexingConfigurationIgnoredTest.java
index 0ff9ce8eb966..036ee50f0998 100644
--- a/query/src/test/java/org/infinispan/query/config/IndexingConfigurationIgnoredTest.java
+++ b/query/src/test/java/org/infinispan/query/config/IndexingConfigurationIgnoredTest.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.config;
 
 import org.infinispan.Cache;
diff --git a/query/src/test/java/org/infinispan/query/config/MultipleCachesTest.java b/query/src/test/java/org/infinispan/query/config/MultipleCachesTest.java
index 124703e5b22b..11b31a852283 100644
--- a/query/src/test/java/org/infinispan/query/config/MultipleCachesTest.java
+++ b/query/src/test/java/org/infinispan/query/config/MultipleCachesTest.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.config;
 
 import static junit.framework.Assert.assertEquals;
diff --git a/query/src/test/java/org/infinispan/query/config/QueryParsingTest.java b/query/src/test/java/org/infinispan/query/config/QueryParsingTest.java
index 156bf6cebca8..0a8b6bbcd59e 100644
--- a/query/src/test/java/org/infinispan/query/config/QueryParsingTest.java
+++ b/query/src/test/java/org/infinispan/query/config/QueryParsingTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.config;
 
 import java.io.IOException;
diff --git a/query/src/test/java/org/infinispan/query/distributed/ClusteredQueryMassIndexingTest.java b/query/src/test/java/org/infinispan/query/distributed/ClusteredQueryMassIndexingTest.java
index e56dedcf1fc2..7be6b967476c 100644
--- a/query/src/test/java/org/infinispan/query/distributed/ClusteredQueryMassIndexingTest.java
+++ b/query/src/test/java/org/infinispan/query/distributed/ClusteredQueryMassIndexingTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.distributed;
 
 import org.apache.lucene.queryParser.ParseException;
diff --git a/query/src/test/java/org/infinispan/query/distributed/DistProgrammaticMassIndexTest.java b/query/src/test/java/org/infinispan/query/distributed/DistProgrammaticMassIndexTest.java
index 8f681ac76465..bfce67ef7b7e 100644
--- a/query/src/test/java/org/infinispan/query/distributed/DistProgrammaticMassIndexTest.java
+++ b/query/src/test/java/org/infinispan/query/distributed/DistProgrammaticMassIndexTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.distributed;
 
 import junit.framework.Assert;
diff --git a/query/src/test/java/org/infinispan/query/distributed/DistributedMassIndexingTest.java b/query/src/test/java/org/infinispan/query/distributed/DistributedMassIndexingTest.java
index 27a98eba3d2a..173ae91e575f 100644
--- a/query/src/test/java/org/infinispan/query/distributed/DistributedMassIndexingTest.java
+++ b/query/src/test/java/org/infinispan/query/distributed/DistributedMassIndexingTest.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.distributed;
 
 import java.util.ArrayList;
diff --git a/query/src/test/java/org/infinispan/query/distributed/MassIndexingTest.java b/query/src/test/java/org/infinispan/query/distributed/MassIndexingTest.java
index a1a616d4fb2b..d750bb48e121 100644
--- a/query/src/test/java/org/infinispan/query/distributed/MassIndexingTest.java
+++ b/query/src/test/java/org/infinispan/query/distributed/MassIndexingTest.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source 
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved. 
- * See the copyright.txt in the distribution for a 
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use, 
- * modify, copy, or redistribute it subject to the terms and conditions 
- * of the GNU Lesser General Public License, v. 2.1. 
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details. 
- * You should have received a copy of the GNU Lesser General Public License, 
- * v.2.1 along with this distribution; if not, write to the Free Software 
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.distributed;
 
 import org.infinispan.context.Flag;
diff --git a/query/src/test/java/org/infinispan/query/distributed/MultiNodeDistributedTest.java b/query/src/test/java/org/infinispan/query/distributed/MultiNodeDistributedTest.java
index e1c6956ce9ec..f209614994fb 100644
--- a/query/src/test/java/org/infinispan/query/distributed/MultiNodeDistributedTest.java
+++ b/query/src/test/java/org/infinispan/query/distributed/MultiNodeDistributedTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.distributed;
 
 import junit.framework.Assert;
diff --git a/query/src/test/java/org/infinispan/query/distributed/MultiNodeDistributedTxTest.java b/query/src/test/java/org/infinispan/query/distributed/MultiNodeDistributedTxTest.java
index 184ad10eb588..7f3576e96603 100644
--- a/query/src/test/java/org/infinispan/query/distributed/MultiNodeDistributedTxTest.java
+++ b/query/src/test/java/org/infinispan/query/distributed/MultiNodeDistributedTxTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.distributed;
 
 import org.infinispan.Cache;
diff --git a/query/src/test/java/org/infinispan/query/distributed/MultiNodeLocalTest.java b/query/src/test/java/org/infinispan/query/distributed/MultiNodeLocalTest.java
index f48ea878bef8..47d089bec01d 100644
--- a/query/src/test/java/org/infinispan/query/distributed/MultiNodeLocalTest.java
+++ b/query/src/test/java/org/infinispan/query/distributed/MultiNodeLocalTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.distributed;
 
 import org.infinispan.Cache;
diff --git a/query/src/test/java/org/infinispan/query/distributed/MultiNodeLocalTxTest.java b/query/src/test/java/org/infinispan/query/distributed/MultiNodeLocalTxTest.java
index 46fcf66309e7..5f5df27f9fde 100644
--- a/query/src/test/java/org/infinispan/query/distributed/MultiNodeLocalTxTest.java
+++ b/query/src/test/java/org/infinispan/query/distributed/MultiNodeLocalTxTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.distributed;
 
 import org.testng.annotations.Test;
diff --git a/query/src/test/java/org/infinispan/query/distributed/MultiNodeReplicatedTest.java b/query/src/test/java/org/infinispan/query/distributed/MultiNodeReplicatedTest.java
index f48b9dc509e3..9b3d9c5955a0 100644
--- a/query/src/test/java/org/infinispan/query/distributed/MultiNodeReplicatedTest.java
+++ b/query/src/test/java/org/infinispan/query/distributed/MultiNodeReplicatedTest.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.distributed;
 
 import org.testng.annotations.Test;
diff --git a/query/src/test/java/org/infinispan/query/distributed/MultiNodeReplicatedTxTest.java b/query/src/test/java/org/infinispan/query/distributed/MultiNodeReplicatedTxTest.java
index 087e30820cf7..311a6e5a1baf 100644
--- a/query/src/test/java/org/infinispan/query/distributed/MultiNodeReplicatedTxTest.java
+++ b/query/src/test/java/org/infinispan/query/distributed/MultiNodeReplicatedTxTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.distributed;
 
 import org.infinispan.Cache;
diff --git a/query/src/test/java/org/infinispan/query/distributed/NonSerializableKeyType.java b/query/src/test/java/org/infinispan/query/distributed/NonSerializableKeyType.java
index a4fece13df41..9012c846e253 100644
--- a/query/src/test/java/org/infinispan/query/distributed/NonSerializableKeyType.java
+++ b/query/src/test/java/org/infinispan/query/distributed/NonSerializableKeyType.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.distributed;
 
 import java.io.IOException;
diff --git a/query/src/test/java/org/infinispan/query/distributed/TopologyAwareDistMassIndexingTest.java b/query/src/test/java/org/infinispan/query/distributed/TopologyAwareDistMassIndexingTest.java
index 2b9d50e6dd5b..d4bf12fea51d 100644
--- a/query/src/test/java/org/infinispan/query/distributed/TopologyAwareDistMassIndexingTest.java
+++ b/query/src/test/java/org/infinispan/query/distributed/TopologyAwareDistMassIndexingTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.distributed;
 
 import org.hibernate.search.infinispan.InfinispanIntegration;
diff --git a/query/src/test/java/org/infinispan/query/dynamicexample/DynamicPropertiesEntity.java b/query/src/test/java/org/infinispan/query/dynamicexample/DynamicPropertiesEntity.java
index 316310e9e9dc..40297e1f8f7d 100644
--- a/query/src/test/java/org/infinispan/query/dynamicexample/DynamicPropertiesEntity.java
+++ b/query/src/test/java/org/infinispan/query/dynamicexample/DynamicPropertiesEntity.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.dynamicexample;
 
 import java.util.HashMap;
diff --git a/query/src/test/java/org/infinispan/query/dynamicexample/DynamicPropertiesTest.java b/query/src/test/java/org/infinispan/query/dynamicexample/DynamicPropertiesTest.java
index 3f7251083f81..68f92daf5108 100644
--- a/query/src/test/java/org/infinispan/query/dynamicexample/DynamicPropertiesTest.java
+++ b/query/src/test/java/org/infinispan/query/dynamicexample/DynamicPropertiesTest.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.dynamicexample;
 
 import java.util.List;
diff --git a/query/src/test/java/org/infinispan/query/dynamicexample/StringKeyedMapBridge.java b/query/src/test/java/org/infinispan/query/dynamicexample/StringKeyedMapBridge.java
index 1a84b11bd032..950bb2ad19ee 100644
--- a/query/src/test/java/org/infinispan/query/dynamicexample/StringKeyedMapBridge.java
+++ b/query/src/test/java/org/infinispan/query/dynamicexample/StringKeyedMapBridge.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.dynamicexample;
 
 import java.util.Map;
diff --git a/query/src/test/java/org/infinispan/query/helper/TestQueryHelperFactory.java b/query/src/test/java/org/infinispan/query/helper/TestQueryHelperFactory.java
index 24ea2ecf5061..eecfb7713ceb 100644
--- a/query/src/test/java/org/infinispan/query/helper/TestQueryHelperFactory.java
+++ b/query/src/test/java/org/infinispan/query/helper/TestQueryHelperFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.helper;
 
 import junit.framework.Assert;
diff --git a/query/src/test/java/org/infinispan/query/impl/EagerIteratorFetchSizeTest.java b/query/src/test/java/org/infinispan/query/impl/EagerIteratorFetchSizeTest.java
index d4e0b90c1b85..14c6bd3d4130 100644
--- a/query/src/test/java/org/infinispan/query/impl/EagerIteratorFetchSizeTest.java
+++ b/query/src/test/java/org/infinispan/query/impl/EagerIteratorFetchSizeTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.impl;
 
 import org.testng.annotations.Test;
diff --git a/query/src/test/java/org/infinispan/query/impl/EagerIteratorTest.java b/query/src/test/java/org/infinispan/query/impl/EagerIteratorTest.java
index 22be35d24408..a9acee83d1b4 100644
--- a/query/src/test/java/org/infinispan/query/impl/EagerIteratorTest.java
+++ b/query/src/test/java/org/infinispan/query/impl/EagerIteratorTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.impl;
 
 import static org.mockito.Matchers.anyObject;
diff --git a/query/src/test/java/org/infinispan/query/impl/InvalidIteratorTest.java b/query/src/test/java/org/infinispan/query/impl/InvalidIteratorTest.java
index 742be2304a02..6ee4eab3dd15 100644
--- a/query/src/test/java/org/infinispan/query/impl/InvalidIteratorTest.java
+++ b/query/src/test/java/org/infinispan/query/impl/InvalidIteratorTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.impl;
 
 import org.hibernate.search.query.engine.spi.DocumentExtractor;
diff --git a/query/src/test/java/org/infinispan/query/impl/LazyIteratorFetchSizeTest.java b/query/src/test/java/org/infinispan/query/impl/LazyIteratorFetchSizeTest.java
index 200d8c0ee202..c2f60a9096ff 100644
--- a/query/src/test/java/org/infinispan/query/impl/LazyIteratorFetchSizeTest.java
+++ b/query/src/test/java/org/infinispan/query/impl/LazyIteratorFetchSizeTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.impl;
 
 import org.testng.annotations.Test;
diff --git a/query/src/test/java/org/infinispan/query/impl/LazyIteratorTest.java b/query/src/test/java/org/infinispan/query/impl/LazyIteratorTest.java
index 545819025753..990adf4d55e3 100644
--- a/query/src/test/java/org/infinispan/query/impl/LazyIteratorTest.java
+++ b/query/src/test/java/org/infinispan/query/impl/LazyIteratorTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.impl;
 
 import static org.mockito.Matchers.anyInt;
diff --git a/query/src/test/java/org/infinispan/query/impl/NullFilteringIteratorTest.java b/query/src/test/java/org/infinispan/query/impl/NullFilteringIteratorTest.java
index 13f7d5eb7cad..3a790a52a77f 100644
--- a/query/src/test/java/org/infinispan/query/impl/NullFilteringIteratorTest.java
+++ b/query/src/test/java/org/infinispan/query/impl/NullFilteringIteratorTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.impl;
 
 import org.testng.annotations.Test;
diff --git a/query/src/test/java/org/infinispan/query/impl/VeryLargeFetchSizeTest.java b/query/src/test/java/org/infinispan/query/impl/VeryLargeFetchSizeTest.java
index fb9640917dd3..772a4a1a49c4 100644
--- a/query/src/test/java/org/infinispan/query/impl/VeryLargeFetchSizeTest.java
+++ b/query/src/test/java/org/infinispan/query/impl/VeryLargeFetchSizeTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.impl;
 
 import org.hibernate.search.query.engine.spi.DocumentExtractor;
diff --git a/query/src/test/java/org/infinispan/query/indexedembedded/Book.java b/query/src/test/java/org/infinispan/query/indexedembedded/Book.java
index d15eba501b54..4324bea6fa7c 100644
--- a/query/src/test/java/org/infinispan/query/indexedembedded/Book.java
+++ b/query/src/test/java/org/infinispan/query/indexedembedded/Book.java
@@ -1,22 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.query.indexedembedded;
 
 import java.io.Serializable;
diff --git a/query/src/test/java/org/infinispan/query/indexedembedded/BooksExampleTest.java b/query/src/test/java/org/infinispan/query/indexedembedded/BooksExampleTest.java
index 279204d36b1c..5a6af5b5e2c0 100644
--- a/query/src/test/java/org/infinispan/query/indexedembedded/BooksExampleTest.java
+++ b/query/src/test/java/org/infinispan/query/indexedembedded/BooksExampleTest.java
@@ -1,22 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-
 package org.infinispan.query.indexedembedded;
 
 import java.util.List;
diff --git a/query/src/test/java/org/infinispan/query/indexedembedded/City.java b/query/src/test/java/org/infinispan/query/indexedembedded/City.java
index 3574b533166f..de388649eda2 100644
--- a/query/src/test/java/org/infinispan/query/indexedembedded/City.java
+++ b/query/src/test/java/org/infinispan/query/indexedembedded/City.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.indexedembedded;
 
 import java.io.Serializable;
diff --git a/query/src/test/java/org/infinispan/query/indexedembedded/CollectionsIndexingTest.java b/query/src/test/java/org/infinispan/query/indexedembedded/CollectionsIndexingTest.java
index f97b2da6b8fd..2e92571ae75a 100644
--- a/query/src/test/java/org/infinispan/query/indexedembedded/CollectionsIndexingTest.java
+++ b/query/src/test/java/org/infinispan/query/indexedembedded/CollectionsIndexingTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.indexedembedded;
 
 import java.util.List;
diff --git a/query/src/test/java/org/infinispan/query/indexedembedded/Country.java b/query/src/test/java/org/infinispan/query/indexedembedded/Country.java
index c1b8897b1710..4c45524dc8d8 100644
--- a/query/src/test/java/org/infinispan/query/indexedembedded/Country.java
+++ b/query/src/test/java/org/infinispan/query/indexedembedded/Country.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.indexedembedded;
 
 import java.io.Serializable;
diff --git a/query/src/test/java/org/infinispan/query/jmx/DistributedMassIndexingViaJmxTest.java b/query/src/test/java/org/infinispan/query/jmx/DistributedMassIndexingViaJmxTest.java
index 00c86de076ad..96bbbbff6835 100644
--- a/query/src/test/java/org/infinispan/query/jmx/DistributedMassIndexingViaJmxTest.java
+++ b/query/src/test/java/org/infinispan/query/jmx/DistributedMassIndexingViaJmxTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.jmx;
 
 import org.infinispan.Cache;
diff --git a/query/src/test/java/org/infinispan/query/jmx/QueryMBeanTest.java b/query/src/test/java/org/infinispan/query/jmx/QueryMBeanTest.java
index 34f16e1456b9..e8d3dfe45f4f 100644
--- a/query/src/test/java/org/infinispan/query/jmx/QueryMBeanTest.java
+++ b/query/src/test/java/org/infinispan/query/jmx/QueryMBeanTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.jmx;
 
 import org.infinispan.commons.CacheException;
diff --git a/query/src/test/java/org/infinispan/query/nulls/NullCollectionElementsTest.java b/query/src/test/java/org/infinispan/query/nulls/NullCollectionElementsTest.java
index d96f6d0688a9..38ffd904ef48 100644
--- a/query/src/test/java/org/infinispan/query/nulls/NullCollectionElementsTest.java
+++ b/query/src/test/java/org/infinispan/query/nulls/NullCollectionElementsTest.java
@@ -1,25 +1,3 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2013 Red Hat Inc. and/or its affiliates and other
-* contributors as indicated by the @author tags. All rights reserved.
-* See the copyright.txt in the distribution for a full listing of
-* individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
 package org.infinispan.query.nulls;
 
 import org.apache.lucene.search.Query;
diff --git a/query/src/test/java/org/infinispan/query/performance/LoopingWriterTest.java b/query/src/test/java/org/infinispan/query/performance/LoopingWriterTest.java
index 1e589647807d..3a258b3b29ab 100644
--- a/query/src/test/java/org/infinispan/query/performance/LoopingWriterTest.java
+++ b/query/src/test/java/org/infinispan/query/performance/LoopingWriterTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.performance;
 
 import java.io.IOException;
diff --git a/query/src/test/java/org/infinispan/query/performance/TuningOptionsAppliedTest.java b/query/src/test/java/org/infinispan/query/performance/TuningOptionsAppliedTest.java
index 95041cb2a228..7706e03bd468 100644
--- a/query/src/test/java/org/infinispan/query/performance/TuningOptionsAppliedTest.java
+++ b/query/src/test/java/org/infinispan/query/performance/TuningOptionsAppliedTest.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.performance;
 
 import java.io.IOException;
diff --git a/query/src/test/java/org/infinispan/query/programmaticmapping/SearchMappingTest.java b/query/src/test/java/org/infinispan/query/programmaticmapping/SearchMappingTest.java
index 885ea35eace8..605550f2979f 100644
--- a/query/src/test/java/org/infinispan/query/programmaticmapping/SearchMappingTest.java
+++ b/query/src/test/java/org/infinispan/query/programmaticmapping/SearchMappingTest.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.query.programmaticmapping;
 
 import java.lang.annotation.ElementType;
diff --git a/query/src/test/java/org/infinispan/query/projection/ProjectionTest.java b/query/src/test/java/org/infinispan/query/projection/ProjectionTest.java
index ac3679c23d14..c96d0a1dd828 100644
--- a/query/src/test/java/org/infinispan/query/projection/ProjectionTest.java
+++ b/query/src/test/java/org/infinispan/query/projection/ProjectionTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.projection;
 
 import org.apache.lucene.search.Query;
diff --git a/query/src/test/java/org/infinispan/query/queries/NumericType.java b/query/src/test/java/org/infinispan/query/queries/NumericType.java
index 62fc710ad57f..50e6660843cd 100644
--- a/query/src/test/java/org/infinispan/query/queries/NumericType.java
+++ b/query/src/test/java/org/infinispan/query/queries/NumericType.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.queries;
 
 import org.hibernate.search.annotations.Analyze;
diff --git a/query/src/test/java/org/infinispan/query/queries/faceting/Car.java b/query/src/test/java/org/infinispan/query/queries/faceting/Car.java
index 8f16ddc5cdb9..6ef5e72e2500 100644
--- a/query/src/test/java/org/infinispan/query/queries/faceting/Car.java
+++ b/query/src/test/java/org/infinispan/query/queries/faceting/Car.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.queries.faceting;
 
 import java.io.Serializable;
diff --git a/query/src/test/java/org/infinispan/query/queries/faceting/SimpleFacetingTest.java b/query/src/test/java/org/infinispan/query/queries/faceting/SimpleFacetingTest.java
index 8b020ca5d7b0..75b075ba589d 100644
--- a/query/src/test/java/org/infinispan/query/queries/faceting/SimpleFacetingTest.java
+++ b/query/src/test/java/org/infinispan/query/queries/faceting/SimpleFacetingTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.query.queries.faceting;
 
 import java.util.List;
diff --git a/query/src/test/java/org/infinispan/query/queries/phrases/QueryPhrasesTest.java b/query/src/test/java/org/infinispan/query/queries/phrases/QueryPhrasesTest.java
index f92ee5a98626..017a89c5143b 100644
--- a/query/src/test/java/org/infinispan/query/queries/phrases/QueryPhrasesTest.java
+++ b/query/src/test/java/org/infinispan/query/queries/phrases/QueryPhrasesTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.queries.phrases;
 
 import junit.framework.Assert;
diff --git a/query/src/test/java/org/infinispan/query/queries/ranges/QueryRangesTest.java b/query/src/test/java/org/infinispan/query/queries/ranges/QueryRangesTest.java
index 17d27998bbae..c2a88cd38dd0 100644
--- a/query/src/test/java/org/infinispan/query/queries/ranges/QueryRangesTest.java
+++ b/query/src/test/java/org/infinispan/query/queries/ranges/QueryRangesTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.queries.ranges;
 
 import junit.framework.Assert;
diff --git a/query/src/test/java/org/infinispan/query/queries/spatial/QuerySpatialTest.java b/query/src/test/java/org/infinispan/query/queries/spatial/QuerySpatialTest.java
index a6eb297b7281..52dfec6b3154 100644
--- a/query/src/test/java/org/infinispan/query/queries/spatial/QuerySpatialTest.java
+++ b/query/src/test/java/org/infinispan/query/queries/spatial/QuerySpatialTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.queries.spatial;
 
 import junit.framework.Assert;
diff --git a/query/src/test/java/org/infinispan/query/searchmanager/ClusteredCacheQueryTimeoutTest.java b/query/src/test/java/org/infinispan/query/searchmanager/ClusteredCacheQueryTimeoutTest.java
index b5e4f0c48da2..1a012b89e155 100644
--- a/query/src/test/java/org/infinispan/query/searchmanager/ClusteredCacheQueryTimeoutTest.java
+++ b/query/src/test/java/org/infinispan/query/searchmanager/ClusteredCacheQueryTimeoutTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.searchmanager;
 
 import org.apache.lucene.queryParser.QueryParser;
diff --git a/query/src/test/java/org/infinispan/query/searchmanager/TimeoutTest.java b/query/src/test/java/org/infinispan/query/searchmanager/TimeoutTest.java
index 21950059f7e0..434bea2abf9e 100644
--- a/query/src/test/java/org/infinispan/query/searchmanager/TimeoutTest.java
+++ b/query/src/test/java/org/infinispan/query/searchmanager/TimeoutTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.searchmanager;
 
 import org.apache.lucene.search.Query;
diff --git a/query/src/test/java/org/infinispan/query/statetransfer/BaseReIndexingTest.java b/query/src/test/java/org/infinispan/query/statetransfer/BaseReIndexingTest.java
index 1226bb62d4c3..2fbed9cc9b78 100644
--- a/query/src/test/java/org/infinispan/query/statetransfer/BaseReIndexingTest.java
+++ b/query/src/test/java/org/infinispan/query/statetransfer/BaseReIndexingTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.query.statetransfer;
 
 import org.apache.lucene.queryParser.ParseException;
diff --git a/query/src/test/java/org/infinispan/query/statetransfer/PersistentStateTransferQueryDistributedIndexTest.java b/query/src/test/java/org/infinispan/query/statetransfer/PersistentStateTransferQueryDistributedIndexTest.java
index 60615c661048..8be837c9a09f 100644
--- a/query/src/test/java/org/infinispan/query/statetransfer/PersistentStateTransferQueryDistributedIndexTest.java
+++ b/query/src/test/java/org/infinispan/query/statetransfer/PersistentStateTransferQueryDistributedIndexTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.query.statetransfer;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/query/src/test/java/org/infinispan/query/statetransfer/PersistentStateTransferQueryIndexTest.java b/query/src/test/java/org/infinispan/query/statetransfer/PersistentStateTransferQueryIndexTest.java
index 8b3b32dc68c8..095123e06bd5 100644
--- a/query/src/test/java/org/infinispan/query/statetransfer/PersistentStateTransferQueryIndexTest.java
+++ b/query/src/test/java/org/infinispan/query/statetransfer/PersistentStateTransferQueryIndexTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.query.statetransfer;
 
 import org.infinispan.Cache;
diff --git a/query/src/test/java/org/infinispan/query/statetransfer/StateTransferQueryDistributedIndexTest.java b/query/src/test/java/org/infinispan/query/statetransfer/StateTransferQueryDistributedIndexTest.java
index 6e7c839aa38c..adddb6e86b6e 100644
--- a/query/src/test/java/org/infinispan/query/statetransfer/StateTransferQueryDistributedIndexTest.java
+++ b/query/src/test/java/org/infinispan/query/statetransfer/StateTransferQueryDistributedIndexTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.query.statetransfer;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/query/src/test/java/org/infinispan/query/statetransfer/StateTransferQueryIndexTest.java b/query/src/test/java/org/infinispan/query/statetransfer/StateTransferQueryIndexTest.java
index e00f7efa4255..4f635b916f6d 100644
--- a/query/src/test/java/org/infinispan/query/statetransfer/StateTransferQueryIndexTest.java
+++ b/query/src/test/java/org/infinispan/query/statetransfer/StateTransferQueryIndexTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.query.statetransfer;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/query/src/test/java/org/infinispan/query/test/AnotherGrassEater.java b/query/src/test/java/org/infinispan/query/test/AnotherGrassEater.java
index 95557bdcc932..505160995e53 100644
--- a/query/src/test/java/org/infinispan/query/test/AnotherGrassEater.java
+++ b/query/src/test/java/org/infinispan/query/test/AnotherGrassEater.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.test;
 
 import org.hibernate.search.annotations.Field;
diff --git a/query/src/test/java/org/infinispan/query/test/BrokenDocumentId.java b/query/src/test/java/org/infinispan/query/test/BrokenDocumentId.java
index e607220900cc..76b2bd3210c7 100644
--- a/query/src/test/java/org/infinispan/query/test/BrokenDocumentId.java
+++ b/query/src/test/java/org/infinispan/query/test/BrokenDocumentId.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.test;
 
 import org.hibernate.search.annotations.DocumentId;
diff --git a/query/src/test/java/org/infinispan/query/test/CustomKey.java b/query/src/test/java/org/infinispan/query/test/CustomKey.java
index 70332f2344e3..5e375ba80280 100644
--- a/query/src/test/java/org/infinispan/query/test/CustomKey.java
+++ b/query/src/test/java/org/infinispan/query/test/CustomKey.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.test;
 
 import org.infinispan.query.Transformable;
diff --git a/query/src/test/java/org/infinispan/query/test/CustomKey2.java b/query/src/test/java/org/infinispan/query/test/CustomKey2.java
index 15a115af08a5..26670011990f 100644
--- a/query/src/test/java/org/infinispan/query/test/CustomKey2.java
+++ b/query/src/test/java/org/infinispan/query/test/CustomKey2.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.test;
 
 import org.infinispan.query.Transformable;
diff --git a/query/src/test/java/org/infinispan/query/test/CustomKey3.java b/query/src/test/java/org/infinispan/query/test/CustomKey3.java
index 55240b616f5a..40f41bd38fd0 100644
--- a/query/src/test/java/org/infinispan/query/test/CustomKey3.java
+++ b/query/src/test/java/org/infinispan/query/test/CustomKey3.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.test;
 
 import java.io.Serializable;
diff --git a/query/src/test/java/org/infinispan/query/test/CustomKey3Transformer.java b/query/src/test/java/org/infinispan/query/test/CustomKey3Transformer.java
index 247fd16dec24..3da441b2a8be 100644
--- a/query/src/test/java/org/infinispan/query/test/CustomKey3Transformer.java
+++ b/query/src/test/java/org/infinispan/query/test/CustomKey3Transformer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.test;
 
 import org.infinispan.query.Transformer;
diff --git a/query/src/test/java/org/infinispan/query/test/CustomTransformer.java b/query/src/test/java/org/infinispan/query/test/CustomTransformer.java
index 6b825d22ea8b..d200b2603a02 100644
--- a/query/src/test/java/org/infinispan/query/test/CustomTransformer.java
+++ b/query/src/test/java/org/infinispan/query/test/CustomTransformer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.test;
 
 import org.infinispan.query.Transformer;
diff --git a/query/src/test/java/org/infinispan/query/test/NonSerializableKey.java b/query/src/test/java/org/infinispan/query/test/NonSerializableKey.java
index 12a990c761cc..be3c60936e04 100644
--- a/query/src/test/java/org/infinispan/query/test/NonSerializableKey.java
+++ b/query/src/test/java/org/infinispan/query/test/NonSerializableKey.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.test;
 
 import org.infinispan.query.Transformable;
diff --git a/query/src/test/java/org/infinispan/query/test/Person.java b/query/src/test/java/org/infinispan/query/test/Person.java
index 9a29ebbe9730..c1e917e41493 100644
--- a/query/src/test/java/org/infinispan/query/test/Person.java
+++ b/query/src/test/java/org/infinispan/query/test/Person.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.test;
 
 import org.hibernate.search.annotations.*;
diff --git a/query/src/test/java/org/infinispan/query/test/PersonAgeFilterFactory.java b/query/src/test/java/org/infinispan/query/test/PersonAgeFilterFactory.java
index 57aa368a6529..84438a88cee8 100644
--- a/query/src/test/java/org/infinispan/query/test/PersonAgeFilterFactory.java
+++ b/query/src/test/java/org/infinispan/query/test/PersonAgeFilterFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.test;
 
 import org.apache.lucene.index.Term;
diff --git a/query/src/test/java/org/infinispan/query/test/PersonBlurbFilterFactory.java b/query/src/test/java/org/infinispan/query/test/PersonBlurbFilterFactory.java
index b3df4f167f46..27061a81cf23 100644
--- a/query/src/test/java/org/infinispan/query/test/PersonBlurbFilterFactory.java
+++ b/query/src/test/java/org/infinispan/query/test/PersonBlurbFilterFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.test;
 
 import org.apache.lucene.index.Term;
diff --git a/query/src/test/java/org/infinispan/query/tx/NonLocalIndexingTest.java b/query/src/test/java/org/infinispan/query/tx/NonLocalIndexingTest.java
index 84c26c3144aa..1323e35b070c 100644
--- a/query/src/test/java/org/infinispan/query/tx/NonLocalIndexingTest.java
+++ b/query/src/test/java/org/infinispan/query/tx/NonLocalIndexingTest.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.query.tx;
 
 import static org.infinispan.test.TestingUtil.withTx;
diff --git a/query/src/test/java/org/infinispan/query/tx/NonLocalTransactionalIndexingTest.java b/query/src/test/java/org/infinispan/query/tx/NonLocalTransactionalIndexingTest.java
index 0419d826997c..da52f7372ead 100644
--- a/query/src/test/java/org/infinispan/query/tx/NonLocalTransactionalIndexingTest.java
+++ b/query/src/test/java/org/infinispan/query/tx/NonLocalTransactionalIndexingTest.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.query.tx;
 
 import org.testng.annotations.Test;
diff --git a/query/src/test/java/org/infinispan/query/tx/TransactionalQueryTest.java b/query/src/test/java/org/infinispan/query/tx/TransactionalQueryTest.java
index 887af51a945c..f3ff688b935a 100644
--- a/query/src/test/java/org/infinispan/query/tx/TransactionalQueryTest.java
+++ b/query/src/test/java/org/infinispan/query/tx/TransactionalQueryTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.query.tx;
 
 import org.hibernate.search.annotations.Field;
diff --git a/query/src/test/resources/dynamic-indexing-distribution.xml b/query/src/test/resources/dynamic-indexing-distribution.xml
index 3fea5216da2e..0a985fcad91b 100644
--- a/query/src/test/resources/dynamic-indexing-distribution.xml
+++ b/query/src/test/resources/dynamic-indexing-distribution.xml
@@ -1,28 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  ~ 
-  ~ Author: Sanne Grinovero
- -->
 <infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="urn:infinispan:config:5.3 http://www.infinispan.org/schemas/infinispan-config-5.3.xsd"
     xmlns="urn:infinispan:config:5.3">
diff --git a/query/src/test/resources/dynamic-indexing-replication.xml b/query/src/test/resources/dynamic-indexing-replication.xml
index 57ff9f8d0931..ec1b8db135cd 100644
--- a/query/src/test/resources/dynamic-indexing-replication.xml
+++ b/query/src/test/resources/dynamic-indexing-replication.xml
@@ -1,28 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  ~ 
-  ~ Author: Sanne Grinovero
- -->
 <infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="urn:infinispan:config:5.3 http://www.infinispan.org/schemas/infinispan-config-5.3.xsd"
     xmlns="urn:infinispan:config:5.3">
diff --git a/query/src/test/resources/nrt-performance-writer-infinispandirectory.xml b/query/src/test/resources/nrt-performance-writer-infinispandirectory.xml
index eb273a2ed937..7eaeeb59142d 100644
--- a/query/src/test/resources/nrt-performance-writer-infinispandirectory.xml
+++ b/query/src/test/resources/nrt-performance-writer-infinispandirectory.xml
@@ -1,28 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2013 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  ~ 
-  ~ Author: Sanne Grinovero
- -->
 <infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="urn:infinispan:config:5.3 http://www.infinispan.org/schemas/infinispan-config-5.3.xsd"
     xmlns="urn:infinispan:config:5.3">
diff --git a/query/src/test/resources/nrt-performance-writer.xml b/query/src/test/resources/nrt-performance-writer.xml
index 0d423562e2fa..d19603b84c1c 100644
--- a/query/src/test/resources/nrt-performance-writer.xml
+++ b/query/src/test/resources/nrt-performance-writer.xml
@@ -1,28 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2013 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  ~ 
-  ~ Author: Sanne Grinovero
- -->
 <infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="urn:infinispan:config:5.3 http://www.infinispan.org/schemas/infinispan-config-5.3.xsd"
     xmlns="urn:infinispan:config:5.3">
diff --git a/rhq-plugin/pom.xml b/rhq-plugin/pom.xml
index 8475a0bd7ab8..a1898b95b1f1 100644
--- a/rhq-plugin/pom.xml
+++ b/rhq-plugin/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <project
       xmlns="http://maven.apache.org/POM/4.0.0"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/rhq-plugin/src/main/java/org/infinispan/rhq/CacheComponent.java b/rhq-plugin/src/main/java/org/infinispan/rhq/CacheComponent.java
index d8201fa6c264..11feff565679 100644
--- a/rhq-plugin/src/main/java/org/infinispan/rhq/CacheComponent.java
+++ b/rhq-plugin/src/main/java/org/infinispan/rhq/CacheComponent.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.rhq;
 
 import org.apache.commons.logging.Log;
diff --git a/rhq-plugin/src/main/java/org/infinispan/rhq/CacheDiscovery.java b/rhq-plugin/src/main/java/org/infinispan/rhq/CacheDiscovery.java
index 106cc40a32e5..7ca7bdc062ab 100644
--- a/rhq-plugin/src/main/java/org/infinispan/rhq/CacheDiscovery.java
+++ b/rhq-plugin/src/main/java/org/infinispan/rhq/CacheDiscovery.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.rhq;
 
 import org.apache.commons.logging.Log;
diff --git a/rhq-plugin/src/main/java/org/infinispan/rhq/CacheManagerComponent.java b/rhq-plugin/src/main/java/org/infinispan/rhq/CacheManagerComponent.java
index 012e02bdb0af..71ec9b45b31e 100644
--- a/rhq-plugin/src/main/java/org/infinispan/rhq/CacheManagerComponent.java
+++ b/rhq-plugin/src/main/java/org/infinispan/rhq/CacheManagerComponent.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.rhq;
 
 import static org.infinispan.rhq.RhqUtil.constructNumericMeasure;
diff --git a/rhq-plugin/src/main/java/org/infinispan/rhq/CacheManagerDiscovery.java b/rhq-plugin/src/main/java/org/infinispan/rhq/CacheManagerDiscovery.java
index 3b3547af9a99..02502f7048af 100644
--- a/rhq-plugin/src/main/java/org/infinispan/rhq/CacheManagerDiscovery.java
+++ b/rhq-plugin/src/main/java/org/infinispan/rhq/CacheManagerDiscovery.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.rhq;
 
 import java.util.HashSet;
diff --git a/rhq-plugin/src/test/java/org/infinispan/rhq/InfinispanRhqTest.java b/rhq-plugin/src/test/java/org/infinispan/rhq/InfinispanRhqTest.java
index bb3d563da03d..da0b62c86450 100644
--- a/rhq-plugin/src/test/java/org/infinispan/rhq/InfinispanRhqTest.java
+++ b/rhq-plugin/src/test/java/org/infinispan/rhq/InfinispanRhqTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.rhq;
 
 import org.infinispan.Cache;
diff --git a/server/core/pom.xml b/server/core/pom.xml
index f7b43c467528..bbe8dd02f2fe 100644
--- a/server/core/pom.xml
+++ b/server/core/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
diff --git a/server/core/src/main/scala/org/infinispan/server/core/AbstractProtocolDecoder.scala b/server/core/src/main/scala/org/infinispan/server/core/AbstractProtocolDecoder.scala
index 9665ecb34db3..a05df7ec4f53 100644
--- a/server/core/src/main/scala/org/infinispan/server/core/AbstractProtocolDecoder.scala
+++ b/server/core/src/main/scala/org/infinispan/server/core/AbstractProtocolDecoder.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.core
 
 import org.infinispan.{AdvancedCache, Cache}
diff --git a/server/core/src/main/scala/org/infinispan/server/core/AbstractProtocolServer.scala b/server/core/src/main/scala/org/infinispan/server/core/AbstractProtocolServer.scala
index 177d4321f793..44d6238d85e5 100644
--- a/server/core/src/main/scala/org/infinispan/server/core/AbstractProtocolServer.scala
+++ b/server/core/src/main/scala/org/infinispan/server/core/AbstractProtocolServer.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.core
 
 import java.net.InetSocketAddress
diff --git a/server/core/src/main/scala/org/infinispan/server/core/CacheValue.scala b/server/core/src/main/scala/org/infinispan/server/core/CacheValue.scala
index 54c18ce49dd8..7ae2941e0c70 100644
--- a/server/core/src/main/scala/org/infinispan/server/core/CacheValue.scala
+++ b/server/core/src/main/scala/org/infinispan/server/core/CacheValue.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.core
 
 import org.infinispan.commons.util.Util
diff --git a/server/core/src/main/scala/org/infinispan/server/core/DecoderState.java b/server/core/src/main/scala/org/infinispan/server/core/DecoderState.java
index 8907bf8bf092..6eed8559cd76 100644
--- a/server/core/src/main/scala/org/infinispan/server/core/DecoderState.java
+++ b/server/core/src/main/scala/org/infinispan/server/core/DecoderState.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.server.core;
 
 /**
diff --git a/server/core/src/main/scala/org/infinispan/server/core/ExternalizerIds.scala b/server/core/src/main/scala/org/infinispan/server/core/ExternalizerIds.scala
index 02a50abacfde..46d1e5fa92ab 100644
--- a/server/core/src/main/scala/org/infinispan/server/core/ExternalizerIds.scala
+++ b/server/core/src/main/scala/org/infinispan/server/core/ExternalizerIds.scala
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.server.core
 
 /**
diff --git a/server/core/src/main/scala/org/infinispan/server/core/LifecycleCallbacks.scala b/server/core/src/main/scala/org/infinispan/server/core/LifecycleCallbacks.scala
index 76859e38e5c4..f50c6318ed55 100644
--- a/server/core/src/main/scala/org/infinispan/server/core/LifecycleCallbacks.scala
+++ b/server/core/src/main/scala/org/infinispan/server/core/LifecycleCallbacks.scala
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.server.core
 
 import org.infinispan.lifecycle.AbstractModuleLifecycle
diff --git a/server/core/src/main/scala/org/infinispan/server/core/Operation.scala b/server/core/src/main/scala/org/infinispan/server/core/Operation.scala
index cf782bd0643c..ae4858529c56 100644
--- a/server/core/src/main/scala/org/infinispan/server/core/Operation.scala
+++ b/server/core/src/main/scala/org/infinispan/server/core/Operation.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.core
 
 /**
diff --git a/server/core/src/main/scala/org/infinispan/server/core/ProtocolServer.scala b/server/core/src/main/scala/org/infinispan/server/core/ProtocolServer.scala
index d335d81f5c0d..72c3111a50af 100644
--- a/server/core/src/main/scala/org/infinispan/server/core/ProtocolServer.scala
+++ b/server/core/src/main/scala/org/infinispan/server/core/ProtocolServer.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.core
 
 import org.infinispan.manager.EmbeddedCacheManager
diff --git a/server/core/src/main/scala/org/infinispan/server/core/ServerConstants.scala b/server/core/src/main/scala/org/infinispan/server/core/ServerConstants.scala
index 611cb38728e3..d570cee3f111 100644
--- a/server/core/src/main/scala/org/infinispan/server/core/ServerConstants.scala
+++ b/server/core/src/main/scala/org/infinispan/server/core/ServerConstants.scala
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.server.core;
 
 /**
diff --git a/server/core/src/main/scala/org/infinispan/server/core/ServerCoreMetadataFileFinder.scala b/server/core/src/main/scala/org/infinispan/server/core/ServerCoreMetadataFileFinder.scala
index ddfff8dbc616..484e8ed3d77a 100644
--- a/server/core/src/main/scala/org/infinispan/server/core/ServerCoreMetadataFileFinder.scala
+++ b/server/core/src/main/scala/org/infinispan/server/core/ServerCoreMetadataFileFinder.scala
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.server.core
 
 import org.infinispan.factories.components.ModuleMetadataFileFinder
diff --git a/server/core/src/main/scala/org/infinispan/server/core/configuration/ProtocolServerConfiguration.java b/server/core/src/main/scala/org/infinispan/server/core/configuration/ProtocolServerConfiguration.java
index 49219d302f37..8e5ac4365e22 100644
--- a/server/core/src/main/scala/org/infinispan/server/core/configuration/ProtocolServerConfiguration.java
+++ b/server/core/src/main/scala/org/infinispan/server/core/configuration/ProtocolServerConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.server.core.configuration;
 
 /**
diff --git a/server/core/src/main/scala/org/infinispan/server/core/configuration/ProtocolServerConfigurationBuilder.java b/server/core/src/main/scala/org/infinispan/server/core/configuration/ProtocolServerConfigurationBuilder.java
index 7695afd8aec4..626c41a0d59f 100644
--- a/server/core/src/main/scala/org/infinispan/server/core/configuration/ProtocolServerConfigurationBuilder.java
+++ b/server/core/src/main/scala/org/infinispan/server/core/configuration/ProtocolServerConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.server.core.configuration;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/server/core/src/main/scala/org/infinispan/server/core/configuration/ProtocolServerConfigurationChildBuilder.java b/server/core/src/main/scala/org/infinispan/server/core/configuration/ProtocolServerConfigurationChildBuilder.java
index 650963f1cda0..0f5d3c048d50 100644
--- a/server/core/src/main/scala/org/infinispan/server/core/configuration/ProtocolServerConfigurationChildBuilder.java
+++ b/server/core/src/main/scala/org/infinispan/server/core/configuration/ProtocolServerConfigurationChildBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.server.core.configuration;
 
 import org.infinispan.commons.configuration.Self;
diff --git a/server/core/src/main/scala/org/infinispan/server/core/configuration/SslConfiguration.java b/server/core/src/main/scala/org/infinispan/server/core/configuration/SslConfiguration.java
index 0326426dceba..11e34667abc4 100644
--- a/server/core/src/main/scala/org/infinispan/server/core/configuration/SslConfiguration.java
+++ b/server/core/src/main/scala/org/infinispan/server/core/configuration/SslConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.server.core.configuration;
 
 import javax.net.ssl.SSLContext;
diff --git a/server/core/src/main/scala/org/infinispan/server/core/configuration/SslConfigurationBuilder.java b/server/core/src/main/scala/org/infinispan/server/core/configuration/SslConfigurationBuilder.java
index 0403592f1984..d4e86d6a9c3d 100644
--- a/server/core/src/main/scala/org/infinispan/server/core/configuration/SslConfigurationBuilder.java
+++ b/server/core/src/main/scala/org/infinispan/server/core/configuration/SslConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.server.core.configuration;
 
 import javax.net.ssl.KeyManager;
diff --git a/server/core/src/main/scala/org/infinispan/server/core/logging/JavaLog.java b/server/core/src/main/scala/org/infinispan/server/core/logging/JavaLog.java
index 4334a7c1d002..2c0b3b05c948 100644
--- a/server/core/src/main/scala/org/infinispan/server/core/logging/JavaLog.java
+++ b/server/core/src/main/scala/org/infinispan/server/core/logging/JavaLog.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.server.core.logging;
 
 import org.infinispan.commons.CacheConfigurationException;
diff --git a/server/core/src/main/scala/org/infinispan/server/core/logging/Log.scala b/server/core/src/main/scala/org/infinispan/server/core/logging/Log.scala
index 879c6331e333..213de5a6a33e 100644
--- a/server/core/src/main/scala/org/infinispan/server/core/logging/Log.scala
+++ b/server/core/src/main/scala/org/infinispan/server/core/logging/Log.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.server.core.logging
 
 import org.jboss.netty.channel.Channel
diff --git a/server/core/src/main/scala/org/infinispan/server/core/transport/ExtendedChannelBuffer.scala b/server/core/src/main/scala/org/infinispan/server/core/transport/ExtendedChannelBuffer.scala
index f5c7c1394e3e..92ad7cb057f6 100644
--- a/server/core/src/main/scala/org/infinispan/server/core/transport/ExtendedChannelBuffer.scala
+++ b/server/core/src/main/scala/org/infinispan/server/core/transport/ExtendedChannelBuffer.scala
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.server.core.transport
 
 import org.jboss.netty.buffer.{ChannelBuffers, ChannelBuffer}
diff --git a/server/core/src/main/scala/org/infinispan/server/core/transport/IdleStateHandlerProvider.scala b/server/core/src/main/scala/org/infinispan/server/core/transport/IdleStateHandlerProvider.scala
index d9c6a77006a8..0a87854fec70 100644
--- a/server/core/src/main/scala/org/infinispan/server/core/transport/IdleStateHandlerProvider.scala
+++ b/server/core/src/main/scala/org/infinispan/server/core/transport/IdleStateHandlerProvider.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.core.transport
 
 import org.jboss.netty.handler.timeout.{IdleStateEvent, IdleStateAwareChannelHandler}
diff --git a/server/core/src/main/scala/org/infinispan/server/core/transport/LifecycleChannelPipelineFactory.scala b/server/core/src/main/scala/org/infinispan/server/core/transport/LifecycleChannelPipelineFactory.scala
index b2824abcc19f..aecb59617410 100644
--- a/server/core/src/main/scala/org/infinispan/server/core/transport/LifecycleChannelPipelineFactory.scala
+++ b/server/core/src/main/scala/org/infinispan/server/core/transport/LifecycleChannelPipelineFactory.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.core.transport
 
 import org.jboss.netty.channel.ChannelPipelineFactory
diff --git a/server/core/src/main/scala/org/infinispan/server/core/transport/NettyChannelPipelineFactory.scala b/server/core/src/main/scala/org/infinispan/server/core/transport/NettyChannelPipelineFactory.scala
index da5e427a6f0f..9ea1ad44c14a 100644
--- a/server/core/src/main/scala/org/infinispan/server/core/transport/NettyChannelPipelineFactory.scala
+++ b/server/core/src/main/scala/org/infinispan/server/core/transport/NettyChannelPipelineFactory.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.core.transport
 
 import org.jboss.netty.channel._
diff --git a/server/core/src/main/scala/org/infinispan/server/core/transport/NettyTransport.scala b/server/core/src/main/scala/org/infinispan/server/core/transport/NettyTransport.scala
index 8a4aae3d9c8b..218052c1ce5c 100644
--- a/server/core/src/main/scala/org/infinispan/server/core/transport/NettyTransport.scala
+++ b/server/core/src/main/scala/org/infinispan/server/core/transport/NettyTransport.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.core.transport
 
 import org.jboss.netty.channel.group.DefaultChannelGroup
diff --git a/server/core/src/main/scala/org/infinispan/server/core/transport/TimeoutEnabledChannelPipelineFactory.scala b/server/core/src/main/scala/org/infinispan/server/core/transport/TimeoutEnabledChannelPipelineFactory.scala
index 17621a7915db..cdc85627437a 100644
--- a/server/core/src/main/scala/org/infinispan/server/core/transport/TimeoutEnabledChannelPipelineFactory.scala
+++ b/server/core/src/main/scala/org/infinispan/server/core/transport/TimeoutEnabledChannelPipelineFactory.scala
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.server.core.transport
 
 import org.jboss.netty.util.HashedWheelTimer
diff --git a/server/core/src/main/scala/org/infinispan/server/core/transport/Transport.java b/server/core/src/main/scala/org/infinispan/server/core/transport/Transport.java
index c659a6494a15..9c546b19eb9c 100644
--- a/server/core/src/main/scala/org/infinispan/server/core/transport/Transport.java
+++ b/server/core/src/main/scala/org/infinispan/server/core/transport/Transport.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.server.core.transport;
 
 import org.infinispan.factories.scopes.Scope;
diff --git a/server/core/src/main/scala/org/infinispan/server/core/transport/VInt.scala b/server/core/src/main/scala/org/infinispan/server/core/transport/VInt.scala
index 971cb3e012f8..0c0a7512ba36 100644
--- a/server/core/src/main/scala/org/infinispan/server/core/transport/VInt.scala
+++ b/server/core/src/main/scala/org/infinispan/server/core/transport/VInt.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.core.transport
 
 import org.jboss.netty.buffer.ChannelBuffer
diff --git a/server/core/src/main/scala/org/infinispan/server/core/transport/VLong.scala b/server/core/src/main/scala/org/infinispan/server/core/transport/VLong.scala
index 3e474d8a6804..f34337586c03 100644
--- a/server/core/src/main/scala/org/infinispan/server/core/transport/VLong.scala
+++ b/server/core/src/main/scala/org/infinispan/server/core/transport/VLong.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.core.transport
 
 import org.jboss.netty.buffer.ChannelBuffer
diff --git a/server/core/src/test/scala/org/infinispan/server/core/AbstractMarshallingTest.scala b/server/core/src/test/scala/org/infinispan/server/core/AbstractMarshallingTest.scala
index 4045ce231b43..5c196944ad23 100644
--- a/server/core/src/test/scala/org/infinispan/server/core/AbstractMarshallingTest.scala
+++ b/server/core/src/test/scala/org/infinispan/server/core/AbstractMarshallingTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.core
 
 import org.testng.annotations.{AfterTest, BeforeTest}
diff --git a/server/core/src/test/scala/org/infinispan/server/core/AbstractProtocolServerTest.scala b/server/core/src/test/scala/org/infinispan/server/core/AbstractProtocolServerTest.scala
index 2192f1a70f7a..20bea0f8d1b5 100644
--- a/server/core/src/test/scala/org/infinispan/server/core/AbstractProtocolServerTest.scala
+++ b/server/core/src/test/scala/org/infinispan/server/core/AbstractProtocolServerTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.core
 
 import org.testng.annotations.Test
diff --git a/server/core/src/test/scala/org/infinispan/server/core/ConnectionStatsTest.scala b/server/core/src/test/scala/org/infinispan/server/core/ConnectionStatsTest.scala
index 2011455f5f41..96b36d367e42 100644
--- a/server/core/src/test/scala/org/infinispan/server/core/ConnectionStatsTest.scala
+++ b/server/core/src/test/scala/org/infinispan/server/core/ConnectionStatsTest.scala
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.server.core
 
 import org.infinispan.jmx.PerThreadMBeanServerLookup
diff --git a/server/core/src/test/scala/org/infinispan/server/core/MarshallingTest.scala b/server/core/src/test/scala/org/infinispan/server/core/MarshallingTest.scala
index f5c08f7f5f7e..5456ae3bd457 100644
--- a/server/core/src/test/scala/org/infinispan/server/core/MarshallingTest.scala
+++ b/server/core/src/test/scala/org/infinispan/server/core/MarshallingTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.core
 
 import org.testng.annotations.Test
diff --git a/server/core/src/test/scala/org/infinispan/server/core/VariableLengthTest.scala b/server/core/src/test/scala/org/infinispan/server/core/VariableLengthTest.scala
index c6ef07359d38..65717a71e4fa 100644
--- a/server/core/src/test/scala/org/infinispan/server/core/VariableLengthTest.scala
+++ b/server/core/src/test/scala/org/infinispan/server/core/VariableLengthTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.core
 
 import org.testng.annotations.Test
diff --git a/server/core/src/test/scala/org/infinispan/server/core/configuration/MockServerConfiguration.java b/server/core/src/test/scala/org/infinispan/server/core/configuration/MockServerConfiguration.java
index 16843a44c612..c91cb5ea6fdd 100644
--- a/server/core/src/test/scala/org/infinispan/server/core/configuration/MockServerConfiguration.java
+++ b/server/core/src/test/scala/org/infinispan/server/core/configuration/MockServerConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.server.core.configuration;
 
 public class MockServerConfiguration extends ProtocolServerConfiguration {
diff --git a/server/core/src/test/scala/org/infinispan/server/core/configuration/MockServerConfigurationBuilder.java b/server/core/src/test/scala/org/infinispan/server/core/configuration/MockServerConfigurationBuilder.java
index 93eddd94b600..0cbb590abfb1 100644
--- a/server/core/src/test/scala/org/infinispan/server/core/configuration/MockServerConfigurationBuilder.java
+++ b/server/core/src/test/scala/org/infinispan/server/core/configuration/MockServerConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.server.core.configuration;
 
 
diff --git a/server/core/src/test/scala/org/infinispan/server/core/test/ServerTestingUtil.scala b/server/core/src/test/scala/org/infinispan/server/core/test/ServerTestingUtil.scala
index bf4bda88416a..aa272c95d44f 100644
--- a/server/core/src/test/scala/org/infinispan/server/core/test/ServerTestingUtil.scala
+++ b/server/core/src/test/scala/org/infinispan/server/core/test/ServerTestingUtil.scala
@@ -1,24 +1,5 @@
 package org.infinispan.server.core.test
 
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 import org.infinispan.server.core.logging.Log
 import org.infinispan.server.core.AbstractProtocolServer
 
diff --git a/server/core/src/test/scala/org/infinispan/server/core/test/Stoppable.scala b/server/core/src/test/scala/org/infinispan/server/core/test/Stoppable.scala
index 4ab92c6f013a..0bfcd26757d4 100644
--- a/server/core/src/test/scala/org/infinispan/server/core/test/Stoppable.scala
+++ b/server/core/src/test/scala/org/infinispan/server/core/test/Stoppable.scala
@@ -1,24 +1,5 @@
 package org.infinispan.server.core.test
 
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 import org.infinispan.manager.EmbeddedCacheManager
 import org.infinispan.test.TestingUtil
 import org.infinispan.server.core.AbstractProtocolServer
diff --git a/server/hotrod/pom.xml b/server/hotrod/pom.xml
index 80ef9aee93ca..0ccf06c605e9 100644
--- a/server/hotrod/pom.xml
+++ b/server/hotrod/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
diff --git a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/AbstractEncoder1x.scala b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/AbstractEncoder1x.scala
index f9bed9164b99..b189727368bd 100644
--- a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/AbstractEncoder1x.scala
+++ b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/AbstractEncoder1x.scala
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.server.hotrod
 
 import logging.Log
diff --git a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/AbstractTopologyAwareEncoder1x.scala b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/AbstractTopologyAwareEncoder1x.scala
index 4daa05e5b510..70ca42066211 100644
--- a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/AbstractTopologyAwareEncoder1x.scala
+++ b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/AbstractTopologyAwareEncoder1x.scala
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.server.hotrod
 
 import logging.Log
diff --git a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/AbstractVersionedDecoder.scala b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/AbstractVersionedDecoder.scala
index 2e9d31d91046..34260ae072d3 100644
--- a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/AbstractVersionedDecoder.scala
+++ b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/AbstractVersionedDecoder.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.hotrod
 
 import org.infinispan.AdvancedCache
diff --git a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/AbstractVersionedEncoder.scala b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/AbstractVersionedEncoder.scala
index 67b9df5d4b5b..34af3b1bbe81 100644
--- a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/AbstractVersionedEncoder.scala
+++ b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/AbstractVersionedEncoder.scala
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.server.hotrod
 
 import org.jboss.netty.buffer.ChannelBuffer
diff --git a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/Constants.scala b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/Constants.scala
index bd4cd06a0e8d..783994fc901b 100644
--- a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/Constants.scala
+++ b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/Constants.scala
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.server.hotrod
 
 /**
diff --git a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/CrashedMemberDetectorListener.scala b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/CrashedMemberDetectorListener.scala
index c63b17a0cb7d..e36415b7a929 100644
--- a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/CrashedMemberDetectorListener.scala
+++ b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/CrashedMemberDetectorListener.scala
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.server.hotrod
 
 import logging.Log
diff --git a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/Decoder10.scala b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/Decoder10.scala
index a138533652f5..1ba0bc898a8a 100644
--- a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/Decoder10.scala
+++ b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/Decoder10.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.hotrod
 
 import logging.Log
diff --git a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/Encoders.scala b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/Encoders.scala
index 595995e602e5..939f526e89fa 100644
--- a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/Encoders.scala
+++ b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/Encoders.scala
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.server.hotrod
 
 import logging.{JavaLog, Log}
diff --git a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodDecoder.scala b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodDecoder.scala
index d68f02a3ce7d..970b9c582c23 100644
--- a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodDecoder.scala
+++ b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodDecoder.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.hotrod
 
 import org.infinispan.server.core._
diff --git a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodEncoder.scala b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodEncoder.scala
index 5273d9d650cd..2717badf9c34 100644
--- a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodEncoder.scala
+++ b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodEncoder.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.hotrod
 
 import logging.Log
diff --git a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodOperation.scala b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodOperation.scala
index 3ff52ac41a66..ec44bc0bda5f 100644
--- a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodOperation.scala
+++ b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodOperation.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.hotrod
 
 /**
diff --git a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodServer.scala b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodServer.scala
index af61ffa5b3d5..28fbc4cbb38e 100644
--- a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodServer.scala
+++ b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodServer.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.hotrod
 
 import logging.Log
diff --git a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodSourceMigrator.scala b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodSourceMigrator.scala
index 7b9617362f33..4f7940c02d09 100644
--- a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodSourceMigrator.scala
+++ b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodSourceMigrator.scala
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 /**
  * An implementation of Migrator, that understands the Hot Rod key and value formats.
  *
diff --git a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodTypeConverter.scala b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodTypeConverter.scala
index 846a40e60595..3a21f2fd0212 100644
--- a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodTypeConverter.scala
+++ b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodTypeConverter.scala
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.server.hotrod
 
 import org.infinispan.compat.TypeConverter
diff --git a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/LifecycleCallbacks.scala b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/LifecycleCallbacks.scala
index 6f1ae1a5f820..552f7d2a97d7 100644
--- a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/LifecycleCallbacks.scala
+++ b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/LifecycleCallbacks.scala
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.server.hotrod
 
 import org.infinispan.lifecycle.AbstractModuleLifecycle
diff --git a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/OperationStatus.scala b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/OperationStatus.scala
index a399da39edbc..14365f0fb791 100644
--- a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/OperationStatus.scala
+++ b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/OperationStatus.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.hotrod
 
 /**
diff --git a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/Response.scala b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/Response.scala
index c187aadb68e2..747a30e0d1b4 100644
--- a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/Response.scala
+++ b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/Response.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.hotrod
 
 import OperationStatus._
diff --git a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/ServerAddress.scala b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/ServerAddress.scala
index 4e675ca292ee..646ba5a4c03a 100644
--- a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/ServerAddress.scala
+++ b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/ServerAddress.scala
@@ -1,43 +1,5 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.server.hotrod
 
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 import org.infinispan.remoting.transport.Address
 import java.nio.charset.Charset
 import java.util.Arrays
diff --git a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/configuration/HotRodServerConfiguration.java b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/configuration/HotRodServerConfiguration.java
index 8d2f97542aa8..8484ccc5674f 100644
--- a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/configuration/HotRodServerConfiguration.java
+++ b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/configuration/HotRodServerConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.server.hotrod.configuration;
 
 import org.infinispan.commons.configuration.BuiltBy;
diff --git a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/configuration/HotRodServerConfigurationBuilder.java b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/configuration/HotRodServerConfigurationBuilder.java
index 0d7f475c248c..26c533bca4c0 100644
--- a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/configuration/HotRodServerConfigurationBuilder.java
+++ b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/configuration/HotRodServerConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.server.hotrod.configuration;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/logging/JavaLog.java b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/logging/JavaLog.java
index cafea7a32889..eb32fbe1403e 100644
--- a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/logging/JavaLog.java
+++ b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/logging/JavaLog.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.server.hotrod.logging;
 
 import org.infinispan.commons.CacheConfigurationException;
diff --git a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/logging/Log.scala b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/logging/Log.scala
index da3de56af28b..25fd8a55ee55 100644
--- a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/logging/Log.scala
+++ b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/logging/Log.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.server.hotrod.logging
 
 import org.infinispan.util.logging.LogFactory
diff --git a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/util/BulkUtil.java b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/util/BulkUtil.java
index 6515facd8f4f..434722558137 100644
--- a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/util/BulkUtil.java
+++ b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/util/BulkUtil.java
@@ -1,21 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
 package org.infinispan.server.hotrod.util;
 
 import java.util.Iterator;
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/CrashedMemberDetectorTest.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/CrashedMemberDetectorTest.scala
index 73933573492c..7c1e0035b6d1 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/CrashedMemberDetectorTest.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/CrashedMemberDetectorTest.scala
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.server.hotrod
 
 import org.testng.annotations.Test
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRod11DistributionTest.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRod11DistributionTest.scala
index 183b8ed62547..28bc6f4751b7 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRod11DistributionTest.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRod11DistributionTest.scala
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.server.hotrod
 
 import org.infinispan.test.AbstractCacheTest._
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRod11LocalCacheTest.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRod11LocalCacheTest.scala
index 6eb943f9235c..e8e7075b515f 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRod11LocalCacheTest.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRod11LocalCacheTest.scala
@@ -1,22 +1,3 @@
-/*
- * Copyright 2013 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.server.hotrod
 
 import org.infinispan.test.AbstractCacheTest._
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRod11ReplicationTest.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRod11ReplicationTest.scala
index e3bf3eb411f6..096044bdeeda 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRod11ReplicationTest.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRod11ReplicationTest.scala
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.server.hotrod
 
 import org.infinispan.test.AbstractCacheTest._
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRod11StorageOnlyNodesTest.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRod11StorageOnlyNodesTest.scala
index 265ee3e52ca7..f6672537b0cc 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRod11StorageOnlyNodesTest.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRod11StorageOnlyNodesTest.scala
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.server.hotrod
 
 import org.infinispan.test.AbstractCacheTest._
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRod12ReplicationTest.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRod12ReplicationTest.scala
index 9857bde3d500..a425a2fd3bb6 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRod12ReplicationTest.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRod12ReplicationTest.scala
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.server.hotrod
 
 import org.testng.annotations.Test
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodConcurrentStartTest.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodConcurrentStartTest.scala
index ea7ea10bf50b..da42f11946de 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodConcurrentStartTest.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodConcurrentStartTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.hotrod
 
 import org.infinispan.test.MultipleCacheManagersTest
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodConcurrentTest.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodConcurrentTest.scala
index 94392517529d..efb1e15d98d6 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodConcurrentTest.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodConcurrentTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.hotrod
 
 import java.lang.reflect.Method
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodConfigurationTest.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodConfigurationTest.scala
index 71a3b4ca3975..39ba3e30fffd 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodConfigurationTest.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodConfigurationTest.scala
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.server.hotrod
 
 import test.UniquePortThreadLocal
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodDistributionTest.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodDistributionTest.scala
index a358f918680d..ac1bd3ae7e10 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodDistributionTest.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodDistributionTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.hotrod
 
 import org.testng.annotations.Test
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodFunctionalTest.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodFunctionalTest.scala
index 206627772583..71b2b30c1e94 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodFunctionalTest.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodFunctionalTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.hotrod
 
 import org.testng.annotations.Test
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodIdleTimeoutTest.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodIdleTimeoutTest.scala
index ac4312bc62f6..949219f58532 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodIdleTimeoutTest.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodIdleTimeoutTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.hotrod
 
 import org.testng.annotations.Test
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodMarshallingTest.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodMarshallingTest.scala
index a644abf4ecf6..687d1ebc1da6 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodMarshallingTest.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodMarshallingTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.hotrod
 
 import org.testng.annotations.Test
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodMultiNodeTest.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodMultiNodeTest.scala
index c9459dee739a..959efd3c727d 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodMultiNodeTest.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodMultiNodeTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.hotrod
 
 import test.HotRodClient
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodProxyTest.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodProxyTest.scala
index 35eadedc6f4b..f757b2d022c7 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodProxyTest.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodProxyTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.hotrod
 
 import org.infinispan.manager.EmbeddedCacheManager
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodReplicationTest.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodReplicationTest.scala
index 7d6ae12f662d..9beb2746a8e0 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodReplicationTest.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodReplicationTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.hotrod
 
 import java.lang.reflect.Method
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodServerTest.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodServerTest.scala
index 4502442b5f17..bddeada7d041 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodServerTest.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodServerTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.hotrod
 
 import org.testng.annotations.Test
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodSharedContainerTest.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodSharedContainerTest.scala
index 43fe36f167f0..bac13e86c3c6 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodSharedContainerTest.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodSharedContainerTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.hotrod
 
 import test.HotRodClient
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodShutdownTest.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodShutdownTest.scala
index c041fc77d471..d37df5f74fb9 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodShutdownTest.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodShutdownTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.hotrod
 
 import org.testng.annotations.Test
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodSingleClusteredTest.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodSingleClusteredTest.scala
index 12f37363a3f0..9ef46cfd6908 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodSingleClusteredTest.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodSingleClusteredTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.hotrod
 
 import test.HotRodClient
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodSingleNodeTest.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodSingleNodeTest.scala
index d79efb88e52e..b7a0461e746b 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodSingleNodeTest.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodSingleNodeTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.hotrod
 
 import org.infinispan.test.SingleCacheManagerTest
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodSslFunctionalTest.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodSslFunctionalTest.scala
index 16d5e7d8eb47..6698218af12f 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodSslFunctionalTest.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodSslFunctionalTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.hotrod
 
 import org.testng.annotations.Test
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodStatsTest.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodStatsTest.scala
index eaa65dad67f3..706ca2b4c25d 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodStatsTest.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodStatsTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.hotrod
 
 import test.HotRodTestingUtil._
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/stress/HotRodBigDataStressTest.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/stress/HotRodBigDataStressTest.scala
index 9baba7d72bcd..d5904b684b15 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/stress/HotRodBigDataStressTest.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/stress/HotRodBigDataStressTest.scala
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.server.hotrod.stress
 
 import java.lang.reflect.Method
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/test/HotRodClient.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/test/HotRodClient.scala
index 67e9de4fc4e9..926af8496835 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/test/HotRodClient.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/test/HotRodClient.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.hotrod.test
 
 import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/test/HotRodMagicKeyGenerator.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/test/HotRodMagicKeyGenerator.scala
index a2826b827e3e..a8dc0e7f82be 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/test/HotRodMagicKeyGenerator.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/test/HotRodMagicKeyGenerator.scala
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.server.hotrod.test
 
 import org.infinispan.Cache
diff --git a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/test/HotRodTestingUtil.scala b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/test/HotRodTestingUtil.scala
index 3e4b1199ec36..83b24c7a4be6 100644
--- a/server/hotrod/src/test/scala/org/infinispan/server/hotrod/test/HotRodTestingUtil.scala
+++ b/server/hotrod/src/test/scala/org/infinispan/server/hotrod/test/HotRodTestingUtil.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.hotrod.test
 
 import java.util.concurrent.atomic.AtomicInteger
diff --git a/server/memcached/pom.xml b/server/memcached/pom.xml
index 851c65d5b498..733fb4f838e6 100644
--- a/server/memcached/pom.xml
+++ b/server/memcached/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
diff --git a/server/memcached/src/main/release/bin/memcached_client.py b/server/memcached/src/main/release/bin/memcached_client.py
index 6a16b585395e..376e97ea58eb 100755
--- a/server/memcached/src/main/release/bin/memcached_client.py
+++ b/server/memcached/src/main/release/bin/memcached_client.py
@@ -37,7 +37,7 @@
 __author__    = "Manik Surtani"
 __version__ = "Infinispan 4.1"
 __copyright__ = "Copyright (C) 2010 Red Hat Middleware LLC"
-__license__   = "LGPL"
+__license__   = "Apache License, 2.0"
 
 import memcache
 import math
diff --git a/server/memcached/src/main/scala/org/infinispan/server/memcached/LifecycleCallbacks.scala b/server/memcached/src/main/scala/org/infinispan/server/memcached/LifecycleCallbacks.scala
index e6c4465d581e..9c2fbb84b4f8 100644
--- a/server/memcached/src/main/scala/org/infinispan/server/memcached/LifecycleCallbacks.scala
+++ b/server/memcached/src/main/scala/org/infinispan/server/memcached/LifecycleCallbacks.scala
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.server.memcached
 
 import org.infinispan.lifecycle.AbstractModuleLifecycle
diff --git a/server/memcached/src/main/scala/org/infinispan/server/memcached/MemcachedDecoder.scala b/server/memcached/src/main/scala/org/infinispan/server/memcached/MemcachedDecoder.scala
index f4fa1ebe4682..9e2f8cd121e1 100644
--- a/server/memcached/src/main/scala/org/infinispan/server/memcached/MemcachedDecoder.scala
+++ b/server/memcached/src/main/scala/org/infinispan/server/memcached/MemcachedDecoder.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.memcached
 
 import logging.Log
diff --git a/server/memcached/src/main/scala/org/infinispan/server/memcached/MemcachedMetadata.scala b/server/memcached/src/main/scala/org/infinispan/server/memcached/MemcachedMetadata.scala
index 4af737130053..92809633d1e6 100644
--- a/server/memcached/src/main/scala/org/infinispan/server/memcached/MemcachedMetadata.scala
+++ b/server/memcached/src/main/scala/org/infinispan/server/memcached/MemcachedMetadata.scala
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.server.memcached
 
 import org.infinispan.container.versioning.EntryVersion
diff --git a/server/memcached/src/main/scala/org/infinispan/server/memcached/MemcachedOperation.scala b/server/memcached/src/main/scala/org/infinispan/server/memcached/MemcachedOperation.scala
index ffe87809baa1..ee92abc8d086 100644
--- a/server/memcached/src/main/scala/org/infinispan/server/memcached/MemcachedOperation.scala
+++ b/server/memcached/src/main/scala/org/infinispan/server/memcached/MemcachedOperation.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.memcached
 
 /**
diff --git a/server/memcached/src/main/scala/org/infinispan/server/memcached/MemcachedServer.scala b/server/memcached/src/main/scala/org/infinispan/server/memcached/MemcachedServer.scala
index 04c1338d2b4c..f708641b03c9 100644
--- a/server/memcached/src/main/scala/org/infinispan/server/memcached/MemcachedServer.scala
+++ b/server/memcached/src/main/scala/org/infinispan/server/memcached/MemcachedServer.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.memcached
 
 import org.infinispan.server.core.AbstractProtocolServer
diff --git a/server/memcached/src/main/scala/org/infinispan/server/memcached/MemcachedTypeConverter.scala b/server/memcached/src/main/scala/org/infinispan/server/memcached/MemcachedTypeConverter.scala
index 7d5e720dfa63..7b636b64788f 100644
--- a/server/memcached/src/main/scala/org/infinispan/server/memcached/MemcachedTypeConverter.scala
+++ b/server/memcached/src/main/scala/org/infinispan/server/memcached/MemcachedTypeConverter.scala
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.server.memcached
 
 import org.infinispan.compat.TypeConverter
diff --git a/server/memcached/src/main/scala/org/infinispan/server/memcached/MemcachedValue.scala b/server/memcached/src/main/scala/org/infinispan/server/memcached/MemcachedValue.scala
index d18cd64d6b9d..6b42ea48160b 100644
--- a/server/memcached/src/main/scala/org/infinispan/server/memcached/MemcachedValue.scala
+++ b/server/memcached/src/main/scala/org/infinispan/server/memcached/MemcachedValue.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.memcached
 
 import org.infinispan.server.core.CacheValue
diff --git a/server/memcached/src/main/scala/org/infinispan/server/memcached/TextProtocolUtil.scala b/server/memcached/src/main/scala/org/infinispan/server/memcached/TextProtocolUtil.scala
index ce33c160c130..28ac4683611f 100644
--- a/server/memcached/src/main/scala/org/infinispan/server/memcached/TextProtocolUtil.scala
+++ b/server/memcached/src/main/scala/org/infinispan/server/memcached/TextProtocolUtil.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.memcached
 
 import org.jboss.netty.buffer.ChannelBuffer
diff --git a/server/memcached/src/main/scala/org/infinispan/server/memcached/configuration/MemcachedServerConfiguration.java b/server/memcached/src/main/scala/org/infinispan/server/memcached/configuration/MemcachedServerConfiguration.java
index 7e6c667bf4c3..c4dbdf1c09c0 100644
--- a/server/memcached/src/main/scala/org/infinispan/server/memcached/configuration/MemcachedServerConfiguration.java
+++ b/server/memcached/src/main/scala/org/infinispan/server/memcached/configuration/MemcachedServerConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.server.memcached.configuration;
 
 import org.infinispan.commons.configuration.BuiltBy;
diff --git a/server/memcached/src/main/scala/org/infinispan/server/memcached/configuration/MemcachedServerConfigurationBuilder.java b/server/memcached/src/main/scala/org/infinispan/server/memcached/configuration/MemcachedServerConfigurationBuilder.java
index f95348dab1bd..d96bad247747 100644
--- a/server/memcached/src/main/scala/org/infinispan/server/memcached/configuration/MemcachedServerConfigurationBuilder.java
+++ b/server/memcached/src/main/scala/org/infinispan/server/memcached/configuration/MemcachedServerConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.server.memcached.configuration;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/server/memcached/src/main/scala/org/infinispan/server/memcached/logging/JavaLog.java b/server/memcached/src/main/scala/org/infinispan/server/memcached/logging/JavaLog.java
index 24f0d789ec25..5b6fee9d722c 100644
--- a/server/memcached/src/main/scala/org/infinispan/server/memcached/logging/JavaLog.java
+++ b/server/memcached/src/main/scala/org/infinispan/server/memcached/logging/JavaLog.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.server.memcached.logging;
 
 import org.jboss.logging.MessageLogger;
diff --git a/server/memcached/src/main/scala/org/infinispan/server/memcached/logging/Log.scala b/server/memcached/src/main/scala/org/infinispan/server/memcached/logging/Log.scala
index b17aebb02f4d..aea8059baf64 100644
--- a/server/memcached/src/main/scala/org/infinispan/server/memcached/logging/Log.scala
+++ b/server/memcached/src/main/scala/org/infinispan/server/memcached/logging/Log.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.server.memcached.logging
 
 import org.infinispan.util.logging.LogFactory
diff --git a/server/memcached/src/test/resources/test_memcached_read.py b/server/memcached/src/test/resources/test_memcached_read.py
index 53651bd4d698..d8adbf89d0a8 100644
--- a/server/memcached/src/test/resources/test_memcached_read.py
+++ b/server/memcached/src/test/resources/test_memcached_read.py
@@ -9,7 +9,7 @@
 __author__    = "Galder Zamarreno"
 __version__ = "Infinispan 4.1"
 __copyright__ = "Copyright (C) 2010 Red Hat Middleware LLC"
-__license__   = "LGPL"
+__license__   = "Apache License, 2.0"
 
 import memcache
 import time
diff --git a/server/memcached/src/test/resources/test_memcached_write.py b/server/memcached/src/test/resources/test_memcached_write.py
index 4d07f8f4b496..4c6ef1892e54 100644
--- a/server/memcached/src/test/resources/test_memcached_write.py
+++ b/server/memcached/src/test/resources/test_memcached_write.py
@@ -9,7 +9,7 @@
 __author__    = "Galder Zamarreno"
 __version__ = "Infinispan 4.1"
 __copyright__ = "Copyright (C) 2010 Red Hat Middleware LLC"
-__license__   = "LGPL"
+__license__   = "Apache License, 2.0"
 
 import memcache
 import time
diff --git a/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedClusteredStatsTest.scala b/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedClusteredStatsTest.scala
index 84585c1326d2..cdb5f0f32e52 100644
--- a/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedClusteredStatsTest.scala
+++ b/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedClusteredStatsTest.scala
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.server.memcached
 
 import org.infinispan.manager.EmbeddedCacheManager
diff --git a/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedFunctionalTest.scala b/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedFunctionalTest.scala
index 24842f836b9d..e1e32df67353 100644
--- a/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedFunctionalTest.scala
+++ b/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedFunctionalTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.memcached
 
 import java.lang.reflect.Method
diff --git a/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedMultiNodeTest.scala b/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedMultiNodeTest.scala
index d9978d653097..1db167c6d303 100644
--- a/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedMultiNodeTest.scala
+++ b/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedMultiNodeTest.scala
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.server.memcached
 
 import org.infinispan.test.MultipleCacheManagersTest
diff --git a/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedReplicationTest.scala b/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedReplicationTest.scala
index d9733dcc3270..a17fa5a6aaf3 100644
--- a/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedReplicationTest.scala
+++ b/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedReplicationTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.memcached
 
 import org.testng.Assert._
diff --git a/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedServerTest.scala b/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedServerTest.scala
index 85d4e2d85186..1d6d265d3676 100644
--- a/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedServerTest.scala
+++ b/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedServerTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.memcached
 
 import org.testng.annotations.Test
diff --git a/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedShutdownTest.scala b/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedShutdownTest.scala
index acc7b1abe5e0..8618bdc43fdd 100644
--- a/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedShutdownTest.scala
+++ b/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedShutdownTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.memcached
 
 import java.util.concurrent.TimeUnit
diff --git a/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedSingleNodeTest.scala b/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedSingleNodeTest.scala
index 2ddf9e099908..bc41c8854a50 100644
--- a/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedSingleNodeTest.scala
+++ b/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedSingleNodeTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.memcached
 
 import test.MemcachedTestingUtil._
diff --git a/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedStatsTest.scala b/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedStatsTest.scala
index 80985360e9b2..9a8ce572878d 100644
--- a/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedStatsTest.scala
+++ b/server/memcached/src/test/scala/org/infinispan/server/memcached/MemcachedStatsTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.memcached
 
 import org.testng.annotations.Test
diff --git a/server/memcached/src/test/scala/org/infinispan/server/memcached/test/MemcachedTestingUtil.scala b/server/memcached/src/test/scala/org/infinispan/server/memcached/test/MemcachedTestingUtil.scala
index e5d974960451..891a0195a35e 100644
--- a/server/memcached/src/test/scala/org/infinispan/server/memcached/test/MemcachedTestingUtil.scala
+++ b/server/memcached/src/test/scala/org/infinispan/server/memcached/test/MemcachedTestingUtil.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.memcached.test
 
 import net.spy.memcached.{DefaultConnectionFactory, MemcachedClient}
diff --git a/server/pom.xml b/server/pom.xml
index 0efff1d0108c..9b30bdd53157 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
diff --git a/server/rest/pom.xml b/server/rest/pom.xml
index 9ceaf0380a59..5e01902bfc6b 100644
--- a/server/rest/pom.xml
+++ b/server/rest/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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>
diff --git a/server/rest/src/main/scala/org/infinispan/rest/LifecycleCallbacks.scala b/server/rest/src/main/scala/org/infinispan/rest/LifecycleCallbacks.scala
index a2d8bf850d64..fa0cd1759436 100644
--- a/server/rest/src/main/scala/org/infinispan/rest/LifecycleCallbacks.scala
+++ b/server/rest/src/main/scala/org/infinispan/rest/LifecycleCallbacks.scala
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.rest
 
 import org.infinispan.lifecycle.AbstractModuleLifecycle
diff --git a/server/rest/src/main/scala/org/infinispan/rest/MimeMetadata.scala b/server/rest/src/main/scala/org/infinispan/rest/MimeMetadata.scala
index 2c55ffb1b28a..21108fe50cb7 100644
--- a/server/rest/src/main/scala/org/infinispan/rest/MimeMetadata.scala
+++ b/server/rest/src/main/scala/org/infinispan/rest/MimeMetadata.scala
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.rest
 
 import org.infinispan.container.versioning.EntryVersion
diff --git a/server/rest/src/main/scala/org/infinispan/rest/Server.scala b/server/rest/src/main/scala/org/infinispan/rest/Server.scala
index 43417d6cb5e7..d082d784b57e 100644
--- a/server/rest/src/main/scala/org/infinispan/rest/Server.scala
+++ b/server/rest/src/main/scala/org/infinispan/rest/Server.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.rest
 
 import com.thoughtworks.xstream.XStream
diff --git a/server/rest/src/main/scala/org/infinispan/rest/ServerBootstrap.java b/server/rest/src/main/scala/org/infinispan/rest/ServerBootstrap.java
index d9c3d2213279..e5e002f392fe 100644
--- a/server/rest/src/main/scala/org/infinispan/rest/ServerBootstrap.java
+++ b/server/rest/src/main/scala/org/infinispan/rest/ServerBootstrap.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.rest;
 
 import java.io.IOException;
diff --git a/server/rest/src/main/scala/org/infinispan/rest/configuration/ExtendedHeaders.java b/server/rest/src/main/scala/org/infinispan/rest/configuration/ExtendedHeaders.java
index cc82d3c297c6..59b61fb707f9 100644
--- a/server/rest/src/main/scala/org/infinispan/rest/configuration/ExtendedHeaders.java
+++ b/server/rest/src/main/scala/org/infinispan/rest/configuration/ExtendedHeaders.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.rest.configuration;
 
 public enum ExtendedHeaders {
diff --git a/server/rest/src/main/scala/org/infinispan/rest/configuration/RestServerConfiguration.java b/server/rest/src/main/scala/org/infinispan/rest/configuration/RestServerConfiguration.java
index bd07fa2ec59d..1bf716ad309b 100644
--- a/server/rest/src/main/scala/org/infinispan/rest/configuration/RestServerConfiguration.java
+++ b/server/rest/src/main/scala/org/infinispan/rest/configuration/RestServerConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.rest.configuration;
 
 import org.infinispan.commons.configuration.BuiltBy;
diff --git a/server/rest/src/main/scala/org/infinispan/rest/configuration/RestServerConfigurationBuilder.java b/server/rest/src/main/scala/org/infinispan/rest/configuration/RestServerConfigurationBuilder.java
index 933669e67676..6f67c73cbf52 100644
--- a/server/rest/src/main/scala/org/infinispan/rest/configuration/RestServerConfigurationBuilder.java
+++ b/server/rest/src/main/scala/org/infinispan/rest/configuration/RestServerConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.rest.configuration;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/server/rest/src/main/scala/org/infinispan/rest/logging/JavaLog.java b/server/rest/src/main/scala/org/infinispan/rest/logging/JavaLog.java
index 01b15fdeb7be..97933594aa06 100644
--- a/server/rest/src/main/scala/org/infinispan/rest/logging/JavaLog.java
+++ b/server/rest/src/main/scala/org/infinispan/rest/logging/JavaLog.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.rest.logging;
 
 import static org.jboss.logging.Logger.Level.ERROR;
diff --git a/server/rest/src/main/scala/org/infinispan/rest/logging/Log.scala b/server/rest/src/main/scala/org/infinispan/rest/logging/Log.scala
index e21d2348f91c..dc8eb8a84473 100644
--- a/server/rest/src/main/scala/org/infinispan/rest/logging/Log.scala
+++ b/server/rest/src/main/scala/org/infinispan/rest/logging/Log.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.rest.logging
 
 import org.infinispan.util.logging.LogFactory
diff --git a/server/rest/src/main/webapp/WEB-INF/jboss-scanning.xml b/server/rest/src/main/webapp/WEB-INF/jboss-scanning.xml
index 1b94726f0f6c..dd7626eb7295 100644
--- a/server/rest/src/main/webapp/WEB-INF/jboss-scanning.xml
+++ b/server/rest/src/main/webapp/WEB-INF/jboss-scanning.xml
@@ -1,25 +1,3 @@
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2011 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <scanning xmlns="urn:jboss:scanning:1.0">
 <!-- Purpose:  Disable scanning for annotations in contained deployment. -->
 </scanning>
diff --git a/server/rest/src/main/webapp/WEB-INF/web.xml b/server/rest/src/main/webapp/WEB-INF/web.xml
index 49f9a289e80a..5e961c514257 100644
--- a/server/rest/src/main/webapp/WEB-INF/web.xml
+++ b/server/rest/src/main/webapp/WEB-INF/web.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
         "http://java.sun.com/dtd/web-app_2_3.dtd">
 <web-app>
diff --git a/server/rest/src/main/webapp/index.html b/server/rest/src/main/webapp/index.html
index 7537e357e551..52d218159d26 100644
--- a/server/rest/src/main/webapp/index.html
+++ b/server/rest/src/main/webapp/index.html
@@ -1,25 +1,3 @@
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
    <head>
diff --git a/server/rest/src/test/resources/test-config.xml b/server/rest/src/test/resources/test-config.xml
index 5fbd7e8ebd11..24b07a2c26c4 100644
--- a/server/rest/src/test/resources/test-config.xml
+++ b/server/rest/src/test/resources/test-config.xml
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-
 <infinispan
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:infinispan:config:5.3 http://www.infinispan.org/schemas/infinispan-config-5.3.xsd"
diff --git a/server/rest/src/test/scala/org/infinispan/rest/IntegrationTest.scala b/server/rest/src/test/scala/org/infinispan/rest/IntegrationTest.scala
index 4e1156302ab5..39a8d5e9efb0 100644
--- a/server/rest/src/test/scala/org/infinispan/rest/IntegrationTest.scala
+++ b/server/rest/src/test/scala/org/infinispan/rest/IntegrationTest.scala
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.rest
 
 import org.apache.commons.httpclient.methods._
diff --git a/server/rest/src/test/scala/org/infinispan/rest/RESTServerTestBase.java b/server/rest/src/test/scala/org/infinispan/rest/RESTServerTestBase.java
index 95d7b726d7a9..56de9d356e17 100644
--- a/server/rest/src/test/scala/org/infinispan/rest/RESTServerTestBase.java
+++ b/server/rest/src/test/scala/org/infinispan/rest/RESTServerTestBase.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.rest;
 
 import java.util.Collections;
diff --git a/server/rest/src/test/scala/org/infinispan/rest/TwoServerTest.java b/server/rest/src/test/scala/org/infinispan/rest/TwoServerTest.java
index ca4306733a89..08e56d16e89f 100644
--- a/server/rest/src/test/scala/org/infinispan/rest/TwoServerTest.java
+++ b/server/rest/src/test/scala/org/infinispan/rest/TwoServerTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.rest;
 
 import static org.testng.Assert.*;
diff --git a/server/websocket/pom.xml b/server/websocket/pom.xml
index d4f97fa09cee..5b6d7dd8c226 100644
--- a/server/websocket/pom.xml
+++ b/server/websocket/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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>
diff --git a/server/websocket/src/main/java/org/infinispan/server/websocket/CacheListener.java b/server/websocket/src/main/java/org/infinispan/server/websocket/CacheListener.java
index 7b2f881479e6..9d8c56bf70d0 100644
--- a/server/websocket/src/main/java/org/infinispan/server/websocket/CacheListener.java
+++ b/server/websocket/src/main/java/org/infinispan/server/websocket/CacheListener.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.websocket;
 
 import java.util.ArrayList;
diff --git a/server/websocket/src/main/java/org/infinispan/server/websocket/ChannelUtils.java b/server/websocket/src/main/java/org/infinispan/server/websocket/ChannelUtils.java
index b60491b27c45..03c75d7ab3ef 100644
--- a/server/websocket/src/main/java/org/infinispan/server/websocket/ChannelUtils.java
+++ b/server/websocket/src/main/java/org/infinispan/server/websocket/ChannelUtils.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.websocket;
 
 import org.infinispan.Cache;
diff --git a/server/websocket/src/main/java/org/infinispan/server/websocket/OpHandler.java b/server/websocket/src/main/java/org/infinispan/server/websocket/OpHandler.java
index 85046b84b81c..5d6bfa3ee902 100644
--- a/server/websocket/src/main/java/org/infinispan/server/websocket/OpHandler.java
+++ b/server/websocket/src/main/java/org/infinispan/server/websocket/OpHandler.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.websocket;
 
 import org.infinispan.Cache;
diff --git a/server/websocket/src/main/java/org/infinispan/server/websocket/WebSocketServer.java b/server/websocket/src/main/java/org/infinispan/server/websocket/WebSocketServer.java
index 3a19c68d3a8f..2d2c75128954 100644
--- a/server/websocket/src/main/java/org/infinispan/server/websocket/WebSocketServer.java
+++ b/server/websocket/src/main/java/org/infinispan/server/websocket/WebSocketServer.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.websocket;
 
 import java.io.BufferedReader;
diff --git a/server/websocket/src/main/java/org/infinispan/server/websocket/WebSocketServerHandler.java b/server/websocket/src/main/java/org/infinispan/server/websocket/WebSocketServerHandler.java
index e5b7a6f95964..ed565c15ec3c 100644
--- a/server/websocket/src/main/java/org/infinispan/server/websocket/WebSocketServerHandler.java
+++ b/server/websocket/src/main/java/org/infinispan/server/websocket/WebSocketServerHandler.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.websocket;
 
 import static org.jboss.netty.handler.codec.http.HttpHeaders.*;
diff --git a/server/websocket/src/main/java/org/infinispan/server/websocket/configuration/WebSocketServerConfiguration.java b/server/websocket/src/main/java/org/infinispan/server/websocket/configuration/WebSocketServerConfiguration.java
index 30248d89c32e..c01289fd605e 100644
--- a/server/websocket/src/main/java/org/infinispan/server/websocket/configuration/WebSocketServerConfiguration.java
+++ b/server/websocket/src/main/java/org/infinispan/server/websocket/configuration/WebSocketServerConfiguration.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.server.websocket.configuration;
 
 import org.infinispan.commons.configuration.BuiltBy;
diff --git a/server/websocket/src/main/java/org/infinispan/server/websocket/configuration/WebSocketServerConfigurationBuilder.java b/server/websocket/src/main/java/org/infinispan/server/websocket/configuration/WebSocketServerConfigurationBuilder.java
index e358f4c08474..7fbe3d352994 100644
--- a/server/websocket/src/main/java/org/infinispan/server/websocket/configuration/WebSocketServerConfigurationBuilder.java
+++ b/server/websocket/src/main/java/org/infinispan/server/websocket/configuration/WebSocketServerConfigurationBuilder.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.server.websocket.configuration;
 
 import org.infinispan.commons.configuration.Builder;
diff --git a/server/websocket/src/main/java/org/infinispan/server/websocket/handlers/GetHandler.java b/server/websocket/src/main/java/org/infinispan/server/websocket/handlers/GetHandler.java
index 318384d52e46..f110016be7be 100644
--- a/server/websocket/src/main/java/org/infinispan/server/websocket/handlers/GetHandler.java
+++ b/server/websocket/src/main/java/org/infinispan/server/websocket/handlers/GetHandler.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.websocket.handlers;
 
 import org.infinispan.Cache;
diff --git a/server/websocket/src/main/java/org/infinispan/server/websocket/handlers/NotifyHandler.java b/server/websocket/src/main/java/org/infinispan/server/websocket/handlers/NotifyHandler.java
index 341ba40a6a97..8852cbce7530 100644
--- a/server/websocket/src/main/java/org/infinispan/server/websocket/handlers/NotifyHandler.java
+++ b/server/websocket/src/main/java/org/infinispan/server/websocket/handlers/NotifyHandler.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.websocket.handlers;
 
 import org.infinispan.Cache;
diff --git a/server/websocket/src/main/java/org/infinispan/server/websocket/handlers/PutHandler.java b/server/websocket/src/main/java/org/infinispan/server/websocket/handlers/PutHandler.java
index f825678981c7..2410d55f4cb8 100644
--- a/server/websocket/src/main/java/org/infinispan/server/websocket/handlers/PutHandler.java
+++ b/server/websocket/src/main/java/org/infinispan/server/websocket/handlers/PutHandler.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.websocket.handlers;
 
 import org.infinispan.Cache;
diff --git a/server/websocket/src/main/java/org/infinispan/server/websocket/handlers/RemoveHandler.java b/server/websocket/src/main/java/org/infinispan/server/websocket/handlers/RemoveHandler.java
index 563b3954953b..189962aea66c 100644
--- a/server/websocket/src/main/java/org/infinispan/server/websocket/handlers/RemoveHandler.java
+++ b/server/websocket/src/main/java/org/infinispan/server/websocket/handlers/RemoveHandler.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.websocket.handlers;
 
 import org.infinispan.Cache;
diff --git a/server/websocket/src/main/java/org/infinispan/server/websocket/logging/Log.java b/server/websocket/src/main/java/org/infinispan/server/websocket/logging/Log.java
index f9a02c1b90ec..131db90a9fdb 100644
--- a/server/websocket/src/main/java/org/infinispan/server/websocket/logging/Log.java
+++ b/server/websocket/src/main/java/org/infinispan/server/websocket/logging/Log.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.server.websocket.logging;
 
 import org.jboss.logging.MessageLogger;
diff --git a/server/websocket/src/main/release/etc/sample-websocket-client.html b/server/websocket/src/main/release/etc/sample-websocket-client.html
index 6f840bdd96a8..0fd4b230cae4 100644
--- a/server/websocket/src/main/release/etc/sample-websocket-client.html
+++ b/server/websocket/src/main/release/etc/sample-websocket-client.html
@@ -1,25 +1,3 @@
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <html>
 	<head>
 		<title>Infinispan Cache Query</title>
diff --git a/server/websocket/src/test/java/org/infinispan/server/websocket/handlers/MockClient.java b/server/websocket/src/test/java/org/infinispan/server/websocket/handlers/MockClient.java
index d13c0ab88b28..8e73c1471c0a 100644
--- a/server/websocket/src/test/java/org/infinispan/server/websocket/handlers/MockClient.java
+++ b/server/websocket/src/test/java/org/infinispan/server/websocket/handlers/MockClient.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.websocket.handlers;
 
 import org.infinispan.Cache;
diff --git a/server/websocket/src/test/java/org/infinispan/server/websocket/handlers/OpHandlerTest.java b/server/websocket/src/test/java/org/infinispan/server/websocket/handlers/OpHandlerTest.java
index ea6cecec6fb2..6efb6316b747 100644
--- a/server/websocket/src/test/java/org/infinispan/server/websocket/handlers/OpHandlerTest.java
+++ b/server/websocket/src/test/java/org/infinispan/server/websocket/handlers/OpHandlerTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.server.websocket.handlers;
 
 import org.infinispan.server.websocket.OpHandler;
diff --git a/server/websocket/src/test/java/org/infinispan/websocket/MockChannel.java b/server/websocket/src/test/java/org/infinispan/websocket/MockChannel.java
index 7af03fc42cbe..29e7f7d945ce 100644
--- a/server/websocket/src/test/java/org/infinispan/websocket/MockChannel.java
+++ b/server/websocket/src/test/java/org/infinispan/websocket/MockChannel.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.websocket;
 
 import java.io.StringWriter;
diff --git a/server/websocket/src/test/java/org/infinispan/websocket/MockChannelHandlerContext.java b/server/websocket/src/test/java/org/infinispan/websocket/MockChannelHandlerContext.java
index e45140fd51a6..401e11bf857b 100644
--- a/server/websocket/src/test/java/org/infinispan/websocket/MockChannelHandlerContext.java
+++ b/server/websocket/src/test/java/org/infinispan/websocket/MockChannelHandlerContext.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.websocket;
 
 import org.jboss.netty.channel.Channel;
diff --git a/server/websocket/src/test/resources/query-cache.html b/server/websocket/src/test/resources/query-cache.html
index e47476a0b3d1..ba988092f7d2 100644
--- a/server/websocket/src/test/resources/query-cache.html
+++ b/server/websocket/src/test/resources/query-cache.html
@@ -1,25 +1,3 @@
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <html>
 	<head>
 		<title>Infinispan Cache Query</title>
diff --git a/spring/pom.xml b/spring/pom.xml
index fd89a140da1b..b2bffa761c78 100644
--- a/spring/pom.xml
+++ b/spring/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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>
 
diff --git a/spring/src/main/java/org/infinispan/spring/AbstractEmbeddedCacheManagerFactory.java b/spring/src/main/java/org/infinispan/spring/AbstractEmbeddedCacheManagerFactory.java
index d7f0621913c7..8dbd4efe026b 100644
--- a/spring/src/main/java/org/infinispan/spring/AbstractEmbeddedCacheManagerFactory.java
+++ b/spring/src/main/java/org/infinispan/spring/AbstractEmbeddedCacheManagerFactory.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring;
 
 import java.io.IOException;
diff --git a/spring/src/main/java/org/infinispan/spring/AbstractRemoteCacheManagerFactory.java b/spring/src/main/java/org/infinispan/spring/AbstractRemoteCacheManagerFactory.java
index c76bbc96ea62..04ff440c5294 100644
--- a/spring/src/main/java/org/infinispan/spring/AbstractRemoteCacheManagerFactory.java
+++ b/spring/src/main/java/org/infinispan/spring/AbstractRemoteCacheManagerFactory.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring;
 
 import java.io.IOException;
diff --git a/spring/src/main/java/org/infinispan/spring/ConfigurationOverrides.java b/spring/src/main/java/org/infinispan/spring/ConfigurationOverrides.java
index ed6f25e73c5b..a9e7afa791ec 100644
--- a/spring/src/main/java/org/infinispan/spring/ConfigurationOverrides.java
+++ b/spring/src/main/java/org/infinispan/spring/ConfigurationOverrides.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring;
 
 import org.infinispan.configuration.cache.CacheMode;
diff --git a/spring/src/main/java/org/infinispan/spring/ConfigurationPropertiesOverrides.java b/spring/src/main/java/org/infinispan/spring/ConfigurationPropertiesOverrides.java
index 80f5ffe4f77b..88ae89c92b84 100644
--- a/spring/src/main/java/org/infinispan/spring/ConfigurationPropertiesOverrides.java
+++ b/spring/src/main/java/org/infinispan/spring/ConfigurationPropertiesOverrides.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring;
 
 import static org.infinispan.client.hotrod.impl.ConfigurationProperties.ASYNC_EXECUTOR_FACTORY;
diff --git a/spring/src/main/java/org/infinispan/spring/GlobalConfigurationOverrides.java b/spring/src/main/java/org/infinispan/spring/GlobalConfigurationOverrides.java
index dea35a6a20b9..f9414d884b9c 100644
--- a/spring/src/main/java/org/infinispan/spring/GlobalConfigurationOverrides.java
+++ b/spring/src/main/java/org/infinispan/spring/GlobalConfigurationOverrides.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring;
 
 import org.infinispan.configuration.global.GlobalConfigurationBuilder;
diff --git a/spring/src/main/java/org/infinispan/spring/config/InfinispanContainerCacheManagerBeanDefinitionParser.java b/spring/src/main/java/org/infinispan/spring/config/InfinispanContainerCacheManagerBeanDefinitionParser.java
index d2d6636f03e9..170eca75ce57 100644
--- a/spring/src/main/java/org/infinispan/spring/config/InfinispanContainerCacheManagerBeanDefinitionParser.java
+++ b/spring/src/main/java/org/infinispan/spring/config/InfinispanContainerCacheManagerBeanDefinitionParser.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *    ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.config;
 
 import org.springframework.beans.factory.BeanDefinitionStoreException;
diff --git a/spring/src/main/java/org/infinispan/spring/config/InfinispanEmbeddedCacheManagerBeanDefinitionParser.java b/spring/src/main/java/org/infinispan/spring/config/InfinispanEmbeddedCacheManagerBeanDefinitionParser.java
index 9f182f62cbfe..a71244f77c80 100644
--- a/spring/src/main/java/org/infinispan/spring/config/InfinispanEmbeddedCacheManagerBeanDefinitionParser.java
+++ b/spring/src/main/java/org/infinispan/spring/config/InfinispanEmbeddedCacheManagerBeanDefinitionParser.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *    ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.config;
 
 import org.springframework.beans.factory.BeanDefinitionStoreException;
diff --git a/spring/src/main/java/org/infinispan/spring/config/InfinispanNamespaceHandler.java b/spring/src/main/java/org/infinispan/spring/config/InfinispanNamespaceHandler.java
index b1a620f76d69..0238fcd8f9a2 100644
--- a/spring/src/main/java/org/infinispan/spring/config/InfinispanNamespaceHandler.java
+++ b/spring/src/main/java/org/infinispan/spring/config/InfinispanNamespaceHandler.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *    ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.config;
 
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
diff --git a/spring/src/main/java/org/infinispan/spring/config/InfinispanNamespaceUtils.java b/spring/src/main/java/org/infinispan/spring/config/InfinispanNamespaceUtils.java
index 0888f03f1568..a1cb0416d7d5 100644
--- a/spring/src/main/java/org/infinispan/spring/config/InfinispanNamespaceUtils.java
+++ b/spring/src/main/java/org/infinispan/spring/config/InfinispanNamespaceUtils.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *    ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.config;
 
 import org.springframework.beans.factory.config.BeanDefinition;
diff --git a/spring/src/main/java/org/infinispan/spring/config/InfinispanRemoteCacheManagerBeanDefinitionParser.java b/spring/src/main/java/org/infinispan/spring/config/InfinispanRemoteCacheManagerBeanDefinitionParser.java
index 3f42c839bf1d..88c32923e219 100644
--- a/spring/src/main/java/org/infinispan/spring/config/InfinispanRemoteCacheManagerBeanDefinitionParser.java
+++ b/spring/src/main/java/org/infinispan/spring/config/InfinispanRemoteCacheManagerBeanDefinitionParser.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *    ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.config;
 
 import org.springframework.beans.factory.BeanDefinitionStoreException;
diff --git a/spring/src/main/java/org/infinispan/spring/package-info.java b/spring/src/main/java/org/infinispan/spring/package-info.java
index 12c191b06b62..fa0a7c63e231 100644
--- a/spring/src/main/java/org/infinispan/spring/package-info.java
+++ b/spring/src/main/java/org/infinispan/spring/package-info.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * <h1>Spring Infinispan - Shared classes.</h1>
  * <p>
diff --git a/spring/src/main/java/org/infinispan/spring/provider/ContainerCacheManagerFactoryBean.java b/spring/src/main/java/org/infinispan/spring/provider/ContainerCacheManagerFactoryBean.java
index 573bdd17a366..3e8c43d51566 100644
--- a/spring/src/main/java/org/infinispan/spring/provider/ContainerCacheManagerFactoryBean.java
+++ b/spring/src/main/java/org/infinispan/spring/provider/ContainerCacheManagerFactoryBean.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *    ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.provider;
 
 import org.infinispan.client.hotrod.RemoteCacheManager;
diff --git a/spring/src/main/java/org/infinispan/spring/provider/NullValue.java b/spring/src/main/java/org/infinispan/spring/provider/NullValue.java
index ad2e2e121e6a..617cae3bdf6a 100644
--- a/spring/src/main/java/org/infinispan/spring/provider/NullValue.java
+++ b/spring/src/main/java/org/infinispan/spring/provider/NullValue.java
@@ -1,21 +1,3 @@
-/* 
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.spring.provider;
 
 import java.io.IOException;
diff --git a/spring/src/main/java/org/infinispan/spring/provider/SpringCache.java b/spring/src/main/java/org/infinispan/spring/provider/SpringCache.java
index 3442b31c1423..418c21588f9b 100644
--- a/spring/src/main/java/org/infinispan/spring/provider/SpringCache.java
+++ b/spring/src/main/java/org/infinispan/spring/provider/SpringCache.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.provider;
 
 import org.springframework.cache.Cache;
diff --git a/spring/src/main/java/org/infinispan/spring/provider/SpringEmbeddedCacheManager.java b/spring/src/main/java/org/infinispan/spring/provider/SpringEmbeddedCacheManager.java
index 82182162531d..c2db190913b8 100644
--- a/spring/src/main/java/org/infinispan/spring/provider/SpringEmbeddedCacheManager.java
+++ b/spring/src/main/java/org/infinispan/spring/provider/SpringEmbeddedCacheManager.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.provider;
 
 import java.util.Collection;
diff --git a/spring/src/main/java/org/infinispan/spring/provider/SpringEmbeddedCacheManagerFactoryBean.java b/spring/src/main/java/org/infinispan/spring/provider/SpringEmbeddedCacheManagerFactoryBean.java
index 42a2be4747cf..28058e162344 100644
--- a/spring/src/main/java/org/infinispan/spring/provider/SpringEmbeddedCacheManagerFactoryBean.java
+++ b/spring/src/main/java/org/infinispan/spring/provider/SpringEmbeddedCacheManagerFactoryBean.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.provider;
 
 import org.infinispan.manager.EmbeddedCacheManager;
diff --git a/spring/src/main/java/org/infinispan/spring/provider/SpringRemoteCacheManager.java b/spring/src/main/java/org/infinispan/spring/provider/SpringRemoteCacheManager.java
index 88d88b303126..768e16297f3b 100644
--- a/spring/src/main/java/org/infinispan/spring/provider/SpringRemoteCacheManager.java
+++ b/spring/src/main/java/org/infinispan/spring/provider/SpringRemoteCacheManager.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.provider;
 
 import java.util.Collection;
diff --git a/spring/src/main/java/org/infinispan/spring/provider/SpringRemoteCacheManagerFactoryBean.java b/spring/src/main/java/org/infinispan/spring/provider/SpringRemoteCacheManagerFactoryBean.java
index 3d53a13307b4..8b18046f35f2 100644
--- a/spring/src/main/java/org/infinispan/spring/provider/SpringRemoteCacheManagerFactoryBean.java
+++ b/spring/src/main/java/org/infinispan/spring/provider/SpringRemoteCacheManagerFactoryBean.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.provider;
 
 import java.util.Properties;
diff --git a/spring/src/main/java/org/infinispan/spring/provider/package-info.java b/spring/src/main/java/org/infinispan/spring/provider/package-info.java
index a95b5ccc753c..9d84f404c80d 100644
--- a/spring/src/main/java/org/infinispan/spring/provider/package-info.java
+++ b/spring/src/main/java/org/infinispan/spring/provider/package-info.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * <h1>Spring Infinispan - An implementation of Spring 3.1's Cache SPI based on JBoss Infinispan.</h1>
  * <p>
diff --git a/spring/src/main/java/org/infinispan/spring/support/InfinispanDefaultCacheFactoryBean.java b/spring/src/main/java/org/infinispan/spring/support/InfinispanDefaultCacheFactoryBean.java
index 5f4fdf5ddf5e..ea159a5cf3fe 100644
--- a/spring/src/main/java/org/infinispan/spring/support/InfinispanDefaultCacheFactoryBean.java
+++ b/spring/src/main/java/org/infinispan/spring/support/InfinispanDefaultCacheFactoryBean.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.support;
 
 import org.infinispan.Cache;
diff --git a/spring/src/main/java/org/infinispan/spring/support/embedded/InfinispanEmbeddedCacheManagerFactoryBean.java b/spring/src/main/java/org/infinispan/spring/support/embedded/InfinispanEmbeddedCacheManagerFactoryBean.java
index 7ea236d4b1ba..b1c45f9b18b7 100644
--- a/spring/src/main/java/org/infinispan/spring/support/embedded/InfinispanEmbeddedCacheManagerFactoryBean.java
+++ b/spring/src/main/java/org/infinispan/spring/support/embedded/InfinispanEmbeddedCacheManagerFactoryBean.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.support.embedded;
 
 import org.infinispan.manager.EmbeddedCacheManager;
diff --git a/spring/src/main/java/org/infinispan/spring/support/embedded/InfinispanNamedEmbeddedCacheFactoryBean.java b/spring/src/main/java/org/infinispan/spring/support/embedded/InfinispanNamedEmbeddedCacheFactoryBean.java
index e1efd0f3ad7f..9a3414c58613 100644
--- a/spring/src/main/java/org/infinispan/spring/support/embedded/InfinispanNamedEmbeddedCacheFactoryBean.java
+++ b/spring/src/main/java/org/infinispan/spring/support/embedded/InfinispanNamedEmbeddedCacheFactoryBean.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.support.embedded;
 
 import org.infinispan.Cache;
diff --git a/spring/src/main/java/org/infinispan/spring/support/remote/InfinispanNamedRemoteCacheFactoryBean.java b/spring/src/main/java/org/infinispan/spring/support/remote/InfinispanNamedRemoteCacheFactoryBean.java
index 22a21e37fbc1..f15409481576 100644
--- a/spring/src/main/java/org/infinispan/spring/support/remote/InfinispanNamedRemoteCacheFactoryBean.java
+++ b/spring/src/main/java/org/infinispan/spring/support/remote/InfinispanNamedRemoteCacheFactoryBean.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.support.remote;
 
 import org.infinispan.api.BasicCache;
diff --git a/spring/src/main/java/org/infinispan/spring/support/remote/InfinispanRemoteCacheManagerFactoryBean.java b/spring/src/main/java/org/infinispan/spring/support/remote/InfinispanRemoteCacheManagerFactoryBean.java
index f1289b44aee3..53e0dc1c88aa 100644
--- a/spring/src/main/java/org/infinispan/spring/support/remote/InfinispanRemoteCacheManagerFactoryBean.java
+++ b/spring/src/main/java/org/infinispan/spring/support/remote/InfinispanRemoteCacheManagerFactoryBean.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.support.remote;
 
 import java.util.Properties;
diff --git a/spring/src/main/resources/org/infinispan/spring/config/infinispan-spring-5.0.xsd b/spring/src/main/resources/org/infinispan/spring/config/infinispan-spring-5.0.xsd
index dee4357d69de..edf0d5f58d52 100644
--- a/spring/src/main/resources/org/infinispan/spring/config/infinispan-spring-5.0.xsd
+++ b/spring/src/main/resources/org/infinispan/spring/config/infinispan-spring-5.0.xsd
@@ -1,28 +1,3 @@
-<!--
-
-    JBoss, Home of Professional Open Source
-    Copyright 2009 Red Hat Inc. and/or its affiliates and other
-    contributors as indicated by the @author tags. All rights reserved.
-    See the copyright.txt in the distribution for a full listing of
-    individual contributors.
-
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-      ~
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
 <xsd:schema xmlns="http://www.infinispan.org/schemas/spring"
             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
             xmlns:beans="http://www.springframework.org/schema/beans"
diff --git a/spring/src/test/java/org/infinispan/spring/AssertionUtils.java b/spring/src/test/java/org/infinispan/spring/AssertionUtils.java
index ebcc0da36337..04de17a8ad54 100644
--- a/spring/src/test/java/org/infinispan/spring/AssertionUtils.java
+++ b/spring/src/test/java/org/infinispan/spring/AssertionUtils.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.spring;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/spring/src/test/java/org/infinispan/spring/ConfigurationOverridesTest.java b/spring/src/test/java/org/infinispan/spring/ConfigurationOverridesTest.java
index f10eca965e9b..ab40c3e929cc 100644
--- a/spring/src/test/java/org/infinispan/spring/ConfigurationOverridesTest.java
+++ b/spring/src/test/java/org/infinispan/spring/ConfigurationOverridesTest.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring;
 
 import java.util.ArrayList;
diff --git a/spring/src/test/java/org/infinispan/spring/ConfigurationPropertiesOverridesTest.java b/spring/src/test/java/org/infinispan/spring/ConfigurationPropertiesOverridesTest.java
index e67b2ff3164f..56ec20cdab87 100644
--- a/spring/src/test/java/org/infinispan/spring/ConfigurationPropertiesOverridesTest.java
+++ b/spring/src/test/java/org/infinispan/spring/ConfigurationPropertiesOverridesTest.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring;
 
 import static org.infinispan.client.hotrod.impl.ConfigurationProperties.ASYNC_EXECUTOR_FACTORY;
diff --git a/spring/src/test/java/org/infinispan/spring/config/CacheLoaderNotFoundTest.java b/spring/src/test/java/org/infinispan/spring/config/CacheLoaderNotFoundTest.java
index 91cfa3a232bf..e2e02265b8da 100644
--- a/spring/src/test/java/org/infinispan/spring/config/CacheLoaderNotFoundTest.java
+++ b/spring/src/test/java/org/infinispan/spring/config/CacheLoaderNotFoundTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.spring.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring/src/test/java/org/infinispan/spring/config/InfinispanContainerCacheManagerDefinitionTest.java b/spring/src/test/java/org/infinispan/spring/config/InfinispanContainerCacheManagerDefinitionTest.java
index 3023baa40459..08ac104737fb 100644
--- a/spring/src/test/java/org/infinispan/spring/config/InfinispanContainerCacheManagerDefinitionTest.java
+++ b/spring/src/test/java/org/infinispan/spring/config/InfinispanContainerCacheManagerDefinitionTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *    ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.config;
 
 
diff --git a/spring/src/test/java/org/infinispan/spring/config/InfinispanEmbeddedCacheManagerDefinitionTest.java b/spring/src/test/java/org/infinispan/spring/config/InfinispanEmbeddedCacheManagerDefinitionTest.java
index 978fe5ad8e1d..1d57468def45 100644
--- a/spring/src/test/java/org/infinispan/spring/config/InfinispanEmbeddedCacheManagerDefinitionTest.java
+++ b/spring/src/test/java/org/infinispan/spring/config/InfinispanEmbeddedCacheManagerDefinitionTest.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.config;
 
 
diff --git a/spring/src/test/java/org/infinispan/spring/config/InfinispanRemoteCacheManagerDefinitionTest.java b/spring/src/test/java/org/infinispan/spring/config/InfinispanRemoteCacheManagerDefinitionTest.java
index 0853f2b52cf5..b6bbb6420666 100644
--- a/spring/src/test/java/org/infinispan/spring/config/InfinispanRemoteCacheManagerDefinitionTest.java
+++ b/spring/src/test/java/org/infinispan/spring/config/InfinispanRemoteCacheManagerDefinitionTest.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *    ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.config;
 
 
diff --git a/spring/src/test/java/org/infinispan/spring/config/NonTransactionalCacheTest.java b/spring/src/test/java/org/infinispan/spring/config/NonTransactionalCacheTest.java
index 38bb7d63afa6..4db70f8e253c 100644
--- a/spring/src/test/java/org/infinispan/spring/config/NonTransactionalCacheTest.java
+++ b/spring/src/test/java/org/infinispan/spring/config/NonTransactionalCacheTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2012 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.spring.config;
 
 import org.springframework.cache.annotation.Cacheable;
diff --git a/spring/src/test/java/org/infinispan/spring/mock/MockExecutorFatory.java b/spring/src/test/java/org/infinispan/spring/mock/MockExecutorFatory.java
index 2e235395aa6c..46630456b174 100644
--- a/spring/src/test/java/org/infinispan/spring/mock/MockExecutorFatory.java
+++ b/spring/src/test/java/org/infinispan/spring/mock/MockExecutorFatory.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.mock;
 
 import java.util.Properties;
diff --git a/spring/src/test/java/org/infinispan/spring/mock/MockMarshaller.java b/spring/src/test/java/org/infinispan/spring/mock/MockMarshaller.java
index c04553e38b0a..ef47329f3bf0 100644
--- a/spring/src/test/java/org/infinispan/spring/mock/MockMarshaller.java
+++ b/spring/src/test/java/org/infinispan/spring/mock/MockMarshaller.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.mock;
 
 import java.io.IOException;
diff --git a/spring/src/test/java/org/infinispan/spring/mock/MockRequestBalancingStrategy.java b/spring/src/test/java/org/infinispan/spring/mock/MockRequestBalancingStrategy.java
index 0a1abcd6afe3..8792c5b27936 100644
--- a/spring/src/test/java/org/infinispan/spring/mock/MockRequestBalancingStrategy.java
+++ b/spring/src/test/java/org/infinispan/spring/mock/MockRequestBalancingStrategy.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.mock;
 
 import java.net.SocketAddress;
diff --git a/spring/src/test/java/org/infinispan/spring/mock/MockScheduleExecutorFactory.java b/spring/src/test/java/org/infinispan/spring/mock/MockScheduleExecutorFactory.java
index 01c819a2bbdb..308b1b157709 100644
--- a/spring/src/test/java/org/infinispan/spring/mock/MockScheduleExecutorFactory.java
+++ b/spring/src/test/java/org/infinispan/spring/mock/MockScheduleExecutorFactory.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.mock;
 
 import java.util.Properties;
diff --git a/spring/src/test/java/org/infinispan/spring/mock/MockTransport.java b/spring/src/test/java/org/infinispan/spring/mock/MockTransport.java
index caf3218e35af..4836d5684a65 100644
--- a/spring/src/test/java/org/infinispan/spring/mock/MockTransport.java
+++ b/spring/src/test/java/org/infinispan/spring/mock/MockTransport.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.mock;
 
 import org.infinispan.commands.ReplicableCommand;
diff --git a/spring/src/test/java/org/infinispan/spring/mock/MockTransportFactory.java b/spring/src/test/java/org/infinispan/spring/mock/MockTransportFactory.java
index c8b50c0aba05..f31da3cfaec8 100644
--- a/spring/src/test/java/org/infinispan/spring/mock/MockTransportFactory.java
+++ b/spring/src/test/java/org/infinispan/spring/mock/MockTransportFactory.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.mock;
 
 import java.net.SocketAddress;
diff --git a/spring/src/test/java/org/infinispan/spring/provider/SpringCacheCacheTest.java b/spring/src/test/java/org/infinispan/spring/provider/SpringCacheCacheTest.java
index 1b244d288292..b0228d6ce7e6 100644
--- a/spring/src/test/java/org/infinispan/spring/provider/SpringCacheCacheTest.java
+++ b/spring/src/test/java/org/infinispan/spring/provider/SpringCacheCacheTest.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.provider;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/spring/src/test/java/org/infinispan/spring/provider/SpringEmbeddedCacheManagerFactoryBeanContextTest.java b/spring/src/test/java/org/infinispan/spring/provider/SpringEmbeddedCacheManagerFactoryBeanContextTest.java
index 2bae729a8fb1..3e7a0a4320d8 100644
--- a/spring/src/test/java/org/infinispan/spring/provider/SpringEmbeddedCacheManagerFactoryBeanContextTest.java
+++ b/spring/src/test/java/org/infinispan/spring/provider/SpringEmbeddedCacheManagerFactoryBeanContextTest.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.provider;
 
 import org.springframework.test.annotation.DirtiesContext;
diff --git a/spring/src/test/java/org/infinispan/spring/provider/SpringEmbeddedCacheManagerFactoryBeanTest.java b/spring/src/test/java/org/infinispan/spring/provider/SpringEmbeddedCacheManagerFactoryBeanTest.java
index b589d8aaf44a..5bda133462db 100644
--- a/spring/src/test/java/org/infinispan/spring/provider/SpringEmbeddedCacheManagerFactoryBeanTest.java
+++ b/spring/src/test/java/org/infinispan/spring/provider/SpringEmbeddedCacheManagerFactoryBeanTest.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.provider;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/spring/src/test/java/org/infinispan/spring/provider/SpringEmbeddedCacheManagerTest.java b/spring/src/test/java/org/infinispan/spring/provider/SpringEmbeddedCacheManagerTest.java
index 9623c38238bc..ba11582cfb98 100644
--- a/spring/src/test/java/org/infinispan/spring/provider/SpringEmbeddedCacheManagerTest.java
+++ b/spring/src/test/java/org/infinispan/spring/provider/SpringEmbeddedCacheManagerTest.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.provider;
 
 import static org.infinispan.test.TestingUtil.withCacheManager;
diff --git a/spring/src/test/java/org/infinispan/spring/provider/SpringRemoteCacheManagerFactoryBeanContextTest.java b/spring/src/test/java/org/infinispan/spring/provider/SpringRemoteCacheManagerFactoryBeanContextTest.java
index 488cb63eab3c..1e60b50efc6c 100644
--- a/spring/src/test/java/org/infinispan/spring/provider/SpringRemoteCacheManagerFactoryBeanContextTest.java
+++ b/spring/src/test/java/org/infinispan/spring/provider/SpringRemoteCacheManagerFactoryBeanContextTest.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.provider;
 
 import static org.testng.AssertJUnit.assertNotNull;
diff --git a/spring/src/test/java/org/infinispan/spring/provider/SpringRemoteCacheManagerFactoryBeanTest.java b/spring/src/test/java/org/infinispan/spring/provider/SpringRemoteCacheManagerFactoryBeanTest.java
index da5e61ddc8e0..9d785b677739 100644
--- a/spring/src/test/java/org/infinispan/spring/provider/SpringRemoteCacheManagerFactoryBeanTest.java
+++ b/spring/src/test/java/org/infinispan/spring/provider/SpringRemoteCacheManagerFactoryBeanTest.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.provider;
 
 import static org.infinispan.client.hotrod.impl.ConfigurationProperties.ASYNC_EXECUTOR_FACTORY;
diff --git a/spring/src/test/java/org/infinispan/spring/provider/SpringRemoteCacheManagerTest.java b/spring/src/test/java/org/infinispan/spring/provider/SpringRemoteCacheManagerTest.java
index 97ba43cc9605..1c4b9c72a0ba 100644
--- a/spring/src/test/java/org/infinispan/spring/provider/SpringRemoteCacheManagerTest.java
+++ b/spring/src/test/java/org/infinispan/spring/provider/SpringRemoteCacheManagerTest.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.provider;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/spring/src/test/java/org/infinispan/spring/provider/TestSpringEmbeddedCacheManagerFactoryBean.java b/spring/src/test/java/org/infinispan/spring/provider/TestSpringEmbeddedCacheManagerFactoryBean.java
index dd9b01e25447..bff7c9d765f0 100644
--- a/spring/src/test/java/org/infinispan/spring/provider/TestSpringEmbeddedCacheManagerFactoryBean.java
+++ b/spring/src/test/java/org/infinispan/spring/provider/TestSpringEmbeddedCacheManagerFactoryBean.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.spring.provider;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/spring/src/test/java/org/infinispan/spring/provider/sample/Book.java b/spring/src/test/java/org/infinispan/spring/provider/sample/Book.java
index baf5584d0f2c..ebaafb4c92f4 100644
--- a/spring/src/test/java/org/infinispan/spring/provider/sample/Book.java
+++ b/spring/src/test/java/org/infinispan/spring/provider/sample/Book.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.spring.provider.sample;
 
 /**
diff --git a/spring/src/test/java/org/infinispan/spring/provider/sample/BookDao.java b/spring/src/test/java/org/infinispan/spring/provider/sample/BookDao.java
index 2228f923616a..a9e2978d4aee 100644
--- a/spring/src/test/java/org/infinispan/spring/provider/sample/BookDao.java
+++ b/spring/src/test/java/org/infinispan/spring/provider/sample/BookDao.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.spring.provider.sample;
 
 /**
diff --git a/spring/src/test/java/org/infinispan/spring/provider/sample/JdbcBookDao.java b/spring/src/test/java/org/infinispan/spring/provider/sample/JdbcBookDao.java
index e6640373aba4..cf3c199b4b41 100644
--- a/spring/src/test/java/org/infinispan/spring/provider/sample/JdbcBookDao.java
+++ b/spring/src/test/java/org/infinispan/spring/provider/sample/JdbcBookDao.java
@@ -1,24 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.spring.provider.sample;
 
 import java.sql.ResultSet;
diff --git a/spring/src/test/java/org/infinispan/spring/support/InfinispanDefaultCacheFactoryBeanContextTest.java b/spring/src/test/java/org/infinispan/spring/support/InfinispanDefaultCacheFactoryBeanContextTest.java
index ed26dc9a4882..c64591723a7e 100644
--- a/spring/src/test/java/org/infinispan/spring/support/InfinispanDefaultCacheFactoryBeanContextTest.java
+++ b/spring/src/test/java/org/infinispan/spring/support/InfinispanDefaultCacheFactoryBeanContextTest.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.support;
 
 import static org.testng.AssertJUnit.assertNotNull;
diff --git a/spring/src/test/java/org/infinispan/spring/support/InfinispanDefaultCacheFactoryBeanTest.java b/spring/src/test/java/org/infinispan/spring/support/InfinispanDefaultCacheFactoryBeanTest.java
index dcfe0e40d41f..a8396f8dd607 100644
--- a/spring/src/test/java/org/infinispan/spring/support/InfinispanDefaultCacheFactoryBeanTest.java
+++ b/spring/src/test/java/org/infinispan/spring/support/InfinispanDefaultCacheFactoryBeanTest.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.support;
 
 import static org.infinispan.test.TestingUtil.withCacheManager;
diff --git a/spring/src/test/java/org/infinispan/spring/support/embedded/InfinispanEmbeddedCacheManagerFactoryBeanContextTest.java b/spring/src/test/java/org/infinispan/spring/support/embedded/InfinispanEmbeddedCacheManagerFactoryBeanContextTest.java
index 13f78be3c443..cd8079d04d5c 100644
--- a/spring/src/test/java/org/infinispan/spring/support/embedded/InfinispanEmbeddedCacheManagerFactoryBeanContextTest.java
+++ b/spring/src/test/java/org/infinispan/spring/support/embedded/InfinispanEmbeddedCacheManagerFactoryBeanContextTest.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.support.embedded;
 
 import org.infinispan.manager.EmbeddedCacheManager;
diff --git a/spring/src/test/java/org/infinispan/spring/support/embedded/InfinispanEmbeddedCacheManagerFactoryBeanTest.java b/spring/src/test/java/org/infinispan/spring/support/embedded/InfinispanEmbeddedCacheManagerFactoryBeanTest.java
index 98d4e1ce7872..cd4cda98724b 100644
--- a/spring/src/test/java/org/infinispan/spring/support/embedded/InfinispanEmbeddedCacheManagerFactoryBeanTest.java
+++ b/spring/src/test/java/org/infinispan/spring/support/embedded/InfinispanEmbeddedCacheManagerFactoryBeanTest.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.support.embedded;
 
 import static org.infinispan.test.TestingUtil.withCacheManager;
diff --git a/spring/src/test/java/org/infinispan/spring/support/embedded/InfinispanNamedEmbeddedCacheFactoryBeanContextTest.java b/spring/src/test/java/org/infinispan/spring/support/embedded/InfinispanNamedEmbeddedCacheFactoryBeanContextTest.java
index 9c8e2f2ab25f..7464f0c0127a 100644
--- a/spring/src/test/java/org/infinispan/spring/support/embedded/InfinispanNamedEmbeddedCacheFactoryBeanContextTest.java
+++ b/spring/src/test/java/org/infinispan/spring/support/embedded/InfinispanNamedEmbeddedCacheFactoryBeanContextTest.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.support.embedded;
 
 import static org.testng.AssertJUnit.assertNotNull;
diff --git a/spring/src/test/java/org/infinispan/spring/support/embedded/InfinispanNamedEmbeddedCacheFactoryBeanTest.java b/spring/src/test/java/org/infinispan/spring/support/embedded/InfinispanNamedEmbeddedCacheFactoryBeanTest.java
index b99c6196ad3c..b6b4da06241b 100644
--- a/spring/src/test/java/org/infinispan/spring/support/embedded/InfinispanNamedEmbeddedCacheFactoryBeanTest.java
+++ b/spring/src/test/java/org/infinispan/spring/support/embedded/InfinispanNamedEmbeddedCacheFactoryBeanTest.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.support.embedded;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/spring/src/test/java/org/infinispan/spring/support/embedded/TestInfinispanEmbeddedCacheManagerFactoryBean.java b/spring/src/test/java/org/infinispan/spring/support/embedded/TestInfinispanEmbeddedCacheManagerFactoryBean.java
index 364fc6869cd6..56613b36493e 100644
--- a/spring/src/test/java/org/infinispan/spring/support/embedded/TestInfinispanEmbeddedCacheManagerFactoryBean.java
+++ b/spring/src/test/java/org/infinispan/spring/support/embedded/TestInfinispanEmbeddedCacheManagerFactoryBean.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.spring.support.embedded;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/spring/src/test/java/org/infinispan/spring/support/remote/HotrodServerLifecycleBean.java b/spring/src/test/java/org/infinispan/spring/support/remote/HotrodServerLifecycleBean.java
index 4593fad5b9aa..37c5dc836c27 100644
--- a/spring/src/test/java/org/infinispan/spring/support/remote/HotrodServerLifecycleBean.java
+++ b/spring/src/test/java/org/infinispan/spring/support/remote/HotrodServerLifecycleBean.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.support.remote;
 
 import org.infinispan.client.hotrod.RemoteCacheManager;
diff --git a/spring/src/test/java/org/infinispan/spring/support/remote/InfinispanNamedRemoteCacheFactoryBeanContextTest.java b/spring/src/test/java/org/infinispan/spring/support/remote/InfinispanNamedRemoteCacheFactoryBeanContextTest.java
index d8ef973ad879..e438db1c732b 100644
--- a/spring/src/test/java/org/infinispan/spring/support/remote/InfinispanNamedRemoteCacheFactoryBeanContextTest.java
+++ b/spring/src/test/java/org/infinispan/spring/support/remote/InfinispanNamedRemoteCacheFactoryBeanContextTest.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.support.remote;
 
 import static org.testng.AssertJUnit.assertNotNull;
diff --git a/spring/src/test/java/org/infinispan/spring/support/remote/InfinispanNamedRemoteCacheFactoryBeanTest.java b/spring/src/test/java/org/infinispan/spring/support/remote/InfinispanNamedRemoteCacheFactoryBeanTest.java
index ae741e15758a..0074c01cd67b 100644
--- a/spring/src/test/java/org/infinispan/spring/support/remote/InfinispanNamedRemoteCacheFactoryBeanTest.java
+++ b/spring/src/test/java/org/infinispan/spring/support/remote/InfinispanNamedRemoteCacheFactoryBeanTest.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.support.remote;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/spring/src/test/java/org/infinispan/spring/support/remote/InfinispanRemoteCacheManagerFactoryBeanContextTest.java b/spring/src/test/java/org/infinispan/spring/support/remote/InfinispanRemoteCacheManagerFactoryBeanContextTest.java
index 7d549ef5da2a..0d6b0cbfd7c0 100644
--- a/spring/src/test/java/org/infinispan/spring/support/remote/InfinispanRemoteCacheManagerFactoryBeanContextTest.java
+++ b/spring/src/test/java/org/infinispan/spring/support/remote/InfinispanRemoteCacheManagerFactoryBeanContextTest.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.support.remote;
 
 import org.infinispan.client.hotrod.RemoteCacheManager;
diff --git a/spring/src/test/java/org/infinispan/spring/support/remote/InfinispanRemoteCacheManagerFactoryBeanTest.java b/spring/src/test/java/org/infinispan/spring/support/remote/InfinispanRemoteCacheManagerFactoryBeanTest.java
index f57b77f3f8b5..8c8317b63571 100644
--- a/spring/src/test/java/org/infinispan/spring/support/remote/InfinispanRemoteCacheManagerFactoryBeanTest.java
+++ b/spring/src/test/java/org/infinispan/spring/support/remote/InfinispanRemoteCacheManagerFactoryBeanTest.java
@@ -1,26 +1,3 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *   ~
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.spring.support.remote;
 
 import static org.infinispan.spring.AssertionUtils.assertPropertiesSubset;
diff --git a/spring/src/test/resources/org/infinispan/spring/config/CacheLoaderNotFoundTest-context.xml b/spring/src/test/resources/org/infinispan/spring/config/CacheLoaderNotFoundTest-context.xml
index 5d42864701d2..0dc1fb84cd2f 100644
--- a/spring/src/test/resources/org/infinispan/spring/config/CacheLoaderNotFoundTest-context.xml
+++ b/spring/src/test/resources/org/infinispan/spring/config/CacheLoaderNotFoundTest-context.xml
@@ -1,21 +1,3 @@
-<!--
-  ~ Copyright 2012 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:jee="http://www.springframework.org/schema/jee"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/spring/src/test/resources/org/infinispan/spring/config/InfinispanContainerCacheManagerDefinitionTest-context.xml b/spring/src/test/resources/org/infinispan/spring/config/InfinispanContainerCacheManagerDefinitionTest-context.xml
index 8c886982bd11..d76043903282 100644
--- a/spring/src/test/resources/org/infinispan/spring/config/InfinispanContainerCacheManagerDefinitionTest-context.xml
+++ b/spring/src/test/resources/org/infinispan/spring/config/InfinispanContainerCacheManagerDefinitionTest-context.xml
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2011 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~    ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:jee="http://www.springframework.org/schema/jee"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/spring/src/test/resources/org/infinispan/spring/config/InfinispanEmbeddedCacheManagerDefinitionTest-context.xml b/spring/src/test/resources/org/infinispan/spring/config/InfinispanEmbeddedCacheManagerDefinitionTest-context.xml
index 966478083f10..d9b76bed6b3f 100644
--- a/spring/src/test/resources/org/infinispan/spring/config/InfinispanEmbeddedCacheManagerDefinitionTest-context.xml
+++ b/spring/src/test/resources/org/infinispan/spring/config/InfinispanEmbeddedCacheManagerDefinitionTest-context.xml
@@ -1,29 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    JBoss, Home of Professional Open Source
-    Copyright 2009 Red Hat Inc. and/or its affiliates and other
-    contributors as indicated by the @author tags. All rights reserved.
-    See the copyright.txt in the distribution for a full listing of
-    individual contributors.
-
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-      ~
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:infinispan="http://www.infinispan.org/schemas/spring"
diff --git a/spring/src/test/resources/org/infinispan/spring/config/InfinispanRemoteCacheManagerDefinitionTest-context.xml b/spring/src/test/resources/org/infinispan/spring/config/InfinispanRemoteCacheManagerDefinitionTest-context.xml
index f5419352984f..50b50b6aa05a 100644
--- a/spring/src/test/resources/org/infinispan/spring/config/InfinispanRemoteCacheManagerDefinitionTest-context.xml
+++ b/spring/src/test/resources/org/infinispan/spring/config/InfinispanRemoteCacheManagerDefinitionTest-context.xml
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2011 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~    ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:infinispan="http://www.infinispan.org/schemas/spring"
diff --git a/spring/src/test/resources/org/infinispan/spring/config/NonTransactionalCacheTest-context.xml b/spring/src/test/resources/org/infinispan/spring/config/NonTransactionalCacheTest-context.xml
index 8c1e83074a9a..a341fd0f1fe8 100644
--- a/spring/src/test/resources/org/infinispan/spring/config/NonTransactionalCacheTest-context.xml
+++ b/spring/src/test/resources/org/infinispan/spring/config/NonTransactionalCacheTest-context.xml
@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2012 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
 <beans
       xmlns="http://www.springframework.org/schema/beans"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/spring/src/test/resources/org/infinispan/spring/provider/SpringEmbeddedCacheManagerFactoryBeanContextTest.xml b/spring/src/test/resources/org/infinispan/spring/provider/SpringEmbeddedCacheManagerFactoryBeanContextTest.xml
index ebd07624671d..8c0279d5831e 100644
--- a/spring/src/test/resources/org/infinispan/spring/provider/SpringEmbeddedCacheManagerFactoryBeanContextTest.xml
+++ b/spring/src/test/resources/org/infinispan/spring/provider/SpringEmbeddedCacheManagerFactoryBeanContextTest.xml
@@ -1,29 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    JBoss, Home of Professional Open Source
-    Copyright 2009 Red Hat Inc. and/or its affiliates and other
-    contributors as indicated by the @author tags. All rights reserved.
-    See the copyright.txt in the distribution for a full listing of
-    individual contributors.
-
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-      ~
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
 <beans
    xmlns="http://www.springframework.org/schema/beans"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/spring/src/test/resources/org/infinispan/spring/provider/SpringRemoteCacheManagerFactoryBeanContextTest.xml b/spring/src/test/resources/org/infinispan/spring/provider/SpringRemoteCacheManagerFactoryBeanContextTest.xml
index a9430e2d5632..a0da803758d7 100644
--- a/spring/src/test/resources/org/infinispan/spring/provider/SpringRemoteCacheManagerFactoryBeanContextTest.xml
+++ b/spring/src/test/resources/org/infinispan/spring/provider/SpringRemoteCacheManagerFactoryBeanContextTest.xml
@@ -1,29 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    JBoss, Home of Professional Open Source
-    Copyright 2009 Red Hat Inc. and/or its affiliates and other
-    contributors as indicated by the @author tags. All rights reserved.
-    See the copyright.txt in the distribution for a full listing of
-    individual contributors.
-
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-      ~
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
 <beans
    xmlns="http://www.springframework.org/schema/beans"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/spring/src/test/resources/org/infinispan/spring/provider/hotrod-client.properties b/spring/src/test/resources/org/infinispan/spring/provider/hotrod-client.properties
index 7a88b694c7ba..dca5b81576cc 100644
--- a/spring/src/test/resources/org/infinispan/spring/provider/hotrod-client.properties
+++ b/spring/src/test/resources/org/infinispan/spring/provider/hotrod-client.properties
@@ -1,26 +1,3 @@
-#
-# JBoss, Home of Professional Open Source
-# Copyright 2009 Red Hat Inc. and/or its affiliates and other
-# contributors as indicated by the @author tags. All rights reserved.
-# See the copyright.txt in the distribution for a full listing of
-# individual contributors.
-#
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#   ~
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
-
 # hopefully this port is available
 infinispan.client.hotrod.transport_factory = org.infinispan.client.hotrod.impl.transport.tcp.TcpTransportFactory
 infinispan.client.hotrod.server_list = 127.0.0.1:19722
diff --git a/spring/src/test/resources/org/infinispan/spring/provider/named-async-cache.xml b/spring/src/test/resources/org/infinispan/spring/provider/named-async-cache.xml
index ad682f68678c..1d6395abbf33 100644
--- a/spring/src/test/resources/org/infinispan/spring/provider/named-async-cache.xml
+++ b/spring/src/test/resources/org/infinispan/spring/provider/named-async-cache.xml
@@ -1,29 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    JBoss, Home of Professional Open Source
-    Copyright 2009 Red Hat Inc. and/or its affiliates and other
-    contributors as indicated by the @author tags. All rights reserved.
-    See the copyright.txt in the distribution for a full listing of
-    individual contributors.
-
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-      ~
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
 <infinispan
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:infinispan:config:5.2 http://www.infinispan.org/schemas/infinispan-config-5.2.xsd"
diff --git a/spring/src/test/resources/org/infinispan/spring/provider/sample/books-infinispan-config.xml b/spring/src/test/resources/org/infinispan/spring/provider/sample/books-infinispan-config.xml
index 5a861bdfae79..b7a87463f92c 100644
--- a/spring/src/test/resources/org/infinispan/spring/provider/sample/books-infinispan-config.xml
+++ b/spring/src/test/resources/org/infinispan/spring/provider/sample/books-infinispan-config.xml
@@ -1,29 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    JBoss, Home of Professional Open Source
-    Copyright 2009 Red Hat Inc. and/or its affiliates and other
-    contributors as indicated by the @author tags. All rights reserved.
-    See the copyright.txt in the distribution for a full listing of
-    individual contributors.
-
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-      ~
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
 <infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="urn:infinispan:config:5.2 http://www.infinispan.org/schemas/infinispan-config-5.2.xsd"
    xmlns="urn:infinispan:config:5.2">
diff --git a/spring/src/test/resources/org/infinispan/spring/support/InfinispanDefaultCacheFactoryBeanContextTest.xml b/spring/src/test/resources/org/infinispan/spring/support/InfinispanDefaultCacheFactoryBeanContextTest.xml
index ba38a3428100..3f00f1f5947e 100644
--- a/spring/src/test/resources/org/infinispan/spring/support/InfinispanDefaultCacheFactoryBeanContextTest.xml
+++ b/spring/src/test/resources/org/infinispan/spring/support/InfinispanDefaultCacheFactoryBeanContextTest.xml
@@ -1,29 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    JBoss, Home of Professional Open Source
-    Copyright 2009 Red Hat Inc. and/or its affiliates and other
-    contributors as indicated by the @author tags. All rights reserved.
-    See the copyright.txt in the distribution for a full listing of
-    individual contributors.
-
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-      ~
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
 <beans
    xmlns="http://www.springframework.org/schema/beans"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/spring/src/test/resources/org/infinispan/spring/support/embedded/InfinispanEmbeddedCacheManagerFactoryBeanContextTest.xml b/spring/src/test/resources/org/infinispan/spring/support/embedded/InfinispanEmbeddedCacheManagerFactoryBeanContextTest.xml
index c6b8935877cf..0f4bfa991e1e 100644
--- a/spring/src/test/resources/org/infinispan/spring/support/embedded/InfinispanEmbeddedCacheManagerFactoryBeanContextTest.xml
+++ b/spring/src/test/resources/org/infinispan/spring/support/embedded/InfinispanEmbeddedCacheManagerFactoryBeanContextTest.xml
@@ -1,29 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    JBoss, Home of Professional Open Source
-    Copyright 2009 Red Hat Inc. and/or its affiliates and other
-    contributors as indicated by the @author tags. All rights reserved.
-    See the copyright.txt in the distribution for a full listing of
-    individual contributors.
-
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-      ~
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
 <beans
    xmlns="http://www.springframework.org/schema/beans"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/spring/src/test/resources/org/infinispan/spring/support/embedded/InfinispanNamedEmbeddedCacheFactoryBeanContextTest.xml b/spring/src/test/resources/org/infinispan/spring/support/embedded/InfinispanNamedEmbeddedCacheFactoryBeanContextTest.xml
index fd6850ea4e9f..1d18621bde0c 100644
--- a/spring/src/test/resources/org/infinispan/spring/support/embedded/InfinispanNamedEmbeddedCacheFactoryBeanContextTest.xml
+++ b/spring/src/test/resources/org/infinispan/spring/support/embedded/InfinispanNamedEmbeddedCacheFactoryBeanContextTest.xml
@@ -1,28 +1,3 @@
-<!--
-
-    JBoss, Home of Professional Open Source
-    Copyright 2009 Red Hat Inc. and/or its affiliates and other
-    contributors as indicated by the @author tags. All rights reserved.
-    See the copyright.txt in the distribution for a full listing of
-    individual contributors.
-
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-      ~
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
 <beans
    xmlns="http://www.springframework.org/schema/beans"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/spring/src/test/resources/org/infinispan/spring/support/embedded/classloader-not-found.xml b/spring/src/test/resources/org/infinispan/spring/support/embedded/classloader-not-found.xml
index 6264c434095f..3af4c0109223 100644
--- a/spring/src/test/resources/org/infinispan/spring/support/embedded/classloader-not-found.xml
+++ b/spring/src/test/resources/org/infinispan/spring/support/embedded/classloader-not-found.xml
@@ -1,22 +1,3 @@
-<!--
-  ~ Copyright 2012 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <infinispan
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xmlns="urn:infinispan:config:5.1"
diff --git a/spring/src/test/resources/org/infinispan/spring/support/embedded/comprehensive-infinispan-config.xml b/spring/src/test/resources/org/infinispan/spring/support/embedded/comprehensive-infinispan-config.xml
index 21c0760f9872..70cdf65d88b1 100644
--- a/spring/src/test/resources/org/infinispan/spring/support/embedded/comprehensive-infinispan-config.xml
+++ b/spring/src/test/resources/org/infinispan/spring/support/embedded/comprehensive-infinispan-config.xml
@@ -1,29 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    JBoss, Home of Professional Open Source
-    Copyright 2009 Red Hat Inc. and/or its affiliates and other
-    contributors as indicated by the @author tags. All rights reserved.
-    See the copyright.txt in the distribution for a full listing of
-    individual contributors.
-
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-      ~
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
 <infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:infinispan:config:5.2 http://www.infinispan.org/schemas/infinispan-config-5.2.xsd"
             xmlns="urn:infinispan:config:5.2">
diff --git a/spring/src/test/resources/org/infinispan/spring/support/embedded/named-async-cache.xml b/spring/src/test/resources/org/infinispan/spring/support/embedded/named-async-cache.xml
index 8df5c5570ccf..ea755b43b207 100644
--- a/spring/src/test/resources/org/infinispan/spring/support/embedded/named-async-cache.xml
+++ b/spring/src/test/resources/org/infinispan/spring/support/embedded/named-async-cache.xml
@@ -1,29 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    JBoss, Home of Professional Open Source
-    Copyright 2009 Red Hat Inc. and/or its affiliates and other
-    contributors as indicated by the @author tags. All rights reserved.
-    See the copyright.txt in the distribution for a full listing of
-    individual contributors.
-
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-      ~
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
 <infinispan
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:infinispan:config:5.2 http://www.infinispan.org/schemas/infinispan-config-5.2.xsd"
diff --git a/spring/src/test/resources/org/infinispan/spring/support/embedded/non-transactional-cache.xml b/spring/src/test/resources/org/infinispan/spring/support/embedded/non-transactional-cache.xml
index a4afc0315520..69a61dc56306 100644
--- a/spring/src/test/resources/org/infinispan/spring/support/embedded/non-transactional-cache.xml
+++ b/spring/src/test/resources/org/infinispan/spring/support/embedded/non-transactional-cache.xml
@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2012 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
 <infinispan
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:infinispan:config:5.1 http://www.infinispan.org/schemas/infinispan-config-5.1.xsd"
diff --git a/spring/src/test/resources/org/infinispan/spring/support/remote/InfinispanNamedRemoteCacheFactoryBeanContextTest.xml b/spring/src/test/resources/org/infinispan/spring/support/remote/InfinispanNamedRemoteCacheFactoryBeanContextTest.xml
index 7788cf088e8f..186b3aa40451 100644
--- a/spring/src/test/resources/org/infinispan/spring/support/remote/InfinispanNamedRemoteCacheFactoryBeanContextTest.xml
+++ b/spring/src/test/resources/org/infinispan/spring/support/remote/InfinispanNamedRemoteCacheFactoryBeanContextTest.xml
@@ -1,29 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    JBoss, Home of Professional Open Source
-    Copyright 2009 Red Hat Inc. and/or its affiliates and other
-    contributors as indicated by the @author tags. All rights reserved.
-    See the copyright.txt in the distribution for a full listing of
-    individual contributors.
-
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-      ~
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
 <beans
    xmlns="http://www.springframework.org/schema/beans"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/spring/src/test/resources/org/infinispan/spring/support/remote/InfinispanRemoteCacheManagerFactoryBeanContextTest.xml b/spring/src/test/resources/org/infinispan/spring/support/remote/InfinispanRemoteCacheManagerFactoryBeanContextTest.xml
index 21d2bbac8c4b..d3621b7769d6 100644
--- a/spring/src/test/resources/org/infinispan/spring/support/remote/InfinispanRemoteCacheManagerFactoryBeanContextTest.xml
+++ b/spring/src/test/resources/org/infinispan/spring/support/remote/InfinispanRemoteCacheManagerFactoryBeanContextTest.xml
@@ -1,29 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    JBoss, Home of Professional Open Source
-    Copyright 2009 Red Hat Inc. and/or its affiliates and other
-    contributors as indicated by the @author tags. All rights reserved.
-    See the copyright.txt in the distribution for a full listing of
-    individual contributors.
-
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-      ~
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
 <beans
    xmlns="http://www.springframework.org/schema/beans"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/spring/src/test/resources/org/infinispan/spring/support/remote/hotrod-client.properties b/spring/src/test/resources/org/infinispan/spring/support/remote/hotrod-client.properties
index c34e84a8367f..5ec6f63db8e3 100644
--- a/spring/src/test/resources/org/infinispan/spring/support/remote/hotrod-client.properties
+++ b/spring/src/test/resources/org/infinispan/spring/support/remote/hotrod-client.properties
@@ -1,26 +1,3 @@
-#
-# JBoss, Home of Professional Open Source
-# Copyright 2009 Red Hat Inc. and/or its affiliates and other
-# contributors as indicated by the @author tags. All rights reserved.
-# See the copyright.txt in the distribution for a full listing of
-# individual contributors.
-#
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#   ~
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
-
 # hopefully this port is available
 infinispan.client.hotrod.transport_factory = org.infinispan.client.hotrod.impl.transport.tcp.TcpTransportFactory
 infinispan.client.hotrod.server_list = 127.0.0.1:19733
diff --git a/src/main/resources/assemblies/all.xml b/src/main/resources/assemblies/all.xml
index e3555f5452a4..f00b5e482254 100644
--- a/src/main/resources/assemblies/all.xml
+++ b/src/main/resources/assemblies/all.xml
@@ -1,28 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-
 <!--
    This package will build a ZIP containing the following:
 
diff --git a/src/main/resources/assemblies/bin.xml b/src/main/resources/assemblies/bin.xml
index 4b608c652988..8c2554ffcdee 100644
--- a/src/main/resources/assemblies/bin.xml
+++ b/src/main/resources/assemblies/bin.xml
@@ -1,28 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-
 <!--
    This package will build a ZIP containing the following:
 
diff --git a/src/main/resources/assemblies/src.xml b/src/main/resources/assemblies/src.xml
index 59e6c8b0eb36..f976dedd9f7f 100644
--- a/src/main/resources/assemblies/src.xml
+++ b/src/main/resources/assemblies/src.xml
@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-
 <!--
    This package will build a ZIP the root of the source tree and all subdirectories.  Essentially a snapshot of the
    subversion checkout.
diff --git a/tools/pom.xml b/tools/pom.xml
index a1a7c5b2ad4f..928db245bc3a 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
diff --git a/tools/src/main/java/org/infinispan/tools/BeanConventions.java b/tools/src/main/java/org/infinispan/tools/BeanConventions.java
index 1a7d35ec8860..d7848e71858b 100644
--- a/tools/src/main/java/org/infinispan/tools/BeanConventions.java
+++ b/tools/src/main/java/org/infinispan/tools/BeanConventions.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tools;
 
 import java.lang.reflect.Field;
diff --git a/tools/src/main/java/org/infinispan/tools/doclet/html/HtmlGenerator.java b/tools/src/main/java/org/infinispan/tools/doclet/html/HtmlGenerator.java
index 546111a2bbbd..50ac425da1eb 100644
--- a/tools/src/main/java/org/infinispan/tools/doclet/html/HtmlGenerator.java
+++ b/tools/src/main/java/org/infinispan/tools/doclet/html/HtmlGenerator.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tools.doclet.html;
 
 import java.io.FileOutputStream;
diff --git a/tools/src/main/java/org/infinispan/tools/doclet/jmx/JmxComponent.java b/tools/src/main/java/org/infinispan/tools/doclet/jmx/JmxComponent.java
index 52a546d70ca2..0ee0b5b288a3 100644
--- a/tools/src/main/java/org/infinispan/tools/doclet/jmx/JmxComponent.java
+++ b/tools/src/main/java/org/infinispan/tools/doclet/jmx/JmxComponent.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tools.doclet.jmx;
 
 /**
diff --git a/tools/src/main/java/org/infinispan/tools/doclet/jmx/JmxDoclet.java b/tools/src/main/java/org/infinispan/tools/doclet/jmx/JmxDoclet.java
index 1a3afb138a92..db682ee19f8a 100644
--- a/tools/src/main/java/org/infinispan/tools/doclet/jmx/JmxDoclet.java
+++ b/tools/src/main/java/org/infinispan/tools/doclet/jmx/JmxDoclet.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tools.doclet.jmx;
 
 import com.sun.javadoc.AnnotationDesc;
diff --git a/tools/src/main/java/org/infinispan/tools/doclet/jmx/JmxHtmlGenerator.java b/tools/src/main/java/org/infinispan/tools/doclet/jmx/JmxHtmlGenerator.java
index 76504cfcc748..c7d6dfc7a8c7 100644
--- a/tools/src/main/java/org/infinispan/tools/doclet/jmx/JmxHtmlGenerator.java
+++ b/tools/src/main/java/org/infinispan/tools/doclet/jmx/JmxHtmlGenerator.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tools.doclet.jmx;
 
 import org.infinispan.tools.doclet.html.HtmlGenerator;
diff --git a/tools/src/main/java/org/infinispan/tools/doclet/jmx/MBeanAttribute.java b/tools/src/main/java/org/infinispan/tools/doclet/jmx/MBeanAttribute.java
index 67f6369a7a34..ca239b03bb98 100644
--- a/tools/src/main/java/org/infinispan/tools/doclet/jmx/MBeanAttribute.java
+++ b/tools/src/main/java/org/infinispan/tools/doclet/jmx/MBeanAttribute.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tools.doclet.jmx;
 
 /**
diff --git a/tools/src/main/java/org/infinispan/tools/doclet/jmx/MBeanComponent.java b/tools/src/main/java/org/infinispan/tools/doclet/jmx/MBeanComponent.java
index 51833966f3d4..95163b2c92bc 100644
--- a/tools/src/main/java/org/infinispan/tools/doclet/jmx/MBeanComponent.java
+++ b/tools/src/main/java/org/infinispan/tools/doclet/jmx/MBeanComponent.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tools.doclet.jmx;
 
 import java.util.LinkedList;
diff --git a/tools/src/main/java/org/infinispan/tools/doclet/jmx/MBeanOperation.java b/tools/src/main/java/org/infinispan/tools/doclet/jmx/MBeanOperation.java
index 6abf27e5e215..3a56cf3729bf 100644
--- a/tools/src/main/java/org/infinispan/tools/doclet/jmx/MBeanOperation.java
+++ b/tools/src/main/java/org/infinispan/tools/doclet/jmx/MBeanOperation.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tools.doclet.jmx;
 
 /**
diff --git a/tools/src/main/java/org/infinispan/tools/rhq/RhqPluginXmlGenerator.java b/tools/src/main/java/org/infinispan/tools/rhq/RhqPluginXmlGenerator.java
index c55cbca42024..d76a6a077539 100644
--- a/tools/src/main/java/org/infinispan/tools/rhq/RhqPluginXmlGenerator.java
+++ b/tools/src/main/java/org/infinispan/tools/rhq/RhqPluginXmlGenerator.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tools.rhq;
 
 import java.io.File;
diff --git a/tools/src/main/java/org/infinispan/tools/xsd/XSDoc.java b/tools/src/main/java/org/infinispan/tools/xsd/XSDoc.java
index 7591447106c7..e3bf7224cb5c 100644
--- a/tools/src/main/java/org/infinispan/tools/xsd/XSDoc.java
+++ b/tools/src/main/java/org/infinispan/tools/xsd/XSDoc.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.tools.xsd;
 
 import gnu.getopt.Getopt;
diff --git a/tools/src/main/resources/ispnDescriptor.ftl b/tools/src/main/resources/ispnDescriptor.ftl
index ed93bae0df1d..52dcc8edbfd7 100644
--- a/tools/src/main/resources/ispnDescriptor.ftl
+++ b/tools/src/main/resources/ispnDescriptor.ftl
@@ -1,23 +1,3 @@
-<#--
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
--->
 <#-- @ftlvariable name="props" type="org.rhq.helpers.pluginGen.Props" -->
 <?xml version="1.0"?>
 <plugin name="${props.pluginName}"
diff --git a/tools/src/main/resources/ispnDescriptorMain.ftl b/tools/src/main/resources/ispnDescriptorMain.ftl
index ecfe680f659c..5f93657e5850 100644
--- a/tools/src/main/resources/ispnDescriptorMain.ftl
+++ b/tools/src/main/resources/ispnDescriptorMain.ftl
@@ -1,23 +1,3 @@
-<#--
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
--->
 <#-- @ftlvariable name="props" type="org.rhq.helpers.pluginGen.Props" -->
 <#--
     This file contains the body of the descriptor for a single
diff --git a/tools/src/main/resources/xsd/xsdoc.xslt b/tools/src/main/resources/xsd/xsdoc.xslt
index 08bbf074cd22..e889ff9be873 100644
--- a/tools/src/main/resources/xsd/xsdoc.xslt
+++ b/tools/src/main/resources/xsd/xsdoc.xslt
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- ~ Copyright 2012 Red Hat, Inc. and/or its affiliates. ~ ~ This is free software; you can redistribute it and/or modify it ~ under the terms of the GNU Lesser General Public License as ~ published by the Free Software Foundation; either version 2.1 of ~ the License, or (at your option) any later 
-   version. ~ ~ This software is distributed in the hope that it will be useful, ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ Lesser General Public License for more details. ~ ~ You should have received a copy of the 
-   GNU Lesser General Public ~ License along with this library; if not, write to the Free Software ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ~ 02110-1301 USA -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" exclude-result-prefixes="xs html">
    <xsl:output method="xml" encoding="ISO-8859-1" standalone="yes" version="1.0" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" />
    
diff --git a/tools/src/test/java/org/infinispan/test/fwk/TestNameVerifier.java b/tools/src/test/java/org/infinispan/test/fwk/TestNameVerifier.java
index 03796f50e956..8bf57ee7d8b1 100644
--- a/tools/src/test/java/org/infinispan/test/fwk/TestNameVerifier.java
+++ b/tools/src/test/java/org/infinispan/test/fwk/TestNameVerifier.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.test.fwk;
 
 import org.testng.annotations.Test;
diff --git a/tree/pom.xml b/tree/pom.xml
index ed3e6419d2a6..7cf28fb87897 100644
--- a/tree/pom.xml
+++ b/tree/pom.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
 <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">
diff --git a/tree/src/main/java/org/infinispan/tree/Fqn.java b/tree/src/main/java/org/infinispan/tree/Fqn.java
index 7d312228ee9d..f12334f72aab 100644
--- a/tree/src/main/java/org/infinispan/tree/Fqn.java
+++ b/tree/src/main/java/org/infinispan/tree/Fqn.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tree;
 
 
diff --git a/tree/src/main/java/org/infinispan/tree/FqnComparator.java b/tree/src/main/java/org/infinispan/tree/FqnComparator.java
index 3f2a06afdef4..e770f1a42a75 100644
--- a/tree/src/main/java/org/infinispan/tree/FqnComparator.java
+++ b/tree/src/main/java/org/infinispan/tree/FqnComparator.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tree;
 
 import net.jcip.annotations.Immutable;
diff --git a/tree/src/main/java/org/infinispan/tree/LifecycleCallbacks.java b/tree/src/main/java/org/infinispan/tree/LifecycleCallbacks.java
index a9d5fbd0161b..98b9654cefd0 100644
--- a/tree/src/main/java/org/infinispan/tree/LifecycleCallbacks.java
+++ b/tree/src/main/java/org/infinispan/tree/LifecycleCallbacks.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tree;
 
 import org.infinispan.configuration.global.GlobalConfiguration;
diff --git a/tree/src/main/java/org/infinispan/tree/Node.java b/tree/src/main/java/org/infinispan/tree/Node.java
index 05a22a5dc087..637589c71177 100644
--- a/tree/src/main/java/org/infinispan/tree/Node.java
+++ b/tree/src/main/java/org/infinispan/tree/Node.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tree;
 
 import net.jcip.annotations.ThreadSafe;
diff --git a/tree/src/main/java/org/infinispan/tree/NodeImpl.java b/tree/src/main/java/org/infinispan/tree/NodeImpl.java
index 50524a793988..e7a799bcaebe 100644
--- a/tree/src/main/java/org/infinispan/tree/NodeImpl.java
+++ b/tree/src/main/java/org/infinispan/tree/NodeImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tree;
 
 import org.infinispan.AdvancedCache;
diff --git a/tree/src/main/java/org/infinispan/tree/NodeKey.java b/tree/src/main/java/org/infinispan/tree/NodeKey.java
index 399147726cb8..b91c761df567 100644
--- a/tree/src/main/java/org/infinispan/tree/NodeKey.java
+++ b/tree/src/main/java/org/infinispan/tree/NodeKey.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tree;
 
 import static org.infinispan.tree.NodeKey.Type.DATA;
diff --git a/tree/src/main/java/org/infinispan/tree/NodeNotExistsException.java b/tree/src/main/java/org/infinispan/tree/NodeNotExistsException.java
index e02e325047fd..2fdfaafaa8ff 100644
--- a/tree/src/main/java/org/infinispan/tree/NodeNotExistsException.java
+++ b/tree/src/main/java/org/infinispan/tree/NodeNotExistsException.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tree;
 
 import org.infinispan.commons.CacheException;
diff --git a/tree/src/main/java/org/infinispan/tree/NodeNotValidException.java b/tree/src/main/java/org/infinispan/tree/NodeNotValidException.java
index 1563a4d5e686..f36ade9bd9dd 100644
--- a/tree/src/main/java/org/infinispan/tree/NodeNotValidException.java
+++ b/tree/src/main/java/org/infinispan/tree/NodeNotValidException.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tree;
 
 import org.infinispan.commons.CacheException;
diff --git a/tree/src/main/java/org/infinispan/tree/TreeCache.java b/tree/src/main/java/org/infinispan/tree/TreeCache.java
index 1a713f007d62..fbd55e1c5430 100644
--- a/tree/src/main/java/org/infinispan/tree/TreeCache.java
+++ b/tree/src/main/java/org/infinispan/tree/TreeCache.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tree;
 
 import org.infinispan.Cache;
diff --git a/tree/src/main/java/org/infinispan/tree/TreeCacheFactory.java b/tree/src/main/java/org/infinispan/tree/TreeCacheFactory.java
index bbcac7e5b4ce..52bcf3eff8ee 100644
--- a/tree/src/main/java/org/infinispan/tree/TreeCacheFactory.java
+++ b/tree/src/main/java/org/infinispan/tree/TreeCacheFactory.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tree;
 
 import org.infinispan.Cache;
diff --git a/tree/src/main/java/org/infinispan/tree/TreeCacheImpl.java b/tree/src/main/java/org/infinispan/tree/TreeCacheImpl.java
index 69f284a52e54..522abe92615e 100644
--- a/tree/src/main/java/org/infinispan/tree/TreeCacheImpl.java
+++ b/tree/src/main/java/org/infinispan/tree/TreeCacheImpl.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tree;
 
 import org.infinispan.AdvancedCache;
diff --git a/tree/src/main/java/org/infinispan/tree/TreeStructureSupport.java b/tree/src/main/java/org/infinispan/tree/TreeStructureSupport.java
index e55f3e815fbd..a3ed2025b4f1 100644
--- a/tree/src/main/java/org/infinispan/tree/TreeStructureSupport.java
+++ b/tree/src/main/java/org/infinispan/tree/TreeStructureSupport.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tree;
 
 import org.infinispan.AdvancedCache;
diff --git a/tree/src/main/java/org/infinispan/tree/logging/Log.java b/tree/src/main/java/org/infinispan/tree/logging/Log.java
index 245c49c92881..2dca313eeb4d 100644
--- a/tree/src/main/java/org/infinispan/tree/logging/Log.java
+++ b/tree/src/main/java/org/infinispan/tree/logging/Log.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.tree.logging;
 
 import org.jboss.logging.MessageLogger;
diff --git a/tree/src/main/java/org/infinispan/tree/package-info.java b/tree/src/main/java/org/infinispan/tree/package-info.java
index 1bb08d6bde58..cfcc3e4b66be 100644
--- a/tree/src/main/java/org/infinispan/tree/package-info.java
+++ b/tree/src/main/java/org/infinispan/tree/package-info.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 /**
  * This package contains the TreeCache.  For usage, see the TreeCache and
  * TreeCacheFactory classes and their javadocs.
diff --git a/tree/src/test/java/org/infinispan/FqnTest.java b/tree/src/test/java/org/infinispan/FqnTest.java
index 5be2978e319d..60ee2e8fa1de 100644
--- a/tree/src/test/java/org/infinispan/FqnTest.java
+++ b/tree/src/test/java/org/infinispan/FqnTest.java
@@ -1,32 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-/*
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
 package org.infinispan;
 
 
diff --git a/tree/src/test/java/org/infinispan/api/tree/BaseNodeMoveAPITest.java b/tree/src/test/java/org/infinispan/api/tree/BaseNodeMoveAPITest.java
index 873348422b00..7ba2f60f2b9e 100644
--- a/tree/src/test/java/org/infinispan/api/tree/BaseNodeMoveAPITest.java
+++ b/tree/src/test/java/org/infinispan/api/tree/BaseNodeMoveAPITest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.tree;
 
 import org.infinispan.api.mvcc.LockAssert;
diff --git a/tree/src/test/java/org/infinispan/api/tree/FlagTest.java b/tree/src/test/java/org/infinispan/api/tree/FlagTest.java
index 0c7f05b10c88..78666cbef13c 100644
--- a/tree/src/test/java/org/infinispan/api/tree/FlagTest.java
+++ b/tree/src/test/java/org/infinispan/api/tree/FlagTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.tree;
 
 import org.infinispan.AdvancedCache;
diff --git a/tree/src/test/java/org/infinispan/api/tree/LazyDeserializationTreeCacheTest.java b/tree/src/test/java/org/infinispan/api/tree/LazyDeserializationTreeCacheTest.java
index f5182d9a51ab..911de79ceb5d 100644
--- a/tree/src/test/java/org/infinispan/api/tree/LazyDeserializationTreeCacheTest.java
+++ b/tree/src/test/java/org/infinispan/api/tree/LazyDeserializationTreeCacheTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.tree;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/tree/src/test/java/org/infinispan/api/tree/NodeAPITest.java b/tree/src/test/java/org/infinispan/api/tree/NodeAPITest.java
index f018455217d1..131762167efc 100644
--- a/tree/src/test/java/org/infinispan/api/tree/NodeAPITest.java
+++ b/tree/src/test/java/org/infinispan/api/tree/NodeAPITest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.tree;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/tree/src/test/java/org/infinispan/api/tree/NodeLockSupport.java b/tree/src/test/java/org/infinispan/api/tree/NodeLockSupport.java
index d9e45cf3a162..89f58a74ef71 100644
--- a/tree/src/test/java/org/infinispan/api/tree/NodeLockSupport.java
+++ b/tree/src/test/java/org/infinispan/api/tree/NodeLockSupport.java
@@ -1,26 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
 package org.infinispan.api.tree;
 
 import org.infinispan.Cache;
diff --git a/tree/src/test/java/org/infinispan/api/tree/NodeMoveAPIOptimisticTest.java b/tree/src/test/java/org/infinispan/api/tree/NodeMoveAPIOptimisticTest.java
index 24cedfcc1e4c..e2b1fe0ca222 100644
--- a/tree/src/test/java/org/infinispan/api/tree/NodeMoveAPIOptimisticTest.java
+++ b/tree/src/test/java/org/infinispan/api/tree/NodeMoveAPIOptimisticTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.tree;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/tree/src/test/java/org/infinispan/api/tree/NodeMoveAPIPessimisticTest.java b/tree/src/test/java/org/infinispan/api/tree/NodeMoveAPIPessimisticTest.java
index d1abfee15aed..8c4aebcfae54 100644
--- a/tree/src/test/java/org/infinispan/api/tree/NodeMoveAPIPessimisticTest.java
+++ b/tree/src/test/java/org/infinispan/api/tree/NodeMoveAPIPessimisticTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.tree;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/tree/src/test/java/org/infinispan/api/tree/NodeReplicatedMoveTest.java b/tree/src/test/java/org/infinispan/api/tree/NodeReplicatedMoveTest.java
index 19fb39e8b386..8b3e76811f87 100644
--- a/tree/src/test/java/org/infinispan/api/tree/NodeReplicatedMoveTest.java
+++ b/tree/src/test/java/org/infinispan/api/tree/NodeReplicatedMoveTest.java
@@ -1,32 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
 package org.infinispan.api.tree;
 
 import org.infinispan.Cache;
diff --git a/tree/src/test/java/org/infinispan/api/tree/SyncReplTest.java b/tree/src/test/java/org/infinispan/api/tree/SyncReplTest.java
index 69e0f48a0593..d3987cb12cf2 100644
--- a/tree/src/test/java/org/infinispan/api/tree/SyncReplTest.java
+++ b/tree/src/test/java/org/infinispan/api/tree/SyncReplTest.java
@@ -1,33 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
 package org.infinispan.api.tree;
 
 import org.infinispan.Cache;
diff --git a/tree/src/test/java/org/infinispan/api/tree/SyncReplTxTest.java b/tree/src/test/java/org/infinispan/api/tree/SyncReplTxTest.java
index 8871a049382f..cd1d8e3c016c 100644
--- a/tree/src/test/java/org/infinispan/api/tree/SyncReplTxTest.java
+++ b/tree/src/test/java/org/infinispan/api/tree/SyncReplTxTest.java
@@ -1,33 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
 package org.infinispan.api.tree;
 
 import org.infinispan.Cache;
diff --git a/tree/src/test/java/org/infinispan/api/tree/TreeCacheAPITest.java b/tree/src/test/java/org/infinispan/api/tree/TreeCacheAPITest.java
index f0c192fb207a..d03539beb1af 100644
--- a/tree/src/test/java/org/infinispan/api/tree/TreeCacheAPITest.java
+++ b/tree/src/test/java/org/infinispan/api/tree/TreeCacheAPITest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.tree;
 
 import org.infinispan.Cache;
diff --git a/tree/src/test/java/org/infinispan/api/tree/TreeStructureHashCodeTest.java b/tree/src/test/java/org/infinispan/api/tree/TreeStructureHashCodeTest.java
index 6e04e160377f..a237ed41158b 100644
--- a/tree/src/test/java/org/infinispan/api/tree/TreeStructureHashCodeTest.java
+++ b/tree/src/test/java/org/infinispan/api/tree/TreeStructureHashCodeTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.api.tree;
 
 import org.infinispan.tree.Fqn;
diff --git a/tree/src/test/java/org/infinispan/loaders/TreeCacheWithJdbmLoaderTest.java b/tree/src/test/java/org/infinispan/loaders/TreeCacheWithJdbmLoaderTest.java
index 8b2d042eefa5..0223d97de3a8 100644
--- a/tree/src/test/java/org/infinispan/loaders/TreeCacheWithJdbmLoaderTest.java
+++ b/tree/src/test/java/org/infinispan/loaders/TreeCacheWithJdbmLoaderTest.java
@@ -1,22 +1,3 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
 package org.infinispan.loaders;
 
 import org.infinispan.configuration.cache.LegacyStoreConfigurationBuilder;
diff --git a/tree/src/test/java/org/infinispan/loaders/TreeCacheWithLoaderTest.java b/tree/src/test/java/org/infinispan/loaders/TreeCacheWithLoaderTest.java
index faec9f32e45d..a128708b62fc 100644
--- a/tree/src/test/java/org/infinispan/loaders/TreeCacheWithLoaderTest.java
+++ b/tree/src/test/java/org/infinispan/loaders/TreeCacheWithLoaderTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.loaders;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/tree/src/test/java/org/infinispan/profiling/TreeProfileTest.java b/tree/src/test/java/org/infinispan/profiling/TreeProfileTest.java
index 57c1425faa36..8ac76900d53b 100644
--- a/tree/src/test/java/org/infinispan/profiling/TreeProfileTest.java
+++ b/tree/src/test/java/org/infinispan/profiling/TreeProfileTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.profiling;
 
 import org.infinispan.Cache;
diff --git a/tree/src/test/java/org/infinispan/profiling/testinternals/FqnGenerator.java b/tree/src/test/java/org/infinispan/profiling/testinternals/FqnGenerator.java
index c389b64f99a0..ca07c94900c8 100644
--- a/tree/src/test/java/org/infinispan/profiling/testinternals/FqnGenerator.java
+++ b/tree/src/test/java/org/infinispan/profiling/testinternals/FqnGenerator.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.profiling.testinternals;
 
 import org.infinispan.tree.Fqn;
diff --git a/tree/src/test/java/org/infinispan/test/TreeTestingUtil.java b/tree/src/test/java/org/infinispan/test/TreeTestingUtil.java
index ec332b716d71..15e0423a04e3 100644
--- a/tree/src/test/java/org/infinispan/test/TreeTestingUtil.java
+++ b/tree/src/test/java/org/infinispan/test/TreeTestingUtil.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.test;
 
 import org.infinispan.tree.TreeCache;
diff --git a/tree/src/test/java/org/infinispan/tx/TransactionManagerLookupTreeTest.java b/tree/src/test/java/org/infinispan/tx/TransactionManagerLookupTreeTest.java
index eefb11dfd9dc..43f548fb1956 100644
--- a/tree/src/test/java/org/infinispan/tx/TransactionManagerLookupTreeTest.java
+++ b/tree/src/test/java/org/infinispan/tx/TransactionManagerLookupTreeTest.java
@@ -1,25 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010 Red Hat Inc. and/or its affiliates and other
- * contributors as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
 package org.infinispan.tx;
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
diff --git a/upgrade-tools/pom.xml b/upgrade-tools/pom.xml
index 7ad837e4bfe5..95ecb18e6760 100644
--- a/upgrade-tools/pom.xml
+++ b/upgrade-tools/pom.xml
@@ -1,23 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2012 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-
 <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">
diff --git a/upgrade-tools/src/main/java/org/infinispan/upgrade/hotrod/HotRodTargetMigrator.java b/upgrade-tools/src/main/java/org/infinispan/upgrade/hotrod/HotRodTargetMigrator.java
index e6303fb6f83a..02dcab4d2d5d 100644
--- a/upgrade-tools/src/main/java/org/infinispan/upgrade/hotrod/HotRodTargetMigrator.java
+++ b/upgrade-tools/src/main/java/org/infinispan/upgrade/hotrod/HotRodTargetMigrator.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.upgrade.hotrod;
 
 import java.util.List;
diff --git a/upgrade-tools/src/main/java/org/infinispan/upgrade/logging/Log.java b/upgrade-tools/src/main/java/org/infinispan/upgrade/logging/Log.java
index b53f7a0d97d0..76f7755eb4aa 100644
--- a/upgrade-tools/src/main/java/org/infinispan/upgrade/logging/Log.java
+++ b/upgrade-tools/src/main/java/org/infinispan/upgrade/logging/Log.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.upgrade.logging;
 
 import static org.jboss.logging.Logger.Level.ERROR;
diff --git a/upgrade-tools/src/test/java/org/infinispan/upgrade/hotrod/HotRodUpgradeSynchronizerTest.java b/upgrade-tools/src/test/java/org/infinispan/upgrade/hotrod/HotRodUpgradeSynchronizerTest.java
index 638383348060..ddc76ca59a6d 100644
--- a/upgrade-tools/src/test/java/org/infinispan/upgrade/hotrod/HotRodUpgradeSynchronizerTest.java
+++ b/upgrade-tools/src/test/java/org/infinispan/upgrade/hotrod/HotRodUpgradeSynchronizerTest.java
@@ -1,21 +1,3 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @author tags. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
 package org.infinispan.upgrade.hotrod;
 
 import org.infinispan.Cache;