From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 3 Oct 2012 14:53:33 +0000 (+0000)
Subject: Fix manifest generation
X-Git-Tag: argeo-commons-2.1.30~831
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=08ad729f003968658575f6cc110a32492aa6ccc1;p=lgpl%2Fargeo-commons.git

Fix manifest generation

git-svn-id: https://svn.argeo.org/commons/trunk@5584 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/server/runtime/org.argeo.server.core/pom.xml b/server/runtime/org.argeo.server.core/pom.xml
index 3857f666f..cdab4208b 100644
--- a/server/runtime/org.argeo.server.core/pom.xml
+++ b/server/runtime/org.argeo.server.core/pom.xml
@@ -34,6 +34,7 @@
 							org.argeo.server.*
 						</Export-Package>
 						<Import-Package>
+							javax.servlet,
 							org.springframework.web.context,
 							*
 						</Import-Package>
diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingView.java b/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingView.java
index f3cf73583..30baed01a 100644
--- a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingView.java
+++ b/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingView.java
@@ -50,7 +50,7 @@ public class SerializingView extends AbstractView implements MvcConstants {
 		this.serializer = serializer;
 	}
 
-	@SuppressWarnings( { "restriction", "rawtypes" })
+	@SuppressWarnings({ "rawtypes" })
 	@Override
 	protected void renderMergedOutputModel(Map model,
 			HttpServletRequest request, HttpServletResponse response)