directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oer...@apache.org
Subject svn commit: r547766 - /directory/sandbox/oersoy/apacheds.testing.archetype/src/main/resources/archetype-resources/src/test/java/org/apache/directory/apacheds/testing/setup/
Date Fri, 15 Jun 2007 18:56:02 GMT
Author: oersoy
Date: Fri Jun 15 11:56:01 2007
New Revision: 547766

URL: http://svn.apache.org/viewvc?view=rev&rev=547766
Log:
Changed the Embedded Class Name and Added Support for a Class for Embedded Hot Partition

Added:
    directory/sandbox/oersoy/apacheds.testing.archetype/src/main/resources/archetype-resources/src/test/java/org/apache/directory/apacheds/testing/setup/ADSEmbeddedConnectionTemplate.java
    directory/sandbox/oersoy/apacheds.testing.archetype/src/main/resources/archetype-resources/src/test/java/org/apache/directory/apacheds/testing/setup/ADSEmbeddedConnectionTemplateTest.java
    directory/sandbox/oersoy/apacheds.testing.archetype/src/main/resources/archetype-resources/src/test/java/org/apache/directory/apacheds/testing/setup/ADSEmbeddedHotPartitionTemplate.java
    directory/sandbox/oersoy/apacheds.testing.archetype/src/main/resources/archetype-resources/src/test/java/org/apache/directory/apacheds/testing/setup/ADSEmbeddedHotPartitionTemplateTest.java
Removed:
    directory/sandbox/oersoy/apacheds.testing.archetype/src/main/resources/archetype-resources/src/test/java/org/apache/directory/apacheds/testing/setup/JNDIEmbeddedConnectionTemplate.java
    directory/sandbox/oersoy/apacheds.testing.archetype/src/main/resources/archetype-resources/src/test/java/org/apache/directory/apacheds/testing/setup/JNDIEmbeddedConnectionTemplateTest.java

