Am Donnerstag, den 20.09.2007, 09:17 +0000 schrieb [EMAIL PROTECTED]:
Author: ningjiang
Date: Thu Sep 20 02:17:24 2007
New Revision: 577649
Modified:
incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java?rev=577649&r1=577648&r2=577649&view=diff
==============================================================================
---
incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java
(original)
+++
incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java
Thu Sep 20 02:17:24 2007
@@ -100,18 +100,12 @@
boolean result = false;
final ConnectionRequestInfo canditate =
canditateConn.getConnectionRequestInfo();
candidate
- if (canditate.equals(crInfo)) {
- LOG.fine("found match canditate=" + canditate + ", info=" +
crInfo);
(again)
+ if (canditate.equals(crInfo) && (subject == null ||
subject.equals(canditateConn.getSubject()))) {
(subject != null && subject.equals(canditateConn.getSubject()) instead?
(I'm not sure if you want to call validateReference() below if the
subject is null)
+ try {
+ validateReference(canditateConn, subject);
+ result = true;
+ } catch (Exception thrown) {
+ result = false;
}
}
Modified:
incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java?rev=577649&r1=577648&r2=577649&view=diff
==============================================================================
---
incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java
(original)
+++
incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java
Thu Sep 20 02:17:24 2007
@@ -76,7 +76,6 @@
LOG.fine("closing handle: " + closingHandle);
"Closing handle: " (I would recommend capitalizing the first letter of
each logging statement)
Modified:
incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImpl.java?rev=577649&r1=577648&r2=577649&view=diff
==============================================================================
---
incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImpl.java
(original)
+++
incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImpl.java
Thu Sep 20 02:17:24 2007
@@ -34,19 +34,15 @@
public class AssociatedManagedConnectionFactoryImpl
extends ManagedConnectionFactoryImpl implements ResourceAdapterAssociation {
if (!props.containsKey(key)) {
setProperty(key, raProps.getProperty(key));
} else {
- LOG.info("ManagedConnectionFactory's props already contains "
- + key + ". No need to merge");
+ LOG.fine("ManagedConnectionFactory's props already contains [" + key +
"]. No need to merge");
"already contain"
}
}
}
@@ -96,6 +95,7 @@
return ((ResourceAdapterImpl)ra).getBootstrapContext();
}
}
+
Modified:
incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java?rev=577649&r1=577648&r2=577649&view=diff
==============================================================================
---
incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
(original)
+++
incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
Thu Sep 20 02:17:24 2007
@@ -49,9 +49,6 @@
+ }
protected synchronized void init() throws ResourceException {
- LOG.config("initialising... the bus");
+ LOG.info("Initializing the CXF BUS....");
Should be "bus" (or "Bus") (else people may think BUS is an acronym)
+
new UriHandlerInit();
-
ClassLoader original = Thread.currentThread().getContextClassLoader();
try {
ClassLoader cl = this.getClass().getClassLoader();
@@ -158,10 +113,8 @@
//TODO Check for the managed connection factory properties
//TODO We may need get the configuration file from properties
//mcf.validateProperties();
- bus = createBus(cl);
- initBus();
-
- initialiseServants();
+ initializeServants();
Good!
deregisterServants(bus);
- LOG.config("Initialising EJB endpoints...");
+ LOG.info("Initialising EJB endpoints...");
Bad!
try {
initialiseServant(jndiName, serviceName);
Bad!
Modified:
incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java?rev=577649&r1=577648&r2=577649&view=diff
==============================================================================
---
incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java
(original)
+++
incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java
Thu Sep 20 02:17:24 2007
@@ -35,7 +35,6 @@
public void registerBus(Bus bus) {
@@ -79,26 +76,11 @@
public void stop() {
LOG.fine("Resource Adapter is stopping by appserver...");
("stopping by" means to visit)
better options:
"Resource Adapter is being stopped by appserver..."
"Resource Adapter is being terminated by appserver..."
"Appserver is stopping Resource Adapter..."
"Appserver is terminating Resource Adapter..."
Regards,
Glen
