fix license headers
git-svn-id: https://svn.apache.org/repos/asf/directmemory/trunk@1495731 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/integrations/ehcache/src/main/java/net/sf/ehcache/EnterpriseFeaturesManager.java b/integrations/ehcache/src/main/java/net/sf/ehcache/EnterpriseFeaturesManager.java
index f198bf9..35a73cf 100644
--- a/integrations/ehcache/src/main/java/net/sf/ehcache/EnterpriseFeaturesManager.java
+++ b/integrations/ehcache/src/main/java/net/sf/ehcache/EnterpriseFeaturesManager.java
@@ -1,5 +1,24 @@
package net.sf.ehcache;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
import net.sf.ehcache.pool.Pool;
import net.sf.ehcache.pool.PoolableStore;
import net.sf.ehcache.store.Store;
diff --git a/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/DirectMemoryOsgiTestSupport.java b/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/DirectMemoryOsgiTestSupport.java
index 8a49d23..75666d8 100644
--- a/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/DirectMemoryOsgiTestSupport.java
+++ b/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/DirectMemoryOsgiTestSupport.java
@@ -1,3 +1,5 @@
+package org.apache.directmemory.tests.osgi;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -7,7 +9,7 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -17,8 +19,6 @@
* under the License.
*/
-package org.apache.directmemory.tests.osgi;
-
import org.ops4j.pax.exam.Inject;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
diff --git a/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/cache/CacheServiceExportingActivator.java b/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/cache/CacheServiceExportingActivator.java
index 51417d1..4f225b6 100644
--- a/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/cache/CacheServiceExportingActivator.java
+++ b/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/cache/CacheServiceExportingActivator.java
@@ -1,3 +1,5 @@
+package org.apache.directmemory.tests.osgi.cache;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -7,7 +9,7 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -17,8 +19,6 @@
* under the License.
*/
-package org.apache.directmemory.tests.osgi.cache;
-
import org.apache.directmemory.DirectMemory;
import org.apache.directmemory.cache.CacheService;
import org.apache.directmemory.measures.Ram;
diff --git a/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/cache/CacheServiceTest.java b/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/cache/CacheServiceTest.java
index 49a7a01..1b0b23a 100644
--- a/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/cache/CacheServiceTest.java
+++ b/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/cache/CacheServiceTest.java
@@ -1,3 +1,5 @@
+package org.apache.directmemory.tests.osgi.cache;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -7,7 +9,7 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -17,9 +19,6 @@
* under the License.
*/
-package org.apache.directmemory.tests.osgi.cache;
-
-
import org.apache.directmemory.cache.CacheService;
import org.apache.directmemory.measures.Every;
import org.apache.directmemory.measures.Monitor;
diff --git a/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/cache/CacheTest.java b/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/cache/CacheTest.java
index 2ec0ead..a2994ae 100644
--- a/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/cache/CacheTest.java
+++ b/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/cache/CacheTest.java
@@ -1,3 +1,5 @@
+package org.apache.directmemory.tests.osgi.cache;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -7,7 +9,7 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -17,9 +19,6 @@
* under the License.
*/
-package org.apache.directmemory.tests.osgi.cache;
-
-
import java.io.InputStream;
import org.apache.directmemory.cache.Cache;
diff --git a/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/cache/SimpleObject.java b/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/cache/SimpleObject.java
index 90cbb07..9d23052 100644
--- a/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/cache/SimpleObject.java
+++ b/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/cache/SimpleObject.java
@@ -1,3 +1,5 @@
+package org.apache.directmemory.tests.osgi.cache;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -7,7 +9,7 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -17,8 +19,6 @@
* under the License.
*/
-package org.apache.directmemory.tests.osgi.cache;
-
import java.io.Serializable;
public class SimpleObject
diff --git a/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/ehcache/EhCacheTest.java b/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/ehcache/EhCacheTest.java
index af7cea9..aef6eac 100644
--- a/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/ehcache/EhCacheTest.java
+++ b/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/ehcache/EhCacheTest.java
@@ -1,20 +1,24 @@
-/**
- * Copyright 2003-2010 Terracotta, 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.apache.directmemory.tests.osgi.ehcache;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
