Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing jndi lock property key to include 'jetty' portion

This commit is contained in:
Joakim Erdfelt 2014-02-12 17:02:01 -07:00
parent e93097c09c
commit 1eb87fdddc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-jndi/src/main/java/org/eclipse/jetty/jndi/NamingContext.java
View File

@ -62,8 +62,8 @@ public class NamingContext implements Context, Cloneable, Dumpable
private final static Logger __log=NamingUtil.__log;
private final static List<Binding> __empty = Collections.emptyList();
public static final String DEEP_BINDING = "org.eclipse.jetty.jndi.deepBinding";
public static final String LOCK_PROPERTY = "org.eclipse.jndi.lock";
public static final String UNLOCK_PROPERTY = "org.eclipse.jndi.unlock";
public static final String LOCK_PROPERTY = "org.eclipse.jetty.jndi.lock";
public static final String UNLOCK_PROPERTY = "org.eclipse.jetty.jndi.unlock";
protected final Hashtable<String,Object> _env = new Hashtable<String,Object>();
private boolean _supportDeepBinding = false;

4
jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/PlusConfiguration.java
View File

@ -109,7 +109,7 @@ public class PlusConfiguration extends AbstractConfiguration
_key = new Integer(random.nextInt());
Context context = new InitialContext();
Context compCtx = (Context)context.lookup("java:comp");
compCtx.addToEnvironment("org.eclipse.jndi.lock", _key);
compCtx.addToEnvironment("org.eclipse.jetty.jndi.lock", _key);
}
finally
{
@ -129,7 +129,7 @@ public class PlusConfiguration extends AbstractConfiguration
{
Context context = new InitialContext();
Context compCtx = (Context)context.lookup("java:comp");
compCtx.addToEnvironment("org.eclipse.jndi.unlock", _key);
compCtx.addToEnvironment("org.eclipse.jetty.jndi.unlock", _key);
}
finally
{