Return-Path: 
 <commits-return-30858-apmail-directory-commits-archive=directory.apache.org@directory.apache.org>
Delivered-To: apmail-directory-commits-archive@www.apache.org
Received: (qmail 1288 invoked from network); 13 Feb 2011 22:09:43 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 13 Feb 2011 22:09:43 -0000
Received: (qmail 70634 invoked by uid 500); 13 Feb 2011 22:09:43 -0000
Delivered-To: apmail-directory-commits-archive@directory.apache.org
Received: (qmail 70568 invoked by uid 500); 13 Feb 2011 22:09:43 -0000
Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@directory.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@directory.apache.org>
List-Post: <mailto:commits@directory.apache.org>
List-Id: <commits.directory.apache.org>
Reply-To: dev@directory.apache.org
Delivered-To: mailing list commits@directory.apache.org
Received: (qmail 70561 invoked by uid 99); 13 Feb 2011 22:09:43 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 13 Feb 2011 22:09:43 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 13 Feb 2011 22:09:40 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id E894723889BF; Sun, 13 Feb 2011 22:09:18 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1070311 - in /directory/shared/branches/m1: ./ integ/
 integ/src/test/java/org/apache/directory/shared/ldap/codec/api/
 ldap-extras/codec/
Date: Sun, 13 Feb 2011 22:09:18 -0000
To: commits@directory.apache.org
From: akarasulu@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110213220918.E894723889BF@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: akarasulu
Date: Sun Feb 13 22:09:18 2011
New Revision: 1070311

URL: http://svn.apache.org/viewvc?rev=1070311&view=rev
Log:
trying to get this pax-exam testing working but having issues: temporary commit to get changes saved

Added:
    directory/shared/branches/m1/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecServiceTest.java
    directory/shared/branches/m1/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/StandaloneLdapCodecServiceTest.java
      - copied, changed from r1070160, directory/shared/branches/m1/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecServiceTest.java
Modified:
    directory/shared/branches/m1/integ/pom.xml
    directory/shared/branches/m1/ldap-extras/codec/pom.xml
    directory/shared/branches/m1/pom.xml

Modified: directory/shared/branches/m1/integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/integ/pom.xml?rev=1070311&r1=1070310&r2=1070311&view=diff
==============================================================================
--- directory/shared/branches/m1/integ/pom.xml (original)
+++ directory/shared/branches/m1/integ/pom.xml Sun Feb 13 22:09:18 2011
@@ -78,6 +78,24 @@
       <version>${commons.io.version}</version>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-container-default</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <properties>

Added: directory/shared/branches/m1/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecServiceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecServiceTest.java?rev=1070311&view=auto
==============================================================================
--- directory/shared/branches/m1/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecServiceTest.java (added)
+++ directory/shared/branches/m1/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecServiceTest.java Sun Feb 13 22:09:18 2011
@@ -0,0 +1,40 @@
+/*
+ *   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.shared.ldap.codec.api;
+
+
+import org.junit.Test;
+
+
+/**
+ * Tests for StandaloneLdapCodecService.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class DefaultLdapCodecServiceTest
+{
+    /**
+     * In situ OSGi test run.
+     */
+    @Test
+    public void testLoadingExtras()
+    {
+    }
+}

Copied: directory/shared/branches/m1/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/StandaloneLdapCodecServiceTest.java (from r1070160, directory/shared/branches/m1/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecServiceTest.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/StandaloneLdapCodecServiceTest.java?p2=directory/shared/branches/m1/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/StandaloneLdapCodecServiceTest.java&p1=directory/shared/branches/m1/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecServiceTest.java&r1=1070160&r2=1070311&rev=1070311&view=diff
==============================================================================
--- directory/shared/branches/m1/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecServiceTest.java (original)
+++ directory/shared/branches/m1/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/StandaloneLdapCodecServiceTest.java Sun Feb 13 22:09:18 2011
@@ -20,7 +20,8 @@
 package org.apache.directory.shared.ldap.codec.api;
 
 
-import static org.junit.Assert.*; 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.util.Iterator;
 
@@ -35,7 +36,7 @@ import org.junit.Test;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class DefaultLdapCodecServiceTest
+public class StandaloneLdapCodecServiceTest
 {   
     /**
      * Test method for {@link org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService#StandaloneLdapCodecService()}.
@@ -43,9 +44,6 @@ public class DefaultLdapCodecServiceTest
     @Test
     public void testLoadingExtras()
     {
-        System.out.println( "Property name = " + StandaloneLdapCodecService.PLUGIN_DIRECTORY_PROPERTY );
-        System.out.println( "Property value = " + System.getProperty( StandaloneLdapCodecService.PLUGIN_DIRECTORY_PROPERTY ) );
-        
         StandaloneLdapCodecService codec = new StandaloneLdapCodecService();
         Iterator<String> oids = codec.registeredControls();
         while ( oids.hasNext() )

Modified: directory/shared/branches/m1/ldap-extras/codec/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-extras/codec/pom.xml?rev=1070311&r1=1070310&r2=1070311&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-extras/codec/pom.xml (original)
+++ directory/shared/branches/m1/ldap-extras/codec/pom.xml Sun Feb 13 22:09:18 2011
@@ -56,7 +56,7 @@
     
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi</artifactId>
+      <artifactId>org.osgi.core</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: directory/shared/branches/m1/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/pom.xml?rev=1070311&r1=1070310&r2=1070311&view=diff
==============================================================================
--- directory/shared/branches/m1/pom.xml (original)
+++ directory/shared/branches/m1/pom.xml Sun Feb 13 22:09:18 2011
@@ -53,12 +53,13 @@
     <mycila-junit.version>1.0.ga</mycila-junit.version>
     <log4j.version>1.2.16</log4j.version>
     <mina.core.version>2.0.2</mina.core.version>
-    <org.apache.felix.version>3.0.8</org.apache.felix.version>
-    <org.osgi.version>3.0.0</org.osgi.version>
+    <org.apache.felix.version>3.0.2</org.apache.felix.version>
+    <org.osgi.version>4.2.0</org.osgi.version>
     <slf4j.api.version>1.6.1</slf4j.api.version>
     <slf4j.log4j12.version>1.6.1</slf4j.log4j12.version>
     <xml.apis.version>2.0.2</xml.apis.version>
     <xpp3.version>1.1.4c</xpp3.version>
+    <pax-exam.version>1.2.3</pax-exam.version>
     <findbugs.annotations.version>1.0.0</findbugs.annotations.version>
   </properties>
   
@@ -435,7 +436,7 @@
 
       <dependency>
         <groupId>org.osgi</groupId>
-        <artifactId>org.osgi</artifactId>
+        <artifactId>org.osgi.core</artifactId>
         <version>${org.osgi.version}</version>
       </dependency>
 
@@ -459,6 +460,27 @@
         <version>${mycila-junit.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.ops4j.pax.exam</groupId>
+        <artifactId>pax-exam</artifactId>
+        <version>${pax-exam.version}</version>
+        <scope>test</scope>
+      </dependency>
+      
+      <dependency>
+        <groupId>org.ops4j.pax.exam</groupId>
+        <artifactId>pax-exam-junit</artifactId>
+        <version>${pax-exam.version}</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.ops4j.pax.exam</groupId>
+        <artifactId>pax-exam-container-default</artifactId>
+        <version>${pax-exam.version}</version>
+        <scope>test</scope>
+      </dependency>
+
       <!-- Logging dependencies -->
 
       <dependency>