Author: tdraier
Date: Mon Nov 19 18:00:39 2007
New Revision: 19228
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19228&repname=
=3Djahia
Log:
descriptor update and temporary hack (jndi registration) for jboss deployme=
nt
Modified:
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/jackrabbit-ext/src/java/org/=
jahia/services/content/JahiaAccessManager.java
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/jackrabbit-ext/src/jav=
a/org/jahia/services/content/JahiaAccessManager.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/jackrabbit-ext/src/java/org/jahia/services/content/Ja=
hiaAccessManager.java&rev=3D19228&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/jackrabbit-ext/src/java/org/=
jahia/services/content/JahiaAccessManager.java (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/jackrabbit-ext/src/java/org/=
jahia/services/content/JahiaAccessManager.java Mon Nov 19 18:00:39 2007
@@ -308,7 +308,11 @@
String serviceName =3D "jahia/users";
Hashtable env =3D new Hashtable();
InitialContext initctx =3D new InitialContext(env);
- Context ctx =3D (Context) initctx.lookup("java:comp/env");
- return (JahiaUserService) ctx.lookup(serviceName);
+ try {
+ Context ctx =3D (Context) initctx.lookup("java:comp/env");
+ return (JahiaUserService) ctx.lookup(serviceName);
+ } catch (NamingException e) {
+ return (JahiaUserService) initctx.lookup("java:jahia/users");
+ }
}
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