Added: directory/sandbox/oersoy/apacheds.testing.archetype/src/main/resources/archetype-resources/src/test/java/org/apache/directory/apacheds/testing/setup/ADSEmbeddedConnectionTemplate.java
URL: http://svn.apache.org/viewvc/directory/sandbox/oersoy/apacheds.testing.archetype/src/main/resources/archetype-resources/src/test/java/org/apache/directory/apacheds/testing/setup/ADSEmbeddedConnectionTemplate.java?view=auto&rev=547766
==============================================================================
--- directory/sandbox/oersoy/apacheds.testing.archetype/src/main/resources/archetype-resources/src/test/java/org/apache/directory/apacheds/testing/setup/ADSEmbeddedConnectionTemplate.java
(added)
+++ directory/sandbox/oersoy/apacheds.testing.archetype/src/main/resources/archetype-resources/src/test/java/org/apache/directory/apacheds/testing/setup/ADSEmbeddedConnectionTemplate.java
Fri Jun 15 11:56:01 2007
@@ -0,0 +1,129 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you 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.directory.apacheds.testing.setup;
+
+import java.util.Hashtable;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.naming.ldap.InitialLdapContext;
+import javax.naming.ldap.LdapContext;
+
+import org.apache.directory.server.core.configuration.MutableStartupConfiguration;
+import org.apache.directory.server.core.configuration.ShutdownConfiguration;
+import org.apache.log4j.PropertyConfigurator;
+
+/**
+ * The Class JNDIEmbeddedConnectionTemplate.
+ */
+public abstract class ADSEmbeddedConnectionTemplate
+extends JNDIConnectionTemplate
+{
+    public void tearDown() throws NamingException, Exception
+    {
+        Hashtable<String,Object> env = 
+        	new Hashtable<String,Object>();
+        
+        env = createEnvironment(env);
+        
+        env.put( 
+        		Context.PROVIDER_URL, 
+        		SYSTEM_PROVIDER_PATH);
+        env.put( 
+        		Context.INITIAL_CONTEXT_FACTORY, 
+        		"org.apache.directory.server.core.jndi.CoreContextFactory" );
+        env.putAll( 
+        		new ShutdownConfiguration().toJndiEnvironment() );
+        
+        new InitialContext( env );
+        Runtime.getRuntime().gc();
+        super.tearDown();
+    }
+    
+    
+    
+    public void setUp() throws Exception
+    {
+    	PropertyConfigurator.
+    	configure(NLOG4J_CONFIGURATION_FILEPATH);
+        super.setUp();
+    }
+    
+	/**
+	 * Connect to an embedded ApacheDS server.
+	 * 
+	 * @param providerPath the provider path ("ou=schema", ou="system", etc.)
+	 * 
+	 * @return the ldap context
+	 * 
+	 * @throws NamingException the naming exception
+	 */
+	public LdapContext connect( String providerPath ) throws NamingException
+	{
+		 MutableStartupConfiguration mutableStartupConfiguration = 
+	    		new MutableStartupConfiguration();
+		 
+	    Hashtable<String,Object> adminEnv  =
+	    	new Hashtable<String,Object>( );
+	    
+	    adminEnv.putAll( 
+	    			mutableStartupConfiguration.
+	    			toJndiEnvironment());
+	    
+	    adminEnv.put( 
+	    		Context.PROVIDER_URL, 
+	    		SYSTEM_PROVIDER_PATH);
+	    adminEnv.put( 
+	    		Context.SECURITY_PRINCIPAL, 
+	    		DEFAULT_SECURITY_PRINCIPAL_VALUE);
+	    adminEnv.put( 
+	    		Context.SECURITY_CREDENTIALS, 
+	    		DEFAULT_SECURITY_CREDENTIALS_VALUE);
+	    adminEnv.put( 
+	    		Context.SECURITY_AUTHENTICATION, 
+	    		SIMPLE_SECURITY_AUTHENTICATION_VALUE );
+   		new InitialLdapContext( adminEnv, null );
+
+   		
+   		
+	    Hashtable<String,Object> env            = 
+	    	new Hashtable<String,Object>();
+	    
+	    env.put( 
+	    		Context.INITIAL_CONTEXT_FACTORY, 
+	    		"org.apache.directory.server.core.jndi.CoreContextFactory" );
+	    env.put( 	    		
+	    		Context.SECURITY_PRINCIPAL, 
+	    		DEFAULT_SECURITY_PRINCIPAL_VALUE);
+	    env.put( 
+	    		Context.SECURITY_CREDENTIALS, 
+	    		DEFAULT_SECURITY_CREDENTIALS_VALUE);
+	    env.put( 
+	    		Context.SECURITY_AUTHENTICATION, 
+	    		SIMPLE_SECURITY_AUTHENTICATION_VALUE );
+	    env.put( Context.PROVIDER_URL, providerPath );
+	    
+	    env.put( Context.PROVIDER_URL, providerPath );
+		
+	    return new InitialLdapContext( env, null );
+		
+	}
+}
\ No newline at end of file

Added: directory/sandbox/oersoy/apacheds.testing.archetype/src/main/resources/archetype-resources/src/test/java/org/apache/directory/apacheds/testing/setup/ADSEmbeddedConnectionTemplateTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/oersoy/apacheds.testing.archetype/src/main/resources/archetype-resources/src/test/java/org/apache/directory/apacheds/testing/setup/ADSEmbeddedConnectionTemplateTest.java?view=auto&rev=547766
==============================================================================
--- directory/sandbox/oersoy/apacheds.testing.archetype/src/main/resources/archetype-resources/src/test/java/org/apache/directory/apacheds/testing/setup/ADSEmbeddedConnectionTemplateTest.java
(added)
+++ directory/sandbox/oersoy/apacheds.testing.archetype/src/main/resources/archetype-resources/src/test/java/org/apache/directory/apacheds/testing/setup/ADSEmbeddedConnectionTemplateTest.java
Fri Jun 15 11:56:01 2007
@@ -0,0 +1,61 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you 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.directory.apacheds.testing.setup;
+
+import javax.naming.NamingException;
+import javax.naming.ldap.LdapContext;
+
+public class ADSEmbeddedConnectionTemplateTest 
+extends ADSEmbeddedConnectionTemplate  
+{
+    public void tearDown() throws NamingException, Exception
+    {
+        super.tearDown();
+    }
+    
+    public void setUp() throws Exception
+    {
+        super.setUp();
+
+    }
+    
+    public void testSchemaConnect() throws NamingException
+    {
+    	LdapContext ldapContext =null;
+    	
+	    ldapContext =connect("ou=schema");
+	    
+	    assertEquals(
+	    		"ou=schema", 
+	    		ldapContext.getNameInNamespace()); 
+    }
+    
+    public void testRootDSEConnect() throws NamingException
+    {
+    	LdapContext ldapContext =null;
+    	
+	    ldapContext =connect("");
+	    
+	    assertEquals(
+	    		"", 
+	    		ldapContext.getNameInNamespace()); 
+    }
+
+}
\ No newline at end of file

