Return-Path: <commits-return-22116-archive-asf-public=cust-asf.ponee.io@cayenne.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id C1EF5200D4E
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Thu,  7 Dec 2017 10:00:18 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id C019D160C33; Thu,  7 Dec 2017 09:00:18 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 178AD160BFE
	for <archive-asf-public@cust-asf.ponee.io>; Thu,  7 Dec 2017 10:00:17 +0100 (CET)
Received: (qmail 37242 invoked by uid 500); 7 Dec 2017 09:00:17 -0000
Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cayenne.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cayenne.apache.org>
List-Post: <mailto:commits@cayenne.apache.org>
List-Id: <commits.cayenne.apache.org>
Reply-To: dev@cayenne.apache.org
Delivered-To: mailing list commits@cayenne.apache.org
Received: (qmail 37225 invoked by uid 99); 7 Dec 2017 09:00:17 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Dec 2017 09:00:17 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 52277E96DA; Thu,  7 Dec 2017 09:00:16 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ntimofeev@apache.org
To: commits@cayenne.apache.org
Date: Thu, 07 Dec 2017 09:00:18 -0000
Message-Id: <7d2d9b9b88674fe1bf17600bd1bc19c9@git.apache.org>
In-Reply-To: <23349aade8e641fbbbb012a0aba74982@git.apache.org>
References: <23349aade8e641fbbbb012a0aba74982@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [03/24] cayenne git commit: CAY-2372. OSGI, web-module with tests.
archived-at: Thu, 07 Dec 2017 09:00:18 -0000

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;