You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2012/01/10 07:31:58 UTC
svn commit: r1229477 - in /geronimo/server/branches/3.0-beta:
framework/modules/geronimo-pax-logging/pom.xml
framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/ pom.xml
Author: xiaming
Date: Tue Jan 10 06:31:57 2012
New Revision: 1229477
URL: http://svn.apache.org/viewvc?rev=1229477&view=rev
Log:
GERONIMO-6184 Redo pax logging upgrade on 3.0-beta branch after 3.0-beta-1 release
Removed:
geronimo/server/branches/3.0-beta/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/
Modified:
geronimo/server/branches/3.0-beta/framework/modules/geronimo-pax-logging/pom.xml
geronimo/server/branches/3.0-beta/pom.xml
Modified: geronimo/server/branches/3.0-beta/framework/modules/geronimo-pax-logging/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/framework/modules/geronimo-pax-logging/pom.xml?rev=1229477&r1=1229476&r2=1229477&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/framework/modules/geronimo-pax-logging/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/framework/modules/geronimo-pax-logging/pom.xml Tue Jan 10 06:31:57 2012
@@ -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/branches/3.0-beta/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/pom.xml?rev=1229477&r1=1229476&r2=1229477&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/pom.xml Tue Jan 10 06:31:57 2012
@@ -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>
@@ -2356,6 +2356,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>