geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1229480 - in /geronimo/server/trunk: framework/modules/geronimo-pax-logging/pom.xml framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/pax/logging/service/internal/JdkHandler.java pom.xml
Date Tue, 10 Jan 2012 07:50:41 GMT
Author: djencks
Date: Tue Jan 10 07:50:41 2012
New Revision: 1229480

URL: http://svn.apache.org/viewvc?rev=1229480&view=rev
Log:
GERONIMO-6184 upgrade to 1.6.4-SNAPSHOT pax logging from karaf.  Don't embed pax logging since
karaf includes it. (this may not work yet)

Removed:
    geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/pax/logging/service/internal/JdkHandler.java
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=1229480&r1=1229479&r2=1229480&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml Tue Jan 10 07:50:41
2012
@@ -61,53 +61,25 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <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)",
+                        <!--<Import-Package>-->
+                            <!--com.*;resolution:=optional,-->
+                            <!--javax.xml.*,-->
+                            <!--javax.*;resolution:=optional,-->
+
+                            <!--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.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)",-->
+
+                            <!--*-->
+                        <!--</Import-Package>-->
 
-                            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.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}
+                            org.apache.geronimo.logging
                         </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=1229480&r1=1229479&r2=1229480&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Jan 10 07:50:41 2012
@@ -86,7 +86,6 @@
         <jaxbImplVersion>2.2.3-1_1</jaxbImplVersion>
 
         <monitoringConsoleVersion>${project.version}</monitoringConsoleVersion>
-        <pax.logging.version>1.6.3</pax.logging.version>
         <woodstoxVersion>4.1.2_1</woodstoxVersion>
         <yokoVersion>1.3</yokoVersion>
         <juddiv3.version>3.1.0</juddiv3.version>
@@ -640,24 +639,6 @@
                 <version>1.6.0</version>
             </dependency>
 
-            <!--<dependency>-->
-                <!--<groupId>org.ops4j.pax.logging</groupId>-->
-                <!--<artifactId>pax-logging-api</artifactId>-->
-                <!--<version>${pax.logging.version}</version>-->
-            <!--</dependency>-->
-
-            <!--<dependency>-->
-                <!--<groupId>org.ops4j.pax.logging</groupId>-->
-                <!--<artifactId>pax-logging-service</artifactId>-->
-                <!--<version>${pax.logging.version}</version>-->
-                <!--<exclusions>-->
-                    <!--<exclusion>-->
-                        <!--<groupId>log4j</groupId>-->
-                        <!--<artifactId>log4j</artifactId>-->
-                    <!--</exclusion>-->
-                <!--</exclusions>-->
-            <!--</dependency>-->
-
             <dependency>
                 <groupId>mockobjects</groupId>
                 <artifactId>mockobjects-jdk1.4-j2ee1.3</artifactId>
@@ -2421,6 +2402,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>



Mime
View raw message