X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fjcr%2Fmvc%2FJcrManagerController.java;h=5b90f03ad663e4cd83fae12d1ff18550aeffbbb5;hb=3e2ab8c7275cf2570f9a53158d12716b8051b376;hp=37fca841c1104366d1f3f1c581ac0ad9a39e88b8;hpb=a668345e948f3f6da7475279bbe330e129fb1841;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/server/jcr/mvc/JcrManagerController.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/server/jcr/mvc/JcrManagerController.java
index 37fca841c..5b90f03ad 100644
--- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/server/jcr/mvc/JcrManagerController.java
+++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/server/jcr/mvc/JcrManagerController.java
@@ -1,8 +1,25 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed 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.argeo.server.jcr.mvc;
 
 import java.util.List;
 import java.util.StringTokenizer;
 
+import javax.jcr.Session;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -12,21 +29,21 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.jcr.JcrResourceAdapter;
 import org.argeo.server.ServerAnswer;
-import org.argeo.server.jcr.JcrResourceAdapter;
 import org.argeo.server.mvc.MvcConstants;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.WebRequest;
 
 @Controller
-public class JcrManagerController implements MvcConstants {
+public class JcrManagerController implements MvcConstants, JcrMvcConstants {
 	private final static Log log = LogFactory
 			.getLog(JcrManagerController.class);
 
-	private JcrResourceAdapter resourceAdapter;
-
 	// Create a factory for disk-based file items
 	private FileItemFactory factory = new DiskFileItemFactory();
 
@@ -36,8 +53,13 @@ public class JcrManagerController implements MvcConstants {
 	@SuppressWarnings("unchecked")
 	@RequestMapping("/upload/**")
 	@ModelAttribute(ANSWER_MODEL_KEY_AS_HTML)
-	public ServerAnswer upload(HttpServletRequest request,
-			HttpServletResponse response) throws Exception {
+	public ServerAnswer upload(WebRequest webRequest,
+			HttpServletRequest request, HttpServletResponse response)
+			throws Exception {
+
+		Session session = ((Session) webRequest.getAttribute(
+				REQUEST_ATTR_SESSION, RequestAttributes.SCOPE_REQUEST));
+		JcrResourceAdapter resourceAdapter = new JcrResourceAdapter(session);
 		// Parse the request
 		List<FileItem> items = upload.parseRequest(request);
 
@@ -72,8 +94,4 @@ public class JcrManagerController implements MvcConstants {
 		return ServerAnswer.ok("File " + path + " imported");
 	}
 
-	public void setResourceAdapter(JcrResourceAdapter resourceAdapter) {
-		this.resourceAdapter = resourceAdapter;
-	}
-
 }