Added: directory/sandbox/oersoy/apacheds.testing.archetype/src/main/resources/archetype-resources/src/test/java/org/apache/directory/apacheds/testing/setup/ADSEmbeddedHotPartitionTemplate.java
URL: http://svn.apache.org/viewvc/directory/sandbox/oersoy/apacheds.testing.archetype/src/main/resources/archetype-resources/src/test/java/org/apache/directory/apacheds/testing/setup/ADSEmbeddedHotPartitionTemplate.java?view=auto&rev=547766
==============================================================================
--- directory/sandbox/oersoy/apacheds.testing.archetype/src/main/resources/archetype-resources/src/test/java/org/apache/directory/apacheds/testing/setup/ADSEmbeddedHotPartitionTemplate.java
(added)
+++ directory/sandbox/oersoy/apacheds.testing.archetype/src/main/resources/archetype-resources/src/test/java/org/apache/directory/apacheds/testing/setup/ADSEmbeddedHotPartitionTemplate.java
Fri Jun 15 11:56:01 2007
@@ -0,0 +1,157 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you 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.directory.apacheds.testing.setup;
+
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Set;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.BasicAttributes;
+import javax.naming.ldap.InitialLdapContext;
+import javax.naming.ldap.LdapContext;
+
+import org.apache.directory.server.core.configuration.Configuration;
+import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
+import org.apache.directory.server.core.configuration.MutableStartupConfiguration;
+import org.apache.directory.server.core.configuration.ShutdownConfiguration;
+import org.apache.log4j.PropertyConfigurator;
+
+/**
+ * The Class JNDIEmbeddedConnectionTemplate.
+ */
+public abstract class ADSEmbeddedHotPartitionTemplate
+extends JNDIConnectionTemplate
+{
+    public void tearDown() throws NamingException, Exception
+    {
+        Hashtable<String,Object> env = 
+        	new Hashtable<String,Object>();
+        
+        env = createEnvironment(env);
+        
+        env.put( 
+        		Context.PROVIDER_URL, 
+        		SYSTEM_PROVIDER_PATH);
+        env.put( 
+        		Context.INITIAL_CONTEXT_FACTORY, 
+        		"org.apache.directory.server.core.jndi.CoreContextFactory" );
+        env.putAll( 
+        		new ShutdownConfiguration().toJndiEnvironment() );
+        
+        new InitialContext( env );
+        Runtime.getRuntime().gc();
+        super.tearDown();
+    }
+    
+    
+    
+    public void setUp() throws Exception
+    {
+    	PropertyConfigurator.
+    	configure(NLOG4J_CONFIGURATION_FILEPATH);
+        super.setUp();
+    }
+    
+	/**
+	 * Connect to an embedded ApacheDS server.
+	 * 
+	 * @param partitionName the provider path ("ou=schema", ou="system", etc.)
+	 * 
+	 * @return the ldap context
+	 * 
+	 * @throws NamingException the naming exception
+	 */
+	public LdapContext connect( String partitionName ) throws NamingException
+	{
+		 MutableStartupConfiguration mutableStartupConfiguration = 
+	    		new MutableStartupConfiguration();
+		 
+	    Hashtable<String,Object> adminEnv                                       =
+	    	new Hashtable<String,Object>( );
+	    
+	    adminEnv.putAll( 
+	    			mutableStartupConfiguration.
+	    			toJndiEnvironment());
+	    
+	    adminEnv.put( 
+	    		Context.PROVIDER_URL, 
+	    		SYSTEM_PROVIDER_PATH);
+	    adminEnv.put( 
+	    		Context.SECURITY_PRINCIPAL, 
+	    		DEFAULT_SECURITY_PRINCIPAL_VALUE);
+	    adminEnv.put( 
+	    		Context.SECURITY_CREDENTIALS, 
+	    		DEFAULT_SECURITY_CREDENTIALS_VALUE);
+	    adminEnv.put( 
+	    		Context.SECURITY_AUTHENTICATION, 
+	    		SIMPLE_SECURITY_AUTHENTICATION_VALUE );
+   		new InitialLdapContext( adminEnv, null );
+
+
+        MutablePartitionConfiguration dasPartition                      = 
+            new MutablePartitionConfiguration();
+        
+        Attributes suffixAttributes = new BasicAttributes();
+        suffixAttributes.put( "objectClass", "top");
+        suffixAttributes.get( "objectClass" ).add( "organizationalUnit" );
+        suffixAttributes.put( "ou", partitionName );
+
+        dasPartition.setName( partitionName);
+        dasPartition.setSuffix( "ou=" +partitionName );
+        dasPartition.setContextEntry( suffixAttributes );
+        
+        Set<MutablePartitionConfiguration> partitions =
+        	new HashSet<MutablePartitionConfiguration> ();
+        
+        partitions.add( dasPartition );
+        
+        mutableStartupConfiguration.
+        setPartitionConfigurations( partitions );
+   		
+	    Hashtable<String,Object> env            = 
+	    	new Hashtable<String,Object>();
+	    
+	    env.put( 
+	    		Context.INITIAL_CONTEXT_FACTORY, 
+	    		"org.apache.directory.server.core.jndi.CoreContextFactory" );
+	    env.put( 	    		
+	    		Context.SECURITY_PRINCIPAL, 
+	    		DEFAULT_SECURITY_PRINCIPAL_VALUE);
+	    env.put( 
+	    		Context.SECURITY_CREDENTIALS, 
+	    		DEFAULT_SECURITY_CREDENTIALS_VALUE);
+	    env.put( 
+	    		Context.SECURITY_AUTHENTICATION, 
+	    		SIMPLE_SECURITY_AUTHENTICATION_VALUE );
+	    env.put( 
+	    		Context.PROVIDER_URL, 
+	    		"ou=" + partitionName );
+	    
+        env.put( 
+        		Configuration.JNDI_KEY, 
+        		mutableStartupConfiguration );
+		
+	    return new InitialLdapContext( env, null );
+	}
+}
\ No newline at end of file

