Author: taylor
Date: Fri May 16 14:15:03 2008
New Revision: 657213
URL: http://svn.apache.org/viewvc?rev=657213&view=rev
Log:
Ate's debugging data source. Want to get this merged into trunk as its very
useful
Added:
portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/jndi/DebuggingDataSourceJndiObjectFactoryBean.java
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/debug/
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/debug/Log4j.properties
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/debug/datasource.xml
Added:
portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/jndi/DebuggingDataSourceJndiObjectFactoryBean.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/jndi/DebuggingDataSourceJndiObjectFactoryBean.java?rev=657213&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/jndi/DebuggingDataSourceJndiObjectFactoryBean.java
(added)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/jndi/DebuggingDataSourceJndiObjectFactoryBean.java
Fri May 16 14:15:03 2008
@@ -0,0 +1,665 @@
+/*
+* 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.apache.jetspeed.components.jndi;
+
+import java.io.PrintWriter;
+import java.sql.CallableStatement;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.Savepoint;
+import java.sql.Statement;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.jndi.JndiObjectFactoryBean;
+
+/**
+* @version $Id$
+*/
+public class DebuggingDataSourceJndiObjectFactoryBean extends
JndiObjectFactoryBean implements DisposableBean
+{
+ private static final Log statisticsLog =
LogFactory.getLog("org.apache.jetspeed.ds.statistics");
+ private static final Log openConnectionsLog =
LogFactory.getLog("org.apache.jetspeed.ds.connections");
+
+ private Object mutex = new Object();
+ private DataSourceWrapper cachedWrapper;
+ private int connectionSequence;
+ private boolean debug;
+ private HashMap<Integer,ConnectionWrapper> cachedConnections = new
HashMap<Integer,ConnectionWrapper>();
+ private HashMap<Integer,ConnectionCallStatistics> connectionsCallStatistics
= new HashMap<Integer,ConnectionCallStatistics>();
+ private String[] debugCallStackPackages = new String[0];
+
+ public void flush()
+ {
+ System.out.print("*** FLUSHING Datasource Wrapper now....");
+ synchronized (mutex)
+ {
+ DebuggingDataSourceJndiObjectFactoryBean.this.debug = true;
+ dumpLog();
+
openConnectionsLog.info("-------------------------------------------------------------------------------");
+ openConnectionsLog.info("open connections log flushed.");
+
statisticsLog.info("-------------------------------------------------------------------------------");
+ statisticsLog.info("data source statistics log flushed.");
+ }
+ System.out.println("...flush completed. ***");
+ }
+
+ class ConnectionCallStatistics
+ {
+ String callStack;
+ int callCount;
+ long accumulatedDuration;
+ long minDuration;
+ long maxDuration;
+ long totalOverhead;
+ }
+
+ class ConnectionWrapper implements Connection
+ {
+ private Connection connection;
+ private Integer connectionKey;
+ private Integer statisticsKey;
+ private long duration;
+ private long overhead;
+ private boolean closed;
+
+ private ConnectionWrapper(Connection connection, Integer connectionKey,
Integer statisticsKey, long startTime)
+ {
+ this.connection = connection;
+ this.connectionKey = connectionKey;
+ this.statisticsKey = statisticsKey;
+ duration = System.currentTimeMillis();
+ this.overhead = startTime;
+ }
+
+ public void clearWarnings() throws SQLException
+ {
+ connection.clearWarnings();
+ }
+
+ public void close() throws SQLException
+ {
+ long endTime = System.currentTimeMillis();
+ connection.close();
+ if (!closed)
+ {
+ closed = true;
+
+ synchronized (mutex)
+ {
+ if (DebuggingDataSourceJndiObjectFactoryBean.this.debug)
+ {
+ duration = endTime - duration;
+ overhead = endTime - overhead - duration;
+ ConnectionCallStatistics statistics =
connectionsCallStatistics.get(statisticsKey);
+ if (statistics == null)
+ {
+ System.out.println("failed to find " +
statisticsKey);
+ return;
+ }
+ statistics.accumulatedDuration+=duration;
+ statistics.totalOverhead+=overhead;
+ if (duration < statistics.minDuration)
+ {
+ statistics.minDuration = duration;
+ }
+ if (duration > statistics.maxDuration)
+ {
+ statistics.maxDuration = duration;
+ }
+ cachedConnections.remove(connectionKey);
+ }
+ }
+ }
+ }
+
+ public void commit() throws SQLException
+ {
+ connection.commit();
+ }
+
+ public Statement createStatement() throws SQLException
+ {
+ return connection.createStatement();
+ }
+
+ public Statement createStatement(int resultSetType, int
resultSetConcurrency, int resultSetHoldability)
+
throws SQLException
+ {
+ return connection.createStatement(resultSetType,
resultSetConcurrency, resultSetHoldability);
+ }
+
+ public Statement createStatement(int resultSetType, int
resultSetConcurrency) throws SQLException
+ {
+ return connection.createStatement(resultSetType,
resultSetConcurrency);
+ }
+
+ public boolean getAutoCommit() throws SQLException
+ {
+ return connection.getAutoCommit();
+ }
+
+ public String getCatalog() throws SQLException
+ {
+ return connection.getCatalog();
+ }
+
+ public int getHoldability() throws SQLException
+ {
+ return connection.getHoldability();
+ }
+
+ public DatabaseMetaData getMetaData() throws SQLException
+ {
+ return connection.getMetaData();
+ }
+
+ public int getTransactionIsolation() throws SQLException
+ {
+ return connection.getTransactionIsolation();
+ }
+
+ public Map<String, Class<?>> getTypeMap() throws SQLException
+ {
+ return connection.getTypeMap();
+ }
+
+ public SQLWarning getWarnings() throws SQLException
+ {
+ return connection.getWarnings();
+ }
+
+ public boolean isClosed() throws SQLException
+ {
+ return connection.isClosed();
+ }
+
+ public boolean isReadOnly() throws SQLException
+ {
+ return connection.isReadOnly();
+ }
+
+ public String nativeSQL(String sql) throws SQLException
+ {
+ return connection.nativeSQL(sql);
+ }
+
+ public CallableStatement prepareCall(String sql, int resultSetType, int
resultSetConcurrency,
+ int resultSetHoldability) throws
SQLException
+ {
+ return connection.prepareCall(sql, resultSetType,
resultSetConcurrency, resultSetHoldability);
+ }
+
+ public CallableStatement prepareCall(String sql, int resultSetType, int
resultSetConcurrency)
+
throws SQLException
+ {
+ return connection.prepareCall(sql, resultSetType,
resultSetConcurrency);
+ }
+
+ public CallableStatement prepareCall(String sql) throws SQLException
+ {
+ return connection.prepareCall(sql);
+ }
+
+ public PreparedStatement prepareStatement(String sql, int
resultSetType, int resultSetConcurrency,
+ int resultSetHoldability)
throws SQLException
+ {
+ return connection.prepareStatement(sql, resultSetType,
resultSetConcurrency, resultSetHoldability);
+ }
+
+ public PreparedStatement prepareStatement(String sql, int
resultSetType, int resultSetConcurrency)
+
throws SQLException
+ {
+ return connection.prepareStatement(sql, resultSetType,
resultSetConcurrency);
+ }
+
+ public PreparedStatement prepareStatement(String sql, int
autoGeneratedKeys) throws SQLException
+ {
+ return connection.prepareStatement(sql, autoGeneratedKeys);
+ }
+
+ public PreparedStatement prepareStatement(String sql, int[]
columnIndexes) throws SQLException
+ {
+ return connection.prepareStatement(sql, columnIndexes);
+ }
+
+ public PreparedStatement prepareStatement(String sql, String[]
columnNames) throws SQLException
+ {
+ return connection.prepareStatement(sql, columnNames);
+ }
+
+ public PreparedStatement prepareStatement(String sql) throws
SQLException
+ {
+ return connection.prepareStatement(sql);
+ }
+
+ public void releaseSavepoint(Savepoint savepoint) throws SQLException
+ {
+ connection.releaseSavepoint(savepoint);
+ }
+
+ public void rollback() throws SQLException
+ {
+ connection.rollback();
+ }
+
+ public void rollback(Savepoint savepoint) throws SQLException
+ {
+ connection.rollback(savepoint);
+ }
+
+ public void setAutoCommit(boolean autoCommit) throws SQLException
+ {
+ connection.setAutoCommit(autoCommit);
+ }
+
+ public void setCatalog(String catalog) throws SQLException
+ {
+ connection.setCatalog(catalog);
+ }
+
+ public void setHoldability(int holdability) throws SQLException
+ {
+ connection.setHoldability(holdability);
+ }
+
+ public void setReadOnly(boolean readOnly) throws SQLException
+ {
+ connection.setReadOnly(readOnly);
+ }
+
+ public Savepoint setSavepoint() throws SQLException
+ {
+ return connection.setSavepoint();
+ }
+
+ public Savepoint setSavepoint(String name) throws SQLException
+ {
+ return connection.setSavepoint(name);
+ }
+
+ public void setTransactionIsolation(int level) throws SQLException
+ {
+ connection.setTransactionIsolation(level);
+ }
+
+ public void setTypeMap(Map<String, Class<?>> map) throws SQLException
+ {
+ connection.setTypeMap(map);
+ }
+ }
+
+ public class DataSourceWrapper implements DataSource
+ {
+ DataSource ds;
+
+ public DataSourceWrapper(DataSource ds)
+ {
+ this.ds = ds;
+ }
+
+ public void flush()
+ {
+ DebuggingDataSourceJndiObjectFactoryBean.this.flush();
+ }
+
+ private void checkHandleTimeoutException(SQLException e)
+ {
+ if (DebuggingDataSourceJndiObjectFactoryBean.this.debug)
+ {
+ // dump on any SQLException
+ dumpLog();
+/*
+ if (e.getMessage().contains("ConnectionWaitTimeoutException")
|| e.getCause() != null &&
e.getCause().getMessage().contains("ConnectionWaitTimeoutException"))
+ {
+ // dump only on (IBM specific) WaitTimeoutException
+ dumpLog();
+ }
+*/
+ }
+ }
+
+ public Connection getConnection() throws SQLException
+ {
+ try
+ {
+ return
DebuggingDataSourceJndiObjectFactoryBean.this.recordConnection(ds.getConnection());
+ }
+ catch (SQLException e)
+ {
+ checkHandleTimeoutException(e);
+ throw e;
+ }
+ }
+
+ public Connection getConnection(String username, String password)
throws SQLException
+ {
+ try
+ {
+ return
DebuggingDataSourceJndiObjectFactoryBean.this.recordConnection(ds.getConnection(username,
password));
+ }
+ catch (SQLException e)
+ {
+ checkHandleTimeoutException(e);
+ throw e;
+ }
+ }
+
+ public int getLoginTimeout() throws SQLException
+ {
+ return ds.getLoginTimeout();
+ }
+
+ public PrintWriter getLogWriter() throws SQLException
+ {
+ return ds.getLogWriter();
+ }
+
+ public void setLoginTimeout(int seconds) throws SQLException
+ {
+ ds.setLoginTimeout(seconds);
+ }
+
+ public void setLogWriter(PrintWriter out) throws SQLException
+ {
+ ds.setLogWriter(out);
+ }
+ }
+
+ public void setDebugCallStackPackages(List list)
+ {
+ if (list != null && !list.isEmpty())
+ {
+ this.debugCallStackPackages = (String[])list.toArray(new
String[list.size()]);
+ }
+ }
+
+// public List getDebugCallStackPackages()
+// {
+// return Arrays.asList(this.debugCallStackPackages);
+// }
+
+ public void afterPropertiesSet() throws IllegalArgumentException,
NamingException
+ {
+ super.afterPropertiesSet();
+ debug = statisticsLog.isDebugEnabled();
+ if (debug)
+ {
+ statisticsLog.debug("Starting collecting Datasource connection call
statistics");
+
+ if (openConnectionsLog.isDebugEnabled())
+ {
+ openConnectionsLog.debug("Starting monitoring open Datasource
connections");
+ }
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.springframework.jndi.JndiObjectFactoryBean#getObject()
+ */
+ public Object getObject()
+ {
+ DataSource ds = (DataSource) super.getObject();
+ if (debug)
+ {
+ synchronized (this)
+ {
+ if (cachedWrapper == null || cachedWrapper.ds != ds)
+ {
+ cachedWrapper = new DataSourceWrapper(ds);
+ }
+ return cachedWrapper;
+ }
+ }
+ return ds;
+ }
+
+ private Connection recordConnection(Connection connection)
+ {
+ long startTime = System.currentTimeMillis();
+ synchronized (mutex)
+ {
+ if (DebuggingDataSourceJndiObjectFactoryBean.this.debug)
+ {
+ String callStack =
getJetspeedCallStack(Thread.currentThread().getStackTrace());
+ if (callStack != null)
+ {
+ Integer statisticsKey = new Integer(callStack.hashCode());
+ ConnectionCallStatistics statistics =
connectionsCallStatistics.get(statisticsKey);
+ if (statistics == null)
+ {
+ statistics = new ConnectionCallStatistics();
+ statistics.callStack = callStack;
+ connectionsCallStatistics.put(statisticsKey,
statistics);
+ }
+ statistics.callCount++;
+ Integer connectionKey = new Integer(connectionSequence++);
+ connection = new ConnectionWrapper(connection,
connectionKey, statisticsKey, startTime);
+ cachedConnections.put(connectionKey,
(ConnectionWrapper)connection);
+ }
+ }
+ }
+ return connection;
+ }
+
+ private void dumpLog()
+ {
+
+// synchronized (mutex)
+// {
+// if (DebuggingDataSourceJndiObjectFactoryBean.this.debug)
+// {
+// DebuggingDataSourceJndiObjectFactoryBean.this.debug = false;
+// }
+// else
+// {
+// return;
+// }
+// }
+
+
+ long currentTime = System.currentTimeMillis();
+
+ ConnectionCallStatistics[] statistics =
connectionsCallStatistics.values().toArray(new
ConnectionCallStatistics[connectionsCallStatistics.size()]);
+ if (statistics.length > 1)
+ {
+ Arrays.sort(statistics, new Comparator<ConnectionCallStatistics>(){
+
+ public int compare(ConnectionCallStatistics o1,
ConnectionCallStatistics o2)
+ {
+ return o1.callCount == o2.callCount ? 0 : o1.callCount >
o2.callCount ? -1 : 1;
+ }});
+ }
+
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("The following "+statistics.length+" DataSource
connection call stacks where recorded, sorted by number of calls: \n");
+ int index = 1;
+ for (ConnectionCallStatistics ccs : statistics)
+ {
+ buffer.append("\n");
+ buffer.append(" call stack nr: ");
+ buffer.append(index++);
+ buffer.append(", calls: ");
+ buffer.append(ccs.callCount);
+ buffer.append(", min.duration: ");
+ buffer.append(formatDuration(ccs.minDuration));
+ buffer.append(", max.duration: ");
+ buffer.append(formatDuration(ccs.maxDuration));
+ buffer.append(", acc.duration: ");
+ buffer.append(formatDuration(ccs.accumulatedDuration));
+ buffer.append(", avg.duration: ");
+
buffer.append(formatDuration(ccs.accumulatedDuration/ccs.callCount));
+ buffer.append(", tot.overhead: ");
+ buffer.append(formatDuration(ccs.totalOverhead));
+ buffer.append(", avg.overhead: ");
+ buffer.append(formatDuration(ccs.totalOverhead/ccs.callCount));
+ buffer.append("\n");
+ buffer.append(ccs.callStack);
+ buffer.append("\n");
+ }
+ statisticsLog.debug(buffer.toString());
+
+ if (openConnectionsLog.isDebugEnabled())
+ {
+ ConnectionWrapper[] connectionWrappers =
cachedConnections.values().toArray(new
ConnectionWrapper[cachedConnections.size()]);
+ for (ConnectionWrapper cw : connectionWrappers)
+ {
+ cw.duration = currentTime - cw.duration;
+ }
+ if (connectionWrappers.length > 1)
+ {
+ Arrays.sort(connectionWrappers, new
Comparator<ConnectionWrapper>(){
+
+ public int compare(ConnectionWrapper o1, ConnectionWrapper
o2)
+ {
+ return o1.duration == o2.duration ? 0 : o1.duration >
o2.duration ? -1 : 1;
+ }});
+ }
+ buffer.setLength(0);
+ buffer.append("The following "+connectionWrappers.length+"
connections where still active, sorted by the duration since creation: \n");
+ index = 1;
+ for (ConnectionWrapper cw : connectionWrappers)
+ {
+ buffer.append("\n");
+ buffer.append(" connection nr: ");
+ buffer.append(index++);
+ buffer.append(", duration: ");
+ buffer.append(formatDuration(cw.duration));
+ buffer.append("\n");
+
buffer.append(connectionsCallStatistics.get(cw.statisticsKey).callStack);
+ buffer.append("\n");
+ }
+ openConnectionsLog.debug(buffer.toString());
+ }
+
+ connectionsCallStatistics.clear();
+ cachedConnections.clear();
+ }
+
+ private static String formatDuration(long duration)
+ {
+ long seconds = duration/1000;
+ long millis = duration-seconds;
+ return ""+seconds+"."+(millis<100?millis<10?"00":"0":"")+millis+"s";
+ }
+
+ private String getJetspeedCallStack(StackTraceElement[] ste)
+ {
+ String callStack = null;
+ for (int i = 1; ste != null && i < ste.length; i++)
+ {
+ if
(ste[i].getClassName().startsWith("org.apache.jetspeed.components.jndi.DebuggingDataSourceJndiObjectFactoryBean$DataSourceWrapper"))
+ {
+ i++;
+ for (; i < ste.length; i++)
+ {
+ if
(ste[i].getClassName().equals("org.apache.jetspeed.components.rdbms.ojb.ConnectionManagerImpl")
&& ste[i].getMethodName().equals("getConnection"))
+ {
+ continue;
+ }
+ if (ste[i].getClassName().startsWith("org.apache.jetspeed"))
+ {
+ StringBuffer b = new StringBuffer();
+ boolean inJ2 = true;
+ for (; i < ste.length; i++)
+ {
+ boolean logSTE =
isDebugCallStackPackage(ste[i].getClassName());
+ if (inJ2)
+ {
+ if (!logSTE)
+ {
+ b.append(" ...\n");
+ inJ2 = false;
+ }
+ }
+ else
+ {
+ if (logSTE)
+ {
+ inJ2 = true;
+ }
+ }
+ if (inJ2)
+ {
+ if (ste[i].getClassName()
+
.equals("org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation") &&
+ ste[i].getMethodName().equals("invokeNext"))
+ {
+ b.append(" ...\n");
+ break;
+ }
+ b.append(" ");
+ b.append(ste[i].toString());
+ b.append("\n");
+ if (ste[i].getClassName()
+
.equals("org.apache.jetspeed.factory.JetspeedPortletInstance"))
+ {
+ b.append(" ...\n");
+ break;
+ }
+ if
(ste[i].getClassName().equals("org.apache.jetspeed.engine.JetspeedEngine"))
+ {
+ b.append(" ...\n");
+ break;
+ }
+ }
+ }
+ callStack = b.toString();
+ break;
+ }
+ }
+ break;
+ }
+ }
+ return callStack;
+ }
+
+ private boolean isDebugCallStackPackage(String className)
+ {
+ if (!className.startsWith("org.apache.jetspeed"))
+ {
+ for (int i = 0; i < debugCallStackPackages.length; i++)
+ {
+ if (className.startsWith(debugCallStackPackages[i]))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+ return true;
+ }
+
+ public void destroy() throws Exception
+ {
+ dumpLog();
+ }
+}
Added:
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/debug/Log4j.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/debug/Log4j.properties?rev=657213&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/debug/Log4j.properties
(added)
+++
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/debug/Log4j.properties
Fri May 16 14:15:03 2008
@@ -0,0 +1,179 @@
+# 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.
+
+# ------------------------------------------------------------------------
+#
+# Logging Configuration
+#
+# $Id$
+#
+# ------------------------------------------------------------------------
+
+#
+# If we don't know the logging facility, put it into the jetspeed.log
+#
+#
+log4j.rootLogger = ERROR, console
+
+#
+# org.apache.portals.tutorials goes into Jetspeed Log
+#
+log4j.category.org.apache.portals.tutorials = ERROR, console
+log4j.additivity.org.apache.portals.tutorials = false
+
+log4j.category.com.fmr = DEBUG, console
+log4j.additivity.com.fmr = false
+
+#
+# Jetspeed goes into Jetspeed Log
+#
+log4j.category.org.apache.jetspeed = ERROR, console
+log4j.additivity.org.apache.jetspeed = false
+
+
+log4j.category.org.apache.jetspeed.tools = ERROR, console
+log4j.additivity.org.apache.jetspeed.tools = false
+
+log4j.category.org.apache.commons.digester = ERROR, console
+log4j.additivity.org.apache.commons.digester = false
+
+
+#
+# Velocity Logfile
+#
+log4j.category.velocity = ERROR, console
+log4j.additivity.velocity = false
+
+#
+# OJB Logfile
+#
+log4j.category.org.apache.ojb= ERROR, console
+log4j.additivity.org.apache.ojb= false
+
+#
+# Scheduler Category
+#
+log4j.category.scheduler = ERROR, console
+log4j.additivity.scheduler = false
+
+#
+# Pluto Category
+#
+log4j.category.org.apache.pluto = ERROR, PLUTO, console
+log4j.additivity.org.apache.pluto = false
+
+#
+# Deployment Category
+#
+log4j.category.deployment = ERROR, DEPLOYMENT, console
+log4j.additivity.deployment = false
+
+
+#
+# Console Category
+#
+log4j.category.console = ERROR, console
+log4j.additivity.console = false
+
+
+#
+# Logfile definitions
+#
+
+#
+# jetspeed.log
+#
+log4j.appender.jetspeed = org.apache.log4j.FileAppender
+log4j.appender.jetspeed.file = ${applicationRoot}/logs/jetspeed.log
+log4j.appender.jetspeed.layout = org.apache.log4j.PatternLayout
+log4j.appender.jetspeed.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.jetspeed.append = false
+
+log4j.appender.digester = org.apache.log4j.FileAppender
+log4j.appender.digester.file = ${applicationRoot}/logs/digester.log
+log4j.appender.digester.layout = org.apache.log4j.PatternLayout
+log4j.appender.digester.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.digester.append = false
+
+#
+# pluto.log
+#
+log4j.appender.PLUTO = org.apache.log4j.FileAppender
+log4j.appender.PLUTO.file = ${applicationRoot}/logs/pluto.log
+log4j.appender.PLUTO.layout = org.apache.log4j.PatternLayout
+log4j.appender.PLUTO.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.PLUTO.append = false
+
+#
+# deployment.log
+#
+log4j.appender.DEPLOYMENT = org.apache.log4j.FileAppender
+log4j.appender.DEPLOYMENT.file = ${applicationRoot}/logs/deployment.log
+log4j.appender.DEPLOYMENT.layout = org.apache.log4j.PatternLayout
+log4j.appender.DEPLOYMENT.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.DEPLOYMENT.append = false
+
+#
+# Scheduler Output
+#
+log4j.appender.scheduler = org.apache.log4j.FileAppender
+log4j.appender.scheduler.file = ${applicationRoot}/logs/scheduler.log
+log4j.appender.scheduler.layout = org.apache.log4j.PatternLayout
+log4j.appender.scheduler.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.scheduler.append = false
+
+#
+# Velocity gets configured to write its output onto the velocity
+# category.
+#
+log4j.appender.velocity = org.apache.log4j.FileAppender
+log4j.appender.velocity.file = ${applicationRoot}/logs/velocity.log
+log4j.appender.velocity.layout = org.apache.log4j.PatternLayout
+log4j.appender.velocity.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.velocity.append = false
+
+
+log4j.appender.ojb = org.apache.log4j.FileAppender
+log4j.appender.ojb.file = ${applicationRoot}/logs/ojb.log
+log4j.appender.ojb.layout = org.apache.log4j.PatternLayout
+log4j.appender.ojb.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.ojb.append = false
+
+#
+# Console
+#
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+
+# Pattern to output the caller's file name and line number.
+log4j.appender.console.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
+
+# David's recommendation for the debug datasource wrapper
+
+log4j.category.org.apache.jetspeed.ds.statistics = DEBUG, dss
+log4j.additivity.org.apache.jetspeed.ds.statistics = false
+log4j.appender.dss = org.apache.log4j.FileAppender
+log4j.appender.dss.file = ${applicationRoot}/logs/ds-statistics.log
+log4j.appender.dss.layout = org.apache.log4j.PatternLayout
+log4j.appender.dss.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.dss.append = false
+
+log4j.category.org.apache.jetspeed.ds.connections = DEBUG, dsc
+log4j.additivity.org.apache.jetspeed.ds.connections = false
+log4j.appender.dsc = org.apache.log4j.FileAppender
+log4j.appender.dsc.file = ${applicationRoot}/logs/ds-connections.log
+log4j.appender.dsc.layout = org.apache.log4j.PatternLayout
+log4j.appender.dsc.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.dsc.append = false
Added:
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/debug/datasource.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/debug/datasource.xml?rev=657213&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/debug/datasource.xml
(added)
+++
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/debug/datasource.xml
Fri May 16 14:15:03 2008
@@ -0,0 +1,138 @@
+<?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.
+-->
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
"http://www.springframework.org/dtd/spring-beans.dtd";>
+<beans>
+
+ <bean id="JetspeedDS"
class="org.apache.jetspeed.components.jndi.DebuggingDataSourceJndiObjectFactoryBean">
+ <property name="resourceRef"><value>false</value></property>
+ <property name="jndiName">
+ <value>java:comp/env/jdbc/jetspeed</value>
+ </property>
+ <property name="debugCallStackPackages">
+ <list>
+ <value>org.apache.portals</value>
+ <value>com.fmr</value>
+ </list>
+ </property>
+ </bean>
+
+ <bean id="ojbConfigurer"
class="org.springframework.orm.ojb.support.LocalOjbConfigurer"/>
+
+ <!--
+ Dynamically configures Database Platform for OJB by looking at the
connection string
+ and figuring out the OJB platform using an OJB metadata utility
+ Its important to get this right otherwise you will be sending the
wrong (most likely HSQL)
+ flavor of SQL statements to the backend database.
+ -->
+ <bean id="PlatformConfigurator"
+
class="org.apache.jetspeed.components.rdbms.ojb.DatabasePlatformConfigurator"
+ init-method="init"
+ >
+ <constructor-arg index='0'>
+ <ref bean="JetspeedDS"/>
+ </constructor-arg>
+ <!-- JNDI Name -->
+ <constructor-arg index='1'>
+ <value>JetspeedDS</value>
+ </constructor-arg>
+ </bean>
+
+ <!--
+ Optional configuration for table schema aware
datasource.
+
+ The way to inject the schema switching is database
specific. Here only the DB2 way
+ is shown (set current schema = xx). Oracle statement
might
+ be: "alter session set current_schema=xx", PostGres
+ may look like this: "SET search_path TO xx"
+
+ The idea was taken from
http://forum.springframework.org/showthread.php?t=10728
+
+ The runtime schema switching support was dropped
because it is not needed here.
+ -->
+ <!--
+ <bean id="JetspeedDS"
+
class="org.apache.jetspeed.components.datasource.SchemaAwareDataSourceProxy">
+ <property name="targetDataSource">
+ <ref local="dataSourceTarget" />
+ </property>
+ <property name="schemaSql">
+ <value>set current schema = xx</value>
+ </property>
+ </bean>
+
+ <bean id="dataSourceTarget"
+ class="org.springframework.jndi.JndiObjectFactoryBean">
+ <property name="resourceRef">
+ <value>false</value>
+ </property>
+ <property name="jndiName">
+ <value>java:comp/env/jdbc/jetspeed</value>
+ </property>
+ </bean>
+ -->
+
+ <!--
+ Creates a JNDI-based datasource bean name "JetspeedDS". The information
+ provided here is merged with the basic configuration for the
+ jdbc-connection-descriptor with the matching jcd-alias property
+ ("JetspeedDS") located under /etc/db-ojb/repository_database.xml in the
+ source tree.
+
+ Another requirement for this to work is to have the
+
ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryManagedImpl
+ or to have
+
ConnectionManagerClass=org.apache.jetspeed.components.rdbms.ojb.ConnectionManagerImpl.
+ (either will do, both are recommended, see comments in configuration
file).
+ These properties are located in /etc/db-ojb/OJB.properties in the source
tree.
+
+ FYI: The two OJB configuration files mentioned above are currently
already setup this way
+ in the default Jetspeed implementation.
+
+ However, if you need to locate/modify these files in a running instance
of jetspeed,
+ they will be located under /WEB-INF/classes.
+ -->
+ <!--
+ <bean id="JetspeedDS"
class="org.apache.jetspeed.components.rdbms.ojb.ConnectionRepositoryEntry">
+ <property name="jndiName">
+ <value>java:comp/env/jdbc/jetspeed</value>
+ </property>
+ </bean>
+ -->
+
+ <!-- If would like use a commons DBCP Pooled datasource as opposed to the
default
+ JNDI one above you can uncomment the configuration below and fill in
+ the datasource information as it relates to your environment.
+
+ A requirement for this to work is to have the
+
ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryDBCPImpl
+ or to have
+
ConnectionManagerClass=org.apache.jetspeed.components.rdbms.ojb.ConnectionManagerImpl
+ This property is located in /etc/db-ojb/OJB.properties in the source
tree.
+ -->
+
+<!--
+ <bean id="JetspeedDS" class="org.apache.commons.dbcp.BasicDataSource"
+ destroy-method="close"
+ >
+ <property
name="driverClassName"><value>com.mysql.jdbc.Driver</value></property>
+ <property
name="url"><value>jdbc:mysql://localhost/j2test</value></property>
+ <property name="username"><value>j2</value></property>
+ <property name="password"><value>XXX</value></property>
+ </bean>
+ -->
+</beans>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
