You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2014/11/12 18:07:17 UTC

[06/11] cayenne git commit: Refactor TestMap Project

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/GeneratedColumnTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/GeneratedColumnTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/GeneratedColumnTestEntity.java
deleted file mode 100644
index 520d137..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/GeneratedColumnTestEntity.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************
- *   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.testmap;
-
-import org.apache.cayenne.testdo.testmap.auto._GeneratedColumnTestEntity;
-
-public class GeneratedColumnTestEntity extends _GeneratedColumnTestEntity {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/GeneratedF1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/GeneratedF1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/GeneratedF1.java
deleted file mode 100644
index 03a7a26..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/GeneratedF1.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************
- *   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.testmap;
-
-import org.apache.cayenne.testdo.testmap.auto._GeneratedF1;
-
-public class GeneratedF1 extends _GeneratedF1 {
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/GeneratedF2.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/GeneratedF2.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/GeneratedF2.java
deleted file mode 100644
index d64e5bd..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/GeneratedF2.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************
- *   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.testmap;
-
-import org.apache.cayenne.testdo.testmap.auto._GeneratedF2;
-
-public class GeneratedF2 extends _GeneratedF2 {
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/LongEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/LongEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/LongEntity.java
deleted file mode 100644
index e7f7c4d..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/LongEntity.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************
- *   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.testmap;
-
-import org.apache.cayenne.testdo.testmap.auto._LongEntity;
-
-public class LongEntity extends _LongEntity {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/MeaningfulPKDep.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/MeaningfulPKDep.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/MeaningfulPKDep.java
deleted file mode 100644
index a4fc275..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/MeaningfulPKDep.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*****************************************************************
- *   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.testmap;
-
-public class MeaningfulPKDep extends org.apache.cayenne.testdo.testmap.auto._MeaningfulPKDep {
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/MeaningfulPKTest1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/MeaningfulPKTest1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/MeaningfulPKTest1.java
deleted file mode 100644
index 33fddbd..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/MeaningfulPKTest1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*****************************************************************
- *   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.testmap;
-
-public class MeaningfulPKTest1 extends org.apache.cayenne.testdo.testmap.auto._MeaningfulPKTest1 {
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/MixedPersistenceStrategy.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/MixedPersistenceStrategy.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/MixedPersistenceStrategy.java
deleted file mode 100644
index 32a2ec9..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/MixedPersistenceStrategy.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*****************************************************************
- *   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.testmap;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.cayenne.testdo.testmap.auto._MixedPersistenceStrategy;
-
-public class MixedPersistenceStrategy extends _MixedPersistenceStrategy {
-
-    // a private variable that intentionally mirrors the name of the persistent property
-    // to create a "conflict"
-    private List details = new ArrayList();
-    
-    public List getIvarDetails() {
-        return details;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/MixedPersistenceStrategy2.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/MixedPersistenceStrategy2.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/MixedPersistenceStrategy2.java
deleted file mode 100644
index 4049fd0..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/MixedPersistenceStrategy2.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************
- *   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.testmap;
-
-import org.apache.cayenne.testdo.testmap.auto._MixedPersistenceStrategy2;
-
-public class MixedPersistenceStrategy2 extends _MixedPersistenceStrategy2 {
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/NoPkTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/NoPkTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/NoPkTestEntity.java
deleted file mode 100644
index a390b27..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/NoPkTestEntity.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************
- *   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.testmap;
-
-import org.apache.cayenne.testdo.testmap.auto._NoPkTestEntity;
-
-public class NoPkTestEntity extends _NoPkTestEntity {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/PrimitivesTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/PrimitivesTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/PrimitivesTestEntity.java
deleted file mode 100644
index b24fce8..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/PrimitivesTestEntity.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************
- *   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.testmap;
-
-import org.apache.cayenne.testdo.testmap.auto._PrimitivesTestEntity;
-
-public class PrimitivesTestEntity extends _PrimitivesTestEntity {
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/ReturnTypesMap1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/ReturnTypesMap1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/ReturnTypesMap1.java
deleted file mode 100644
index 60c0609..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/ReturnTypesMap1.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************
- *   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.testmap;
-
-import org.apache.cayenne.testdo.testmap.auto._ReturnTypesMap1;
-
-public class ReturnTypesMap1 extends _ReturnTypesMap1 {
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/ReturnTypesMap2.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/ReturnTypesMap2.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/ReturnTypesMap2.java
deleted file mode 100644
index bfd8706..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/ReturnTypesMap2.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************
- *   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.testmap;
-
-import org.apache.cayenne.testdo.testmap.auto._ReturnTypesMap2;
-
-public class ReturnTypesMap2 extends _ReturnTypesMap2 {
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/ReturnTypesMapLobs1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/ReturnTypesMapLobs1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/ReturnTypesMapLobs1.java
deleted file mode 100644
index 2aaacd7..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/ReturnTypesMapLobs1.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************
- *   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.testmap;
-
-import org.apache.cayenne.testdo.testmap.auto._ReturnTypesMapLobs1;
-
-public class ReturnTypesMapLobs1 extends _ReturnTypesMapLobs1 {
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/SerializableEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/SerializableEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/SerializableEntity.java
deleted file mode 100644
index 4e93149..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/SerializableEntity.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************
- *   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.testmap;
-
-import org.apache.cayenne.testdo.testmap.auto._SerializableEntity;
-
-public class SerializableEntity extends _SerializableEntity {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/SmallintTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/SmallintTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/SmallintTestEntity.java
deleted file mode 100644
index 8f2273b..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/SmallintTestEntity.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************
- *   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.testmap;
-
-import org.apache.cayenne.testdo.testmap.auto._SmallintTestEntity;
-
-public class SmallintTestEntity extends _SmallintTestEntity {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/StringET1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/StringET1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/StringET1.java
deleted file mode 100644
index 476790d..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/StringET1.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*****************************************************************
- *   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.testmap;
-
-/**
- * A test extended type.
- */
-public class StringET1 {
-
-    protected String string;
-
-    public StringET1(String string) {
-        this.string = string;
-    }
-
-    public String getString() {
-        return string;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/StringET1ExtendedType.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/StringET1ExtendedType.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/StringET1ExtendedType.java
deleted file mode 100644
index f4338e2..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/StringET1ExtendedType.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************
- *   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.testmap;
-
-import java.sql.CallableStatement;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-
-import org.apache.cayenne.access.types.ExtendedType;
-
-public class StringET1ExtendedType implements ExtendedType {
-
-    @Override
-    public String getClassName() {
-        return StringET1.class.getName();
-    }
-
-    @Override
-    public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
-        String string = rs.getString(index);
-        return string != null ? new StringET1(string) : null;
-    }
-
-    @Override
-    public Object materializeObject(CallableStatement rs, int index, int type)
-            throws Exception {
-        String string = rs.getString(index);
-        return string != null ? new StringET1(string) : null;
-    }
-
-    @Override
-    public void setJdbcObject(
-            PreparedStatement statement,
-            Object value,
-            int pos,
-            int type,
-            int precision) throws Exception {
-
-        if (value instanceof StringET1) {
-            statement.setString(pos, ((StringET1) value).getString());
-        }
-        else {
-            statement.setNull(pos, type);
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/Thing.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/Thing.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/Thing.java
deleted file mode 100644
index 1fa4967..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/Thing.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************
- *   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.testmap;
-
-import org.apache.cayenne.testdo.testmap.auto._Thing;
-
-public class Thing extends _Thing {
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/TinyintTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/TinyintTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/TinyintTestEntity.java
deleted file mode 100644
index 817a324..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/TinyintTestEntity.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************
- *   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.testmap;
-
-import org.apache.cayenne.testdo.testmap.auto._TinyintTestEntity;
-
-public class TinyintTestEntity extends _TinyintTestEntity {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/UuidPkEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/UuidPkEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/UuidPkEntity.java
deleted file mode 100644
index 1fbfb7e..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/UuidPkEntity.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************
- *   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.testmap;
-
-import org.apache.cayenne.testdo.testmap.auto._UuidPkEntity;
-
-public class UuidPkEntity extends _UuidPkEntity {
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/UuidTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/UuidTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/UuidTestEntity.java
deleted file mode 100644
index 3ded534..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/UuidTestEntity.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************
- *   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.testmap;
-
-import org.apache.cayenne.testdo.testmap.auto._UuidTestEntity;
-
-public class UuidTestEntity extends _UuidTestEntity {
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArraysEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArraysEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArraysEntity.java
deleted file mode 100644
index 7a186f7..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArraysEntity.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-
-/**
- * Class _ArraysEntity was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _ArraysEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String BYTE_ARRAY_PROPERTY = "byteArray";
-    @Deprecated
-    public static final String BYTE_WRAPPER_ARRAY_PROPERTY = "byteWrapperArray";
-    @Deprecated
-    public static final String CHAR_ARRAY_PROPERTY = "charArray";
-    @Deprecated
-    public static final String CHAR_WRAPPER_ARRAY_PROPERTY = "charWrapperArray";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<byte[]> BYTE_ARRAY = new Property<byte[]>("byteArray");
-    public static final Property<Byte[]> BYTE_WRAPPER_ARRAY = new Property<Byte[]>("byteWrapperArray");
-    public static final Property<char[]> CHAR_ARRAY = new Property<char[]>("charArray");
-    public static final Property<Character[]> CHAR_WRAPPER_ARRAY = new Property<Character[]>("charWrapperArray");
-
-    public void setByteArray(byte[] byteArray) {
-        writeProperty("byteArray", byteArray);
-    }
-    public byte[] getByteArray() {
-        return (byte[])readProperty("byteArray");
-    }
-
-    public void setByteWrapperArray(Byte[] byteWrapperArray) {
-        writeProperty("byteWrapperArray", byteWrapperArray);
-    }
-    public Byte[] getByteWrapperArray() {
-        return (Byte[])readProperty("byteWrapperArray");
-    }
-
-    public void setCharArray(char[] charArray) {
-        writeProperty("charArray", charArray);
-    }
-    public char[] getCharArray() {
-        return (char[])readProperty("charArray");
-    }
-
-    public void setCharWrapperArray(Character[] charWrapperArray) {
-        writeProperty("charWrapperArray", charWrapperArray);
-    }
-    public Character[] getCharWrapperArray() {
-        return (Character[])readProperty("charWrapperArray");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Bag.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Bag.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Bag.java
deleted file mode 100644
index e392a37..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Bag.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-import org.apache.cayenne.testdo.testmap.Ball;
-import org.apache.cayenne.testdo.testmap.Box;
-import org.apache.cayenne.testdo.testmap.Thing;
-
-/**
- * Class _Bag was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _Bag extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String NAME_PROPERTY = "name";
-    @Deprecated
-    public static final String BALLS_PROPERTY = "balls";
-    @Deprecated
-    public static final String BOXES_PROPERTY = "boxes";
-    @Deprecated
-    public static final String THINGS_PROPERTY = "things";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<String> NAME = new Property<String>("name");
-    public static final Property<List<Ball>> BALLS = new Property<List<Ball>>("balls");
-    public static final Property<List<Box>> BOXES = new Property<List<Box>>("boxes");
-    public static final Property<List<Thing>> THINGS = new Property<List<Thing>>("things");
-
-    public void setName(String name) {
-        writeProperty("name", name);
-    }
-    public String getName() {
-        return (String)readProperty("name");
-    }
-
-    @SuppressWarnings("unchecked")
-    public List<Ball> getBalls() {
-        return (List<Ball>)readProperty("balls");
-    }
-
-
-    public void addToBoxes(Box obj) {
-        addToManyTarget("boxes", obj, true);
-    }
-    public void removeFromBoxes(Box obj) {
-        removeToManyTarget("boxes", obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<Box> getBoxes() {
-        return (List<Box>)readProperty("boxes");
-    }
-
-
-    @SuppressWarnings("unchecked")
-    public List<Thing> getThings() {
-        return (List<Thing>)readProperty("things");
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Ball.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Ball.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Ball.java
deleted file mode 100644
index 3dca69a..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Ball.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-import org.apache.cayenne.testdo.testmap.Box;
-import org.apache.cayenne.testdo.testmap.Thing;
-
-/**
- * Class _Ball was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _Ball extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String THING_VOLUME_PROPERTY = "thingVolume";
-    @Deprecated
-    public static final String THING_WEIGHT_PROPERTY = "thingWeight";
-    @Deprecated
-    public static final String BOX_PROPERTY = "box";
-    @Deprecated
-    public static final String THING_PROPERTY = "thing";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<Integer> THING_VOLUME = new Property<Integer>("thingVolume");
-    public static final Property<Integer> THING_WEIGHT = new Property<Integer>("thingWeight");
-    public static final Property<Box> BOX = new Property<Box>("box");
-    public static final Property<Thing> THING = new Property<Thing>("thing");
-
-    public void setThingVolume(Integer thingVolume) {
-        writeProperty("thingVolume", thingVolume);
-    }
-    public Integer getThingVolume() {
-        return (Integer)readProperty("thingVolume");
-    }
-
-    public void setThingWeight(Integer thingWeight) {
-        writeProperty("thingWeight", thingWeight);
-    }
-    public Integer getThingWeight() {
-        return (Integer)readProperty("thingWeight");
-    }
-
-    public void setBox(Box box) {
-        setToOneTarget("box", box, true);
-    }
-
-    public Box getBox() {
-        return (Box)readProperty("box");
-    }
-
-
-    public void setThing(Thing thing) {
-        setToOneTarget("thing", thing, true);
-    }
-
-    public Thing getThing() {
-        return (Thing)readProperty("thing");
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BigDecimalEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BigDecimalEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BigDecimalEntity.java
deleted file mode 100644
index bc83c95..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BigDecimalEntity.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import java.math.BigDecimal;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-
-/**
- * Class _BigDecimalEntity was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _BigDecimalEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String BIG_DECIMAL_FIELD_PROPERTY = "bigDecimalField";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<BigDecimal> BIG_DECIMAL_FIELD = new Property<BigDecimal>("bigDecimalField");
-
-    public void setBigDecimalField(BigDecimal bigDecimalField) {
-        writeProperty("bigDecimalField", bigDecimalField);
-    }
-    public BigDecimal getBigDecimalField() {
-        return (BigDecimal)readProperty("bigDecimalField");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BigIntegerEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BigIntegerEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BigIntegerEntity.java
deleted file mode 100644
index f39f0f4..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BigIntegerEntity.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import java.math.BigInteger;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-
-/**
- * Class _BigIntegerEntity was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _BigIntegerEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String BIG_INTEGER_FIELD_PROPERTY = "bigIntegerField";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<BigInteger> BIG_INTEGER_FIELD = new Property<BigInteger>("bigIntegerField");
-
-    public void setBigIntegerField(BigInteger bigIntegerField) {
-        writeProperty("bigIntegerField", bigIntegerField);
-    }
-    public BigInteger getBigIntegerField() {
-        return (BigInteger)readProperty("bigIntegerField");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BinaryPKTest1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BinaryPKTest1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BinaryPKTest1.java
deleted file mode 100644
index 448a864..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BinaryPKTest1.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-import org.apache.cayenne.testdo.testmap.BinaryPKTest2;
-
-/**
- * Class _BinaryPKTest1 was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _BinaryPKTest1 extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String NAME_PROPERTY = "name";
-    @Deprecated
-    public static final String BINARY_PKDETAILS_PROPERTY = "binaryPKDetails";
-
-    public static final String BIN_ID_PK_COLUMN = "BIN_ID";
-
-    public static final Property<String> NAME = new Property<String>("name");
-    public static final Property<List<BinaryPKTest2>> BINARY_PKDETAILS = new Property<List<BinaryPKTest2>>("binaryPKDetails");
-
-    public void setName(String name) {
-        writeProperty("name", name);
-    }
-    public String getName() {
-        return (String)readProperty("name");
-    }
-
-    public void addToBinaryPKDetails(BinaryPKTest2 obj) {
-        addToManyTarget("binaryPKDetails", obj, true);
-    }
-    public void removeFromBinaryPKDetails(BinaryPKTest2 obj) {
-        removeToManyTarget("binaryPKDetails", obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<BinaryPKTest2> getBinaryPKDetails() {
-        return (List<BinaryPKTest2>)readProperty("binaryPKDetails");
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BinaryPKTest2.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BinaryPKTest2.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BinaryPKTest2.java
deleted file mode 100644
index 4bff8bd..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BinaryPKTest2.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-import org.apache.cayenne.testdo.testmap.BinaryPKTest1;
-
-/**
- * Class _BinaryPKTest2 was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _BinaryPKTest2 extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String DETAIL_NAME_PROPERTY = "detailName";
-    @Deprecated
-    public static final String TO_BINARY_PKMASTER_PROPERTY = "toBinaryPKMaster";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<String> DETAIL_NAME = new Property<String>("detailName");
-    public static final Property<BinaryPKTest1> TO_BINARY_PKMASTER = new Property<BinaryPKTest1>("toBinaryPKMaster");
-
-    public void setDetailName(String detailName) {
-        writeProperty("detailName", detailName);
-    }
-    public String getDetailName() {
-        return (String)readProperty("detailName");
-    }
-
-    public void setToBinaryPKMaster(BinaryPKTest1 toBinaryPKMaster) {
-        setToOneTarget("toBinaryPKMaster", toBinaryPKMaster, true);
-    }
-
-    public BinaryPKTest1 getToBinaryPKMaster() {
-        return (BinaryPKTest1)readProperty("toBinaryPKMaster");
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BitNumberTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BitNumberTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BitNumberTestEntity.java
deleted file mode 100644
index fe7c998..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BitNumberTestEntity.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-
-/**
- * Class _BitNumberTestEntity was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _BitNumberTestEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String BIT_COLUMN_PROPERTY = "bitColumn";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<Integer> BIT_COLUMN = new Property<Integer>("bitColumn");
-
-    public void setBitColumn(Integer bitColumn) {
-        writeProperty("bitColumn", bitColumn);
-    }
-    public Integer getBitColumn() {
-        return (Integer)readProperty("bitColumn");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BitTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BitTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BitTestEntity.java
deleted file mode 100644
index bbc78d7..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BitTestEntity.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-
-/**
- * Class _BitTestEntity was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _BitTestEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String BIT_COLUMN_PROPERTY = "bitColumn";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<Boolean> BIT_COLUMN = new Property<Boolean>("bitColumn");
-
-    public void setBitColumn(Boolean bitColumn) {
-        writeProperty("bitColumn", bitColumn);
-    }
-    public Boolean getBitColumn() {
-        return (Boolean)readProperty("bitColumn");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BlobTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BlobTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BlobTestEntity.java
deleted file mode 100644
index 59d4f8c..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BlobTestEntity.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-
-/**
- * Class _BlobTestEntity was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _BlobTestEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String BLOB_COL_PROPERTY = "blobCol";
-
-    public static final String BLOB_TEST_ID_PK_COLUMN = "BLOB_TEST_ID";
-
-    public static final Property<byte[]> BLOB_COL = new Property<byte[]>("blobCol");
-
-    public void setBlobCol(byte[] blobCol) {
-        writeProperty("blobCol", blobCol);
-    }
-    public byte[] getBlobCol() {
-        return (byte[])readProperty("blobCol");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BooleanTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BooleanTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BooleanTestEntity.java
deleted file mode 100644
index 380505e..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BooleanTestEntity.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-
-/**
- * Class _BooleanTestEntity was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _BooleanTestEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String BOOLEAN_COLUMN_PROPERTY = "booleanColumn";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<Boolean> BOOLEAN_COLUMN = new Property<Boolean>("booleanColumn");
-
-    public void setBooleanColumn(Boolean booleanColumn) {
-        writeProperty("booleanColumn", booleanColumn);
-    }
-    public Boolean getBooleanColumn() {
-        return (Boolean)readProperty("booleanColumn");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Box.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Box.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Box.java
deleted file mode 100644
index bf5c24e..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Box.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-import org.apache.cayenne.testdo.testmap.Bag;
-import org.apache.cayenne.testdo.testmap.Ball;
-import org.apache.cayenne.testdo.testmap.BoxInfo;
-import org.apache.cayenne.testdo.testmap.Thing;
-
-/**
- * Class _Box was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _Box extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String NAME_PROPERTY = "name";
-    @Deprecated
-    public static final String BAG_PROPERTY = "bag";
-    @Deprecated
-    public static final String BALLS_PROPERTY = "balls";
-    @Deprecated
-    public static final String BOX_INFO_PROPERTY = "boxInfo";
-    @Deprecated
-    public static final String THINGS_PROPERTY = "things";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<String> NAME = new Property<String>("name");
-    public static final Property<Bag> BAG = new Property<Bag>("bag");
-    public static final Property<List<Ball>> BALLS = new Property<List<Ball>>("balls");
-    public static final Property<BoxInfo> BOX_INFO = new Property<BoxInfo>("boxInfo");
-    public static final Property<List<Thing>> THINGS = new Property<List<Thing>>("things");
-
-    public void setName(String name) {
-        writeProperty("name", name);
-    }
-    public String getName() {
-        return (String)readProperty("name");
-    }
-
-    public void setBag(Bag bag) {
-        setToOneTarget("bag", bag, true);
-    }
-
-    public Bag getBag() {
-        return (Bag)readProperty("bag");
-    }
-
-
-    public void addToBalls(Ball obj) {
-        addToManyTarget("balls", obj, true);
-    }
-    public void removeFromBalls(Ball obj) {
-        removeToManyTarget("balls", obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<Ball> getBalls() {
-        return (List<Ball>)readProperty("balls");
-    }
-
-
-    public void setBoxInfo(BoxInfo boxInfo) {
-        setToOneTarget("boxInfo", boxInfo, true);
-    }
-
-    public BoxInfo getBoxInfo() {
-        return (BoxInfo)readProperty("boxInfo");
-    }
-
-
-    @SuppressWarnings("unchecked")
-    public List<Thing> getThings() {
-        return (List<Thing>)readProperty("things");
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BoxInfo.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BoxInfo.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BoxInfo.java
deleted file mode 100644
index b8312e4..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BoxInfo.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-import org.apache.cayenne.testdo.testmap.Box;
-
-/**
- * Class _BoxInfo was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _BoxInfo extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String COLOR_PROPERTY = "color";
-    @Deprecated
-    public static final String BOX_PROPERTY = "box";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<String> COLOR = new Property<String>("color");
-    public static final Property<Box> BOX = new Property<Box>("box");
-
-    public void setColor(String color) {
-        writeProperty("color", color);
-    }
-    public String getColor() {
-        return (String)readProperty("color");
-    }
-
-    public void setBox(Box box) {
-        setToOneTarget("box", box, true);
-    }
-
-    public Box getBox() {
-        return (Box)readProperty("box");
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CalendarEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CalendarEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CalendarEntity.java
deleted file mode 100644
index b0549ab..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CalendarEntity.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import java.util.Calendar;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-
-/**
- * Class _CalendarEntity was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _CalendarEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String CALENDAR_FIELD_PROPERTY = "calendarField";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<Calendar> CALENDAR_FIELD = new Property<Calendar>("calendarField");
-
-    public void setCalendarField(Calendar calendarField) {
-        writeProperty("calendarField", calendarField);
-    }
-    public Calendar getCalendarField() {
-        return (Calendar)readProperty("calendarField");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharFkTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharFkTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharFkTestEntity.java
deleted file mode 100644
index e293528..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharFkTestEntity.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-import org.apache.cayenne.testdo.testmap.CharPkTestEntity;
-
-/**
- * Class _CharFkTestEntity was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _CharFkTestEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String NAME_PROPERTY = "name";
-    @Deprecated
-    public static final String TO_CHAR_PK_PROPERTY = "toCharPK";
-
-    public static final String PK_PK_COLUMN = "PK";
-
-    public static final Property<String> NAME = new Property<String>("name");
-    public static final Property<CharPkTestEntity> TO_CHAR_PK = new Property<CharPkTestEntity>("toCharPK");
-
-    public void setName(String name) {
-        writeProperty("name", name);
-    }
-    public String getName() {
-        return (String)readProperty("name");
-    }
-
-    public void setToCharPK(CharPkTestEntity toCharPK) {
-        setToOneTarget("toCharPK", toCharPK, true);
-    }
-
-    public CharPkTestEntity getToCharPK() {
-        return (CharPkTestEntity)readProperty("toCharPK");
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharPkTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharPkTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharPkTestEntity.java
deleted file mode 100644
index 81ecbc6..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharPkTestEntity.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-import org.apache.cayenne.testdo.testmap.CharFkTestEntity;
-
-/**
- * Class _CharPkTestEntity was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _CharPkTestEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String OTHER_COL_PROPERTY = "otherCol";
-    @Deprecated
-    public static final String PK_COL_PROPERTY = "pkCol";
-    @Deprecated
-    public static final String CHAR_FKS_PROPERTY = "charFKs";
-
-    public static final String PK_COL_PK_COLUMN = "PK_COL";
-
-    public static final Property<String> OTHER_COL = new Property<String>("otherCol");
-    public static final Property<String> PK_COL = new Property<String>("pkCol");
-    public static final Property<List<CharFkTestEntity>> CHAR_FKS = new Property<List<CharFkTestEntity>>("charFKs");
-
-    public void setOtherCol(String otherCol) {
-        writeProperty("otherCol", otherCol);
-    }
-    public String getOtherCol() {
-        return (String)readProperty("otherCol");
-    }
-
-    public void setPkCol(String pkCol) {
-        writeProperty("pkCol", pkCol);
-    }
-    public String getPkCol() {
-        return (String)readProperty("pkCol");
-    }
-
-    public void addToCharFKs(CharFkTestEntity obj) {
-        addToManyTarget("charFKs", obj, true);
-    }
-    public void removeFromCharFKs(CharFkTestEntity obj) {
-        removeToManyTarget("charFKs", obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<CharFkTestEntity> getCharFKs() {
-        return (List<CharFkTestEntity>)readProperty("charFKs");
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharacterEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharacterEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharacterEntity.java
deleted file mode 100644
index 613ee6e..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharacterEntity.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-
-/**
- * Class _CharacterEntity was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _CharacterEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String CHARACTER_FIELD_PROPERTY = "characterField";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<Character> CHARACTER_FIELD = new Property<Character>("characterField");
-
-    public void setCharacterField(Character characterField) {
-        writeProperty("characterField", characterField);
-    }
-    public Character getCharacterField() {
-        return (Character)readProperty("characterField");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ClobTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ClobTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ClobTestEntity.java
deleted file mode 100644
index 64fcbff..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ClobTestEntity.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-import org.apache.cayenne.testdo.testmap.ClobTestRelation;
-
-/**
- * Class _ClobTestEntity was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _ClobTestEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String CLOB_COL_PROPERTY = "clobCol";
-    @Deprecated
-    public static final String CLOB_VALUE_PROPERTY = "clobValue";
-
-    public static final String CLOB_TEST_ID_PK_COLUMN = "CLOB_TEST_ID";
-
-    public static final Property<String> CLOB_COL = new Property<String>("clobCol");
-    public static final Property<List<ClobTestRelation>> CLOB_VALUE = new Property<List<ClobTestRelation>>("clobValue");
-
-    public void setClobCol(String clobCol) {
-        writeProperty("clobCol", clobCol);
-    }
-    public String getClobCol() {
-        return (String)readProperty("clobCol");
-    }
-
-    public void addToClobValue(ClobTestRelation obj) {
-        addToManyTarget("clobValue", obj, true);
-    }
-    public void removeFromClobValue(ClobTestRelation obj) {
-        removeToManyTarget("clobValue", obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<ClobTestRelation> getClobValue() {
-        return (List<ClobTestRelation>)readProperty("clobValue");
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ClobTestRelation.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ClobTestRelation.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ClobTestRelation.java
deleted file mode 100644
index 5897c35..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ClobTestRelation.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-import org.apache.cayenne.testdo.testmap.ClobTestEntity;
-
-/**
- * Class _ClobTestRelation was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _ClobTestRelation extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String ID_PROPERTY = "id";
-    @Deprecated
-    public static final String VALUE_PROPERTY = "value";
-    @Deprecated
-    public static final String CLOB_ID_PROPERTY = "clobId";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<Integer> ID = new Property<Integer>("id");
-    public static final Property<Integer> VALUE = new Property<Integer>("value");
-    public static final Property<ClobTestEntity> CLOB_ID = new Property<ClobTestEntity>("clobId");
-
-    public void setId(Integer id) {
-        writeProperty("id", id);
-    }
-    public Integer getId() {
-        return (Integer)readProperty("id");
-    }
-
-    public void setValue(Integer value) {
-        writeProperty("value", value);
-    }
-    public Integer getValue() {
-        return (Integer)readProperty("value");
-    }
-
-    public void setClobId(ClobTestEntity clobId) {
-        setToOneTarget("clobId", clobId, true);
-    }
-
-    public ClobTestEntity getClobId() {
-        return (ClobTestEntity)readProperty("clobId");
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundFkTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundFkTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundFkTestEntity.java
deleted file mode 100644
index 53d4944..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundFkTestEntity.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-import org.apache.cayenne.testdo.testmap.CompoundPkTestEntity;
-
-/**
- * Class _CompoundFkTestEntity was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _CompoundFkTestEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String NAME_PROPERTY = "name";
-    @Deprecated
-    public static final String TO_COMPOUND_PK_PROPERTY = "toCompoundPk";
-
-    public static final String PKEY_PK_COLUMN = "PKEY";
-
-    public static final Property<String> NAME = new Property<String>("name");
-    public static final Property<CompoundPkTestEntity> TO_COMPOUND_PK = new Property<CompoundPkTestEntity>("toCompoundPk");
-
-    public void setName(String name) {
-        writeProperty("name", name);
-    }
-    public String getName() {
-        return (String)readProperty("name");
-    }
-
-    public void setToCompoundPk(CompoundPkTestEntity toCompoundPk) {
-        setToOneTarget("toCompoundPk", toCompoundPk, true);
-    }
-
-    public CompoundPkTestEntity getToCompoundPk() {
-        return (CompoundPkTestEntity)readProperty("toCompoundPk");
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPkTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPkTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPkTestEntity.java
deleted file mode 100644
index f06172b..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPkTestEntity.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-import org.apache.cayenne.testdo.testmap.CompoundFkTestEntity;
-
-/**
- * Class _CompoundPkTestEntity was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _CompoundPkTestEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String KEY1_PROPERTY = "key1";
-    @Deprecated
-    public static final String KEY2_PROPERTY = "key2";
-    @Deprecated
-    public static final String NAME_PROPERTY = "name";
-    @Deprecated
-    public static final String COMPOUND_FK_ARRAY_PROPERTY = "compoundFkArray";
-
-    public static final String KEY1_PK_COLUMN = "KEY1";
-    public static final String KEY2_PK_COLUMN = "KEY2";
-
-    public static final Property<String> KEY1 = new Property<String>("key1");
-    public static final Property<String> KEY2 = new Property<String>("key2");
-    public static final Property<String> NAME = new Property<String>("name");
-    public static final Property<List<CompoundFkTestEntity>> COMPOUND_FK_ARRAY = new Property<List<CompoundFkTestEntity>>("compoundFkArray");
-
-    public void setKey1(String key1) {
-        writeProperty("key1", key1);
-    }
-    public String getKey1() {
-        return (String)readProperty("key1");
-    }
-
-    public void setKey2(String key2) {
-        writeProperty("key2", key2);
-    }
-    public String getKey2() {
-        return (String)readProperty("key2");
-    }
-
-    public void setName(String name) {
-        writeProperty("name", name);
-    }
-    public String getName() {
-        return (String)readProperty("name");
-    }
-
-    public void addToCompoundFkArray(CompoundFkTestEntity obj) {
-        addToManyTarget("compoundFkArray", obj, true);
-    }
-    public void removeFromCompoundFkArray(CompoundFkTestEntity obj) {
-        removeToManyTarget("compoundFkArray", obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<CompoundFkTestEntity> getCompoundFkArray() {
-        return (List<CompoundFkTestEntity>)readProperty("compoundFkArray");
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_DateTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_DateTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_DateTestEntity.java
deleted file mode 100644
index ca110eb..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_DateTestEntity.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import java.util.Date;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-
-/**
- * Class _DateTestEntity was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _DateTestEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String DATE_COLUMN_PROPERTY = "dateColumn";
-    @Deprecated
-    public static final String TIME_COLUMN_PROPERTY = "timeColumn";
-    @Deprecated
-    public static final String TIMESTAMP_COLUMN_PROPERTY = "timestampColumn";
-
-    public static final String DATE_TEST_ID_PK_COLUMN = "DATE_TEST_ID";
-
-    public static final Property<Date> DATE_COLUMN = new Property<Date>("dateColumn");
-    public static final Property<Date> TIME_COLUMN = new Property<Date>("timeColumn");
-    public static final Property<Date> TIMESTAMP_COLUMN = new Property<Date>("timestampColumn");
-
-    public void setDateColumn(Date dateColumn) {
-        writeProperty("dateColumn", dateColumn);
-    }
-    public Date getDateColumn() {
-        return (Date)readProperty("dateColumn");
-    }
-
-    public void setTimeColumn(Date timeColumn) {
-        writeProperty("timeColumn", timeColumn);
-    }
-    public Date getTimeColumn() {
-        return (Date)readProperty("timeColumn");
-    }
-
-    public void setTimestampColumn(Date timestampColumn) {
-        writeProperty("timestampColumn", timestampColumn);
-    }
-    public Date getTimestampColumn() {
-        return (Date)readProperty("timestampColumn");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_DecimalPKTest1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_DecimalPKTest1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_DecimalPKTest1.java
deleted file mode 100644
index 0cab136..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_DecimalPKTest1.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-
-/**
- * Class _DecimalPKTest1 was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _DecimalPKTest1 extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String DECIMAL_PK_PROPERTY = "decimalPK";
-    @Deprecated
-    public static final String NAME_PROPERTY = "name";
-
-    public static final String DECIMAL_PK_PK_COLUMN = "DECIMAL_PK";
-
-    public static final Property<Double> DECIMAL_PK = new Property<Double>("decimalPK");
-    public static final Property<String> NAME = new Property<String>("name");
-
-    public void setDecimalPK(Double decimalPK) {
-        writeProperty("decimalPK", decimalPK);
-    }
-    public Double getDecimalPK() {
-        return (Double)readProperty("decimalPK");
-    }
-
-    public void setName(String name) {
-        writeProperty("name", name);
-    }
-    public String getName() {
-        return (String)readProperty("name");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_DecimalPKTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_DecimalPKTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_DecimalPKTestEntity.java
deleted file mode 100644
index 4386364..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_DecimalPKTestEntity.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import java.math.BigDecimal;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-
-/**
- * Class _DecimalPKTestEntity was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _DecimalPKTestEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String DECIMAL_PK_PROPERTY = "decimalPK";
-    @Deprecated
-    public static final String NAME_PROPERTY = "name";
-
-    public static final String DECIMAL_PK_PK_COLUMN = "DECIMAL_PK";
-
-    public static final Property<BigDecimal> DECIMAL_PK = new Property<BigDecimal>("decimalPK");
-    public static final Property<String> NAME = new Property<String>("name");
-
-    public void setDecimalPK(BigDecimal decimalPK) {
-        writeProperty("decimalPK", decimalPK);
-    }
-    public BigDecimal getDecimalPK() {
-        return (BigDecimal)readProperty("decimalPK");
-    }
-
-    public void setName(String name) {
-        writeProperty("name", name);
-    }
-    public String getName() {
-        return (String)readProperty("name");
-    }
-
-}