cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r582879 - in /incubator/cxf/branches/2.0.x-fixes: ./ integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ integration/jca/src/main/java/org/apache/cxf/jca/cxf/ rt/transports/http-jetty/src/main/java/org/apache/cxf/transpor...
Date Mon, 08 Oct 2007 16:50:27 GMT
Author: dkulp
Date: Mon Oct  8 09:50:25 2007
New Revision: 582879

URL: http://svn.apache.org/viewvc?rev=582879&view=rev
Log:
Merged revisions 577992 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r577992 | ningjiang | 2007-09-21 02:05:10 -0400 (Fri, 21 Sep 2007) | 1 line
  
  Fixed the types of my last two commits, thanks Glen
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java
    incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java
    incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImpl.java
    incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
    incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java
    incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties
    incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java

Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Oct  8 09:50:25 2007
@@ -1 +1 @@
-/incubator/cxf/trunk:1-573657,573659-573660,573662-574161,574163-574834,574836-575221,575223-575253,575255-576654,576656-576672,576674-576710,576712-576775,576777-576788,576790-576791,576793-576831,576833-577091,577477,577543,577649
+/incubator/cxf/trunk:1-573657,573659-573660,573662-574161,574163-574834,574836-575221,575223-575253,575255-576654,576656-576672,576674-576710,576712-576775,576777-576788,576790-576791,576793-576831,576833-577091,577477,577543,577649,577992

Modified: incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java?rev=582879&r1=582878&r2=582879&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java
Mon Oct  8 09:50:25 2007
@@ -80,11 +80,11 @@
                                      crInfo});
 
             if (!((AbstractManagedConnectionImpl)conn).isBound()) {
-                LOG.fine("match against unbounded, con= " + conn + ", info=" + crInfo);
+                LOG.fine("Match against unbounded, con= " + conn + ", info=" + crInfo);
                 return conn;
             } else {
                 if (isMatch(conn, crInfo, subject)) {
-                    LOG.fine("match against bounded, con= " + conn + ", info=" + crInfo);
+                    LOG.fine("Match against bounded, con= " + conn + ", info=" + crInfo);
 
                     return conn;
                 }
@@ -94,15 +94,15 @@
         return null;
     }
 
