Author: norman
Date: Sun Apr 25 19:55:34 2010
New Revision: 937866
URL: http://svn.apache.org/viewvc?rev=937866&view=rev
Log:
Factor out the ResourceLoader stuff to an extra class to share it in other
deployments too (war..). See JAMES-834
Added:
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/JamesResourceLoader.java
Modified:
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/JamesServerApplicationContext.java
Added:
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/JamesResourceLoader.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/JamesResourceLoader.java?rev=937866&view=auto
==============================================================================
---
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/JamesResourceLoader.java
(added)
+++
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/JamesResourceLoader.java
Sun Apr 25 19:55:34 2010
@@ -0,0 +1,79 @@
+/****************************************************************
+ * 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.james.container.spring;
+
+import java.io.File;
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
+
+/**
+ * Abstract base class which load JAMES files based on the prefix. This can be
used in different
+ * {...@link ApplicationContext} implementations
+ *
+ *
+ */
+public abstract class JamesResourceLoader implements ResourceLoader{
+
+ private static final String FILE_PROTOCOL = "file://";
+ private static final String FILE_PROTOCOL_ABSOLUTE = "file:///";
+
+ private static final String FILE_PROTOCOL_AND_CONF = "file://conf/";
+ private static final String FILE_PROTOCOL_AND_VAR = "file://var/";
+
+
+ /**
+ * Return the {...@link Resource} for the given url. If the resource can
not be found null get returned
+ *
+ * @see
org.springframework.core.io.ResourceLoader#getResource(java.lang.String)
+ */
+ public Resource getResource(String fileURL) {
+ Resource r = null;
+ if (fileURL.startsWith("classpath:")) {
+ String resourceName = fileURL.substring("classpath:".length());
+ r = new ClassPathResource(resourceName);
+ } else if (fileURL.startsWith(FILE_PROTOCOL)) {
+ File file = null;
+ if (fileURL.startsWith(FILE_PROTOCOL_AND_CONF)) {
+ file = new File(getRootPath() + "/conf/" +
fileURL.substring(FILE_PROTOCOL_AND_CONF.length()));
+ } else if (fileURL.startsWith(FILE_PROTOCOL_AND_VAR)) {
+ file = new File(getRootPath() + "/var/" +
fileURL.substring(FILE_PROTOCOL_AND_VAR.length()));
+ } else if (fileURL.startsWith(FILE_PROTOCOL_ABSOLUTE)) {
+ file = new File("/" +
fileURL.substring(FILE_PROTOCOL_ABSOLUTE.length()));
+ } else {
+ // move to the root folder of the spring deployment
+ file = new File(getRootPath() + "/" +
fileURL.substring(FILE_PROTOCOL.length()));
+ }
+ r = new FileSystemResource(file);
+ } else {
+ return null;
+ }
+ return r;
+ }
+
+ /**
+ * Return the root path of the application
+ *
+ * @return rootPath
+ */
+ protected abstract String getRootPath();
+}
Modified:
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/JamesServerApplicationContext.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/JamesServerApplicationContext.java?rev=937866&r1=937865&r2=937866&view=diff
==============================================================================
---
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/JamesServerApplicationContext.java
(original)
+++
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/JamesServerApplicationContext.java
Sun Apr 25 19:55:34 2010
@@ -18,44 +18,45 @@
****************************************************************/
package org.apache.james.container.spring;
-import java.io.File;
-
+import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
+/**
+ * {...@link ApplicationContext} which loads all needed beans for JAMES
+ *
+ */
public class JamesServerApplicationContext extends
ClassPathXmlApplicationContext{
- private static final String FILE_PROTOCOL = "file://";
- private static final String FILE_PROTOCOL_ABSOLUTE = "file:///";
+ /**
+ * The resourceloader to use
+ */
+ private final static JamesResourceLoader resourceLoader = new
JamesResourceLoader() {
+
+ @Override
+ protected String getRootPath() {
+ return "..";
+ }
- private static final String FILE_PROTOCOL_AND_CONF = "file://conf/";
- private static final String FILE_PROTOCOL_AND_VAR = "file://var/";
+ public ClassLoader getClassLoader() {
+ return this.getClassLoader();
+ }
+
+ };
+
public JamesServerApplicationContext(String[] configs) {
super(configs);
}
+ /*
+ * (non-Javadoc)
+ * @see
org.springframework.core.io.DefaultResourceLoader#getResource(java.lang.String)
+ */
public Resource getResource(String fileURL) {
- Resource r = null;
- if (fileURL.startsWith("classpath:")) {
- String resourceName = fileURL.substring("classpath:".length());
- r = new ClassPathResource(resourceName);
- } else if (fileURL.startsWith(FILE_PROTOCOL)) {
- File file = null;
- if (fileURL.startsWith(FILE_PROTOCOL_AND_CONF)) {
- file = new File("../conf/" +
fileURL.substring(FILE_PROTOCOL_AND_CONF.length()));
- } else if (fileURL.startsWith(FILE_PROTOCOL_AND_VAR)) {
- file = new File("../var/" +
fileURL.substring(FILE_PROTOCOL_AND_VAR.length()));
- } else if (fileURL.startsWith(FILE_PROTOCOL_ABSOLUTE)) {
- file = new File("/" +
fileURL.substring(FILE_PROTOCOL_ABSOLUTE.length()));
- } else {
- // move to the root folder of the spring deployment
- file = new File("../" +
fileURL.substring(FILE_PROTOCOL.length()));
- }
- r = new FileSystemResource(file);
- } else {
+ // delegate the loading to the resourceloader
+ Resource r = resourceLoader.getResource(fileURL);
+ if (r == null) {
r = super.getResource(fileURL);
}
return r;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
