You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2006/12/04 21:17:18 UTC
svn commit: r482337 - in
/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src:
main/resources/META-INF/ test/java/org/apache/openejb/test/
Author: dblevins
Date: Mon Dec 4 12:17:16 2006
New Revision: 482337
URL: http://svn.apache.org/viewvc?view=rev&rev=482337
Log:
Porting fixes from v2_2 branch
Modified:
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/resources/META-INF/openejb-jar.xml
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/apache/openejb/test/AbstractTestDatabase.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/apache/openejb/test/IvmTestServer.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/apache/openejb/test/NumberedTestCase.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/apache/openejb/test/RemoteTestServer.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/apache/openejb/test/RiTestServer.java
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/resources/META-INF/openejb-jar.xml?view=diff&rev=482337&r1=482336&r2=482337
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/resources/META-INF/openejb-jar.xml (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/resources/META-INF/openejb-jar.xml Mon Dec 4 12:17:16 2006
@@ -374,6 +374,15 @@
<name>SystemDatasource</name>
</pattern>
</resource-ref>
+ <query>
+ <query-method>
+ <method-name>findEmptyCollection</method-name>
+ <method-params/>
+ </query-method>
+ <ejb-ql>
+ <![CDATA[SELECT OBJECT(a) FROM EncCmp2 AS a WHERE 1 = 0]]>
+ </ejb-ql>
+ </query>
</entity>
<entity>
<ejb-name>Cmp2RMIIIOPBean</ejb-name>
@@ -397,6 +406,15 @@
<return-type>java.lang.Integer</return-type>
</auto-increment-table>
</key-generator>
+ <query>
+ <query-method>
+ <method-name>findEmptyCollection</method-name>
+ <method-params/>
+ </query-method>
+ <ejb-ql>
+ <![CDATA[SELECT OBJECT(a) FROM Cmp2RmiIiop AS a WHERE 1 = 0]]>
+ </ejb-ql>
+ </query>
</entity>
<!--
@@ -480,6 +498,15 @@
</key-generator>
<query>
<query-method>
+ <method-name>findEmptyCollection</method-name>
+ <method-params/>
+ </query-method>
+ <ejb-ql>
+ <![CDATA[SELECT OBJECT(a) FROM BasicCmpBeanExplicitPK AS a WHERE 1 = 0]]>
+ </ejb-ql>
+ </query>
+ <query>
+ <query-method>
<method-name>findByPrimaryKey</method-name>
<method-params>
<method-param>java.lang.Integer</method-param>
@@ -603,6 +630,15 @@
<name>SystemDatasource</name>
</pattern>
</resource-ref>
+ <query>
+ <query-method>
+ <method-name>findEmptyCollection</method-name>
+ <method-params/>
+ </query-method>
+ <ejb-ql>
+ <![CDATA[SELECT OBJECT(a) FROM EncCmpBean AS a WHERE 1 = 0]]>
+ </ejb-ql>
+ </query>
</entity>
<entity>
<ejb-name>CmpRMIIIOPBean</ejb-name>
@@ -626,6 +662,15 @@
<return-type>java.lang.Integer</return-type>
</auto-increment-table>
</key-generator>
+ <query>
+ <query-method>
+ <method-name>findEmptyCollection</method-name>
+ <method-params/>
+ </query-method>
+ <ejb-ql>
+ <![CDATA[SELECT OBJECT(a) FROM CmpRMIIIOPBean AS a WHERE 1 = 0]]>
+ </ejb-ql>
+ </query>
</entity>
<!--
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/apache/openejb/test/AbstractTestDatabase.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/apache/openejb/test/AbstractTestDatabase.java?view=diff&rev=482337&r1=482336&r2=482337
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/apache/openejb/test/AbstractTestDatabase.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/apache/openejb/test/AbstractTestDatabase.java Mon Dec 4 12:17:16 2006
@@ -102,7 +102,7 @@
// Properties properties = TestManager.getServer().getContextEnvironment();
Properties properties = new Properties();
properties.put("test.server.class", "org.apache.openejb.test.RemoteTestServer");
- properties.put("java.naming.factory.initial", "org.openejb.client.RemoteInitialContextFactory");
+ properties.put("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
properties.put("java.naming.provider.url", "127.0.0.1:4201");
properties.put("java.naming.security.principal", "testuser");
properties.put("java.naming.security.credentials", "testpassword");
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/apache/openejb/test/IvmTestServer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/apache/openejb/test/IvmTestServer.java?view=diff&rev=482337&r1=482336&r2=482337
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/apache/openejb/test/IvmTestServer.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/apache/openejb/test/IvmTestServer.java Mon Dec 4 12:17:16 2006
@@ -31,7 +31,7 @@
properties = props;
try {
- props.put("java.naming.factory.initial", "org.openejb.client.LocalInitialContextFactory");
+ props.put("java.naming.factory.initial", "org.apache.openejb.client.LocalInitialContextFactory");
Properties p = new Properties(props);
p.put("openejb.loader", "embed");
new InitialContext(p);
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/apache/openejb/test/NumberedTestCase.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/apache/openejb/test/NumberedTestCase.java?view=diff&rev=482337&r1=482336&r2=482337
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/apache/openejb/test/NumberedTestCase.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/apache/openejb/test/NumberedTestCase.java Mon Dec 4 12:17:16 2006
@@ -93,20 +93,7 @@
try {
setUp();
} catch (Exception e) {
- Test test = new Test() {
- public int countTestCases() {
- return 0;
- }
-
- public void run(TestResult result) {
- }
-
- public String toString() {
- return name() + ".setUp()";
- }
- };
-
- result.addError(test, e);
+ result.addError(new DummyTest(".setUp()", 0), e);
return;
}
for (int i = 0; i < testMethods.length; i++) {
@@ -115,20 +102,7 @@
try {
tearDown();
} catch (Exception e) {
- Test test = new Test() {
- public int countTestCases() {
- return 0;
- }
-
- public void run(TestResult result) {
- }
-
- public String toString() {
- return name() + ".tearDown()";
- }
- };
-
- result.addError(test, e);
+ result.addError(new DummyTest(".tearDown()", 0), e);
return;
}
}
@@ -147,19 +121,7 @@
protected Test createTest(final Method testMethod) {
- Test test = new Test() {
- public int countTestCases() {
- return 1;
- }
-
- public void run(TestResult result) {
- }
-
- public String toString() {
- return createTestName(testMethod);
- }
- };
- return test;
+ return new DummyTest(createTestName(testMethod), 1);
}
protected void runTestMethod(Method testMethod) throws Throwable {
@@ -180,7 +142,7 @@
}
public String getName() {
- return name();
+ return name();
}
public String name() {
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/apache/openejb/test/RemoteTestServer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/apache/openejb/test/RemoteTestServer.java?view=diff&rev=482337&r1=482336&r2=482337
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/apache/openejb/test/RemoteTestServer.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/apache/openejb/test/RemoteTestServer.java Mon Dec 4 12:17:16 2006
@@ -45,7 +45,7 @@
properties = props;
props.put("test.server.class", "org.apache.openejb.test.RemoteTestServer");
- props.put("java.naming.factory.initial", "org.openejb.client.RemoteInitialContextFactory");
+ props.put("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
props.put("java.naming.provider.url", "127.0.0.1:4201");
props.put("java.naming.security.principal", "testuser");
props.put("java.naming.security.credentials", "testpassword");
@@ -61,7 +61,7 @@
try {
System.out.println("[] START SERVER");
serverHasAlreadyBeenStarted = false;
- Launcher.main(new String[]{"-nowait", "org.openejb.server.Main"});
+ Launcher.main(new String[]{"-nowait", "org.apache.openejb.server.Main"});
//oldStart();
} catch (Exception e) {
throw new RuntimeException("Cannot start the server.");
@@ -84,7 +84,7 @@
cmd[1] = "-classpath";
cmd[2] = classpath;
cmd[3] = "-Dopenejb.home=" + openejbHome;
- cmd[4] = "org.openejb.server.Main";
+ cmd[4] = "org.apache.openejb.server.Main";
for (int i = 0; i < cmd.length; i++) {
//System.out.println("[] "+cmd[i]);
}
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/apache/openejb/test/RiTestServer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/apache/openejb/test/RiTestServer.java?view=diff&rev=482337&r1=482336&r2=482337
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/apache/openejb/test/RiTestServer.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/apache/openejb/test/RiTestServer.java Mon Dec 4 12:17:16 2006
@@ -34,7 +34,7 @@
protected Process server;
protected boolean startServerProcess;
protected String configFile;
- protected String serverClassName = " org.openejb.ri.server.Server ";
+ protected String serverClassName = " org.apache.openejb.ri.server.Server ";
protected String classPath;
protected DataInputStream in;
protected DataInputStream err;
@@ -172,7 +172,7 @@
public Properties getContextEnvironment() {
Properties properties = new Properties();
- properties.put(Context.INITIAL_CONTEXT_FACTORY, "org.openejb.ri.server.RiInitCtxFactory");
+ properties.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.ri.server.RiInitCtxFactory");
try {
properties.put(Context.PROVIDER_URL, new URL("http", "127.0.0.1", 1098, ""));