You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2017/02/21 15:33:21 UTC

cayenne git commit: Code cleanup: - add missing licenses - cleanup tests for Oracle

Repository: cayenne
Updated Branches:
  refs/heads/master e1823c3e2 -> 4caa3900a


Code cleanup:
- add missing licenses
- cleanup tests for Oracle


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/4caa3900
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/4caa3900
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/4caa3900

Branch: refs/heads/master
Commit: 4caa3900a8ee11595026bf577d8b7fb34b5fe13b
Parents: e1823c3
Author: Nikita Timofeev <st...@gmail.com>
Authored: Tue Feb 21 18:32:55 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Tue Feb 21 18:32:55 2017 +0300

----------------------------------------------------------------------
 .../org.apache.cayenne.di.spi.ModuleProvider     | 19 +++++++++++++++++++
 .../org.apache.cayenne.di.spi.ModuleProvider     | 19 +++++++++++++++++++
 .../apache/cayenne/dbsync/merge/MergeCase.java   |  2 +-
 .../token/model/SetGeneratedFlagToModelIT.java   |  6 +++++-
 .../dbsync/reverse/dbload/AttributeLoaderIT.java | 12 ++++++++++--
 .../org.apache.cayenne.di.spi.ModuleProvider     | 19 +++++++++++++++++++
 .../org.apache.cayenne.di.spi.ModuleProvider     | 19 +++++++++++++++++++
 .../org.apache.cayenne.di.spi.ModuleProvider     | 19 +++++++++++++++++++
 .../org.apache.cayenne.di.spi.ModuleProvider     | 19 +++++++++++++++++++
 .../org.apache.cayenne.di.spi.ModuleProvider     | 19 +++++++++++++++++++
 .../org.apache.cayenne.di.spi.ModuleProvider     | 19 +++++++++++++++++++
 .../access/NestedDataContext_DeadlockIT.java     |  8 ++++----
 .../translator/select/OrderingTranslatorIT.java  |  4 ++--
 .../org/apache/cayenne/testdo/cay_2032/Team.java | 19 +++++++++++++++++++
 .../org/apache/cayenne/testdo/cay_2032/User.java | 19 +++++++++++++++++++
 15 files changed, 212 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/4caa3900/cayenne-crypto/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider b/cayenne-crypto/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
