Author: niallp
Date: Wed Jan 14 17:05:25 2009
New Revision: 734588
URL: http://svn.apache.org/viewvc?rev=734588&view=rev
Log:
Fix minor checkstyle issues
Added:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/package.html
(with props)
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/LRUMap.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/ManagedConnection.java
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java?rev=734588&r1=734587&r2=734588&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java
Wed Jan 14 17:05:25 2009
@@ -35,7 +35,6 @@
import java.sql.SQLXML;
import java.sql.Struct;
import java.util.Collections;
-import java.util.Map;
import java.util.Properties;
/* JDBC_4_ANT_KEY_END */
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/LRUMap.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/LRUMap.java?rev=734588&r1=734587&r2=734588&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/LRUMap.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/LRUMap.java
Wed Jan 14 17:05:25 2009
@@ -175,7 +175,7 @@
public void writeExternal( ObjectOutput out ) throws IOException {
out.writeInt( maximumSize );
out.writeInt( size() );
- for( Iterator iterator = keySet().iterator(); iterator.hasNext(); ) {
+ for( Iterator iterator = keySet().iterator(); iterator.hasNext();) {
Object key = iterator.next();
out.writeObject( key );
// be sure to call super.get(key), or you're likely to
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/ManagedConnection.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/ManagedConnection.java?rev=734588&r1=734587&r2=734588&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/ManagedConnection.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/ManagedConnection.java
Wed Jan 14 17:05:25 2009
@@ -152,6 +152,10 @@
}
}
+ /**
+ * Delegates to {...@link ManagedConnection#transactionComplete()}
+ * for transaction completion events.
+ */
protected class CompletionListener implements TransactionContextListener {
public void afterCompletion(TransactionContext completedContext,
boolean commited) {
if (completedContext == transactionContext) {
Added:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/package.html
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/package.html?rev=734588&view=auto
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/package.html
(added)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/package.html
Wed Jan 14 17:05:25 2009
@@ -0,0 +1,42 @@
+<!--
+ 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.
+-->
+<html>
+<body>
+
+<p>
+This package provides support for pooling of ManagedConnections. A managed
+connection is responsible for managing a database connection in a
+transactional environment (typically called <i>Container Managed</i>).
+A managed connection opperates like any other connection when no gloabal
+transaction (a.k.a. XA transaction or JTA Transaction) is in progress.
+When a global transaction is active a single physical connection to the
+database is used by all ManagedConnections accessed in the scope of the
+transaction. Connection sharing means that all data access during a
+transaction has a consistent view of the database. When the global
+transaction is committed or rolled back the enlisted connections are
+committed or rolled back.
+</p>
+
+<p>
+This package supports full XADataSources and non-XA data sources using
+local transaction semantics. non-XA data sources commit and rollback as
+part of the transaction but are not recoverable in the case of an error
+because they do not implement the two-phase commit protocol.
+</p>
+
+</body>
+</html>
Propchange:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/package.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/package.html
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision
