10:37 a.m.
Author: remy.maucherat(a)jboss.com
Date: 2011-11-10 04:37:41 -0500 (Thu, 10 Nov 2011)
New Revision: 1863
Added:
trunk/java/org/apache/naming/resources/AliasDirContext.java
Modified:
trunk/java/org/apache/naming/resources/LocalStrings.properties
trunk/webapps/docs/changelog.xml
Log:
Add alias based dir context.
Added: trunk/java/org/apache/naming/resources/AliasDirContext.java
===================================================================
--- trunk/java/org/apache/naming/resources/AliasDirContext.java
(rev 0)
+++ trunk/java/org/apache/naming/resources/AliasDirContext.java 2011-11-10 09:37:41 UTC
(rev 1863)
@@ -0,0 +1,292 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.apache.naming.resources;
+
+import java.io.File;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.naming.Name;
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.OperationNotSupportedException;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
+import javax.naming.directory.SearchControls;
+
+/**
+ * Alias based implementation.
+ *
+ * @author Remy Maucherat
+ * @author Mark Thomas
+ */
+public class AliasDirContext extends BaseDirContext {
+
+ protected Map<String, DirContext> aliases = new ConcurrentHashMap<String,
DirContext>();
+
+ public AliasDirContext() {
+ super();
+ }
+
+ public AliasDirContext(Hashtable env) {
+ super(env);
+ }
+
+ /**
+ * Add an alias.
+ */
+ public void addAlias(String path, BaseDirContext dirContext) {
+ if (!path.startsWith("/")) {
+ throw new IllegalArgumentException(
+ sm.getString("resources.invalidAliasPath", path));
+ }
+ aliases.put(path, dirContext);
+ }
+
+
+ /**
+ * Remove an alias.
+ */
+ public void removeAlias(String path) {
+ if (!path.startsWith("/")) {
+ throw new IllegalArgumentException(
+ sm.getString("resources.invalidAliasPath", path));
+ }
+ aliases.remove(path);
+ }
+
+
+ /**
+ * Get the current alias configuration in String form. If no aliases are
+ * configured, an empty string will be returned.
+ */
+ public String getAliases() {
+ StringBuilder result = new StringBuilder();
+ Iterator<Entry<String,DirContext>> iter =
+ aliases.entrySet().iterator();
+ boolean first = true;
+ while (iter.hasNext()) {
+ if (first) {
+ first = false;
+ } else {
+ result.append(',');
+ }
+ Entry<String,DirContext> entry = iter.next();
+ result.append(entry.getKey());
+ result.append('=');
+ if (entry.getValue() instanceof BaseDirContext) {
+ result.append(((BaseDirContext) entry.getValue()).getDocBase());
+ }
+ }
+ return result.toString();
+ }
+
+
+ /**
+ * Set the current alias configuration from a String. The String should be
+ * of the form "/aliasPath1=docBase1,/aliasPath2=docBase2" where
aliasPathN
+ * must include a leading '/' and docBaseN must be an absolute path to
+ * either a .war file or a directory. Any call to this method will replace
+ * the current set of aliases.
+ */
+ public void setAliases(String theAliases) {
+ // Overwrite whatever is currently set
+ aliases.clear();
+
+ if (theAliases == null || theAliases.length() == 0)
+ return;
+
+ String[] kvps = theAliases.split(",");
+ for (String kvp : kvps) {
+ String[] kv = kvp.split("=");
+ if (kv.length != 2 || kv[0].length() == 0 || kv[1].length() == 0)
+ throw new
IllegalArgumentException(sm.getString("resources.invalidAliasMapping", kvp));
+ File aliasLoc = new File(kv[1]);
+ if (!aliasLoc.exists()) {
+ throw new
IllegalArgumentException(sm.getString("resources.invalidAliasNotExist",
kv[1]));
+ }
+ BaseDirContext context;
+ if (kv[1].endsWith(".war") && !(aliasLoc.isDirectory())) {
+ context = new WARDirContext();
+ } else if (aliasLoc.isDirectory()) {
+ context = new FileDirContext();
+ } else {
+ throw new
IllegalArgumentException(sm.getString("resources.invalidAliasFile", kv[1]));
+ }
+ context.setDocBase(kv[1]);
+ addAlias(kv[0], context);
+ }
+ }
+
+
+ private AliasResult findAlias(String name) {
+ AliasResult result = new AliasResult();
+
+ String searchName = name;
+
+ result.dirContext = aliases.get(searchName);
+ while (result.dirContext == null) {
+ int slash = searchName.lastIndexOf('/');
+ if (slash < 0)
+ break;
+ searchName = searchName.substring(0, slash);
+ result.dirContext = aliases.get(searchName);
+ }
+
+ if (result.dirContext != null)
+ result.aliasName = name.substring(searchName.length());
+
+ return result;
+ }
+
+ private static class AliasResult {
+ DirContext dirContext;
+ String aliasName;
+ }
+
+ public void release() {
+ this.aliases.clear();
+ super.release();
+ }
+
+ public Object lookup(String name) throws NamingException {
+ AliasResult result = findAlias(name);
+ if (result.dirContext != null) {
+ return result.dirContext.lookup(result.aliasName);
+ }
+ throw new NameNotFoundException(sm.getString("resources.notFound",
name));
+ }
+
+ public Object lookup(Name name) throws NamingException {
+ return lookup(name.toString());
+ }
+
+ public void unbind(String name) throws NamingException {
+ throw new OperationNotSupportedException();
+ }
+
+ public void rename(String oldName, String newName) throws NamingException {
+ throw new OperationNotSupportedException();
+ }
+
+ public NamingEnumeration list(String name) throws NamingException {
+ AliasResult result = findAlias(name);
+ if (result.dirContext != null) {
+ return result.dirContext.list(result.aliasName);
+ }
+ throw new NameNotFoundException(sm.getString("resources.notFound",
name));
+ }
+
+ public NamingEnumeration list(Name name) throws NamingException {
+ return list(name.toString());
+ }
+
+ public NamingEnumeration listBindings(String name) throws NamingException {
+ AliasResult result = findAlias(name);
+ if (result.dirContext != null) {
+ return result.dirContext.listBindings(result.aliasName);
+ }
+ throw new NameNotFoundException(sm.getString("resources.notFound",
name));
+ }
+
+ public NamingEnumeration listBindings(Name name) throws NamingException {
+ return listBindings(name.toString());
+ }
+
+ public void destroySubcontext(String name) throws NamingException {
+ throw new OperationNotSupportedException();
+ }
+
+ public Object lookupLink(String name) throws NamingException {
+ // Note : Links are not supported
+ return lookup(name);
+ }
+
+ public String getNameInNamespace() throws NamingException {
+ return docBase;
+ }
+
+ public Attributes getAttributes(String name, String[] attrIds) throws NamingException
{
+ AliasResult result = findAlias(name);
+ if (result.dirContext != null) {
+ return result.dirContext.getAttributes(result.aliasName, attrIds);
+ }
+ throw new NameNotFoundException(sm.getString("resources.notFound",
name));
+ }
+
+ public Attributes getAttributes(Name name, String[] attrIds) throws NamingException
{
+ return getAttributes(name.toString(), attrIds);
+ }
+
+ public void modifyAttributes(String name, int mod_op, Attributes attrs) throws
NamingException {
+ throw new OperationNotSupportedException();
+ }
+
+ public void modifyAttributes(String name, ModificationItem[] mods) throws
NamingException {
+ throw new OperationNotSupportedException();
+ }
+
+ public void bind(String name, Object obj, Attributes attrs) throws NamingException {
+ throw new OperationNotSupportedException();
+ }
+
+ public void rebind(String name, Object obj, Attributes attrs) throws NamingException
{
+ throw new OperationNotSupportedException();
+ }
+
+ public DirContext createSubcontext(String name, Attributes attrs) throws
NamingException {
+ throw new OperationNotSupportedException();
+ }
+
+ public DirContext getSchema(String name) throws NamingException {
+ throw new OperationNotSupportedException();
+ }
+
+ public DirContext getSchemaClassDefinition(String name) throws NamingException {
+ throw new OperationNotSupportedException();
+ }
+
+ public NamingEnumeration search(String name, Attributes matchingAttributes, String[]
attributesToReturn)
+ throws NamingException {
+ throw new OperationNotSupportedException();
+ }
+
+ public NamingEnumeration search(String name, Attributes matchingAttributes) throws
NamingException {
+ throw new OperationNotSupportedException();
+ }
+
+ public NamingEnumeration search(String name, String filter, SearchControls cons)
throws NamingException {
+ throw new OperationNotSupportedException();
+ }
+
+ public NamingEnumeration search(String name, String filterExpr, Object[] filterArgs,
SearchControls cons)
+ throws NamingException {
+ throw new OperationNotSupportedException();
+ }
+
+}
Modified: trunk/java/org/apache/naming/resources/LocalStrings.properties
===================================================================
--- trunk/java/org/apache/naming/resources/LocalStrings.properties 2011-11-07 15:42:49 UTC
(rev 1862)
+++ trunk/java/org/apache/naming/resources/LocalStrings.properties 2011-11-10 09:37:41 UTC
(rev 1863)
@@ -13,6 +13,10 @@
resources.alreadyBound=Name {0} is already bound in this Context
resources.bindFailed=Bind failed: {0}
resources.unbindFailed=Unbind failed: {0}
+resources.invalidAliasPath=Alias path {0} is invalid
+resources.invalidAliasMapping=Invalid alias mapping {0}
+resources.invalidAliasNotExist=Aliased path {0} does not exist
+resources.invalidAliasFile=Aliased path {0} is not a folder
standardResources.alreadyStarted=Resources has already been started
standardResources.directory=File base {0} is not a directory
standardResources.exists=File base {0} does not exist
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2011-11-07 15:42:49 UTC (rev 1862)
+++ trunk/webapps/docs/changelog.xml 2011-11-10 09:37:41 UTC (rev 1863)
@@ -19,6 +19,16 @@
<section name="JBoss Web 7.0.3.Final (remm)">
<subsection name="Catalina">
<changelog>
+ <update>
+ Add alias based dir context. (remm, markt)
+ </update>
+ </changelog>
+ </subsection>
+</section>
+
+<section name="JBoss Web 7.0.3.Final (remm)">
+ <subsection name="Catalina">
+ <changelog>
<fix>
Improve DIGEST authentication security. (remm)
</fix>