Added: directory/sandbox/oersoy/apacheds.testing.archetype/src/main/resources/archetype-resources/src/test/java/org/apache/directory/apacheds/testing/setup/ADSEmbeddedHotPartitionTemplateTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/oersoy/apacheds.testing.archetype/src/main/resources/archetype-resources/src/test/java/org/apache/directory/apacheds/testing/setup/ADSEmbeddedHotPartitionTemplateTest.java?view=auto&rev=547766
==============================================================================
--- directory/sandbox/oersoy/apacheds.testing.archetype/src/main/resources/archetype-resources/src/test/java/org/apache/directory/apacheds/testing/setup/ADSEmbeddedHotPartitionTemplateTest.java
(added)
+++ directory/sandbox/oersoy/apacheds.testing.archetype/src/main/resources/archetype-resources/src/test/java/org/apache/directory/apacheds/testing/setup/ADSEmbeddedHotPartitionTemplateTest.java
Fri Jun 15 11:56:01 2007
@@ -0,0 +1,50 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you 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.directory.apacheds.testing.setup;
+
+import javax.naming.NamingException;
+import javax.naming.ldap.LdapContext;
+
+public class ADSEmbeddedHotPartitionTemplateTest 
+extends ADSEmbeddedHotPartitionTemplate  
+{
+    public void tearDown() throws NamingException, Exception
+    {
+        super.tearDown();
+    }
+    
+    public void setUp() throws Exception
+    {
+        super.setUp();
+    }
+    
+    public void testSchemaConnect() throws NamingException
+    {
+    	LdapContext ldapContext =
+    		null;
+    	
+	    ldapContext                       =
+	    	connect("test");
+	    
+	    assertEquals(
+	    		"ou=test", 
+	    		ldapContext.getNameInNamespace()); 
+    }
+}
\ No newline at end of file



Mime
View raw message