Return-Path: Delivered-To: apmail-incubator-jackrabbit-commits-archive@www.apache.org Received: (qmail 79399 invoked from network); 31 Jan 2005 12:45:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 31 Jan 2005 12:45:12 -0000 Received: (qmail 96780 invoked by uid 500); 31 Jan 2005 12:45:11 -0000 Mailing-List: contact jackrabbit-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jackrabbit-dev@incubator.apache.org Delivered-To: mailing list jackrabbit-commits@incubator.apache.org Received: (qmail 96766 invoked by uid 500); 31 Jan 2005 12:45:11 -0000 Delivered-To: apmail-incubator-jackrabbit-cvs@incubator.apache.org Received: (qmail 96761 invoked by uid 99); 31 Jan 2005 12:45:11 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Mon, 31 Jan 2005 04:45:11 -0800 Received: (qmail 79382 invoked by uid 65534); 31 Jan 2005 12:45:10 -0000 Message-ID: <20050131124510.79381.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Mon, 31 Jan 2005 12:45:09 -0000 Subject: svn commit: r149248 - in incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test: JNDIRepositoryStub.java RepositoryStub.java To: jackrabbit-cvs@incubator.apache.org From: mreutegg@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: mreutegg Date: Mon Jan 31 04:45:08 2005 New Revision: 149248 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D149248 Log: Fixed username and password reading from propery file (missing prefix). Added repository stub over JNDI. Added: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/JNDIRepo= sitoryStub.java (with props) Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/Reposito= ryStub.java Added: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/JNDIR= epositoryStub.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/JNDIRepositoryStub.java?view=3Dauto&rev=3D149248 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/JNDIRepo= sitoryStub.java (added) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/JNDIRepo= sitoryStub.java Mon Jan 31 04:45:08 2005 @@ -0,0 +1,66 @@ +/* + * Copyright 2004-2005 The Apache Software Foundation or its licensors, + * as applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.jackrabbit.test; + +import javax.jcr.Repository; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.rmi.PortableRemoteObject; +import java.util.Properties; + +/** + * Implements the abstract class RepositoryStub and uses JNDI + * to obtain a javax.jcr.Repository instance. + */ +public class JNDIRepositoryStub extends RepositoryStub { + + public static final String REPOSITORY_LOOKUP_PROP =3D "javax.jcr.tck.j= ndi.repository_lookup_name"; + + private Repository repository =3D null; + + public JNDIRepositoryStub(Properties env) { + super(env); + } + + /** + * Returns a reference to the Repository provided by this + * RepositoryStub. + * @return + */ + public synchronized Repository getRepository() throws RepositoryStubEx= ception { + if (repository =3D=3D null) { + try { + String lookupName =3D environment.getProperty(REPOSITORY_L= OOKUP_PROP); + if (lookupName =3D=3D null) { + throw new RepositoryStubException("Property " + REPOSI= TORY_LOOKUP_PROP + " not defined!"); + } + InitialContext initial =3D new InitialContext(environment); + Object obj =3D initial.lookup(lookupName); + + repository =3D (Repository)PortableRemoteObject.narrow(obj= , Repository.class); + + } catch (ClassCastException e) { + // ClassCastException may be thrown by ProtableRemoteObjec= t=2Enarrow() + throw new RepositoryStubException("Object cannot be narrow= ed to javax.jcr.Repository: " + e); + } catch (NamingException e) { + throw new RepositoryStubException(e.getMessage()); + } + } + return repository; + } + +} Propchange: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/= JNDIRepositoryStub.java ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/Re= positoryStub.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/RepositoryStub.java?view=3Ddiff&r1=3D149247&r2=3D149= 248 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/Reposito= ryStub.java (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/Reposito= ryStub.java Mon Jan 31 04:45:08 2005 @@ -87,12 +87,12 @@ throw new IllegalArgumentException("Parameter 'env' must not b= e null!"); } environment =3D env; - superuser =3D new SimpleCredentials(env.getProperty(PROP_SUPERUSER= _NAME, ""), - env.getProperty(PROP_SUPERUSER_PWD, "").toCharArray()); - readonly =3D new SimpleCredentials(env.getProperty(PROP_READONLY_N= AME, ""), - env.getProperty(PROP_READONLY_PWD, "").toCharArray()); - readwrite =3D new SimpleCredentials(env.getProperty(PROP_READWRITE= _NAME, ""), - env.getProperty(PROP_READWRITE_PWD, "").toCharArray()); + superuser =3D new SimpleCredentials(env.getProperty(PROP_PREFIX + = "=2E" + PROP_SUPERUSER_NAME, ""), + env.getProperty(PROP_PREFIX + "." + PROP_SUPERUSER_PWD, ""= )=2EtoCharArray()); + readonly =3D new SimpleCredentials(env.getProperty(PROP_PREFIX + "= ." + PROP_READONLY_NAME, ""), + env.getProperty(PROP_PREFIX + "." + PROP_READONLY_PWD, "")= .toCharArray()); + readwrite =3D new SimpleCredentials(env.getProperty(PROP_PREFIX + = "=2E" + PROP_READWRITE_NAME, ""), + env.getProperty(PROP_PREFIX + "." + PROP_READWRITE_PWD, ""= )=2EtoCharArray()); } =20 /**