You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2004/04/08 22:35:32 UTC
cvs commit: incubator-geronimo/modules/connector/src/test-data/connector_1_5 geronimo-ra.xml
djencks 2004/04/08 13:35:32
Modified: modules/connector/src/java/org/apache/geronimo/connector/outbound
ConnectionManagerDeployment.java
modules/connector/src/java/org/apache/geronimo/connector/work
WorkerContext.java
modules/connector/src/test-data/connector_1_5
geronimo-ra.xml
Removed: modules/connector project.properties
Log:
fixed assert problems
Revision Changes Path
1.7 +7 -5 incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/ConnectionManagerDeployment.java
Index: ConnectionManagerDeployment.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/ConnectionManagerDeployment.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ConnectionManagerDeployment.java 10 Mar 2004 09:58:32 -0000 1.6
+++ ConnectionManagerDeployment.java 8 Apr 2004 20:35:32 -0000 1.7
@@ -34,8 +34,10 @@
import org.apache.geronimo.gbean.GConstructorInfo;
import org.apache.geronimo.gbean.GOperationInfo;
import org.apache.geronimo.gbean.GReferenceInfo;
+import org.apache.geronimo.gbean.WaitingException;
import org.apache.geronimo.kernel.KernelMBean;
import org.apache.geronimo.security.bridge.RealmBridge;
+import org.apache.geronimo.deployment.DeploymentException;
/**
* ConnectionManagerDeployment is an mbean that sets up a ProxyConnectionManager
@@ -93,7 +95,7 @@
public void setGBeanContext(GBeanContext context) {
}
- public void doStart() {
+ public void doStart() throws WaitingException, Exception{
setUpConnectionManager();
}
@@ -110,10 +112,10 @@
* LocalXAResourceInsertionInterceptor or XAResourceInsertionInterceptor (useTransactions (&localTransactions))
* MCFConnectionInterceptor
*/
- private void setUpConnectionManager() {
+ private void setUpConnectionManager() throws DeploymentException {
//check for consistency between attributes
- if (realmBridge == null) {
- assert useSubject == false: "To use Subject in pooling, you need a SecurityDomain";
+ if (realmBridge == null && useSubject) {
+ throw new DeploymentException("To use Subject in pooling, you need a SecurityDomain");
}
//Set up the interceptor stack
1.5 +2 -2 incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/work/WorkerContext.java
Index: WorkerContext.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/work/WorkerContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WorkerContext.java 10 Mar 2004 09:58:33 -0000 1.4
+++ WorkerContext.java 8 Apr 2004 20:35:32 -0000 1.5
@@ -213,7 +213,7 @@
* @return true if the Work has timed out and false otherwise.
*/
public synchronized boolean isTimedOut() {
- assert !isAccepted: "The work is not accepted.";
+ assert isAccepted: "The work is not accepted.";
// A value of 0 means that the work never times out.
if (0 == startTimeOut) {
return false;
1.13 +3 -3 incubator-geronimo/modules/connector/src/test-data/connector_1_5/geronimo-ra.xml
Index: geronimo-ra.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/connector/src/test-data/connector_1_5/geronimo-ra.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- geronimo-ra.xml 12 Mar 2004 17:58:45 -0000 1.12
+++ geronimo-ra.xml 8 Apr 2004 20:35:32 -0000 1.13
@@ -48,14 +48,14 @@
<config-property-setting name="OutboundStringProperty4">newvalue3</config-property-setting>
<config-property-setting name="OutboundStringProperty1">newvalue4</config-property-setting>
<connectionmanager>
- <!--realm-bridge>TargetRealm</realm-bridge-->
+ <realm-bridge>TargetRealm</realm-bridge>
<blockingTimeout>5000</blockingTimeout>
<maxSize>10</maxSize>
<useTransactions>true</useTransactions>
<useLocalTransactions>false</useLocalTransactions>
<useTransactionCaching>true</useTransactionCaching>
- <useConnectionRequestInfo>false</useConnectionRequestInfo>
- <useSubject>true</useSubject>
+ <useConnectionRequestInfo>true</useConnectionRequestInfo>
+ <useSubject>false</useSubject>
</connectionmanager>
</connectiondefinition-instance>
</connection-definition>