http://git-wip-us.apache.org/repos/asf/cayenne/blob/24b45fd4/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b890722..6faaba8 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,11 @@ <module>cayenne-web</module> ======= <module>cayenne-osgi</module> +<<<<<<< HEAD >>>>>>> e8768c6e3... CAY-2372 Extracted OSGI module from server module +======= + <module>cayenne-rop-server</module> +>>>>>>> 48b87d59f... CAY-2372 with osgi, web and rop-server modules. Tests failling </modules> <issueManagement> <system>jira</system>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/24b45fd4/tutorials/tutorial-rop-server-http2/src/main/java/org/apache/cayenne/tutorial/Http2ROPServlet.java ---------------------------------------------------------------------- diff --git a/tutorials/tutorial-rop-server-http2/src/main/java/org/apache/cayenne/tutorial/Http2ROPServlet.java b/tutorials/tutorial-rop-server-http2/src/main/java/org/apache/cayenne/tutorial/Http2ROPServlet.java index 4c4b4df..d8fab63 100644 --- a/tutorials/tutorial-rop-server-http2/src/main/java/org/apache/cayenne/tutorial/Http2ROPServlet.java +++ b/tutorials/tutorial-rop-server-http2/src/main/java/org/apache/cayenne/tutorial/Http2ROPServlet.java @@ -20,10 +20,10 @@ package org.apache.cayenne.tutorial; import org.apache.cayenne.configuration.rop.client.ProtostuffModule; -import org.apache.cayenne.configuration.rop.server.ROPServerModule; +import org.apache.cayenne.rop.server.ROPServerModule; import org.apache.cayenne.configuration.server.ServerRuntime; -import org.apache.cayenne.configuration.web.WebConfiguration; -import org.apache.cayenne.configuration.web.WebUtil; +import org.apache.cayenne.web.WebConfiguration; +import org.apache.cayenne.web.WebUtil; import org.apache.cayenne.di.Module; import org.apache.cayenne.remote.RemoteService; import org.apache.cayenne.rop.ROPSerializationService;