-    private boolean isMatch(final AbstractManagedConnectionImpl canditateConn,
+    private boolean isMatch(final AbstractManagedConnectionImpl candidateConn,
                             final ConnectionRequestInfo crInfo, final Subject subject)
         throws ResourceAdapterInternalException {
         boolean result = false;
-        final ConnectionRequestInfo canditate = canditateConn.getConnectionRequestInfo();
+        final ConnectionRequestInfo candidate = candidateConn.getConnectionRequestInfo();
 
-        if (canditate.equals(crInfo) && (subject == null || subject.equals(canditateConn.getSubject())))
{
+        if (candidate.equals(crInfo) && (subject == null || subject.equals(candidateConn.getSubject())))
{
             try {
-                validateReference(canditateConn, subject);
+                validateReference(candidateConn, subject);
                 result = true; 
             } catch (Exception thrown) {
                 result = false;

Modified: incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java?rev=582879&r1=582878&r2=582879&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java
Mon Oct  8 09:50:25 2007
@@ -73,7 +73,7 @@
     public abstract boolean isBound();
 
     public void close(Object closingHandle) throws ResourceException {
-        LOG.fine("closing handle: " + closingHandle);
+        LOG.fine("Closing handle: " + closingHandle);
 
         ConnectionEvent coEvent = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
         coEvent.setConnectionHandle(closingHandle);

Modified: incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImpl.java?rev=582879&r1=582878&r2=582879&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImpl.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImpl.java
Mon Oct  8 09:50:25 2007
@@ -78,7 +78,7 @@
             if (!props.containsKey(key)) {
                 setProperty(key, raProps.getProperty(key));
             } else {
-                LOG.fine("ManagedConnectionFactory's props already contains [" + key + "].
No need to merge");
+                LOG.fine("ManagedConnectionFactory's props already contain [" + key + "].
No need to merge");
             }
         }
     }

Modified: incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java?rev=582879&r1=582878&r2=582879&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
Mon Oct  8 09:50:25 2007
@@ -100,7 +100,7 @@
     }    
     
     protected synchronized void init() throws ResourceException {
-        LOG.info("Initializing the CXF BUS....");
+        LOG.info("Initializing the CXF Bus ...");
         
         new UriHandlerInit();
         ClassLoader original = Thread.currentThread().getContextClassLoader();
@@ -156,7 +156,7 @@
 
         deregisterServants(bus);
 
-        LOG.info("Initialising EJB endpoints...");
+        LOG.info("Initializing EJB endpoints...");
        
         Enumeration keys = ejbServants.keys();
 
@@ -166,9 +166,9 @@
             LOG.fine("Found ejb endpoint: jndi name=" + jndiName + ", wsdl service=" + serviceName);
             
             try {
-                initialiseServant(jndiName, serviceName);      
+                initializeServant(jndiName, serviceName);      
             } catch (ResourceException re) {
-                LOG.warning("Error initialising servant with jndi name " 
+                LOG.warning("Error initializing servant with jndi name " 
                             + jndiName + " and service name "
                             + serviceName + " Exception:"
                             + re.getMessage());
@@ -179,7 +179,7 @@
         }
     }
     
-    void initialiseServant(String jndiName, String serviceName) throws ResourceException
{
+    void initializeServant(String jndiName, String serviceName) throws ResourceException
{
 
         Server servant = null;
         EJBObject ejb = null;

Modified: incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java?rev=582879&r1=582878&r2=582879&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java
Mon Oct  8 09:50:25 2007
@@ -74,7 +74,7 @@
     }
 
     public void stop() {
-        LOG.fine("Resource Adapter is stopping by appserver...");
+        LOG.fine("Resource Adapter is being stopped by appserver...");
         if (!busCache.isEmpty()) {
             Iterator busIterator = busCache.iterator();
             Bus bus = null;

Modified: incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties?rev=582879&r1=582878&r2=582879&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties
Mon Oct  8 09:50:25 2007
@@ -22,4 +22,4 @@
 ADD_HANDLER_FAILED_MSG = Could not add cxf jetty handler to Jetty server: {0}
 REMOVE_HANDLER_FAILED_MSG = Could not remove cxf jetty handler from Jetty server: {0}
 CAN_NOT_FIND_HANDLER_MSG = Could not find the handler to remove for context url {0}
-FAILED_TO_SHOWDOWN_ENGINE_MSG = Failed to shutdown the Jetty server: {0} because it still
be used.
\ No newline at end of file
+FAILED_TO_SHOWDOWN_ENGINE_MSG = Failed to shutdown the Jetty server: {0} , because it is
still being used.
\ No newline at end of file

Modified: incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java?rev=582879&r1=582878&r2=582879&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
Mon Oct  8 09:50:25 2007
@@ -139,7 +139,7 @@
         try {
             engine.finalizeConfig();
         } catch (Exception ex) {
-            fail("we should not throw exception here");
+            fail("We should not throw exception here");
         }
     }
     
@@ -158,26 +158,26 @@
         try {
             response = getResponse(urlStr);
         } catch (Exception ex) {
-            fail("Can't get the reponse from the server " + ex);
+            fail("Can't get the response from the server " + ex);
         }
-        assertEquals("the jetty http handler did not take effect", response, "string1");
+        assertEquals("The jetty http handler did not take effect", response, "string1");
         
         engine.addServant(new URL(urlStr), handler2);
         try {
             response = getResponse(urlStr);
         } catch (Exception ex) {
-            fail("Can't get the reponse from the server " + ex);
+            fail("Can't get the response from the server " + ex);
         }
-        assertEquals("the jetty http handler did not take effect", response, "string1string2");
+        assertEquals("The jetty http handler did not take effect", response, "string1string2");
         engine.addServant(new URL(urlStr2), handler2);
         engine.removeServant(new URL(urlStr));
         engine.shutdown();
         try {
             response = getResponse(urlStr2);
         } catch (Exception ex) {
-            fail("Server should work, even we call the shutdown" + ex);
+            fail("Server should still work, even if we call the shutdown" + ex);
         }
-        assertEquals("the jetty http handler did not take effect", response, "string2");
+        assertEquals("The jetty http handler did not take effect", response, "string2");
         // set the get request
         factory.destroyForPort(1234);       
         



Mime
View raw message