You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/05/05 22:34:07 UTC
svn commit: r653588 - in /geronimo/server/trunk/framework/modules:
geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/
geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/
geronimo-kernel/src/main/java/org/apache/geronimo/kerne...
Author: jdillon
Date: Mon May 5 13:34:06 2008
New Revision: 653588
URL: http://svn.apache.org/viewvc?rev=653588&view=rev
Log:
Start of custom SLF4J muck for Geronimo
Added:
geronimo/server/trunk/framework/modules/geronimo-logging/
geronimo/server/trunk/framework/modules/geronimo-logging/pom.xml (with props)
geronimo/server/trunk/framework/modules/geronimo-logging/src/
geronimo/server/trunk/framework/modules/geronimo-logging/src/main/
geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/
geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/
geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/apache/
geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/apache/geronimo/
geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/apache/geronimo/framework/
geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/apache/geronimo/framework/logging/
geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/
geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/
geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticLoggerBinder.java (with props)
geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticMDCBinder.java (with props)
geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticMarkerBinder.java (with props)
Modified:
geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java
geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java
geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/Configuration.java
geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/DebugLoggingLifecycleMonitor.java
geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java
geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/AbstractRepository.java
geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIRegistryService.java
geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/repository/AbstractRepositoryTest.java
geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImplTest.java
geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JavaVariable.java
geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlConditionParser.java
geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlExpressionParser.java
geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/properties/JvmVendor.java
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java?rev=653588&r1=653587&r2=653588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java Mon May 5 13:34:06 2008
@@ -175,11 +175,11 @@
for (Iterator iterator = dependents.iterator(); iterator.hasNext();) {
AbstractName child = (AbstractName) iterator.next();
try {
- log.trace("Checking if child is running: child=" + child);
+ log.trace("Checking if child is running: child={}", child);
if (kernel.getGBeanState(child) == State.RUNNING_INDEX) {
- log.trace("Stopping child: child=" + child);
+ log.trace("Stopping child: child={}", child);
kernel.stopGBean(child);
- log.trace("Stopped child: child=" + child);
+ log.trace("Stopped child: child={}", child);
}
} catch (Exception ignore) {
// not a big deal... did my best
@@ -242,23 +242,23 @@
for (Iterator i = parents.iterator(); i.hasNext();) {
AbstractName parent = (AbstractName) i.next();
if (!kernel.isLoaded(parent)) {
- log.trace("Cannot run because parent is not registered: parent=" + parent);
+ log.trace("Cannot run because parent is not registered: parent={}", parent);
return;
}
try {
- log.trace("Checking if parent is running: parent=" + parent);
+ log.trace("Checking if parent is running: parent={}", parent);
if (kernel.getGBeanState(parent) != State.RUNNING_INDEX) {
- log.trace("Cannot run because parent is not running: parent=" + parent);
+ log.trace("Cannot run because parent is not running: parent={}", parent);
return;
}
- log.trace("Parent is running: parent=" + parent);
+ log.trace("Parent is running: parent={}", parent);
} catch (GBeanNotFoundException e) {
// depended on instance was removed bewteen the register check and the invoke
- log.trace("Cannot run because parent is not registered: parent=" + parent);
+ log.trace("Cannot run because parent is not registered: parent={}", parent);
return;
} catch (Exception e) {
// problem getting the attribute, parent has most likely failed
- log.trace("Cannot run because an error occurred while checking if parent is running: parent=" + parent);
+ log.trace("Cannot run because an error occurred while checking if parent is running: parent={}", parent);
return;
}
}
@@ -318,17 +318,17 @@
AbstractName child = (AbstractName) i.next();
if (kernel.isLoaded(child)) {
try {
- log.trace("Checking if child is stopped: child=" + child);
+ log.trace("Checking if child is stopped: child={}", child);
int state = kernel.getGBeanState(child);
if (state == State.RUNNING_INDEX) {
- log.trace("Cannot stop because child is still running: child=" + child);
+ log.trace("Cannot stop because child is still running: child={}", child);
return;
}
} catch (GBeanNotFoundException e) {
// depended on instance was removed between the register check and the invoke
} catch (Exception e) {
// problem getting the attribute, depended on bean has most likely failed
- log.trace("Cannot run because an error occurred while checking if child is stopped: child=" + child);
+ log.trace("Cannot run because an error occurred while checking if child is stopped: child={}", child);
return;
}
}
@@ -439,7 +439,9 @@
}
break;
}
- log.debug(toString() + " State changed from " + state + " to " + newState);
+
+ log.debug("{} State changed from {} to {}", new Object[] { toString(), state, newState });
+
state = newState;
}
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java?rev=653588&r1=653587&r2=653588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java Mon May 5 13:34:06 2008
@@ -83,7 +83,7 @@
} else {
setProxy(getKernel().getProxyManager().createProxy(targetName, getReferenceType()));
}
- log.debug("Started " + abstractName);
+ log.debug("Started {}", abstractName);
return true;
}
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/Configuration.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/Configuration.java?rev=653588&r1=653587&r2=653588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/Configuration.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/Configuration.java Mon May 5 13:34:06 2008
@@ -754,17 +754,17 @@
}
public void doStart() throws Exception {
- log.debug("Started configuration " + id);
+ log.debug("Started configuration {}", id);
}
public synchronized void doStop() throws Exception {
- log.debug("Stopping configuration " + id);
+ log.debug("Stopping configuration {}", id);
shutdown();
}
public void doFail() {
- log.debug("Failed configuration " + id);
+ log.debug("Failed configuration {}", id);
shutdown();
}
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/DebugLoggingLifecycleMonitor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/DebugLoggingLifecycleMonitor.java?rev=653588&r1=653587&r2=653588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/DebugLoggingLifecycleMonitor.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/DebugLoggingLifecycleMonitor.java Mon May 5 13:34:06 2008
@@ -35,39 +35,39 @@
}
public void addConfiguration(Artifact configurationId) {
- log.debug("added module: " + configurationId);
+ log.debug("added module: {}", configurationId);
}
public void resolving(Artifact configurationId) {
- log.debug("resolving dependencies for module: " + configurationId);
+ log.debug("resolving dependencies for module: {}", configurationId);
}
public void reading(Artifact configurationId) {
- log.debug("reading module: " + configurationId);
+ log.debug("reading module: {}", configurationId);
}
public void loading(Artifact configurationId) {
- log.debug("loading module: " + configurationId);
+ log.debug("loading module: {}", configurationId);
}
public void starting(Artifact configurationId) {
- log.debug("starting module: " + configurationId);
+ log.debug("starting module: {}", configurationId);
}
public void stopping(Artifact configurationId) {
- log.debug("stopping module: " + configurationId);
+ log.debug("stopping module: {}", configurationId);
}
public void unloading(Artifact configurationId) {
- log.debug("unloading module: " + configurationId);
+ log.debug("unloading module: {}", configurationId);
}
public void succeeded(Artifact configurationId) {
- log.debug("succeeded module: " + configurationId);
+ log.debug("succeeded module: {}", configurationId);
}
public void failed(Artifact configurationId, Throwable cause) {
- log.debug("failed module: " + configurationId);
+ log.debug("failed module: {}", configurationId);
}
public void finished() {
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java?rev=653588&r1=653587&r2=653588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java Mon May 5 13:34:06 2008
@@ -173,7 +173,7 @@
artifactManager.loadArtifacts(configurationId, configuration.getDependencies());
}
- log.debug("Loaded Configuration " + configurationName);
+ log.debug("Loaded Configuration {}", configurationName);
} catch (Exception e) {
unload(configurationId);
if (e instanceof InvalidConfigException) {
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/AbstractRepository.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/AbstractRepository.java?rev=653588&r1=653587&r2=653588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/AbstractRepository.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/AbstractRepository.java Mon May 5 13:34:06 2008
@@ -61,7 +61,7 @@
}
this.rootFile = rootFile;
- log.debug("Repository root is " + rootFile.getAbsolutePath());
+ log.debug("Repository root is {}", rootFile.getAbsolutePath());
typeHandlers.put("car", new UnpackArtifactTypeHandler());
}
@@ -208,7 +208,7 @@
typeHandler.install(source, size, destination, monitor, location);
if (destination.getType().equalsIgnoreCase("car")) {
- log.debug("Installed module configuration; id=" + destination + "; location=" + location);
+ log.debug("Installed module configuration; id={}; location={}", destination, location);
}
}
}
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIRegistryService.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIRegistryService.java?rev=653588&r1=653587&r2=653588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIRegistryService.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIRegistryService.java Mon May 5 13:34:06 2008
@@ -61,7 +61,7 @@
public void doStart() throws Exception {
System.setProperty("java.rmi.server.RMIClassLoaderSpi",RMIClassLoaderSpiImpl.class.getName());
registry = LocateRegistry.createRegistry(port);
- log.debug("Started RMI Registry on port " + port);
+ log.debug("Started RMI Registry on port: {}", port);
}
public void doStop() throws Exception {
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/repository/AbstractRepositoryTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/repository/AbstractRepositoryTest.java?rev=653588&r1=653587&r2=653588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/repository/AbstractRepositoryTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/repository/AbstractRepositoryTest.java Mon May 5 13:34:06 2008
@@ -83,7 +83,7 @@
public void testListAll() {
SortedSet artifacts = repository.list();
- log.debug("Matched artifacts: "+artifacts);
+ log.debug("Matched artifacts: {}", artifacts);
assertTrue(artifacts.contains(new Artifact("org.foo", "test", "2.0.1", "properties")));
assertFalse(artifacts.contains(new Artifact("Unknown", "artifact", "2.0.1", "properties")));
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImplTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImplTest.java?rev=653588&r1=653587&r2=653588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImplTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImplTest.java Mon May 5 13:34:06 2008
@@ -55,8 +55,8 @@
normalizedBaseURL = normalizedBaseURL.substring(0, normalizedBaseURL.length() - 1);
}
- log.debug("Using base URL: " + baseURL);
- log.debug("Using normalized base URL: " + normalizedBaseURL);
+ log.debug("Using base URL: {}", baseURL);
+ log.debug("Using normalized base URL: {}", normalizedBaseURL);
}
public void testNormalizeURL() throws MalformedURLException {
Added: geronimo/server/trunk/framework/modules/geronimo-logging/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-logging/pom.xml?rev=653588&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-logging/pom.xml (added)
+++ geronimo/server/trunk/framework/modules/geronimo-logging/pom.xml Mon May 5 13:34:06 2008
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ 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.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>modules</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>geronimo-logging</artifactId>
+ <name>Geronimo Framework, Modules :: Logging</name>
+
+</project>
+
Propchange: geronimo/server/trunk/framework/modules/geronimo-logging/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/modules/geronimo-logging/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/trunk/framework/modules/geronimo-logging/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticLoggerBinder.java?rev=653588&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticLoggerBinder.java (added)
+++ geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticLoggerBinder.java Mon May 5 13:34:06 2008
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. 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. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.slf4j.impl;
+
+import org.slf4j.ILoggerFactory;
+import org.slf4j.spi.LoggerFactoryBinder;
+
+/**
+ * ???
+ *
+ * @version $Revision$ $Date$
+ */
+public class StaticLoggerBinder
+ implements LoggerFactoryBinder
+{
+}
Propchange: geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticMDCBinder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticMDCBinder.java?rev=653588&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticMDCBinder.java (added)
+++ geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticMDCBinder.java Mon May 5 13:34:06 2008
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. 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. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.slf4j.impl;
+
+import org.slf4j.helpers.NOPMakerAdapter;
+import org.slf4j.spi.MDCAdapter;
+
+/**
+ * ???
+ *
+ * @version $Revision$ $Date$
+ */
+public class StaticMDCBinder
+{
+}
Propchange: geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticMDCBinder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticMDCBinder.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticMDCBinder.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticMarkerBinder.java?rev=653588&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticMarkerBinder.java (added)
+++ geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticMarkerBinder.java Mon May 5 13:34:06 2008
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. 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. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.slf4j.impl;
+
+import org.slf4j.IMarkerFactory;
+import org.slf4j.helpers.BasicMarkerFactory;
+import org.slf4j.spi.MarkerFactoryBinder;
+
+/**
+ * ???
+ *
+ * @version $Revision$ $Date$
+ */
+public class StaticMarkerBinder
+ implements MarkerFactoryBinder
+{
+}
Propchange: geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java?rev=653588&r1=653587&r2=653588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java Mon May 5 13:34:06 2008
@@ -386,7 +386,7 @@
readNameAndID(xml, plugins);
} else {
if (!dir.isFile() || !dir.canRead()) {
- log.error("Cannot read artifact dir " + dir.getAbsolutePath());
+ log.error("Cannot read artifact dir {}", dir.getAbsolutePath());
throw new IllegalStateException("Cannot read artifact dir " + dir.getAbsolutePath());
}
try {
@@ -448,7 +448,7 @@
Artifact artifact = toArtifact(instance.getModuleId());
File dir = writeableRepo.getLocation(artifact);
if (dir == null) {
- log.error(artifact + " is not installed.");
+ log.error("{} is not installed", artifact);
throw new IllegalArgumentException(artifact + " is not installed.");
}
if (!dir.isDirectory()) { // must be a packed (JAR-formatted) plugin
@@ -484,11 +484,11 @@
out.close();
input.close();
if (!dir.delete()) {
- log.error("Unable to delete old plugin at " + dir.getAbsolutePath());
+ log.error("Unable to delete old plugin at {}", dir.getAbsolutePath());
throw new IOException("Unable to delete old plugin at " + dir.getAbsolutePath());
}
if (!temp.renameTo(dir)) {
- log.error("Unable to move new plugin " + temp.getAbsolutePath() + " to " + dir.getAbsolutePath());
+ log.error("Unable to move new plugin {} to {}", temp.getAbsolutePath(), dir.getAbsolutePath());
throw new IOException(
"Unable to move new plugin " + temp.getAbsolutePath() + " to " + dir.getAbsolutePath());
}
@@ -499,7 +499,7 @@
} else {
File meta = new File(dir, "META-INF");
if (!meta.isDirectory() || !meta.canRead()) {
- log.error(artifact + " is not a plugin.");
+ log.error("{} is not a plugin", artifact);
throw new IllegalArgumentException(artifact + " is not a plugin.");
}
File xml = new File(meta, "geronimo-plugin.xml");
@@ -507,7 +507,7 @@
try {
if (!xml.isFile()) {
if (!xml.createNewFile()) {
- log.error("Cannot create plugin metadata file for " + artifact);
+ log.error("Cannot create plugin metadata file for {}", artifact);
throw new RuntimeException("Cannot create plugin metadata file for " + artifact);
}
}
@@ -679,14 +679,14 @@
serverInstance.getAttributeStore().save();
}
} catch (Exception e) {
- log.error("Unable to install plugin. ", e);
+ log.error("Unable to install plugin", e);
poller.setFailure(e);
//Attempt to cleanup a failed plugin installation
for (Artifact artifact : downloadedArtifacts) {
try {
configManager.uninstallConfiguration(artifact);
} catch (Exception e2) {
- log.warn("Warning: ",e2);
+ log.warn(e2.toString(), e2);
}
}
} finally {
@@ -834,7 +834,7 @@
// 1. Extract the configuration metadata
PluginType data = GeronimoSourceRepository.extractPluginMetadata(carFile);
if (data == null) {
- log.error("Invalid Configuration Archive " + carFile.getAbsolutePath() + " no plugin metadata found");
+ log.error("Invalid Configuration Archive {} no plugin metadata found", carFile.getAbsolutePath());
throw new IllegalArgumentException(
"Invalid Configuration Archive " + carFile.getAbsolutePath() + " no plugin metadata found");
}
@@ -891,7 +891,7 @@
}
}
if (!upgrade) {
- log.debug("Configuration " + artifact + " is already installed.");
+ log.debug("Configuration {} is already installed", artifact);
throw new MissingDependencyException(
"Configuration " + artifact + " is already installed.", toArtifact(metadata.getModuleId()), (Stack<Artifact>) null);
}
@@ -1047,10 +1047,8 @@
if (hash != null) {
String actual = ConfigurationStoreUtil.getActualChecksum(tempFile, hash.getType());
if (!actual.equals(hash.getValue())) {
- log.error(
- "File download incorrect (expected " + hash.getType() + " hash " + hash.getValue() + " but got " + actual + ")");
- throw new IOException(
- "File download incorrect (expected " + hash.getType() + " hash " + hash.getValue() + " but got " + actual + ")");
+ log.error("File download incorrect (expected {} hash {} but got {})", new String[] { hash.getType(), hash.getValue(), actual });
+ throw new IOException("File download incorrect (expected " + hash.getType() + " hash " + hash.getValue() + " but got " + actual + ")");
}
}
// See if the download file has plugin metadata and use it in preference to what is in the catalog.
@@ -1060,9 +1058,8 @@
pluginData = realPluginData;
}
} catch (Exception e) {
- log.error("Unable to read plugin metadata: " + e.getMessage());
- throw (IOException) new IOException(
- "Unable to read plugin metadata: " + e.getMessage()).initCause(e);
+ log.error("Unable to read plugin metadata: {}", e.getMessage());
+ throw (IOException) new IOException("Unable to read plugin metadata: " + e.getMessage()).initCause(e);
}
if (pluginData != null) { // it's a plugin, not a plain JAR
validatePlugin(pluginData);
@@ -1083,15 +1080,15 @@
monitor.getResults().addInstalledConfigID(configID);
}
pluginWasInstalled = true;
- if (pluginData != null)
- log.info("Installed plugin with moduleId=" + pluginData.getPluginArtifact().get(0).getModuleId() + " and name=" + pluginData.getName());
- else
- log.info("Installed artifact=" + configID);
+ if (pluginData != null) {
+ log.debug("Installed plugin with moduleId={} and name={}", pluginData.getPluginArtifact().get(0).getModuleId(), pluginData.getName());
+ }
+ else {
+ log.debug("Installed artifact={}", configID);
+ }
} catch (InvalidGBeanException e) {
- log.error("Invalid gbean configuration ", e);
- throw new IllegalStateException(
- "Invalid GBean configuration: " + e.getMessage(), e);
-
+ log.error("Invalid gbean configuration", e);
+ throw new IllegalStateException("Invalid GBean configuration: " + e.getMessage(), e);
} finally {
//todo probably not needede
result.close();
@@ -1110,10 +1107,10 @@
for (int i = matches.length - 1; i >= 0; i--) {
Artifact match = matches[i];
if (configStore.containsConfiguration(match) && configManager.isRunning(match)) {
- log.debug("Found required configuration=" + match + " and it is running.");
+ log.debug("Found required configuration={} and it is running", match);
return; // its dependencies must be OK
} else {
- log.debug("Either required configuration=" + match + " is not installed or it is not running.");
+ log.debug("Either required configuration={} is not installed or it is not running", match);
}
}
// Go with something that's installed
@@ -1124,7 +1121,7 @@
if (configManager.isRunning(configID)) {
return; // its dependencies must be OK
}
- log.debug("Loading configuration=" + configID);
+ log.debug("Loading configuration={}", configID);
data = configStore.loadConfiguration(configID);
}
// Download the dependencies
@@ -1134,7 +1131,7 @@
Dependency[] dependencies = data == null ? getDependencies(writeableRepo, configID) : getDependencies(data);
for (Dependency dep : dependencies) {
Artifact artifact = dep.getArtifact();
- log.debug("Attempting to download dependency=" + artifact + " for configuration=" + configID);
+ log.debug("Attempting to download dependency={} for configuration={}", artifact, configID);
downloadArtifact(artifact, metadata, repos, username, password, monitor, soFar, parentStack, true, servers, loadOverride);
}
} else {
@@ -1142,19 +1139,17 @@
List<DependencyType> deps = instance.getDependency();
for (DependencyType dep : deps) {
Artifact artifact = toArtifact(dep);
- log.debug("Attempting to download dependency=" + artifact + " for configuration=" + configID);
+ log.debug("Attempting to download dependency={} for configuration={}", artifact, configID);
downloadArtifact(artifact, metadata, repos, username, password, monitor, soFar, parentStack, true, servers, loadOverride & dep.isStart());
}
}
parentStack.pop();
} catch (NoSuchConfigException e) {
- log.error("Installed configuration into repository but ConfigStore does not see it: " + e.getMessage());
- throw new IllegalStateException(
- "Installed configuration into repository but ConfigStore does not see it: " + e.getMessage(), e);
+ log.error("Installed configuration into repository but ConfigStore does not see it: {}", e.getMessage());
+ throw new IllegalStateException("Installed configuration into repository but ConfigStore does not see it: " + e.getMessage(), e);
} catch (InvalidConfigException e) {
- log.error("Installed configuration into repository but ConfigStore cannot load it: " + e.getMessage());
- throw new IllegalStateException(
- "Installed configuration into repository but ConfigStore cannot load it: " + e.getMessage(), e);
+ log.error("Installed configuration into repository but ConfigStore cannot load it: {}", e.getMessage());
+ throw new IllegalStateException("Installed configuration into repository but ConfigStore cannot load it: " + e.getMessage(), e);
}
// Copy any files out of the artifact
PluginType currentPlugin = getPluginMetadata(configID);
@@ -1179,11 +1174,11 @@
try {
set = configStore.resolve(configID, null, sourceFile);
} catch (NoSuchConfigException e) {
- log.error("Unable to identify module " + configID + " to copy files from");
+ log.error("Unable to identify module {} to copy files from", configID);
throw new IllegalStateException("Unable to identify module " + configID + " to copy files from", e);
}
if (set.size() == 0) {
- log.error("Installed configuration into repository but cannot locate file to copy " + sourceFile);
+ log.error("Installed configuration into repository but cannot locate file to copy {}", sourceFile);
return;
}
if (set.iterator().next().getPath().endsWith("/")) {
@@ -1203,7 +1198,7 @@
});
set.addAll(configStore.resolve(configID, null, pattern));
} catch (NoSuchConfigException e) {
- log.error("Unable to list directory " + pattern + " to copy files from");
+ log.error("Unable to list directory {} to copy files from", pattern);
throw new IllegalStateException("Unable to list directory " + pattern + " to copy files from", e);
}
}
@@ -1215,13 +1210,11 @@
createDirectory(targetDir);
URI targetURI = targetDir.toURI();
if (!targetDir.isDirectory()) {
- log.error(
- "Plugin install cannot write file " + data.getValue() + " to " + destDir + " because " + targetDir.getAbsolutePath() + " is not a directory");
+ log.error("Plugin install cannot write file {} to {} because {} is not a directory", new String[] { data.getValue(), destDir, targetDir.getAbsolutePath() });
return;
}
if (!targetDir.canWrite()) {
- log.error(
- "Plugin install cannot write file " + data.getValue() + " to " + destDir + " because " + targetDir.getAbsolutePath() + " is not writable");
+ log.error("Plugin install cannot write file {} to {} because {} is not writable", new String[] { data.getValue(), destDir, targetDir.getAbsolutePath() });
return;
}
int start = -1;
@@ -1250,12 +1243,12 @@
if (!target.exists()) {
if (path.endsWith("/")) {
if (!target.mkdirs()) {
- log.error("Plugin install cannot create directory " + target.getAbsolutePath());
+ log.error("Plugin install cannot create directory {}", target.getAbsolutePath());
}
continue;
}
if (!target.createNewFile()) {
- log.error("Plugin install cannot create new file " + target.getAbsolutePath());
+ log.error("Plugin install cannot create new file {}", target.getAbsolutePath());
continue;
}
}
@@ -1263,7 +1256,7 @@
continue;
}
if (!target.canWrite()) {
- log.error("Plugin install cannot write to file " + target.getAbsolutePath());
+ log.error("Plugin install cannot write to file {}", target.getAbsolutePath());
continue;
}
copyFile(url.openStream(), new FileOutputStream(target));
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java?rev=653588&r1=653587&r2=653588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java Mon May 5 13:34:06 2008
@@ -113,7 +113,9 @@
this.readOnly = readOnly;
this.serverInfo = serverInfo;
serverOverride = new ServerOverride();
- log.debug("setting configSubstitutionsFile to " + configSubstitutionsFile + ".");
+
+ log.debug("setting configSubstitutionsFile to: {}", configSubstitutionsFile);
+
infoFactory = newGBeanInfoFactory();
}
@@ -231,7 +233,9 @@
}
configuration.setLoad(load);
configuration.setCondition(condition);
- log.info("Added gbeans for module: " + moduleName + " load: " + load);
+
+ log.debug("Added gbeans for module: {} load: {}", moduleName, load);
+
attributeChanged();
}
@@ -310,7 +314,7 @@
}
ConfigurationOverride configuration = serverOverride.getConfiguration(configurationName);
if (configuration == null) {
- log.debug("Can not add GBean; Configuration not found " + configurationName);
+ log.debug("Can not add GBean; Configuration not found {}", configurationName);
return;
}
try {
@@ -521,7 +525,7 @@
if (!readOnly) {
timer = new Timer(true);
}
- log.debug("Started LocalAttributeManager with data on " + serverOverride.getConfigurations().size() + " configurations");
+ log.debug("Started LocalAttributeManager with data on {} configurations", serverOverride.getConfigurations().size());
}
public synchronized void doStop() throws Exception {
@@ -538,7 +542,7 @@
if (doSave) {
save();
}
- log.debug("Stopped LocalAttributeManager with data on " + serverOverride.getConfigurations().size() + " configurations");
+ log.debug("Stopped LocalAttributeManager with data on {} configurations", serverOverride.getConfigurations().size());
serverOverride = new ServerOverride();
}
@@ -620,8 +624,7 @@
in.close();
}
} catch (Exception e) {
- log.error("Caught exception " + e
- + " trying to open properties file " + configSubstitutionsFile.getAbsolutePath());
+ log.error("Caught exception {} trying to open properties file {}", e, configSubstitutionsFile.getAbsolutePath());
}
}
return properties;
@@ -637,8 +640,7 @@
out.close();
}
} catch (Exception e) {
- log.error("Caught exception " + e
- + " trying to open properties file " + configSubstitutionsFile.getAbsolutePath());
+ log.error("Caught exception {} trying to open properties file {}", e, configSubstitutionsFile.getAbsolutePath());
}
}
}
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JavaVariable.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JavaVariable.java?rev=653588&r1=653587&r2=653588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JavaVariable.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JavaVariable.java Mon May 5 13:34:06 2008
@@ -79,52 +79,39 @@
public boolean getVersionMatches(String version) {
version = version.trim();
- boolean debug = log.isDebugEnabled();
boolean result = false;
if (version.endsWith("*")) {
version = version.substring(0, version.length() - 1).trim();
- if (debug) {
- log.debug("Checking Java version is in the same group as: " + version);
- }
+ log.debug("Checking Java version is in the same group as: {}", version);
String tmp = SystemUtils.JAVA_VERSION_TRIMMED;
- if (debug) {
- log.debug("Requested version: " + tmp);
- log.debug("JVM version: " + SystemUtils.JAVA_VERSION_FLOAT);
- }
+ log.debug("Requested version: {}", tmp);
+ log.debug("JVM version: {}", SystemUtils.JAVA_VERSION_FLOAT);
result = tmp.startsWith(version);
}
else if (version.endsWith("+")) {
version = version.substring(0, version.length() - 1).trim();
- if (debug) {
- log.debug("Checking Java version is greater than: " + version);
- }
+ log.debug("Checking Java version is greater than: {}", version);
float tmp = Float.parseFloat(version);
- if (debug) {
- log.debug("Requested version: " + tmp);
- log.debug("JVM version: " + SystemUtils.JAVA_VERSION_FLOAT);
- }
+ log.debug("Requested version: {}", tmp);
+ log.debug("JVM version: {}", SystemUtils.JAVA_VERSION_FLOAT);
result = tmp <= SystemUtils.JAVA_VERSION_FLOAT;
}
else {
- if (debug) {
- log.debug("Checking Java version is equal to: " + version);
- }
+ log.debug("Checking Java version is equal to: {}", version);
float tmp = Float.parseFloat(version);
- if (debug) {
- log.debug("Requested version: " + tmp);
- log.debug("JVM version: " + SystemUtils.JAVA_VERSION_FLOAT);
- }
+ log.debug("Requested version: {}", tmp);
+ log.debug("JVM version: {}", SystemUtils.JAVA_VERSION_FLOAT);
result = tmp == SystemUtils.JAVA_VERSION_FLOAT;
}
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlConditionParser.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlConditionParser.java?rev=653588&r1=653587&r2=653588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlConditionParser.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlConditionParser.java Mon May 5 13:34:06 2008
@@ -97,21 +97,15 @@
private Object doEvaluate(final String expression) throws Exception {
assert expression != null;
- boolean debug = log.isDebugEnabled();
-
- if (debug) {
- log.debug("Evaluating expression: " + expression);
- }
-
+ log.debug("Evaluating expression: {}", expression);
+
Expression expr = ExpressionFactory.createExpression(expression);
JexlContext ctx = JexlHelper.createContext();
ctx.setVars(vars);
Object result = expr.evaluate(ctx);
- if (debug) {
- log.debug("Result: " + result);
- }
+ log.debug("Result: {}", result);
return result;
}
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlExpressionParser.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlExpressionParser.java?rev=653588&r1=653587&r2=653588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlExpressionParser.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlExpressionParser.java Mon May 5 13:34:06 2008
@@ -44,9 +44,7 @@
context = JexlHelper.createContext();
context.setVars(vars);
- if (log.isTraceEnabled()) {
- log.trace("Using variables: " + context.getVars());
- }
+ log.trace("Using variables: {}", context.getVars());
}
public JexlExpressionParser() {
@@ -112,16 +110,11 @@
throw new IllegalArgumentException("expression");
}
- boolean trace = log.isTraceEnabled();
- if (trace) {
- log.trace("Evaluating expression: " + expression);
- }
+ log.trace("Evaluating expression: {}", expression);
Expression expr = createExpression(expression);
Object obj = expr.evaluate(context);
- if (trace) {
- log.trace("Result: " + obj);
- }
+ log.trace("Result: {}", obj);
return obj;
}
@@ -131,10 +124,7 @@
throw new IllegalArgumentException("input");
}
- boolean trace = log.isTraceEnabled();
- if (trace) {
- log.trace("Parsing input: " + input);
- }
+ log.trace("Parsing input: {}", input);
StringBuffer buff = new StringBuffer();
@@ -169,9 +159,7 @@
buff.append(input.substring(cur));
- if (trace) {
- log.trace("Parsed result: " + buff);
- }
+ log.trace("Parsed result: {}", buff);
return buff.toString();
}
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/properties/JvmVendor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/properties/JvmVendor.java?rev=653588&r1=653587&r2=653588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/properties/JvmVendor.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/properties/JvmVendor.java Mon May 5 13:34:06 2008
@@ -66,23 +66,27 @@
// Security.addProvider(new com.ibm.jsse2.IBMJSSEProvider2());
log.debug("Loaded the IBM JSSE2 Provider");
} else {
- log.debug("Found the IBM JSSE2 Provider = " + Security.getProvider("com.ibm.jsse2.IBMJSSEProvider2"));
+ log.debug("Found the IBM JSSE2 Provider: {}", Security.getProvider("com.ibm.jsse2.IBMJSSEProvider2"));
}
+
if (Security.getProvider("IBMCertPath") == null) {
// If we found IBMJSSE but not this one, then the JAVA_OPTS are probably messed up
log.debug("No IBMCertPath provider found.");
throw new RuntimeException("Could not find the IBMCertPath provider.");
} else {
- log.debug("Found the IBMCertPath Provider = " + Security.getProvider("IBMCertPath"));
+ log.debug("Found the IBMCertPath Provider: {}", Security.getProvider("IBMCertPath"));
}
+
if (Security.getProvider("IBMJCE") == null) {
// If we found IBMJSSE but not this one, then the JAVA_OPTS are probably messed up
log.debug("No IBMJCE provider found.");
throw new RuntimeException("Could not find the IBMJCE provider.");
} else {
- log.debug("Found the IBMJCE Provider" + Security.getProvider("IBMJCE"));
+ log.debug("Found the IBMJCE Provider {}", Security.getProvider("IBMJCE"));
}
+
System.setProperty("java.protocol.handler.pkgs", "com.ibm.net.ssl.www2.protocol");
+
// All of the expected IBM Extensions were found, so we must be using the IBM Hybrid JDK
bSun = false;
bApache = false;
@@ -90,11 +94,11 @@
bIBMHybrid = true;
} catch (ClassNotFoundException e) {
// Couldn't load the IBMJSSE Provider, so we must not be using the IBM Hybrid SDK
- log.debug("Caught Exception="+e.toString());
+ log.debug("Caught Exception: {}", e.toString());
log.debug("Could not load the IBM JSSE Provider. Must be using the OS provider's Java.");
} catch (Throwable t) {
// Couldn't load the IBMJSSE Provider, so we must not be using the IBM Hybrid SDK
- log.debug("Caught Throwable="+t.toString());
+ log.debug("Caught Throwable: {}", t.toString());
log.debug("Assume we could not load the IBM JSSE Provider and that we are using the OS provider's Java.");
}
}