You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by mr...@apache.org on 2005/01/31 13:45:09 UTC
svn commit: r149248 - in
incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test:
JNDIRepositoryStub.java RepositoryStub.java
Author: mreutegg
Date: Mon Jan 31 04:45:08 2005
New Revision: 149248
URL: http://svn.apache.org/viewcvs?view=rev&rev=149248
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/JNDIRepositoryStub.java (with props)
Modified:
incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/RepositoryStub.java
Added: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/JNDIRepositoryStub.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/JNDIRepositoryStub.java?view=auto&rev=149248
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/JNDIRepositoryStub.java (added)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/JNDIRepositoryStub.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 <code>RepositoryStub</code> and uses JNDI
+ * to obtain a <code>javax.jcr.Repository</code> instance.
+ */
+public class JNDIRepositoryStub extends RepositoryStub {
+
+ public static final String REPOSITORY_LOOKUP_PROP = "javax.jcr.tck.jndi.repository_lookup_name";
+
+ private Repository repository = null;
+
+ public JNDIRepositoryStub(Properties env) {
+ super(env);
+ }
+
+ /**
+ * Returns a reference to the <code>Repository</code> provided by this
+ * <code>RepositoryStub</code>.
+ * @return
+ */
+ public synchronized Repository getRepository() throws RepositoryStubException {
+ if (repository == null) {
+ try {
+ String lookupName = environment.getProperty(REPOSITORY_LOOKUP_PROP);
+ if (lookupName == null) {
+ throw new RepositoryStubException("Property " + REPOSITORY_LOOKUP_PROP + " not defined!");
+ }
+ InitialContext initial = new InitialContext(environment);
+ Object obj = initial.lookup(lookupName);
+
+ repository = (Repository)PortableRemoteObject.narrow(obj, Repository.class);
+
+ } catch (ClassCastException e) {
+ // ClassCastException may be thrown by ProtableRemoteObject.narrow()
+ throw new RepositoryStubException("Object cannot be narrowed 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 = native
Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/RepositoryStub.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/RepositoryStub.java?view=diff&r1=149247&r2=149248
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/RepositoryStub.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/RepositoryStub.java Mon Jan 31 04:45:08 2005
@@ -87,12 +87,12 @@
throw new IllegalArgumentException("Parameter 'env' must not be null!");
}
environment = env;
- superuser = new SimpleCredentials(env.getProperty(PROP_SUPERUSER_NAME, ""),
- env.getProperty(PROP_SUPERUSER_PWD, "").toCharArray());
- readonly = new SimpleCredentials(env.getProperty(PROP_READONLY_NAME, ""),
- env.getProperty(PROP_READONLY_PWD, "").toCharArray());
- readwrite = new SimpleCredentials(env.getProperty(PROP_READWRITE_NAME, ""),
- env.getProperty(PROP_READWRITE_PWD, "").toCharArray());
+ superuser = new SimpleCredentials(env.getProperty(PROP_PREFIX + "." + PROP_SUPERUSER_NAME, ""),
+ env.getProperty(PROP_PREFIX + "." + PROP_SUPERUSER_PWD, "").toCharArray());
+ readonly = new SimpleCredentials(env.getProperty(PROP_PREFIX + "." + PROP_READONLY_NAME, ""),
+ env.getProperty(PROP_PREFIX + "." + PROP_READONLY_PWD, "").toCharArray());
+ readwrite = new SimpleCredentials(env.getProperty(PROP_PREFIX + "." + PROP_READWRITE_NAME, ""),
+ env.getProperty(PROP_PREFIX + "." + PROP_READWRITE_PWD, "").toCharArray());
}
/**