Return-Path: 
 <scm-return-47434-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
X-Original-To: apmail-geronimo-scm-archive@www.apache.org
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3D6B97599
	for <apmail-geronimo-scm-archive@www.apache.org>;
 Thu,  6 Oct 2011 20:30:41 +0000 (UTC)
Received: (qmail 33561 invoked by uid 500); 6 Oct 2011 20:30:41 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 33524 invoked by uid 500); 6 Oct 2011 20:30:41 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 33517 invoked by uid 99); 6 Oct 2011 20:30:41 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Oct 2011 20:30:41 +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; Thu, 06 Oct 2011 20:30:38 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id B85CE2388A74;
	Thu,  6 Oct 2011 20:30:16 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1179831 - in /geronimo/server/trunk:
 framework/modules/geronimo-pax-logging/pom.xml
 framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/ pom.xml
Date: Thu, 06 Oct 2011 20:30:16 -0000
To: scm@geronimo.apache.org
From: gawor@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111006203016.B85CE2388A74@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gawor
Date: Thu Oct  6 20:30:16 2011
New Revision: 1179831

URL: http://svn.apache.org/viewvc?rev=1179831&view=rev
Log:
GERONIMO-6184: Updated PAX Logging to pick upi latest changes and fixes

Removed:
    geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/
Modified:
    geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml?rev=1179831&r1=1179830&r2=1179831&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml Thu Oct  6 20:30:16 2011
@@ -63,50 +63,26 @@
                         <Embed-Dependency>pax-logging-service;inline=true</Embed-Dependency>
  
                         <Import-Package>
-                            com.ibm.uvm.tools;resolution:=optional,
-                            com.sun.jdmk.comm;resolution:=optional,
-                            javax.jmdns;resolution:=optional,
-                            javax.jms;resolution:=optional,
-                            javax.mail;resolution:=optional,
-                            javax.mail.internet;resolution:=optional,
-                            javax.management;resolution:=optional,
-                            javax.naming;resolution:=optional,
-                            javax.swing;resolution:=optional,
-                            javax.swing.border;resolution:=optional,
-                            javax.swing.event;resolution:=optional,
-                            javax.swing.table;resolution:=optional,
-                            javax.swing.text;resolution:=optional,
-                            javax.swing.tree;resolution:=optional,
-                            org.osgi.service.event;resolution:=optional;version="[1.0.0,2.0.0)",
+                            com.*;resolution:=optional,
+                            javax.xml.*,
+                            javax.*;resolution:=optional,
 
-                            javax.xml.parsers,
-                            org.apache.avalon.framework.logger;version="4.3.0",
-                            org.apache.commons.logging;version="1.1.0",
-                            org.apache.juli.logging;version="1.0.0",
                             org.knopflerfish.service.log;provider=paxlogging;version="[1.1.0,2.0.0)",
                             org.ops4j.pax.logging;version="[0.9.5,2.0.0)",
-                            org.ops4j.pax.logging.avalon;version="1.5.0",
-                            org.ops4j.pax.logging.slf4j;version="1.5.0",
-                            org.ops4j.pax.logging.spi;provider=paxlogging;version="1.5.0",
                             org.osgi.framework;version="[1.0.0,2.0.0)",
                             org.osgi.service.cm;version="[1.0.0,2.0.0)",
+                            org.osgi.service.event;version="[1.0.0,2.0.0)";resolution:=optional,
                             org.osgi.service.log;version="[1.3.0,2.0.0)",
                             org.osgi.util.tracker;version="[1.3.0,2.0.0)",
-                            org.slf4j;version="1.5.0",
-                            org.w3c.dom,
-                            org.xml.sax,
-                            org.xml.sax.helpers,
+
                             *
                         </Import-Package>
+
                         <Export-Package>
                             org.apache.geronimo.logging,
                             org.ops4j.pax.logging.spi;provider=paxlogging;version=${pax.logging.version}
                         </Export-Package>
                         <Bundle-Activator>org.apache.geronimo.logging.impl.LoggingServiceActivator</Bundle-Activator>
-                        <Include-Resource>
-                           {maven-resources},
-                           org/ops4j/pax/logging/service/internal/JdkHandler.class=target/classes/org/ops4j/pax/logging/service/internal/JdkHandler.class
-                        </Include-Resource>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1179831&r1=1179830&r2=1179831&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Oct  6 20:30:16 2011
@@ -85,7 +85,7 @@
         <jaxbImplVersion>2.2.3-1_1</jaxbImplVersion>
 
         <monitoringConsoleVersion>${project.version}</monitoringConsoleVersion>
-        <pax.logging.version>1.6.1</pax.logging.version>
+        <pax.logging.version>1.6.4-SNAPSHOT</pax.logging.version>
         <woodstoxVersion>4.1.2_1</woodstoxVersion>
         <sxcVersion>0.7.3_1</sxcVersion>
         <yokoVersion>1.3</yokoVersion>
@@ -2352,6 +2352,18 @@ only found in cxf
                     </releases>
                 </repository>
                 <repository>
+                    <id>ops4j.oss.sonatype.org</id>
+                    <name>OPS4J Repository</name>
+                    <layout>default</layout>
+                    <url>http://oss.sonatype.org/content/groups/ops4j-with-staging</url>
+                    <snapshots>
+                        <enabled>true</enabled>
+                    </snapshots>
+                    <releases>
+                        <enabled>true</enabled>
+                    </releases>
+                </repository>
+                <repository>
                     <!-- equinox -->
                     <!-- org.eclipse routing -->
                     <id>smx.svn</id>