You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2010/05/11 11:49:05 UTC
svn commit: r943066 - in
/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat:
BundleDirContext.java GeronimoStandardContext.java
Author: xuhaihong
Date: Tue May 11 09:49:04 2010
New Revision: 943066
URL: http://svn.apache.org/viewvc?rev=943066&view=rev
Log:
GERONIMO-5292 Resources inside WEB-INF/lib/ [*.jar]/META-INF/resources directory can not be recognized
Modified:
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java?rev=943066&r1=943065&r2=943066&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java Tue May 11 09:49:04 2010
@@ -22,8 +22,10 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
+import java.util.Collections;
import java.util.Enumeration;
import java.util.Iterator;
+import java.util.List;
import java.util.Map.Entry;
import javax.naming.Binding;
@@ -37,10 +39,10 @@ import javax.naming.directory.Modificati
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
-import org.apache.xbean.osgi.bundle.util.BundleUtils;
import org.apache.naming.resources.BaseDirContext;
import org.apache.naming.resources.Resource;
import org.apache.naming.resources.ResourceAttributes;
+import org.apache.xbean.osgi.bundle.util.BundleUtils;
import org.osgi.framework.Bundle;
/**
@@ -57,8 +59,13 @@ public class BundleDirContext extends Ba
private final String path;
public BundleDirContext(Bundle bundle, String path) {
+ this(bundle, path, Collections.<DirContext> emptyList());
+ }
+
+ public BundleDirContext(Bundle bundle, String path, List<DirContext> altDirContext) {
this.bundle = bundle;
this.path = path;
+ this.altDirContexts.addAll(altDirContext);
}
@Override
@@ -243,7 +250,7 @@ public class BundleDirContext extends Ba
name = getName(name);
URL url = BundleUtils.getEntry(bundle, name);
if (url == null) {
- throw new NamingException(sm.getString("resources.notFound", name));
+ return null;
}
if (url.toString().endsWith("/")) {
return new BundleDirContext(bundle, name);
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java?rev=943066&r1=943065&r2=943066&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java Tue May 11 09:49:04 2010
@@ -17,14 +17,23 @@
package org.apache.geronimo.tomcat;
import java.beans.PropertyChangeListener;
+import java.io.File;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URL;
+import java.util.ArrayList;
import java.util.Collections;
+import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import javax.naming.directory.DirContext;
import javax.security.auth.Subject;
import javax.security.jacc.PolicyContext;
import javax.servlet.Servlet;
@@ -34,6 +43,7 @@ import javax.servlet.ServletException;
import org.apache.catalina.Container;
import org.apache.catalina.ContainerListener;
+import org.apache.catalina.Engine;
import org.apache.catalina.Globals;
import org.apache.catalina.InstanceListener;
import org.apache.catalina.Lifecycle;
@@ -51,6 +61,8 @@ import org.apache.catalina.ha.CatalinaCl
import org.apache.catalina.valves.ValveBase;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.common.GeronimoSecurityException;
+import org.apache.geronimo.kernel.util.FileUtils;
+import org.apache.geronimo.kernel.util.IOUtils;
import org.apache.geronimo.osgi.web.WebApplicationUtils;
import org.apache.geronimo.security.ContextManager;
import org.apache.geronimo.security.jaas.ConfigurationFactory;
@@ -70,6 +82,7 @@ import org.apache.geronimo.web.WebAttrib
import org.apache.geronimo.webservices.POJOWebServiceServlet;
import org.apache.geronimo.webservices.WebServiceContainer;
import org.apache.geronimo.webservices.WebServiceContainerInvoker;
+import org.apache.naming.resources.FileDirContext;
import org.apache.tomcat.InstanceManager;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceRegistration;
@@ -81,11 +94,10 @@ import org.osgi.framework.ServiceRegistr
public class GeronimoStandardContext extends StandardContext {
private static final long serialVersionUID = 3834587716552831032L;
- private static final boolean allowLinking;
- static {
- allowLinking = new Boolean(System.getProperty("org.apache.geronimo.tomcat.GeronimoStandardContext.allowLinking", "false"));
- }
+ private static final boolean allowLinking = Boolean.getBoolean("org.apache.geronimo.tomcat.GeronimoStandardContext.allowLinking");
+
+ private static final boolean FLUSH_STATIC_RESOURCES_ON_STARTUP = Boolean.getBoolean("org.apache.geronimo.tomcat.GeronimoStandardContext.flushStaticResourcesOnStartup");
private Subject defaultSubject = null;
private RunAsSource runAsSource = RunAsSource.NULL;
@@ -113,7 +125,7 @@ public class GeronimoStandardContext ext
public void setContextProperties(TomcatContext ctx) throws DeploymentException {
bundle = ctx.getBundle();
- setResources(new BundleDirContext(ctx.getBundle(), ctx.getModulePath()));
+ setResources(createDirContext(ctx));
// Create ReadOnlyContext
javax.naming.Context enc = ctx.getJndiContext();
@@ -565,6 +577,70 @@ public class GeronimoStandardContext ext
return context;
}
+ protected DirContext createDirContext(TomcatContext tomcatContext) throws DeploymentException {
+ List<DirContext> altDirContexts = new ArrayList<DirContext>();
+ Engine engine = (Engine)getParent().getParent();
+ String serviceName = engine.getService().getName();
+ String engineName = engine.getName();
+ String hostName = getParent().getName();
+ String tomcatHome = System.getProperty("catalina.home");
+ File resourceRootDirectory = new File(tomcatHome + File.separator + "resources" + File.separator + serviceName + File.separator + engineName + File.separator + hostName + File.separator
+ + (getName().equals("/") ? "_" : getName()));
+ File completeFlagFile = new File(resourceRootDirectory, "complete.flag");
+ if (!resourceRootDirectory.exists() || FLUSH_STATIC_RESOURCES_ON_STARTUP || !completeFlagFile.exists()) {
+ try {
+ completeFlagFile.delete();
+ FileUtils.recursiveDelete(resourceRootDirectory);
+ resourceRootDirectory.mkdirs();
+ Enumeration<URL> en = tomcatContext.getBundle().findEntries(tomcatContext.getModulePath() != null ? tomcatContext.getModulePath() + "/WEB-INF/lib" : "WEB-INF/lib", "*.jar", false);
+ if (en != null) {
+ while (en.hasMoreElements()) {
+ URL jarUrl = en.nextElement();
+ File jarResourceDirectory = new File(resourceRootDirectory, jarUrl.getFile().substring(jarUrl.getFile().lastIndexOf('/') + 1));
+ jarResourceDirectory.mkdirs();
+ ZipInputStream in = null;
+ try {
+ in = new ZipInputStream(jarUrl.openStream());
+ ZipEntry zipEntry;
+ while ((zipEntry = in.getNextEntry()) != null) {
+ String name = zipEntry.getName();
+ if (name.indexOf("META-INF/resources") == 0) {
+ if (zipEntry.isDirectory()) {
+ new File(jarResourceDirectory, name).mkdirs();
+ } else {
+ File resourceFile = new File(jarResourceDirectory, name);
+ resourceFile.getParentFile().mkdirs();
+ OutputStream out = null;
+ try {
+ out = new FileOutputStream(resourceFile);
+ IOUtils.copy(in, out);
+ } finally {
+ IOUtils.close(out);
+ }
+ }
+ }
+ }
+ } finally {
+ IOUtils.close(in);
+ }
+ }
+ }
+ completeFlagFile.createNewFile();
+ } catch (IOException e) {
+ throw new DeploymentException("Fail to create static resoruce cache for jar files in WEB-INF folder", e);
+ }
+ }
+ for (File resourceDirectory : resourceRootDirectory.listFiles()) {
+ if (resourceDirectory.isDirectory() && resourceDirectory.getName().endsWith(".jar") && resourceDirectory.listFiles().length > 0) {
+ FileDirContext fileDirContext = new FileDirContext();
+ fileDirContext.setAllowLinking(allowLinking);
+ fileDirContext.setDocBase(resourceDirectory.getAbsolutePath());
+ altDirContexts.add(fileDirContext);
+ }
+ }
+ return new BundleDirContext(tomcatContext.getBundle(), tomcatContext.getModulePath(), altDirContexts);
+ }
+
private class SystemMethodValve extends ValveBase {
public SystemMethodValve(){