You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/10/08 18:57:39 UTC
svn commit: r582883 - 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/
integration/jca/src/test/java/org/apache/cxf/jca/core/resource...
Author: dkulp
Date: Mon Oct 8 09:57:37 2007
New Revision: 582883
URL: http://svn.apache.org/viewvc?rev=582883&view=rev
Log:
Merged revisions 578103 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r578103 | ningjiang | 2007-09-21 09:44:56 -0400 (Fri, 21 Sep 2007) | 1 line
Fixed the typos and added the getManagedConnectionMetaData()
........
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/AbstractManagedConnectionImpl.java
incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/Messages.properties
incubator/cxf/branches/2.0.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
incubator/cxf/branches/2.0.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Oct 8 09:57:37 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,577992,578027
+/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,578027,578103
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=582883&r1=582882&r2=582883&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:57:37 2007
@@ -23,7 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.resource.NotSupportedException;
import javax.resource.ResourceException;
import javax.resource.spi.ConnectionEvent;
import javax.resource.spi.ConnectionEventListener;
@@ -33,6 +32,7 @@
import javax.security.auth.Subject;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.jca.core.logging.LoggerHelper;
+import org.apache.cxf.jca.cxf.CXFManagedConnectionMetaData;
public abstract class AbstractManagedConnectionImpl implements ManagedConnection {
private static final Logger LOG = LogUtils.getL7dLogger(AbstractManagedConnectionImpl.class);
@@ -101,7 +101,7 @@
}
public ManagedConnectionMetaData getMetaData() throws ResourceException {
- throw new NotSupportedException("NOT_YET_IMPLEMENTED getMetaData");
+ return new CXFManagedConnectionMetaData();
}
public void setLogWriter(PrintWriter aPrintWriter) throws ResourceException {
Modified: incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/Messages.properties?rev=582883&r1=582882&r2=582883&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/Messages.properties (original)
+++ incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/Messages.properties Mon Oct 8 09:57:37 2007
@@ -20,5 +20,5 @@
#
INTERFACE_IS_NULL = The interface parameter is null.
IS_NOT_AN_INTERFACE = The [{0}] is not an interface.
-FAIL_TO_GET_CXF_CONNECTION = Failed to get the CXF Connection with connection parameters : {0}
+FAILED_TO_GET_CXF_CONNECTION = Failed to get the CXF Connection with connection parameters: {0}
ASSOCIATED_ERROR = Error in associating connection.
Modified: incubator/cxf/branches/2.0.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java?rev=582883&r1=582882&r2=582883&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java Mon Oct 8 09:57:37 2007
@@ -83,10 +83,9 @@
@Test
public void testGetMetaData() throws Exception {
try {
- mc.getMetaData();
- fail("expect exception");
+ mc.getMetaData();
} catch (NotSupportedException expected) {
- // do nothing here
+ fail("Got the Exception here");
}
}
@@ -94,7 +93,7 @@
public void testGetSetSubject() {
Subject s = new Subject();
mc.setSubject(s);
- assertEquals("got back what we set", s, mc.getSubject());
+ assertEquals("Got back what we set", s, mc.getSubject());
}
@Test
@@ -103,7 +102,7 @@
};
mc.setConnectionRequestInfo(ri);
- assertEquals("got back what we set", ri, mc.getConnectionRequestInfo());
+ assertEquals("Got back what we set", ri, mc.getConnectionRequestInfo());
}
@Test
Modified: incubator/cxf/branches/2.0.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java?rev=582883&r1=582882&r2=582883&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java Mon Oct 8 09:57:37 2007
@@ -60,7 +60,7 @@
@Test
public void testInstanceOfReferencable() throws Exception {
- assertTrue("Instance of Referencable", cf instanceof Referenceable);
+ assertTrue("Instance of Referenceable", cf instanceof Referenceable);
assertNull("No ref set", cf.getReference());
Reference ref = EasyMock.createMock(Reference.class);
@@ -179,7 +179,7 @@
param.setServiceName(new QName(""));
param.setPortName(new QName(""));
cf.getConnection(param);
- fail("Expect exception on use of non interface class");
+ fail("Expect exception on using of none interface class");
} catch (ResourceException re) {
assertTrue(true);
}
@@ -190,7 +190,7 @@
try {
param.setInterface(null);
cf.getConnection(param);
- fail("Should get an exception");
+ fail("Expect exception of no interface here");
} catch (ResourceException re) {
assertTrue(true);
}