geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r882296 - in /geronimo/server/trunk/framework: configs/karaf-framework/ configs/karaf-framework/src/main/filtered-resources/etc/ modules/geronimo-pax-logging/ modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/
Date Thu, 19 Nov 2009 21:09:59 GMT
Author: gawor
Date: Thu Nov 19 21:09:59 2009
New Revision: 882296

URL: http://svn.apache.org/viewvc?rev=882296&view=rev
Log:
should make framework work again

Modified:
    geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
    geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/LoggingServiceActivator.java

Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=882296&r1=882295&r2=882296&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Thu Nov 19 21:09:59 2009
@@ -61,7 +61,7 @@
         <maven.version>2.0.9</maven.version>
         <mina.version>2.0.0-M6</mina.version>
         <pax.exam.version>1.0.0</pax.exam.version>
-        <pax.logging.version>1.4</pax.logging.version>
+        <pax.logging.version>1.4.1-SNAPSHOT</pax.logging.version>
         <pax.runner.version>1.1.1</pax.runner.version>
         <pax.url.version>1.1.2</pax.url.version>
         <pax.web.version>0.6.0</pax.web.version>

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties?rev=882296&r1=882295&r2=882296&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
Thu Nov 19 21:09:59 2009
@@ -65,10 +65,10 @@
 org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.ssh/${felix.karaf.version}/org.apache.felix.karaf.shell.ssh-${felix.karaf.version}.jar=30
 
 
-org/apache/servicemix/bundles/org.apache.servicemix.bundles.xstream/1.3_2-SNAPSHOT/org.apache.servicemix.bundles.xstream-1.3_2-SNAPSHOT.jar=40
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.xstream/1.3_3/org.apache.servicemix.bundles.xstream-1.3_3.jar=40
 org/apache/servicemix/bundles/org.apache.servicemix.bundles.xpp3/1.1.4c_2-SNAPSHOT/org.apache.servicemix.bundles.xpp3-1.1.4c_2-SNAPSHOT.jar=40
 org/apache/servicemix/bundles/org.apache.servicemix.bundles.cglib/2.1_3_3-SNAPSHOT/org.apache.servicemix.bundles.cglib-2.1_3_3-SNAPSHOT.jar=40
-org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-jexl/1.1_2-SNAPSHOT/org.apache.servicemix.bundles.commons-jexl-1.1_2-SNAPSHOT.jar=40
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-jexl/1.1_1/org.apache.servicemix.bundles.commons-jexl-1.1_1.jar=40
 org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-lang/2.4_2-SNAPSHOT/org.apache.servicemix.bundles.commons-lang-2.4_2-SNAPSHOT.jar=40
 org/apache/servicemix/bundles/org.apache.servicemix.bundles.jaxb-impl/2.1.6_1/org.apache.servicemix.bundles.jaxb-impl-2.1.6_1.jar=40
 org/apache/servicemix/specs/org.apache.servicemix.specs.activation-api-1.1/1.4-SNAPSHOT/org.apache.servicemix.specs.activation-api-1.1-1.4-SNAPSHOT.jar=40

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=882296&r1=882295&r2=882296&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml Thu Nov 19 21:09:59
2009
@@ -64,7 +64,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <!--<version>2.0.1-SNAPSHOT</version>-->
                 <configuration>
                     <instructions>
                         <Embed-Dependency>pax-logging-service;inline=true</Embed-Dependency>

Modified: geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/LoggingServiceActivator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/LoggingServiceActivator.java?rev=882296&r1=882295&r2=882296&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/LoggingServiceActivator.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/LoggingServiceActivator.java
Thu Nov 19 21:09:59 2009
@@ -19,7 +19,7 @@
 
 import org.apache.geronimo.logging.SystemLog;
 import org.apache.geronimo.main.ServerInfo;
-import org.ops4j.pax.logging.internal.Activator;
+import org.ops4j.pax.logging.service.internal.Activator;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;



Mime
View raw message