geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r1180300 - in /geronimo/server/trunk: ./ framework/modules/geronimo-pax-logging/ framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/ framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/pax/ framework/modules/geronimo-...
Date Sat, 08 Oct 2011 02:52:56 GMT
Author: rwonly
Date: Sat Oct  8 02:52:55 2011
New Revision: 1180300

URL: http://svn.apache.org/viewvc?rev=1180300&view=rev
Log:
revert the changes in rev 1179831 (GERONIMO-6184: Updated PAX Logging to pick upi latest changes
and fixes), because this involves a new snapshot dependency in trunk. After 3.0-beta is branched,
will re-apply this.

Added:
    geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/
      - copied from r1179830, geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/
    geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/pax/
      - copied from r1179830, geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/pax/
    geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/pax/logging/
      - copied from r1179830, geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/pax/logging/
    geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/pax/logging/service/
      - copied from r1179830, geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/pax/logging/service/
    geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/pax/logging/service/internal/
      - copied from r1179830, geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/pax/logging/service/internal/
    geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/pax/logging/service/internal/JdkHandler.java
      - copied unchanged from r1179830, 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=1180300&r1=1180299&r2=1180300&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml Sat Oct  8 02:52:55
2011
@@ -63,26 +63,50 @@
                         <Embed-Dependency>pax-logging-service;inline=true</Embed-Dependency>
  
                         <Import-Package>
-                            com.*;resolution:=optional,
-                            javax.xml.*,
-                            javax.*;resolution:=optional,
+                            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)",
 
+                            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=1180300&r1=1180299&r2=1180300&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Sat Oct  8 02:52:55 2011
@@ -85,7 +85,7 @@
         <jaxbImplVersion>2.2.3-1_1</jaxbImplVersion>
 
         <monitoringConsoleVersion>${project.version}</monitoringConsoleVersion>
-        <pax.logging.version>1.6.4-SNAPSHOT</pax.logging.version>
+        <pax.logging.version>1.6.1</pax.logging.version>
         <woodstoxVersion>4.1.2_1</woodstoxVersion>
         <sxcVersion>0.7.3_1</sxcVersion>
         <yokoVersion>1.3</yokoVersion>
@@ -2352,18 +2352,6 @@ 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