| Commit in servicemix/jencks/src/main/java/org/servicemix/jencks/factory on MAIN | |||
| PartitionedPoolFactoryBean.java | +1 | 1.1 -> 1.2 | |
| TransactionContextManagerFactoryBean.java | +8 | -17 | 1.1 -> 1.2 |
| TransactionManagerFactoryBean.java | +8 | -3 | 1.2 -> 1.3 |
| +17 | -20 | ||
tidied up the jencks factory beans to remove unnecessary fields, add more properties and fix up javadoc
servicemix/jencks/src/main/java/org/servicemix/jencks/factory
diff -u -r1.1 -r1.2 --- PartitionedPoolFactoryBean.java 4 Aug 2005 03:03:14 -0000 1.1 +++ PartitionedPoolFactoryBean.java 16 Aug 2005 12:37:54 -0000 1.2 @@ -18,6 +18,7 @@
import org.apache.geronimo.connector.outbound.connectionmanagerconfig.PartitionedPool; import org.apache.geronimo.connector.outbound.connectionmanagerconfig.SinglePool;
+import org.apache.geronimo.connector.outbound.connectionmanagerconfig.PoolingSupport;
import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean;
servicemix/jencks/src/main/java/org/servicemix/jencks/factory
diff -u -r1.1 -r1.2 --- TransactionContextManagerFactoryBean.java 4 Aug 2005 03:03:14 -0000 1.1 +++ TransactionContextManagerFactoryBean.java 16 Aug 2005 12:37:54 -0000 1.2 @@ -32,9 +32,7 @@
*/
public class TransactionContextManagerFactoryBean implements FactoryBean,InitializingBean {
- private TransactionLog transactionLog;
private TransactionManagerImpl transactionManagerImpl;
-
private TransactionContextManager transactionContextManager;
public Object getObject() throws Exception {
@@ -49,22 +47,15 @@
return true; }
- /**
- * Set the transaction log for the transaction context manager.
- */
- public void setTransactionLog(TransactionLog log) {
- transactionLog = log;
- }
-
- /**
- * Set the Geronimo implementation of the transaction manager for the
- * transaction context manager.
- */
- public void setTransactionManagerImpl(TransactionManagerImpl impl) {
- transactionManagerImpl = impl;
- }
+ public TransactionManagerImpl getTransactionManagerImpl() {
+ return transactionManagerImpl;
+ }
+
+ public void setTransactionManagerImpl(TransactionManagerImpl transactionManagerImpl) {
+ this.transactionManagerImpl = transactionManagerImpl;
+ }
- /**
+ /**
* This method initializes the transaction context manager basing on * the Geronimo implementation of the transaction manager and a dedicated * transaction log.
servicemix/jencks/src/main/java/org/servicemix/jencks/factory
diff -u -r1.2 -r1.3 --- TransactionManagerFactoryBean.java 16 Aug 2005 10:53:39 -0000 1.2 +++ TransactionManagerFactoryBean.java 16 Aug 2005 12:37:54 -0000 1.3 @@ -19,6 +19,7 @@
import org.apache.geronimo.transaction.log.UnrecoverableLog; import org.apache.geronimo.transaction.manager.TransactionLog; import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
+import org.apache.geronimo.gbean.ReferenceCollection;
import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean;
@@ -36,7 +37,7 @@
private int defaultTransactionTimeoutSeconds = 600;
private TransactionLog transactionLog;
- private Collection resourceManagers;
+ private ReferenceCollection resourceManagers;
private TransactionManagerImpl transactionManagerImpl;
@@ -66,11 +67,15 @@
transactionLog = log;
}
+ public ReferenceCollection getResourceManagers() {
+ return resourceManagers;
+ }
+
/**
* Set the resource managers
*/
- public void setResourceManagers(Collection collection) {
- resourceManagers = collection;
+ public void setResourceManagers(ReferenceCollection resourceManagers) {
+ this.resourceManagers = resourceManagers;
}
public void afterPropertiesSet() throws Exception {
