geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r835361 - in /geronimo/server/trunk: framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/ framework/configs/gshell-geronimo/src/main/history/ framework/modules/geronimo-kernel/ plugins/j2ee/geronimo-j2ee/ plugins/j2ee/geron...
Date Thu, 12 Nov 2009 12:13:11 GMT
Author: rickmcguire
Date: Thu Nov 12 12:13:11 2009
New Revision: 835361

URL: http://svn.apache.org/viewvc?rev=835361&view=rev
Log:
Fixes to adjust to the logging updates

Modified:
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/pom.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml?rev=835361&r1=835360&r2=835361&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
Thu Nov 12 12:13:11 2009
@@ -13,6 +13,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.configadmin</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.felix</groupId>
         <artifactId>org.osgi.core</artifactId>
         <type>jar</type>
     </dependency>
@@ -63,6 +68,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-pax-logging</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-service-builder</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml?rev=835361&r1=835360&r2=835361&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
Thu Nov 12 12:13:11 2009
@@ -28,6 +28,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.configadmin</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.felix</groupId>
         <artifactId>org.osgi.core</artifactId>
         <type>jar</type>
     </dependency>
@@ -93,6 +98,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-pax-logging</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-plugin</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml?rev=835361&r1=835360&r2=835361&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml Thu Nov 12 12:13:11 2009
@@ -6,9 +6,9 @@
     The ASF licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
     the License.  You may obtain a copy of the License at
-    
+
        http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
     <artifactId>geronimo-kernel</artifactId>
     <packaging>bundle</packaging>
     <name>Geronimo Framework, Modules :: Kernel</name>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
@@ -48,11 +48,11 @@
             <artifactId>pax-logging-api</artifactId>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-            <!--<artifactId>geronimo-logging</artifactId>-->
-            <!--<version>${version}</version>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-pax-logging</artifactId>
+            <version>${version}</version>
+        </dependency>
         <!--<dependency>-->
             <!--<groupId>asm</groupId>-->
             <!--<artifactId>asm</artifactId>-->
@@ -129,7 +129,7 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
     </dependencies>
 
     <build>
@@ -148,12 +148,12 @@
                             <tasks>
                                 <delete dir="${project.build.directory}/tmp" />
                                 <mkdir dir="${project.build.directory}/tmp" />
-                                
+
                                 <mkdir dir="${project.build.directory}/m1" />
                                 <copy todir="${project.build.directory}/m1">
                                     <fileset dir="${basedir}/src/test/repo/m1" />
                                 </copy>
-                                
+
                                 <mkdir dir="${project.build.directory}/m2" />
                                 <copy todir="${project.build.directory}/m2">
                                     <fileset dir="${basedir}/src/test/repo/m2" />
@@ -162,7 +162,7 @@
                         </configuration>
                     </execution>
                 </executions>
-                
+
                 <dependencies>
                     <dependency>
                         <groupId>ant</groupId>
@@ -171,7 +171,7 @@
                     </dependency>
                 </dependencies>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -192,6 +192,6 @@
             </plugin>
         </plugins>
     </build>
-    
+
 </project>
 

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/pom.xml?rev=835361&r1=835360&r2=835361&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/pom.xml Thu Nov 12 12:13:11 2009
@@ -46,6 +46,7 @@
             <artifactId>geronimo-management</artifactId>
             <version>${version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-kernel</artifactId>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java?rev=835361&r1=835360&r2=835361&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java
Thu Nov 12 12:13:11 2009
@@ -40,7 +40,7 @@
 import org.apache.geronimo.management.stats.BoundedRangeStatisticImpl;
 import org.apache.geronimo.management.stats.CountStatisticImpl;
 import org.apache.geronimo.management.stats.JVMStatsImpl;
-import org.apache.geronimo.system.logging.SystemLog;
+import org.apache.geronimo.logging.SystemLog;
 
 /**
  *
@@ -161,7 +161,7 @@
         MemoryUsage memUsage = memmxbean.getHeapMemoryUsage();
         CountStatisticImpl upTime;
         BoundedRangeStatisticImpl heapSize;
-        
+
         if (stats == null) {
             stats = new JVMStatsImpl();
             // setup UpTime CountStatistic



Mime
View raw message