Author: tdraier
Date: Mon Nov 19 18:00:12 2007
New Revision: 19227
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19227&repname=
=3Djahia
Log:
descriptor update and temporary hack (jndi registration) for jboss deployme=
nt
Modified:
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/project.xml
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/usermanager/JahiaUserManagerRoutingService.java
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/WEB-INF/jbos=
s-web.xml
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/WEB-INF/web.=
xml
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/project.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/project.xml&rev=3D19227&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/core/project.xml (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/project.xml Mon Nov 19 =
18:00:12 2007
@@ -387,6 +387,22 @@
</properties>
</dependency>
<dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-spi</artifactId>
+ <version>1.4-595678</version>
+ <properties>
+ <war.bundle>${jcr.embedded.jackrabbit}</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-spi-commons</artifactId>
+ <version>1.4-595678</version>
+ <properties>
+ <war.bundle>${jcr.embedded.jackrabbit}</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
<groupId>jahia</groupId>
<artifactId>jackrabbit-ext</artifactId>
<version>5.0-SNAPSHOT</version>
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahi=
a/services/usermanager/JahiaUserManagerRoutingService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/services/usermanager/JahiaUse=
rManagerRoutingService.java&rev=3D19227&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/core/src/java/org/jahia/serv=
ices/usermanager/JahiaUserManagerRoutingService.java (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/usermanager/JahiaUserManagerRoutingService.java Mon Nov 19 18:00:12 20=
07
@@ -171,7 +171,15 @@
Hashtable env =3D new Hashtable();
InitialContext initctx =3D new InitialContext(env);
ctx =3D (Context) initctx.lookup("java:comp/env");
- JahiaUserServiceProxy proxy =3D (JahiaUserServiceProxy) ctx.lo=
okup(serviceName);
+ JahiaUserServiceProxy proxy =3D null;
+ try {
+ proxy =3D (JahiaUserServiceProxy) ctx.lookup(serviceName);
+ } catch (NamingException e) {
+ proxy =3D new JahiaUserServiceProxy();
+ initctx.createSubcontext("java:jahia");
+ initctx.bind("java:jahia/users",proxy);
+ }
+
proxy.setService(new JahiaUserService() {
public boolean checkPassword(String username, String passw=
ord) {
JahiaUser user =3D lookupUser(0,username);
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/WEB-IN=
F/jboss-web.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/src/webapp/WEB-INF/jboss-web.xml&rev=3D19227&rep=
name=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/core/src/webapp/WEB-INF/jbos=
s-web.xml (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/WEB-INF/jbos=
s-web.xml Mon Nov 19 18:00:12 2007
@@ -3,11 +3,21 @@
<resource-ref>
<res-ref-name>jdbc/jetspeed</res-ref-name>
<res-type>javax.sql.DataSource</res-type>
- <jndi-name>java:/jahiaDS</jndi-name>
+ <jndi-name>java:jahiaDS</jndi-name>
</resource-ref>
<resource-ref>
<res-ref-name>jdbc/jetspeedNonTx</res-ref-name>
<res-type>javax.sql.DataSource</res-type>
- <jndi-name>java:/jahiaDS</jndi-name>
+ <jndi-name>java:jahiaDS</jndi-name>
</resource-ref> =
+ <resource-ref>
+ <res-ref-name>jcr/repository</res-ref-name>
+ <res-type>javax.jcr.Repository</res-type>
+ <jndi-name>java:jcr/local</jndi-name>
+ </resource-ref>
+ <resource-ref>
+ <res-ref-name>jahia/users</res-ref-name>
+ <res-type>org.jahia.api.user.JahiaUserService</res-type>
+ <jndi-name>java:jahia/users</jndi-name>
+ </resource-ref> =
</jboss-web>
\ No newline at end of file
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/WEB-IN=
F/web.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/src/webapp/WEB-INF/web.xml&rev=3D19227&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/core/src/webapp/WEB-INF/web.=
xml (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/WEB-INF/web.=
xml Mon Nov 19 18:00:12 2007
@@ -1394,6 +1394,20 @@
<res-auth>Container</res-auth>
</resource-ref>
=
+ <resource-ref>
+ <description>Repository</description>
+ <res-ref-name>jcr/repository</res-ref-name>
+ <res-type>javax.jcr.Repository</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+
+ <resource-ref>
+ <description>Jahia service</description>
+ <res-ref-name>jahia/users</res-ref-name>
+ <res-type>org.jahia.api.user.JahiaUserService</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+
<security-constraint>
<web-resource-collection>
<web-resource-name>JAM monitoring report</web-resource-name>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
