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 2018/01/11 14:40:51 UTC
[1/2] cayenne git commit: Add missing licenses
Repository: cayenne
Updated Branches:
refs/heads/master 8b33a3eb3 -> af167bdb7
Add missing licenses
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/cde79c11
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/cde79c11
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/cde79c11
Branch: refs/heads/master
Commit: cde79c1173bbc6979350dabfbd6e65d08fe6abc6
Parents: 8b33a3e
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Jan 11 17:38:37 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu Jan 11 17:38:37 2018 +0300
----------------------------------------------------------------------
cayenne-osgi/pom.xml | 18 ++++++++++++++++++
cayenne-rop-server/pom.xml | 18 ++++++++++++++++++
.../types/ValueObjectTypeFactoryOrderTest.java | 18 ++++++++++++++++++
.../access/types/ValueObjectTypeFactoryTest.java | 18 ++++++++++++++++++
.../testdo/meaningful_pk/MeaningfulPkTest2.java | 18 ++++++++++++++++++
.../cayenne/testdo/qualified/Qualified3.java | 18 ++++++++++++++++++
.../cayenne/testdo/qualified/Qualified4.java | 18 ++++++++++++++++++
.../src/test/resources/cayenne-meaningful-pk.xml | 1 -
.../src/test/resources/meaningful-pk.graph.xml | 9 ---------
cayenne-web/pom.xml | 18 ++++++++++++++++++
.../web/WebServerModuleProvider.java | 18 ++++++++++++++++++
.../src/docs/asciidoc/_cayenne-guide/var.adoc | 14 ++++++++++++++
docs/asciidoc/getting-started-rop/pom.xml | 18 ++++++++++++++++++
.../docs/asciidoc/_getting-started-rop/var.adoc | 14 ++++++++++++++
14 files changed, 208 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cde79c11/cayenne-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-osgi/pom.xml b/cayenne-osgi/pom.xml
index c948165..ffe3fdc 100644
--- a/cayenne-osgi/pom.xml
+++ b/cayenne-osgi/pom.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cde79c11/cayenne-rop-server/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-rop-server/pom.xml b/cayenne-rop-server/pom.xml
index 93399a0..4f0e92a 100644
--- a/cayenne-rop-server/pom.xml
+++ b/cayenne-rop-server/pom.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cde79c11/cayenne-server/src/test/java/org/apache/cayenne/access/types/ValueObjectTypeFactoryOrderTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/types/ValueObjectTypeFactoryOrderTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/types/ValueObjectTypeFactoryOrderTest.java
index 41843a9..b3e2535 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/types/ValueObjectTypeFactoryOrderTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/types/ValueObjectTypeFactoryOrderTest.java
@@ -1,3 +1,21 @@
+/*****************************************************************
+ * 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.access.types;
import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cde79c11/cayenne-server/src/test/java/org/apache/cayenne/access/types/ValueObjectTypeFactoryTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/types/ValueObjectTypeFactoryTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/types/ValueObjectTypeFactoryTest.java
index 463bf76..25f88d6 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/types/ValueObjectTypeFactoryTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/types/ValueObjectTypeFactoryTest.java
@@ -1,3 +1,21 @@
+/*****************************************************************
+ * 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.access.types;
import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cde79c11/cayenne-server/src/test/java/org/apache/cayenne/testdo/meaningful_pk/MeaningfulPkTest2.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/meaningful_pk/MeaningfulPkTest2.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/meaningful_pk/MeaningfulPkTest2.java
index b67c685..981233a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/meaningful_pk/MeaningfulPkTest2.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/meaningful_pk/MeaningfulPkTest2.java
@@ -1,3 +1,21 @@
+/*****************************************************************
+ * 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.meaningful_pk;
import org.apache.cayenne.testdo.meaningful_pk.auto._MeaningfulPkTest2;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cde79c11/cayenne-server/src/test/java/org/apache/cayenne/testdo/qualified/Qualified3.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/qualified/Qualified3.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/qualified/Qualified3.java
index 203481d..a30eb3c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/qualified/Qualified3.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/qualified/Qualified3.java
@@ -1,3 +1,21 @@
+/*****************************************************************
+ * 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.qualified;
import org.apache.cayenne.testdo.qualified.auto._Qualified3;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cde79c11/cayenne-server/src/test/java/org/apache/cayenne/testdo/qualified/Qualified4.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/qualified/Qualified4.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/qualified/Qualified4.java
index a510a8c..a815b50 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/qualified/Qualified4.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/qualified/Qualified4.java
@@ -1,3 +1,21 @@
+/*****************************************************************
+ * 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.qualified;
import org.apache.cayenne.testdo.qualified.auto._Qualified4;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cde79c11/cayenne-server/src/test/resources/cayenne-meaningful-pk.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-meaningful-pk.xml b/cayenne-server/src/test/resources/cayenne-meaningful-pk.xml
index 9e51cef..7980383 100644
--- a/cayenne-server/src/test/resources/cayenne-meaningful-pk.xml
+++ b/cayenne-server/src/test/resources/cayenne-meaningful-pk.xml
@@ -4,5 +4,4 @@
xsi:schemaLocation="http://cayenne.apache.org/schema/10/domain http://cayenne.apache.org/schema/10/domain.xsd"
project-version="10">
<map name="meaningful-pk"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="meaningful-pk.graph.xml"/>
</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cde79c11/cayenne-server/src/test/resources/meaningful-pk.graph.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/meaningful-pk.graph.xml b/cayenne-server/src/test/resources/meaningful-pk.graph.xml
deleted file mode 100644
index 34d1647..0000000
--- a/cayenne-server/src/test/resources/meaningful-pk.graph.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<graphs xmlns="http://cayenne.apache.org/schema/10/graph">
- <graph type="ER" scale="1.0">
- <entity name="MEANINGFUL_PK" x="318.0" y="139.0" width="115.0" height="50.0"/>
- <entity name="MEANINGFUL_PK_TEST2" x="770.24" y="594.87" width="200.0" height="82.0"/>
- <entity name="MEANINGFUL_PK_TEST1" x="0.0" y="155.19" width="169.0" height="98.0"/>
- <entity name="MEANINGFUL_PK_DEP" x="276.25" y="0.0" width="148.0" height="82.0"/>
- </graph>
-</graphs>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cde79c11/cayenne-web/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-web/pom.xml b/cayenne-web/pom.xml
index 732e8e9..c68c5f3 100644
--- a/cayenne-web/pom.xml
+++ b/cayenne-web/pom.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cde79c11/cayenne-web/src/main/java/org/apache/cayenne/configuration/web/WebServerModuleProvider.java
----------------------------------------------------------------------
diff --git a/cayenne-web/src/main/java/org/apache/cayenne/configuration/web/WebServerModuleProvider.java b/cayenne-web/src/main/java/org/apache/cayenne/configuration/web/WebServerModuleProvider.java
index 47e165e..bad08e3 100644
--- a/cayenne-web/src/main/java/org/apache/cayenne/configuration/web/WebServerModuleProvider.java
+++ b/cayenne-web/src/main/java/org/apache/cayenne/configuration/web/WebServerModuleProvider.java
@@ -1,3 +1,21 @@
+/*****************************************************************
+ * 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.configuration.web;
import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cde79c11/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/var.adoc
----------------------------------------------------------------------
diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/var.adoc b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/var.adoc
index e575eda..f5b6f37 100644
--- a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/var.adoc
+++ b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/var.adoc
@@ -1 +1,15 @@
+// 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.
+
:version: {project-version}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cde79c11/docs/asciidoc/getting-started-rop/pom.xml
----------------------------------------------------------------------
diff --git a/docs/asciidoc/getting-started-rop/pom.xml b/docs/asciidoc/getting-started-rop/pom.xml
index 15b515a..d358a09 100644
--- a/docs/asciidoc/getting-started-rop/pom.xml
+++ b/docs/asciidoc/getting-started-rop/pom.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cde79c11/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/var.adoc
----------------------------------------------------------------------
diff --git a/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/var.adoc b/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/var.adoc
index e575eda..f5b6f37 100644
--- a/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/var.adoc
+++ b/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/var.adoc
@@ -1 +1,15 @@
+// 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.
+
:version: {project-version}
\ No newline at end of file
[2/2] cayenne git commit: Revert changes
Posted by nt...@apache.org.
Revert changes
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/af167bdb
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/af167bdb
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/af167bdb
Branch: refs/heads/master
Commit: af167bdb72441b3b01ad6385778c124ebfd5fd54
Parents: cde79c1
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Jan 11 17:40:22 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu Jan 11 17:40:22 2018 +0300
----------------------------------------------------------------------
.../cayenne/query/ObjectSelect_RunIT.java | 30 --------------------
1 file changed, 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/af167bdb/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectSelect_RunIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectSelect_RunIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectSelect_RunIT.java
index e5a8c39..f1d4ba5 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectSelect_RunIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectSelect_RunIT.java
@@ -28,12 +28,10 @@ import java.util.List;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.DataRow;
-import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.ResultBatchIterator;
import org.apache.cayenne.ResultIterator;
import org.apache.cayenne.ResultIteratorCallback;
import org.apache.cayenne.access.DataContext;
-import org.apache.cayenne.configuration.server.ServerRuntime;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.exp.FunctionExpressionFactory;
@@ -41,7 +39,6 @@ import org.apache.cayenne.exp.Property;
import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.testdo.testmap.Artist;
-import org.apache.cayenne.testdo.testmap.Painting;
import org.apache.cayenne.unit.di.server.CayenneProjects;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
@@ -55,9 +52,6 @@ public class ObjectSelect_RunIT extends ServerCase {
private DataContext context;
@Inject
- ServerRuntime runtime;
-
- @Inject
private DBHelper dbHelper;
@Before
@@ -135,30 +129,6 @@ public class ObjectSelect_RunIT extends ServerCase {
}
@Test
- public void testBatchIteratorWithNullExpression() throws Exception {
-
- ObjectContext insertContext = runtime.newContext();
-
- List<Ordering> orderings = Artist.ARTIST_NAME.ascInsensitives();
- try (ResultBatchIterator<Artist> it = ObjectSelect.query(Artist.class, null, orderings).batchIterator(context, 5);) {
- int count = 0;
-
- for (List<Artist> artistList : it) {
- count++;
- for(Artist artist : artistList) {
- Painting painting = insertContext.newObject(Painting.class);
- painting.setPaintingTitle("painting " + count);
- painting.setPaintingDescription("artist " + artist.getArtistName());
- }
- assertEquals(5, artistList.size());
- insertContext.commitChanges();
- }
-
- assertEquals(4, count);
- }
- }
-
- @Test
public void test_SelectDataRows() throws Exception {
List<DataRow> result = ObjectSelect.dataRowQuery(Artist.class).select(context);
assertEquals(20, result.size());