index e782376..7a649a3 100644
--- a/cayenne-crypto/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
+++ b/cayenne-crypto/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
@@ -1 +1,20 @@
+##################################################################
+#   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.
+##################################################################
+
 org.apache.cayenne.crypto.CryptoModuleProvider
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/4caa3900/cayenne-dbsync/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider b/cayenne-dbsync/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
index 7784c87..1dfd1a0 100644
--- a/cayenne-dbsync/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
+++ b/cayenne-dbsync/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
@@ -1 +1,20 @@
+##################################################################
+#   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.
+##################################################################
+
 org.apache.cayenne.dbsync.DbSyncModuleProvider
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/4caa3900/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergeCase.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergeCase.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergeCase.java
index ef262ee..a8315ec 100644
--- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergeCase.java
+++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergeCase.java
@@ -75,7 +75,7 @@ public abstract class MergeCase extends DbSyncCase {
     @Inject
     private ServerRuntime runtime;
     @Inject
-    private UnitDbAdapter accessStackAdapter;
+    protected UnitDbAdapter accessStackAdapter;
     @Inject
     private ServerCaseDataSourceFactory dataSourceFactory;
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/4caa3900/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/token/model/SetGeneratedFlagToModelIT.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/token/model/SetGeneratedFlagToModelIT.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/token/model/SetGeneratedFlagToModelIT.java
index 2a29745..68d9cff 100644
--- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/token/model/SetGeneratedFlagToModelIT.java
+++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/token/model/SetGeneratedFlagToModelIT.java
@@ -39,6 +39,11 @@ public class SetGeneratedFlagToModelIT extends MergeCase {
 
     @Test
     public void test() throws Exception {
+        if(!accessStackAdapter.supportsGeneratedKeysAdd()) {
+            // nothing to do here
+            return;
+        }
+
         DbEntity dbEntity = map.getDbEntity("PAINTING");
         assertNotNull(dbEntity);
 
@@ -50,7 +55,6 @@ public class SetGeneratedFlagToModelIT extends MergeCase {
 
         List<MergerToken> tokens = createMergeTokens();
         assertEquals(1, tokens.size());
-
         MergerToken token = tokens.get(0);
         if (token.getDirection().isToDb()) {
             token = token.createReverse(mergerFactory());

http://git-wip-us.apache.org/repos/asf/cayenne/blob/4caa3900/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/AttributeLoaderIT.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/AttributeLoaderIT.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/AttributeLoaderIT.java
index f0207bb..ec20f8b 100644
--- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/AttributeLoaderIT.java
+++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/AttributeLoaderIT.java
@@ -44,7 +44,11 @@ public class AttributeLoaderIT extends BaseLoaderIT {
         DbEntity artist = getDbEntity("ARTIST");
         DbAttribute a = getDbAttribute(artist, "ARTIST_ID");
         assertNotNull(a);
-        assertEquals(Types.BIGINT, a.getType());
+        if(accessStackAdapter.onlyGenericNumberType()) {
+            assertEquals(Types.INTEGER, a.getType());
+        } else {
+            assertEquals(Types.BIGINT, a.getType());
+        }
         assertTrue(a.isMandatory());
         assertFalse(a.isGenerated());
 
@@ -56,7 +60,11 @@ public class AttributeLoaderIT extends BaseLoaderIT {
 
         a = getDbAttribute(artist, "DATE_OF_BIRTH");
         assertNotNull(a);
-        assertEquals(Types.DATE, a.getType());
+        if(accessStackAdapter.onlyGenericDateType()) {
+            assertEquals(Types.TIMESTAMP, a.getType());
+        } else {
+            assertEquals(Types.DATE, a.getType());
+        }
         assertFalse(a.isMandatory());
 
         if(accessStackAdapter.supportsLobs()) {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/4caa3900/cayenne-di/src/test/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
----------------------------------------------------------------------
diff --git a/cayenne-di/src/test/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider b/cayenne-di/src/test/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
index ff2d444..8e50e8d 100644
--- a/cayenne-di/src/test/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
+++ b/cayenne-di/src/test/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
@@ -1,3 +1,22 @@
+##################################################################
+#   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.
+##################################################################
+
 org.apache.cayenne.di.spi.ModuleLoaderTest$ModuleProvider1
 org.apache.cayenne.di.spi.ModuleLoaderTest$ModuleProvider2
 org.apache.cayenne.di.spi.ModuleLoaderTest$ModuleProvider3

http://git-wip-us.apache.org/repos/asf/cayenne/blob/4caa3900/cayenne-java8/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
----------------------------------------------------------------------
diff --git a/cayenne-java8/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider b/cayenne-java8/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
index d24953f..143cc5d 100644
--- a/cayenne-java8/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
+++ b/cayenne-java8/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
@@ -1 +1,20 @@
+##################################################################
+#   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.
+##################################################################
+
 org.apache.cayenne.java8.Java8ModuleProvider
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/4caa3900/cayenne-jcache/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
----------------------------------------------------------------------
diff --git a/cayenne-jcache/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider b/cayenne-jcache/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
index 2fff139..352b8ff 100644
--- a/cayenne-jcache/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
+++ b/cayenne-jcache/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
@@ -1 +1,20 @@
+##################################################################
+#   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.
+##################################################################
+
 org.apache.cayenne.jcache.JCacheModuleProvider
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/4caa3900/cayenne-joda/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
----------------------------------------------------------------------
diff --git a/cayenne-joda/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider b/cayenne-joda/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
index a4e3ebb..6839f25 100644
--- a/cayenne-joda/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
+++ b/cayenne-joda/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
@@ -1 +1,20 @@
+##################################################################
+#   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.
+##################################################################
+
 org.apache.cayenne.joda.JodaModuleProvider
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/4caa3900/cayenne-project/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
----------------------------------------------------------------------
diff --git a/cayenne-project/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider b/cayenne-project/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
index 0d402c1..03e731d 100644
--- a/cayenne-project/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
+++ b/cayenne-project/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
@@ -1 +1,20 @@
+##################################################################
+#   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.
+##################################################################
+
 org.apache.cayenne.project.ProjectModuleProvider
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/4caa3900/cayenne-server/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider b/cayenne-server/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
index 9e5f5bb..9c385c4 100644
--- a/cayenne-server/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
+++ b/cayenne-server/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
@@ -1 +1,20 @@
+##################################################################
+#   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.
+##################################################################
+
 org.apache.cayenne.configuration.server.ServerModuleProvider
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/4caa3900/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java
index 850a288..5228f1e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java
@@ -75,19 +75,19 @@ public class NestedDataContext_DeadlockIT extends ServerCase {
 			threads[i] = new UpdateThread("UpdateThread-" + i, runtime.newContext(parent), rnd);
 		}
 
-		for (int i = 0; i < threads.length; i++) {
-			threads[i].start();
+		for (Thread thread : threads) {
+			thread.start();
 		}
 
 		new ParallelTestContainer() {
 
 			@Override
 			protected void assertResult() throws Exception {
-				for (int i = 0; i < threads.length; i++) {
+				for (Thread thread : threads) {
 					// unfortunately here we'll have to leave some dead threads
 					// behind... Of course if there's no deadlock, there won't
 					// be a leak either
-					assertFalse("Deadlocked thread", threads[i].isAlive());
+					assertFalse("Deadlocked thread", thread.isAlive());
 				}
 			}
 		}.runTest(40000);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/4caa3900/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/OrderingTranslatorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/OrderingTranslatorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/OrderingTranslatorIT.java
index cca9c9b..0aff229 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/OrderingTranslatorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/OrderingTranslatorIT.java
@@ -110,9 +110,9 @@ public class OrderingTranslatorIT extends ServerCase {
 	@Test
 	public void testAppendFunctionExpression2() throws Exception {
 		Ordering o1 = new Ordering(FunctionExpressionFactory.countExp(ExpressionFactory.pathExp("dateOfBirth")), SortOrder.ASCENDING_INSENSITIVE);
-		Ordering o2 = new Ordering(FunctionExpressionFactory.modExp("paintingArray.estimatedPrice", 3), SortOrder.DESCENDING);
+		Ordering o2 = new Ordering(FunctionExpressionFactory.sqrtExp("paintingArray.estimatedPrice"), SortOrder.DESCENDING);
 
-		doTestAppendPart("UPPER(COUNT(ta.DATE_OF_BIRTH)), MOD(ta.ESTIMATED_PRICE, ?) DESC", o1, o2);
+		doTestAppendPart("UPPER(COUNT(ta.DATE_OF_BIRTH)), SQRT(ta.ESTIMATED_PRICE) DESC", o1, o2);
 	}
 
 	@Test(expected = CayenneRuntimeException.class)

http://git-wip-us.apache.org/repos/asf/cayenne/blob/4caa3900/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/Team.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/Team.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/Team.java
index d6f3ac4..b54f07a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/Team.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/Team.java
@@ -1,3 +1,22 @@
+/*****************************************************************
+ *   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.
+ ****************************************************************/
+
 package org.apache.cayenne.testdo.cay_2032;
 
 import org.apache.cayenne.testdo.cay_2032.auto._Team;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/4caa3900/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/User.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/User.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/User.java
index ab76f6a..ce6238d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/User.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/User.java
@@ -1,3 +1,22 @@
+/*****************************************************************
+ *   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.
+ ****************************************************************/
+
 package org.apache.cayenne.testdo.cay_2032;
 
 import org.apache.cayenne.testdo.cay_2032.auto._User;