You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/07/15 23:55:19 UTC
svn commit: r1610862 [19/44] - in /tomee/tomee/trunk/itests: ./ failover-ejb/
failover-ejb/src/main/java/org/apache/openejb/itest/failover/ejb/ failover/
failover/src/main/java/org/apache/openejb/itest/failover/
failover/src/main/java/org/apache/openej...
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/resources/META-INF/openejb-jar.xml?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/resources/META-INF/openejb-jar.xml (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/resources/META-INF/openejb-jar.xml Tue Jul 15 21:55:09 2014
@@ -18,7 +18,7 @@
-->
<openejb-jar xmlns="http://www.openejb.org/openejb-jar/1.1">
<properties>
- openejb.jndiname.format = {deploymentId}{interfaceType.openejbLegacyName}
+ openejb.jndiname.format = {deploymentId}{interfaceType.openejbLegacyName}
</properties>
<ejb-deployment ejb-name="BasicCmpBean" deployment-id="client/tests/entity/cmp/BasicCmpHome">
<resource-link res-ref-name="jdbc/basic/entityDatabase" res-id="My DataSource"/>
@@ -210,19 +210,22 @@
<resource-link res-ref-name="QueueCF" res-id="My JMS Connection Factory"/>
<resource-link res-ref-name="TopicCF" res-id="My JMS Connection Factory"/>
</ejb-deployment>
- <ejb-deployment ejb-name="FieldInjectionStatefulBean" deployment-id="client/tests/stateful/FieldInjectionStatefulBean">
+ <ejb-deployment ejb-name="FieldInjectionStatefulBean"
+ deployment-id="client/tests/stateful/FieldInjectionStatefulBean">
<resource-link res-ref-name="datasource" res-id="My DataSource"/>
<resource-link res-ref-name="connectionFactory" res-id="My JMS Connection Factory"/>
<resource-link res-ref-name="queueConnectionFactory" res-id="My JMS Connection Factory"/>
<resource-link res-ref-name="topicConnectionFactory" res-id="My JMS Connection Factory"/>
</ejb-deployment>
- <ejb-deployment ejb-name="SetterInjectionStatefulBean" deployment-id="client/tests/stateful/SetterInjectionStatefulBean">
+ <ejb-deployment ejb-name="SetterInjectionStatefulBean"
+ deployment-id="client/tests/stateful/SetterInjectionStatefulBean">
<resource-link res-ref-name="datasource" res-id="My DataSource"/>
<resource-link res-ref-name="connectionFactory" res-id="My JMS Connection Factory"/>
<resource-link res-ref-name="queueConnectionFactory" res-id="My JMS Connection Factory"/>
<resource-link res-ref-name="topicConnectionFactory" res-id="My JMS Connection Factory"/>
</ejb-deployment>
- <ejb-deployment ejb-name="PersistenceContextStatefulBean" deployment-id="client/tests/stateful/PersistenceContextStatefulBean">
+ <ejb-deployment ejb-name="PersistenceContextStatefulBean"
+ deployment-id="client/tests/stateful/PersistenceContextStatefulBean">
<resource-link res-ref-name="datasource" res-id="My DataSource"/>
</ejb-deployment>
<ejb-deployment ejb-name="ContextLookupStatefulBean" deployment-id="client/tests/stateful/ContextLookupStatefulBean">
@@ -231,7 +234,8 @@
<resource-link res-ref-name="QueueCF" res-id="My JMS Connection Factory"/>
<resource-link res-ref-name="TopicCF" res-id="My JMS Connection Factory"/>
</ejb-deployment>
- <ejb-deployment ejb-name="ContextLookupStatefulPojoBean" deployment-id="client/tests/stateful/ContextLookupStatefulPojoBean">
+ <ejb-deployment ejb-name="ContextLookupStatefulPojoBean"
+ deployment-id="client/tests/stateful/ContextLookupStatefulPojoBean">
<resource-link res-ref-name="datasource" res-id="My DataSource"/>
<resource-link res-ref-name="jms" res-id="My JMS Connection Factory"/>
<resource-link res-ref-name="QueueCF" res-id="My JMS Connection Factory"/>
@@ -244,13 +248,15 @@
<ejb-deployment ejb-name="BasicStatelessPojoBean" deployment-id="client/tests/stateless/BasicStatelessPojoHome">
<resource-link res-ref-name="stateless/references/Resource_manager_access" res-id="My DataSource"/>
</ejb-deployment>
- <ejb-deployment ejb-name="Basic BMT StatelessBean" deployment-id="client/tests/stateless/BeanManagedBasicStatelessHome">
+ <ejb-deployment ejb-name="Basic BMT StatelessBean"
+ deployment-id="client/tests/stateless/BeanManagedBasicStatelessHome">
<resource-link res-ref-name="stateless/references/Resource_manager_access" res-id="My DataSource"/>
</ejb-deployment>
<ejb-deployment ejb-name="DatabaseBean" deployment-id="client/tools/DatabaseHome">
<resource-link res-ref-name="database" res-id="My DataSource"/>
</ejb-deployment>
- <ejb-deployment ejb-name="BMT StatelessBean" deployment-id="client/tests/stateless/BeanManagedTransactionTests/EJBHome">
+ <ejb-deployment ejb-name="BMT StatelessBean"
+ deployment-id="client/tests/stateless/BeanManagedTransactionTests/EJBHome">
<resource-link res-ref-name="database" res-id="My DataSource"/>
</ejb-deployment>
<ejb-deployment ejb-name="EncStatelessBean" deployment-id="client/tests/stateless/EncBean">
@@ -259,25 +265,29 @@
<resource-link res-ref-name="QueueCF" res-id="My JMS Connection Factory"/>
<resource-link res-ref-name="TopicCF" res-id="My JMS Connection Factory"/>
</ejb-deployment>
- <ejb-deployment ejb-name="FieldInjectionStatelessBean" deployment-id="client/tests/stateless/FieldInjectionStatelessBean">
+ <ejb-deployment ejb-name="FieldInjectionStatelessBean"
+ deployment-id="client/tests/stateless/FieldInjectionStatelessBean">
<resource-link res-ref-name="datasource" res-id="My DataSource"/>
<resource-link res-ref-name="connectionFactory" res-id="My JMS Connection Factory"/>
<resource-link res-ref-name="queueConnectionFactory" res-id="My JMS Connection Factory"/>
<resource-link res-ref-name="topicConnectionFactory" res-id="My JMS Connection Factory"/>
</ejb-deployment>
- <ejb-deployment ejb-name="SetterInjectionStatelessBean" deployment-id="client/tests/stateless/SetterInjectionStatelessBean">
+ <ejb-deployment ejb-name="SetterInjectionStatelessBean"
+ deployment-id="client/tests/stateless/SetterInjectionStatelessBean">
<resource-link res-ref-name="datasource" res-id="My DataSource"/>
<resource-link res-ref-name="connectionFactory" res-id="My JMS Connection Factory"/>
<resource-link res-ref-name="queueConnectionFactory" res-id="My JMS Connection Factory"/>
<resource-link res-ref-name="topicConnectionFactory" res-id="My JMS Connection Factory"/>
</ejb-deployment>
- <ejb-deployment ejb-name="ContextLookupStatelessBean" deployment-id="client/tests/stateless/ContextLookupStatelessBean">
+ <ejb-deployment ejb-name="ContextLookupStatelessBean"
+ deployment-id="client/tests/stateless/ContextLookupStatelessBean">
<resource-link res-ref-name="datasource" res-id="My DataSource"/>
<resource-link res-ref-name="jms" res-id="My JMS Connection Factory"/>
<resource-link res-ref-name="QueueCF" res-id="My JMS Connection Factory"/>
<resource-link res-ref-name="TopicCF" res-id="My JMS Connection Factory"/>
</ejb-deployment>
- <ejb-deployment ejb-name="ContextLookupStatelessPojoBean" deployment-id="client/tests/stateless/ContextLookupStatelessPojoBean">
+ <ejb-deployment ejb-name="ContextLookupStatelessPojoBean"
+ deployment-id="client/tests/stateless/ContextLookupStatelessPojoBean">
<resource-link res-ref-name="datasource" res-id="My DataSource"/>
<resource-link res-ref-name="jms" res-id="My JMS Connection Factory"/>
<resource-link res-ref-name="QueueCF" res-id="My JMS Connection Factory"/>
@@ -351,25 +361,43 @@
<resource-link res-ref-name="jms" res-id="My JMS Connection Factory"/>
</ejb-deployment>
<ejb-deployment ejb-name="AnnotatedFieldInjectionStatefulBean" deployment-id="AnnotatedFieldInjectionStatefulBean">
- <resource-link res-ref-name="org.apache.openejb.test.stateful.AnnotatedFieldInjectionStatefulBean/daataSource" res-id="My DataSource"/>
- <resource-link res-ref-name="org.apache.openejb.test.stateful.AnnotatedFieldInjectionStatefulBean/coonnectionFactory" res-id="My JMS Connection Factory"/>
- <resource-link res-ref-name="org.apache.openejb.test.stateful.AnnotatedFieldInjectionStatefulBean/queueCoonnectionFactory" res-id="My JMS Connection Factory"/>
- <resource-link res-ref-name="org.apache.openejb.test.stateful.AnnotatedFieldInjectionStatefulBean/topicCoonnectionFactory" res-id="My JMS Connection Factory"/>
+ <resource-link res-ref-name="org.apache.openejb.test.stateful.AnnotatedFieldInjectionStatefulBean/daataSource"
+ res-id="My DataSource"/>
+ <resource-link
+ res-ref-name="org.apache.openejb.test.stateful.AnnotatedFieldInjectionStatefulBean/coonnectionFactory"
+ res-id="My JMS Connection Factory"/>
+ <resource-link
+ res-ref-name="org.apache.openejb.test.stateful.AnnotatedFieldInjectionStatefulBean/queueCoonnectionFactory"
+ res-id="My JMS Connection Factory"/>
+ <resource-link
+ res-ref-name="org.apache.openejb.test.stateful.AnnotatedFieldInjectionStatefulBean/topicCoonnectionFactory"
+ res-id="My JMS Connection Factory"/>
</ejb-deployment>
<ejb-deployment ejb-name="AnnotatedFieldInjectionStatelessBean" deployment-id="AnnotatedFieldInjectionStatelessBean">
- <resource-link res-ref-name="org.apache.openejb.test.stateless.AnnotatedFieldInjectionStatelessBean/daataSource" res-id="My DataSource"/>
- <resource-link res-ref-name="org.apache.openejb.test.stateless.AnnotatedFieldInjectionStatelessBean/coonnectionFactory" res-id="My JMS Connection Factory"/>
- <resource-link res-ref-name="org.apache.openejb.test.stateless.AnnotatedFieldInjectionStatelessBean/queueCoonnectionFactory" res-id="My JMS Connection Factory"/>
- <resource-link res-ref-name="org.apache.openejb.test.stateless.AnnotatedFieldInjectionStatelessBean/topicCoonnectionFactory" res-id="My JMS Connection Factory"/>
+ <resource-link res-ref-name="org.apache.openejb.test.stateless.AnnotatedFieldInjectionStatelessBean/daataSource"
+ res-id="My DataSource"/>
+ <resource-link
+ res-ref-name="org.apache.openejb.test.stateless.AnnotatedFieldInjectionStatelessBean/coonnectionFactory"
+ res-id="My JMS Connection Factory"/>
+ <resource-link
+ res-ref-name="org.apache.openejb.test.stateless.AnnotatedFieldInjectionStatelessBean/queueCoonnectionFactory"
+ res-id="My JMS Connection Factory"/>
+ <resource-link
+ res-ref-name="org.apache.openejb.test.stateless.AnnotatedFieldInjectionStatelessBean/topicCoonnectionFactory"
+ res-id="My JMS Connection Factory"/>
</ejb-deployment>
<ejb-deployment ejb-name="BasicStatelessIntercepted" deployment-id="BasicStatelessIntercepted"/>
<ejb-deployment ejb-name="BasicStatefulIntercepted" deployment-id="BasicStatefulIntercepted"/>
<ejb-deployment ejb-name="AnnotatedFieldInjectionMdbBean" deployment-id="AnnotatedFieldInjectionMdbBean">
<resource-link res-ref-name="openejb/destination" res-id="AnnotatedFieldInjectionMdb"/>
- <resource-link res-ref-name="org.apache.openejb.test.mdb.AnnotatedFieldInjectionMdbBean/daataSource" res-id="My DataSource"/>
- <resource-link res-ref-name="org.apache.openejb.test.mdb.AnnotatedFieldInjectionMdbBean/coonnectionFactory" res-id="My JMS Connection Factory"/>
- <resource-link res-ref-name="org.apache.openejb.test.mdb.AnnotatedFieldInjectionMdbBean/queueCoonnectionFactory" res-id="My JMS Connection Factory"/>
- <resource-link res-ref-name="org.apache.openejb.test.mdb.AnnotatedFieldInjectionMdbBean/topicCoonnectionFactory" res-id="My JMS Connection Factory"/>
+ <resource-link res-ref-name="org.apache.openejb.test.mdb.AnnotatedFieldInjectionMdbBean/daataSource"
+ res-id="My DataSource"/>
+ <resource-link res-ref-name="org.apache.openejb.test.mdb.AnnotatedFieldInjectionMdbBean/coonnectionFactory"
+ res-id="My JMS Connection Factory"/>
+ <resource-link res-ref-name="org.apache.openejb.test.mdb.AnnotatedFieldInjectionMdbBean/queueCoonnectionFactory"
+ res-id="My JMS Connection Factory"/>
+ <resource-link res-ref-name="org.apache.openejb.test.mdb.AnnotatedFieldInjectionMdbBean/topicCoonnectionFactory"
+ res-id="My JMS Connection Factory"/>
</ejb-deployment>
<ejb-deployment ejb-name="BasicSingletonBean" deployment-id="client/tests/singleton/BasicSingletonHome">
<resource-link res-ref-name="singleton/references/Resource_manager_access" res-id="My DataSource"/>
@@ -377,10 +405,12 @@
<ejb-deployment ejb-name="BasicSingletonPojoBean" deployment-id="client/tests/singleton/BasicSingletonPojoHome">
<resource-link res-ref-name="singleton/references/Resource_manager_access" res-id="My DataSource"/>
</ejb-deployment>
- <ejb-deployment ejb-name="Basic BMT SingletonBean" deployment-id="client/tests/singleton/BeanManagedBasicSingletonHome">
+ <ejb-deployment ejb-name="Basic BMT SingletonBean"
+ deployment-id="client/tests/singleton/BeanManagedBasicSingletonHome">
<resource-link res-ref-name="singleton/references/Resource_manager_access" res-id="My DataSource"/>
</ejb-deployment>
- <ejb-deployment ejb-name="BMT SingletonBean" deployment-id="client/tests/singleton/BeanManagedTransactionTests/EJBHome">
+ <ejb-deployment ejb-name="BMT SingletonBean"
+ deployment-id="client/tests/singleton/BeanManagedTransactionTests/EJBHome">
<resource-link res-ref-name="database" res-id="My DataSource"/>
</ejb-deployment>
<ejb-deployment ejb-name="EncSingletonBean" deployment-id="client/tests/singleton/EncBean">
@@ -389,25 +419,29 @@
<resource-link res-ref-name="QueueCF" res-id="My JMS Connection Factory"/>
<resource-link res-ref-name="TopicCF" res-id="My JMS Connection Factory"/>
</ejb-deployment>
- <ejb-deployment ejb-name="FieldInjectionSingletonBean" deployment-id="client/tests/singleton/FieldInjectionSingletonBean">
+ <ejb-deployment ejb-name="FieldInjectionSingletonBean"
+ deployment-id="client/tests/singleton/FieldInjectionSingletonBean">
<resource-link res-ref-name="datasource" res-id="My DataSource"/>
<resource-link res-ref-name="connectionFactory" res-id="My JMS Connection Factory"/>
<resource-link res-ref-name="queueConnectionFactory" res-id="My JMS Connection Factory"/>
<resource-link res-ref-name="topicConnectionFactory" res-id="My JMS Connection Factory"/>
</ejb-deployment>
- <ejb-deployment ejb-name="SetterInjectionSingletonBean" deployment-id="client/tests/singleton/SetterInjectionSingletonBean">
+ <ejb-deployment ejb-name="SetterInjectionSingletonBean"
+ deployment-id="client/tests/singleton/SetterInjectionSingletonBean">
<resource-link res-ref-name="datasource" res-id="My DataSource"/>
<resource-link res-ref-name="connectionFactory" res-id="My JMS Connection Factory"/>
<resource-link res-ref-name="queueConnectionFactory" res-id="My JMS Connection Factory"/>
<resource-link res-ref-name="topicConnectionFactory" res-id="My JMS Connection Factory"/>
</ejb-deployment>
- <ejb-deployment ejb-name="ContextLookupSingletonBean" deployment-id="client/tests/singleton/ContextLookupSingletonBean">
+ <ejb-deployment ejb-name="ContextLookupSingletonBean"
+ deployment-id="client/tests/singleton/ContextLookupSingletonBean">
<resource-link res-ref-name="datasource" res-id="My DataSource"/>
<resource-link res-ref-name="jms" res-id="My JMS Connection Factory"/>
<resource-link res-ref-name="QueueCF" res-id="My JMS Connection Factory"/>
<resource-link res-ref-name="TopicCF" res-id="My JMS Connection Factory"/>
</ejb-deployment>
- <ejb-deployment ejb-name="ContextLookupSingletonPojoBean" deployment-id="client/tests/singleton/ContextLookupSingletonPojoBean">
+ <ejb-deployment ejb-name="ContextLookupSingletonPojoBean"
+ deployment-id="client/tests/singleton/ContextLookupSingletonPojoBean">
<resource-link res-ref-name="datasource" res-id="My DataSource"/>
<resource-link res-ref-name="jms" res-id="My JMS Connection Factory"/>
<resource-link res-ref-name="QueueCF" res-id="My JMS Connection Factory"/>
@@ -415,10 +449,17 @@
</ejb-deployment>
<ejb-deployment ejb-name="Singleton RMI-IIOP Bean" deployment-id="client/tests/singleton/RMI-over-IIOP/EJBHome"/>
<ejb-deployment ejb-name="AnnotatedFieldInjectionSingletonBean" deployment-id="AnnotatedFieldInjectionSingletonBean">
- <resource-link res-ref-name="org.apache.openejb.test.singleton.AnnotatedFieldInjectionSingletonBean/daataSource" res-id="My DataSource"/>
- <resource-link res-ref-name="org.apache.openejb.test.singleton.AnnotatedFieldInjectionSingletonBean/coonnectionFactory" res-id="My JMS Connection Factory"/>
- <resource-link res-ref-name="org.apache.openejb.test.singleton.AnnotatedFieldInjectionSingletonBean/queueCoonnectionFactory" res-id="My JMS Connection Factory"/>
- <resource-link res-ref-name="org.apache.openejb.test.singleton.AnnotatedFieldInjectionSingletonBean/topicCoonnectionFactory" res-id="My JMS Connection Factory"/>
+ <resource-link res-ref-name="org.apache.openejb.test.singleton.AnnotatedFieldInjectionSingletonBean/daataSource"
+ res-id="My DataSource"/>
+ <resource-link
+ res-ref-name="org.apache.openejb.test.singleton.AnnotatedFieldInjectionSingletonBean/coonnectionFactory"
+ res-id="My JMS Connection Factory"/>
+ <resource-link
+ res-ref-name="org.apache.openejb.test.singleton.AnnotatedFieldInjectionSingletonBean/queueCoonnectionFactory"
+ res-id="My JMS Connection Factory"/>
+ <resource-link
+ res-ref-name="org.apache.openejb.test.singleton.AnnotatedFieldInjectionSingletonBean/topicCoonnectionFactory"
+ res-id="My JMS Connection Factory"/>
</ejb-deployment>
<ejb-deployment ejb-name="BasicSingletonIntercepted" deployment-id="BasicSingletonIntercepted"/>
</openejb-jar>
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/resources/META-INF/persistence.xml?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/resources/META-INF/persistence.xml (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/resources/META-INF/persistence.xml Tue Jul 15 21:55:09 2014
@@ -17,21 +17,21 @@
limitations under the License.
-->
<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
- <persistence-unit transaction-type="JTA" name="cmp">
- <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
- <jta-data-source>java:openejb/Resource/My DataSource</jta-data-source>
- <non-jta-data-source>java:openejb/Resource/My Unmanaged DataSource</non-jta-data-source>
- <mapping-file>META-INF/jpa.mapping.xml</mapping-file>
- <exclude-unlisted-classes>false</exclude-unlisted-classes>
- <properties>
- <!--<property name="openjpa.Log" value="DefaultLevel=TRACE"/>-->
- <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
- </properties>
- </persistence-unit>
- <persistence-unit name="openjpa-test-unit">
- <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
- <jta-data-source>java:openejb/Resource/My DataSource</jta-data-source>
- <non-jta-data-source>java:openejb/Resource/My Unmanaged DataSource</non-jta-data-source>
- <class>org.apache.openejb.test.entity.Customer</class>
- </persistence-unit>
+ <persistence-unit transaction-type="JTA" name="cmp">
+ <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+ <jta-data-source>java:openejb/Resource/My DataSource</jta-data-source>
+ <non-jta-data-source>java:openejb/Resource/My Unmanaged DataSource</non-jta-data-source>
+ <mapping-file>META-INF/jpa.mapping.xml</mapping-file>
+ <exclude-unlisted-classes>false</exclude-unlisted-classes>
+ <properties>
+ <!--<property name="openjpa.Log" value="DefaultLevel=TRACE"/>-->
+ <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
+ </properties>
+ </persistence-unit>
+ <persistence-unit name="openjpa-test-unit">
+ <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+ <jta-data-source>java:openejb/Resource/My DataSource</jta-data-source>
+ <non-jta-data-source>java:openejb/Resource/My Unmanaged DataSource</non-jta-data-source>
+ <class>org.apache.openejb.test.entity.Customer</class>
+ </persistence-unit>
</persistence>
Modified: tomee/tomee/trunk/itests/openejb-itests-client/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/pom.xml?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/pom.xml (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/pom.xml Tue Jul 15 21:55:09 2014
@@ -19,7 +19,8 @@
<!-- $Rev$ $Date$ -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>itests</artifactId>
<groupId>org.apache.openejb</groupId>
@@ -61,10 +62,12 @@
<configuration>
<target>
<tstamp>
- <format property="TSTAMP" pattern="hh:mm" />
+ <format property="TSTAMP" pattern="hh:mm"/>
</tstamp>
- <replace file="target/classes/META-INF/openejb-version.properties" token="@DATE-REPLACED-BY-MAVEN@" value="${DSTAMP}" />
- <replace file="target/classes/META-INF/openejb-version.properties" token="@TIME-REPLACED-BY-MAVEN@" value="${TSTAMP}" />
+ <replace file="target/classes/META-INF/openejb-version.properties" token="@DATE-REPLACED-BY-MAVEN@"
+ value="${DSTAMP}"/>
+ <replace file="target/classes/META-INF/openejb-version.properties" token="@TIME-REPLACED-BY-MAVEN@"
+ value="${TSTAMP}"/>
</target>
</configuration>
</execution>
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/ClientTestSuite.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/ClientTestSuite.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/ClientTestSuite.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/ClientTestSuite.java Tue Jul 15 21:55:09 2014
@@ -29,22 +29,22 @@ import org.apache.openejb.test.singleton
public class ClientTestSuite extends junit.framework.TestCase {
- public ClientTestSuite(String name){
+ public ClientTestSuite(final String name) {
super(name);
}
public static junit.framework.Test suite() {
- TestSuite suite = new TestSuite();
+ final TestSuite suite = new TestSuite();
if (Boolean.getBoolean("openejb.test.servlets")) {
suite.addTest(ServletTestSuite.suite());
}
- suite.addTest( SingletonTestSuite.suite() );
- suite.addTest( StatelessTestSuite.suite() );
- suite.addTest( StatefulTestSuite.suite() );
- suite.addTest( BmpTestSuite.suite() );
- suite.addTest( CmpTestSuite.suite() );
- suite.addTest( Cmp2TestSuite.suite() );
- suite.addTest( MdbTestSuite.suite() );
+ suite.addTest(SingletonTestSuite.suite());
+ suite.addTest(StatelessTestSuite.suite());
+ suite.addTest(StatefulTestSuite.suite());
+ suite.addTest(BmpTestSuite.suite());
+ suite.addTest(CmpTestSuite.suite());
+ suite.addTest(Cmp2TestSuite.suite());
+ suite.addTest(MdbTestSuite.suite());
return suite;
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/CorbaTestServer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/CorbaTestServer.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/CorbaTestServer.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/CorbaTestServer.java Tue Jul 15 21:55:09 2014
@@ -19,10 +19,10 @@ package org.apache.openejb.test;
import java.util.Properties;
public class CorbaTestServer implements TestServer {
-
+
Properties props;
- public void init(Properties props){
+ public void init(final Properties props) {
/* TO DO:
* Perform some test to see if the OpenEJB CORBA Server
* is started. If not, display the followding message
@@ -41,22 +41,23 @@ public class CorbaTestServer implements
this.props = props;
}
-
- public void log(String s){
- System.out.println("[NOTE] "+s);
+
+ public void log(final String s) {
+ System.out.println("[NOTE] " + s);
}
- public void destroy(){
+
+ public void destroy() {
}
-
- public void start(){
+
+ public void start() {
}
- public void stop(){
-
+ public void stop() {
+
}
- public Properties getContextEnvironment(){
- return (Properties)props.clone();
+ public Properties getContextEnvironment() {
+ return (Properties) props.clone();
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/DerbyTestDatabase.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/DerbyTestDatabase.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/DerbyTestDatabase.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/DerbyTestDatabase.java Tue Jul 15 21:55:09 2014
@@ -24,10 +24,9 @@ import java.rmi.RemoteException;
import java.util.Properties;
/**
- *
- * @version $Rev$ $Date$
+ * @version $Rev$ $Date$
*/
-public class DerbyTestDatabase implements TestDatabase{
+public class DerbyTestDatabase implements TestDatabase {
protected Database database;
protected InitialContext initialContext;
@@ -40,53 +39,54 @@ public class DerbyTestDatabase implement
private static String _dropEntity = "DROP TABLE entity";
- static{
+ static {
System.setProperty("noBanner", "true");
}
public void createEntityTable() throws java.sql.SQLException {
- try{
- try{
+ try {
+ try {
database.execute(DerbyTestDatabase._dropEntity);
- } catch (Exception e){
+ } catch (final Exception e) {
// not concerned
}
database.execute(DerbyTestDatabase._createEntity);
- } catch (RemoteException re){
+ } catch (final RemoteException re) {
if (re.detail != null && re.detail instanceof java.sql.SQLException) {
- throw (java.sql.SQLException)re.detail;
+ throw (java.sql.SQLException) re.detail;
} else {
- throw new java.sql.SQLException("Cannot create entity table: "+re.getMessage(), DerbyTestDatabase._createEntity);
+ throw new java.sql.SQLException("Cannot create entity table: " + re.getMessage(), DerbyTestDatabase._createEntity);
}
}
}
+
public void dropEntityTable() throws java.sql.SQLException {
try {
database.execute(DerbyTestDatabase._dropEntity);
- } catch (RemoteException re){
+ } catch (final RemoteException re) {
if (re.detail != null && re.detail instanceof java.sql.SQLException) {
- throw (java.sql.SQLException)re.detail;
+ throw (java.sql.SQLException) re.detail;
} else {
- throw new java.sql.SQLException("Unable to drop entity table: "+re.getMessage(), DerbyTestDatabase._dropEntity);
+ throw new java.sql.SQLException("Unable to drop entity table: " + re.getMessage(), DerbyTestDatabase._dropEntity);
}
}
}
public void createAccountTable() throws java.sql.SQLException {
- try{
- try{
+ try {
+ try {
database.execute(DerbyTestDatabase._dropAccount);
- } catch (Exception e){
+ } catch (final Exception e) {
// not concerned
}
database.execute(DerbyTestDatabase._createAccount);
- } catch (RemoteException re){
+ } catch (final RemoteException re) {
if (re.detail != null && re.detail instanceof java.sql.SQLException) {
- throw (java.sql.SQLException)re.detail;
+ throw (java.sql.SQLException) re.detail;
} else {
- throw new java.sql.SQLException("Cannot create account table: "+re.getMessage(), DerbyTestDatabase._createAccount);
+ throw new java.sql.SQLException("Cannot create account table: " + re.getMessage(), DerbyTestDatabase._createAccount);
}
}
}
@@ -94,36 +94,36 @@ public class DerbyTestDatabase implement
public void dropAccountTable() throws java.sql.SQLException {
try {
database.execute(DerbyTestDatabase._dropAccount);
- } catch (RemoteException re){
+ } catch (final RemoteException re) {
if (re.detail != null && re.detail instanceof java.sql.SQLException) {
- throw (java.sql.SQLException)re.detail;
+ throw (java.sql.SQLException) re.detail;
} else {
- throw new java.sql.SQLException("Cannot drop account table: "+re.getMessage(), DerbyTestDatabase._dropAccount);
+ throw new java.sql.SQLException("Cannot drop account table: " + re.getMessage(), DerbyTestDatabase._dropAccount);
}
}
}
public void start() throws IllegalStateException {
try {
- Properties properties = TestManager.getServer().getContextEnvironment();
+ final Properties properties = TestManager.getServer().getContextEnvironment();
initialContext = new InitialContext(properties);
- } catch (Exception e){
- throw (IllegalStateException) new IllegalStateException("Cannot create initial context: "+e.getClass().getName()+" "+e.getMessage()).initCause(e);
+ } catch (final Exception e) {
+ throw (IllegalStateException) new IllegalStateException("Cannot create initial context: " + e.getClass().getName() + " " + e.getMessage()).initCause(e);
}
- Object obj =null;
- DatabaseHome databaseHome =null;
+ Object obj = null;
+ DatabaseHome databaseHome = null;
try {
/* Create database */
obj = initialContext.lookup("client/tools/DatabaseHome");
- databaseHome = (DatabaseHome)javax.rmi.PortableRemoteObject.narrow( obj, DatabaseHome.class);
- } catch (Exception e){
- throw new IllegalStateException("Cannot find 'client/tools/DatabaseHome': "+e.getClass().getName()+" "+e.getMessage());
+ databaseHome = (DatabaseHome) javax.rmi.PortableRemoteObject.narrow(obj, DatabaseHome.class);
+ } catch (final Exception e) {
+ throw new IllegalStateException("Cannot find 'client/tools/DatabaseHome': " + e.getClass().getName() + " " + e.getMessage());
}
try {
database = databaseHome.create();
- } catch (Exception e){
- throw new IllegalStateException("Cannot start database: "+e.getClass().getName()+" "+e.getMessage());
+ } catch (final Exception e) {
+ throw new IllegalStateException("Cannot start database: " + e.getClass().getName() + " " + e.getMessage());
}
}
@@ -131,6 +131,6 @@ public class DerbyTestDatabase implement
public void stop() throws IllegalStateException {
}
- public void init(Properties props) throws IllegalStateException {
+ public void init(final Properties props) throws IllegalStateException {
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/FilteredTestSuite.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/FilteredTestSuite.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/FilteredTestSuite.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/FilteredTestSuite.java Tue Jul 15 21:55:09 2014
@@ -31,17 +31,17 @@ public class FilteredTestSuite extends T
return filter(super.getTests());
}
- public static List<Test> filter(List<Test> tests) {
- String itest = System.getProperty("itest");
+ public static List<Test> filter(final List<Test> tests) {
+ final String itest = System.getProperty("itest");
if (itest == null) {
return tests;
}
- ArrayList<Test> filtered = new ArrayList<Test>();
- for (Test test : tests) {
- String simpleName = test.getClass().getSimpleName();
- if (simpleName.matches(itest)){
+ final ArrayList<Test> filtered = new ArrayList<Test>();
+ for (final Test test : tests) {
+ final String simpleName = test.getClass().getSimpleName();
+ if (simpleName.matches(itest)) {
filtered.add(test);
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/HsqldbTestDatabase.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/HsqldbTestDatabase.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/HsqldbTestDatabase.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/HsqldbTestDatabase.java Tue Jul 15 21:55:09 2014
@@ -46,37 +46,37 @@ public class HsqldbTestDatabase implemen
private static final String DROP_MANY_OWNING = "DROP TABLE manyowning";
// Automatically created tables - these must be dropped before the tests run or you will get a duplicate key exception
- private static final String[] AUTO_CREATED_TABLES = new String[] {
- "BasicCmpBean",
- "BasicCmpBeanX",
- "ComplexCmpBean",
- "ComplexCmpBeanX",
- "UnknownCmpBean",
- "UnknownCmpBeanX",
- "BasicCmp2Bean",
- "ComplexCmp2Bean",
- "UnknownCmp2Bean",
- "AOBasicCmpBean",
- "AllowedOperationsCmp2Bean",
- "EncCmpBean",
- "EncCmp2Bean",
- "ContextLookupCmpBean",
- "Cmp_RMI_IIOP_Bean",
- "RmiIiopCmp2Bean",
- "Person",
- "License",
- "ComplexPerson",
- "ComplexLicense",
- "Artist",
- "Song",
- "ComplexArtist",
- "Complexsong",
- "Game",
- "Platform",
- "ComplexGame",
- "ComplexPlatform",
- "Query",
- "QueryData",
+ private static final String[] AUTO_CREATED_TABLES = new String[]{
+ "BasicCmpBean",
+ "BasicCmpBeanX",
+ "ComplexCmpBean",
+ "ComplexCmpBeanX",
+ "UnknownCmpBean",
+ "UnknownCmpBeanX",
+ "BasicCmp2Bean",
+ "ComplexCmp2Bean",
+ "UnknownCmp2Bean",
+ "AOBasicCmpBean",
+ "AllowedOperationsCmp2Bean",
+ "EncCmpBean",
+ "EncCmp2Bean",
+ "ContextLookupCmpBean",
+ "Cmp_RMI_IIOP_Bean",
+ "RmiIiopCmp2Bean",
+ "Person",
+ "License",
+ "ComplexPerson",
+ "ComplexLicense",
+ "Artist",
+ "Song",
+ "ComplexArtist",
+ "Complexsong",
+ "Game",
+ "Platform",
+ "ComplexGame",
+ "ComplexPlatform",
+ "Query",
+ "QueryData",
};
static {
@@ -100,15 +100,15 @@ public class HsqldbTestDatabase implemen
clearTables(AUTO_CREATED_TABLES);
}
- private void createTable(String create, String drop) throws java.sql.SQLException {
+ private void createTable(final String create, final String drop) throws java.sql.SQLException {
try {
try {
database.execute(drop);
- } catch (Exception e) {
+ } catch (final Exception e) {
// not concerned
}
database.execute(create);
- } catch (RemoteException re) {
+ } catch (final RemoteException re) {
if (re.detail != null && re.detail instanceof java.sql.SQLException) {
throw (java.sql.SQLException) re.detail;
} else {
@@ -117,20 +117,20 @@ public class HsqldbTestDatabase implemen
}
}
- private void clearTables(String... autoCreatedTables) {
- for (String tableName : autoCreatedTables) {
+ private void clearTables(final String... autoCreatedTables) {
+ for (final String tableName : autoCreatedTables) {
try {
database.execute("DELETE FROM " + tableName);
- } catch (Exception e) {
+ } catch (final Exception e) {
// not concerned
}
}
}
- private void dropTable(String drop) throws java.sql.SQLException {
+ private void dropTable(final String drop) throws java.sql.SQLException {
try {
database.execute(drop);
- } catch (RemoteException re) {
+ } catch (final RemoteException re) {
if (re.detail != null && re.detail instanceof java.sql.SQLException) {
throw (java.sql.SQLException) re.detail;
} else {
@@ -143,11 +143,11 @@ public class HsqldbTestDatabase implemen
try {
try {
database.execute(_dropAccount);
- } catch (Exception e) {
+ } catch (final Exception e) {
// not concerned
}
database.execute(_createAccount);
- } catch (RemoteException re) {
+ } catch (final RemoteException re) {
if (re.detail != null && re.detail instanceof java.sql.SQLException) {
throw (java.sql.SQLException) re.detail;
} else {
@@ -159,7 +159,7 @@ public class HsqldbTestDatabase implemen
public void dropAccountTable() throws java.sql.SQLException {
try {
database.execute(_dropAccount);
- } catch (RemoteException re) {
+ } catch (final RemoteException re) {
if (re.detail != null && re.detail instanceof java.sql.SQLException) {
throw (java.sql.SQLException) re.detail;
} else {
@@ -170,27 +170,27 @@ public class HsqldbTestDatabase implemen
public void start() throws IllegalStateException {
try {
- TestServer server = TestManager.getServer();
- Properties properties = server.getContextEnvironment();
+ final TestServer server = TestManager.getServer();
+ final Properties properties = server.getContextEnvironment();
initialContext = new InitialContext(properties);
- } catch (Exception e) {
+ } catch (final Exception e) {
throw (IllegalStateException) new IllegalStateException("Cannot create initial context: " + e.getClass().getName() + " " + e.getMessage()).initCause(e);
}
final String databaseHomeJndiName = "client/tools/DatabaseHome";
-
+
Object obj = null;
DatabaseHome databaseHome = null;
try {
/* Create database */
obj = initialContext.lookup(databaseHomeJndiName);
databaseHome = (DatabaseHome) javax.rmi.PortableRemoteObject.narrow(obj, DatabaseHome.class);
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new IllegalStateException("Cannot find " + databaseHomeJndiName + ": " + e.getClass().getName() + " " + e.getMessage());
}
try {
database = databaseHome.create();
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new IllegalStateException("Cannot start database: " + e.getClass().getName() + " " + e.getMessage());
}
}
@@ -199,6 +199,6 @@ public class HsqldbTestDatabase implemen
public void stop() throws IllegalStateException {
}
- public void init(Properties props) throws IllegalStateException {
+ public void init(final Properties props) throws IllegalStateException {
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/InstantDbTestDatabase.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/InstantDbTestDatabase.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/InstantDbTestDatabase.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/InstantDbTestDatabase.java Tue Jul 15 21:55:09 2014
@@ -24,18 +24,18 @@ import javax.naming.InitialContext;
import org.apache.openejb.test.beans.Database;
import org.apache.openejb.test.beans.DatabaseHome;
-public class InstantDbTestDatabase implements TestDatabase{
-
+public class InstantDbTestDatabase implements TestDatabase {
+
protected Database database;
protected InitialContext initialContext;
-
+
private static String _createAccount = "CREATE TABLE account ( ssn CHAR(11) PRIMARY KEY, first_name CHAR(20), last_name CHAR(20), balance INT)";
//private static String _createAccount = "CREATE TABLE Account ( AcctID INT PRIMARY KEY AUTO INCREMENT, SSN CHAR(11), first_name CHAR(20), last_name CHAR(20), BALANCE INT)";
- private static String _dropAccount = "DROP TABLE account";
-
+ private static String _dropAccount = "DROP TABLE account";
+
//private static String _createEntity = "CREATE TABLE entity ( id INT PRIMARY KEY, first_name CHAR(20), last_name CHAR(20) )";
- private static String _createEntity = "CREATE TABLE entity ( id INT PRIMARY KEY AUTO INCREMENT, first_name CHAR(20), last_name CHAR(20) )";
- private static String _dropEntity = "DROP TABLE entity";
+ private static String _createEntity = "CREATE TABLE entity ( id INT PRIMARY KEY AUTO INCREMENT, first_name CHAR(20), last_name CHAR(20) )";
+ private static String _dropEntity = "DROP TABLE entity";
private static final String CREATE_ONE_TO_ONE_A = "CREATE TABLE OneToOneA(A1 INTEGER, A2 VARCHAR(50))";
private static final String DROP_ONE_TO_ONE_A = "DROP TABLE OneToOneA";
@@ -54,10 +54,10 @@ public class InstantDbTestDatabase imple
private static final String DROP_MANY_OWNING = "DROP TABLE manyowning";
- static{
+ static {
System.setProperty("noBanner", "true");
}
-
+
public void createEntityTable() throws java.sql.SQLException {
createTable(_createEntity, _dropEntity);
@@ -85,31 +85,31 @@ public class InstantDbTestDatabase imple
dropTable(_dropAccount);
}
- private void createTable(String create, String drop) throws java.sql.SQLException {
- try{
- try{
+ private void createTable(final String create, final String drop) throws java.sql.SQLException {
+ try {
+ try {
database.execute(drop);
- } catch (Exception e){
+ } catch (final Exception e) {
// not concerned
}
database.execute(create);
- } catch (RemoteException re){
+ } catch (final RemoteException re) {
if (re.detail != null && re.detail instanceof java.sql.SQLException) {
- throw (java.sql.SQLException)re.detail;
+ throw (java.sql.SQLException) re.detail;
} else {
- throw new java.sql.SQLException("Cannot create table: "+re.getMessage(), create);
+ throw new java.sql.SQLException("Cannot create table: " + re.getMessage(), create);
}
}
}
- private void dropTable(String drop) throws java.sql.SQLException {
+ private void dropTable(final String drop) throws java.sql.SQLException {
try {
database.execute(drop);
- } catch (RemoteException re){
+ } catch (final RemoteException re) {
if (re.detail != null && re.detail instanceof java.sql.SQLException) {
- throw (java.sql.SQLException)re.detail;
+ throw (java.sql.SQLException) re.detail;
} else {
- throw new java.sql.SQLException("Unable to drop table: "+re.getMessage(), drop);
+ throw new java.sql.SQLException("Unable to drop table: " + re.getMessage(), drop);
}
}
}
@@ -117,33 +117,33 @@ public class InstantDbTestDatabase imple
public void start() throws IllegalStateException {
try {
- Properties properties = TestManager.getServer().getContextEnvironment();
+ final Properties properties = TestManager.getServer().getContextEnvironment();
initialContext = new InitialContext(properties);
- } catch (Exception e){
- throw (IllegalStateException) new IllegalStateException("Cannot create initial context: "+e.getClass().getName()+" "+e.getMessage()).initCause(e);
+ } catch (final Exception e) {
+ throw (IllegalStateException) new IllegalStateException("Cannot create initial context: " + e.getClass().getName() + " " + e.getMessage()).initCause(e);
}
- Object obj =null;
- DatabaseHome databaseHome =null;
+ Object obj = null;
+ DatabaseHome databaseHome = null;
try {
/* Create database */
obj = initialContext.lookup("client/tools/DatabaseHome");
- databaseHome = (DatabaseHome)javax.rmi.PortableRemoteObject.narrow( obj, DatabaseHome.class);
- } catch (Exception e){
- throw new IllegalStateException("Cannot find 'client/tools/DatabaseHome': "+e.getClass().getName()+" "+e.getMessage());
+ databaseHome = (DatabaseHome) javax.rmi.PortableRemoteObject.narrow(obj, DatabaseHome.class);
+ } catch (final Exception e) {
+ throw new IllegalStateException("Cannot find 'client/tools/DatabaseHome': " + e.getClass().getName() + " " + e.getMessage());
}
try {
database = databaseHome.create();
- } catch (Exception e){
- throw new IllegalStateException("Cannot start database: "+e.getClass().getName()+" "+e.getMessage());
+ } catch (final Exception e) {
+ throw new IllegalStateException("Cannot start database: " + e.getClass().getName() + " " + e.getMessage());
}
}
-
-
+
+
public void stop() throws IllegalStateException {
}
-
- public void init(Properties props) throws IllegalStateException {
+
+ public void init(final Properties props) throws IllegalStateException {
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/IvmTestServer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/IvmTestServer.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/IvmTestServer.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/IvmTestServer.java Tue Jul 15 21:55:09 2014
@@ -23,50 +23,49 @@ import javax.naming.Context;
import javax.naming.InitialContext;
/**
- *
- * @version $Rev$ $Date$
+ * @version $Rev$ $Date$
*/
public class IvmTestServer implements TestServer {
private Properties properties;
- public void init(Properties props){
-
+ public void init(final Properties props) {
+
properties = props;
-
- try{
+
+ try {
props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
props.put("Default JDBC Database", "new://Resource?type=DataSource");
props.put("Default JDBC Database.JdbcUrl", "jdbc:hsqldb:mem:" + IvmTestServer.class.getSimpleName() + new Random().nextInt(250) + ";shutdown=true");
- Properties p = new Properties();
+ final Properties p = new Properties();
p.putAll(props);
p.put("openejb.loader", "embed");
- new InitialContext( p ); // initialize openejb via constructing jndi tree
-
- //OpenEJB.init(properties);
- }catch(Exception oe){
+ new InitialContext(p); // initialize openejb via constructing jndi tree
+
+ //OpenEJB.init(properties);
+ } catch (final Exception oe) {
System.out.println("=========================");
- System.out.println(""+oe.getMessage());
+ System.out.println("" + oe.getMessage());
System.out.println("=========================");
oe.printStackTrace();
throw new RuntimeException("OpenEJB could not be initiated");
}
}
- public void destroy(){
+ public void destroy() {
}
- public void start(){
+ public void start() {
}
- public void stop(){
+ public void stop() {
}
- public Properties getContextEnvironment(){
- return (Properties)properties.clone();
+ public Properties getContextEnvironment() {
+ return (Properties) properties.clone();
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/Main.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/Main.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/Main.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/Main.java Tue Jul 15 21:55:09 2014
@@ -18,7 +18,7 @@ package org.apache.openejb.test;
public class Main {
- public static void main(String args[]) {
+ public static void main(final String[] args) {
// try{
// File directory = SystemInstance.get().getHome().getDirectory("lib");
// SystemInstance.get().getClassPath().addJarsToPath(directory);
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/NamedTestCase.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/NamedTestCase.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/NamedTestCase.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/NamedTestCase.java Tue Jul 15 21:55:09 2014
@@ -17,21 +17,21 @@
package org.apache.openejb.test;
-public abstract class NamedTestCase extends NumberedTestCase{
-
+public abstract class NamedTestCase extends NumberedTestCase {
+
protected String testName;
- public NamedTestCase(String testName){
+ public NamedTestCase(final String testName) {
super();
this.testName = testName;
}
-
- public NamedTestCase(String category, String testName){
+
+ public NamedTestCase(final String category, final String testName) {
super();
this.testName = testName;
}
- public String name(){
+ public String name() {
return testName;
}
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/NumberedTestCase.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/NumberedTestCase.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/NumberedTestCase.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/NumberedTestCase.java Tue Jul 15 21:55:09 2014
@@ -24,93 +24,95 @@ import org.junit.Assert;
import junit.framework.Protectable;
import junit.framework.Test;
import junit.framework.TestResult;
-public class NumberedTestCase extends Assert implements Test{
-
+
+public class NumberedTestCase extends Assert implements Test {
+
Method[] testMethods = new Method[]{};
protected static final String standardPrefix = "test##_";
-
+
class MethodComparator implements java.util.Comparator {
-
- public int compare(Object o1, Object o2){
- Method m1 = (Method)o1;
- Method m2 = (Method)o2;
- return m1.getName().compareTo(m2.getName());
+
+ public int compare(final Object o1, final Object o2) {
+ final Method m1 = (Method) o1;
+ final Method m2 = (Method) o2;
+ return m1.getName().compareTo(m2.getName());
}
- public boolean equals(Object other){
- if(other instanceof MethodComparator)
+
+ public boolean equals(final Object other) {
+ if (other instanceof MethodComparator)
return true;
else
return false;
}
}
-
- public NumberedTestCase(){
- try{
+
+ public NumberedTestCase() {
+ try {
// Get all methods of the subclass
- Method[] methods = getClass().getMethods();
- java.util.TreeSet tm = new java.util.TreeSet(new MethodComparator());
+ final Method[] methods = getClass().getMethods();
+ final java.util.TreeSet tm = new java.util.TreeSet(new MethodComparator());
// Add the ones that start with "test"
- for (int i=0; i < methods.length; i++){
- if (methods[i].getName().startsWith("test")){
+ for (int i = 0; i < methods.length; i++) {
+ if (methods[i].getName().startsWith("test")) {
tm.add(methods[i]);
}
}
testMethods = new Method[tm.size()];
- Iterator orderedMethods = tm.iterator();
- for(int i=0;orderedMethods.hasNext();i++){
- testMethods[i]=(Method)orderedMethods.next();
+ final Iterator orderedMethods = tm.iterator();
+ for (int i = 0; orderedMethods.hasNext(); i++) {
+ testMethods[i] = (Method) orderedMethods.next();
}
- } catch (Exception e){
+ } catch (final Exception e) {
throw new RuntimeException(e.getMessage());
}
}
-
- protected void setUp() throws Exception{
+
+ protected void setUp() throws Exception {
}
- protected void tearDown() throws Exception{
+ protected void tearDown() throws Exception {
}
-
+
/**
* Counts the number of test cases that will be run by this test.
*/
public int countTestCases() {
return testMethods.length;
}
-
+
/**
* Runs a test and collects its result in a TestResult instance.
*/
- public void run(TestResult result) {
- try{
+ public void run(final TestResult result) {
+ try {
setUp();
- } catch (Exception e){
+ } catch (final Exception e) {
e.printStackTrace();
- Test test = new TestSetup();
-
+ final Test test = new TestSetup();
+
result.addError(test, e);
return;
}
- for (int i=0; i < testMethods.length; i++){
+ for (int i = 0; i < testMethods.length; i++) {
run(result, testMethods[i]);
}
- try{
+ try {
tearDown();
- } catch (Exception e){
+ } catch (final Exception e) {
e.printStackTrace();
- Test test = new TestTearDown();
-
+ final Test test = new TestTearDown();
+
result.addError(test, e);
return;
}
}
protected void run(final TestResult result, final Method testMethod) {
- Test test = createTest(testMethod);
+ final Test test = createTest(testMethod);
result.startTest(test);
- Protectable p= new Protectable() {
+ final Protectable p = new Protectable() {
public void protect() throws Throwable {
runTestMethod(testMethod);
}
@@ -120,50 +122,50 @@ public class NumberedTestCase extends As
result.endTest(test);
//System.out.println(">>" + NumberedTestCase.class.getName() + "> done: " + testMethod.toGenericString());
}
-
- protected Test createTest(final Method testMethod){
- Test test = new NamedTest(testMethod);
+
+ protected Test createTest(final Method testMethod) {
+ final Test test = new NamedTest(testMethod);
return test;
}
- protected void runTestMethod(Method testMethod) throws Throwable {
+ protected void runTestMethod(final Method testMethod) throws Throwable {
try {
testMethod.invoke(this, new Class[0]);
- } catch (InvocationTargetException e) {
+ } catch (final InvocationTargetException e) {
e.fillInStackTrace();
throw e.getTargetException();
- } catch (IllegalAccessException e) {
+ } catch (final IllegalAccessException e) {
e.fillInStackTrace();
throw e;
}
}
- public String toString(){
+ public String toString() {
return name();
}
- public String name(){
+ public String name() {
return "";
}
-
- protected String createTestName(Method testMethod){
+
+ protected String createTestName(final Method testMethod) {
return name() + removePrefix(testMethod.getName());
}
- protected static String removePrefix(String name){
+ protected static String removePrefix(final String name) {
return removePrefix(standardPrefix, name);
}
-
- protected static String removePrefix(String prefix, String name){
+
+ protected static String removePrefix(final String prefix, final String name) {
return name.substring(prefix.length());
}
public class NamedTest implements Test {
private final Method testMethod;
- public NamedTest(Method testMethod) {
+ public NamedTest(final Method testMethod) {
this.testMethod = testMethod;
}
@@ -175,7 +177,7 @@ public class NumberedTestCase extends As
return 1;
}
- public void run(TestResult result) {
+ public void run(final TestResult result) {
}
public String toString() {
@@ -188,11 +190,11 @@ public class NumberedTestCase extends As
return 0;
}
- public void run(TestResult result) {
+ public void run(final TestResult result) {
}
- public String getName(){
- return name()+".setUp()";
+ public String getName() {
+ return name() + ".setUp()";
}
public String toString() {
@@ -205,11 +207,11 @@ public class NumberedTestCase extends As
return 0;
}
- public void run(TestResult result) {
+ public void run(final TestResult result) {
}
- public String getName(){
- return name()+".tearDown()";
+ public String getName() {
+ return name() + ".tearDown()";
}
public String toString() {
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/PostgreSqlTestDatabase.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/PostgreSqlTestDatabase.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/PostgreSqlTestDatabase.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/PostgreSqlTestDatabase.java Tue Jul 15 21:55:09 2014
@@ -44,22 +44,22 @@ public class PostgreSqlTestDatabase impl
public void createEntityTable() throws java.sql.SQLException {
try {
database.execute("DROP SEQUENCE entity_id_seq");
- } catch (Exception e) {
+ } catch (final Exception e) {
// not concerned
}
try {
database.execute(_dropEntity);
- } catch (Exception e) {
+ } catch (final Exception e) {
// not concerned
}
try {
database.execute("CREATE SEQUENCE entity_id_seq");
- } catch (Exception e) {
+ } catch (final Exception e) {
// not concerned
}
try {
database.execute(_createEntity);
- } catch (RemoteException re) {
+ } catch (final RemoteException re) {
if (re.detail != null && re.detail instanceof java.sql.SQLException) {
throw (java.sql.SQLException) re.detail;
} else {
@@ -71,12 +71,12 @@ public class PostgreSqlTestDatabase impl
public void dropEntityTable() throws java.sql.SQLException {
try {
database.execute("DROP SEQUENCE entity_id_seq");
- } catch (Exception e) {
+ } catch (final Exception e) {
// not concerned
}
try {
database.execute(_dropEntity);
- } catch (RemoteException re) {
+ } catch (final RemoteException re) {
if (re.detail != null && re.detail instanceof java.sql.SQLException) {
throw (java.sql.SQLException) re.detail;
} else {
@@ -89,22 +89,22 @@ public class PostgreSqlTestDatabase impl
public void createAccountTable() throws java.sql.SQLException {
try {
database.execute("DROP SEQUENCE account_id_seq");
- } catch (Exception e) {
+ } catch (final Exception e) {
// not concerned
}
try {
database.execute("DROP TABLE account");
- } catch (Exception e) {
+ } catch (final Exception e) {
// not concerned
}
try {
database.execute("CREATE SEQUENCE account_id_seq");
- } catch (Exception e) {
+ } catch (final Exception e) {
// not concerned
}
try {
database.execute(_createAccount);
- } catch (RemoteException re) {
+ } catch (final RemoteException re) {
if (re.detail != null && re.detail instanceof java.sql.SQLException) {
throw (java.sql.SQLException) re.detail;
} else {
@@ -117,11 +117,11 @@ public class PostgreSqlTestDatabase impl
try {
try {
database.execute("DROP SEQUENCE account_id_seq");
- } catch (Exception e) {
+ } catch (final Exception e) {
// not concerned
}
database.execute(_dropAccount);
- } catch (RemoteException re) {
+ } catch (final RemoteException re) {
if (re.detail != null && re.detail instanceof java.sql.SQLException) {
throw (java.sql.SQLException) re.detail;
} else {
@@ -132,14 +132,14 @@ public class PostgreSqlTestDatabase impl
public void start() throws IllegalStateException {
try {
- Properties properties = TestManager.getServer().getContextEnvironment();
+ final Properties properties = TestManager.getServer().getContextEnvironment();
initialContext = new InitialContext(properties);
/* Create database */
- Object obj = initialContext.lookup("client/tools/DatabaseHome");
- DatabaseHome databaseHome = (DatabaseHome) javax.rmi.PortableRemoteObject.narrow(obj, DatabaseHome.class);
+ final Object obj = initialContext.lookup("client/tools/DatabaseHome");
+ final DatabaseHome databaseHome = (DatabaseHome) javax.rmi.PortableRemoteObject.narrow(obj, DatabaseHome.class);
database = databaseHome.create();
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new IllegalStateException("Cannot start database: " + e.getClass().getName() + " " + e.getMessage());
}
}
@@ -147,19 +147,19 @@ public class PostgreSqlTestDatabase impl
public void stop() throws IllegalStateException {
}
- public void init(Properties props) throws IllegalStateException {
+ public void init(final Properties props) throws IllegalStateException {
}
- public static void main(String[] args) {
+ public static void main(final String[] args) {
System.out.println("Checking if driver is registered with DriverManager.");
try {
- ClassLoader cl = (ClassLoader) java.security.AccessController.doPrivileged(new java.security.PrivilegedAction() {
+ final ClassLoader cl = (ClassLoader) java.security.AccessController.doPrivileged(new java.security.PrivilegedAction() {
public Object run() {
return Thread.currentThread().getContextClassLoader();
}
});
Class.forName("org.postgresql.Driver", true, cl);
- } catch (ClassNotFoundException e) {
+ } catch (final ClassNotFoundException e) {
System.out.println("Couldn't find the driver!");
e.printStackTrace();
System.exit(1);
@@ -171,7 +171,7 @@ public class PostgreSqlTestDatabase impl
try {
conn = DriverManager.getConnection("jdbc:postgresql://localhost/openejbtest", "openejbuser", "javaone");
- } catch (SQLException e) {
+ } catch (final SQLException e) {
System.out.println("Couldn't connect.");
e.printStackTrace();
System.exit(1);
@@ -185,23 +185,23 @@ public class PostgreSqlTestDatabase impl
try {
stmt = conn.createStatement();
- } catch (SQLException e) {
+ } catch (final SQLException e) {
System.out.println("Couldn't create a statement.");
e.printStackTrace();
System.exit(1);
}
- ResultSet rs = null;
+ final ResultSet rs = null;
try {
stmt.execute("DROP TABLE entity");
- } catch (SQLException e) {
+ } catch (final SQLException e) {
}
System.out.println("Creating entity table.");
try {
stmt.execute(_createEntity);
- } catch (SQLException e) {
+ } catch (final SQLException e) {
System.out.println("Couldn't create the entity table");
e.printStackTrace();
System.exit(1);
@@ -209,12 +209,12 @@ public class PostgreSqlTestDatabase impl
System.out.println("Inserting record.");
try {
- PreparedStatement pstmt = conn.prepareStatement("insert into entity (id, first_name, last_name) values (?,?,?)");
+ final PreparedStatement pstmt = conn.prepareStatement("insert into entity (id, first_name, last_name) values (?,?,?)");
pstmt.setInt(1, 101);
pstmt.setString(2, "Bunson");
pstmt.setString(3, "Honeydew");
pstmt.executeUpdate();
- } catch (SQLException e) {
+ } catch (final SQLException e) {
System.out.println("Couldn't create the entity table");
e.printStackTrace();
System.exit(1);
@@ -222,11 +222,11 @@ public class PostgreSqlTestDatabase impl
System.out.println("Selecting the record.");
try {
- PreparedStatement pstmt = conn.prepareStatement("select id from entity where first_name = ? AND last_name = ?");
+ final PreparedStatement pstmt = conn.prepareStatement("select id from entity where first_name = ? AND last_name = ?");
pstmt.setString(1, "Bunson");
pstmt.setString(2, "Honeydew");
- ResultSet set = pstmt.executeQuery();
- } catch (SQLException e) {
+ final ResultSet set = pstmt.executeQuery();
+ } catch (final SQLException e) {
System.out.println("Couldn't select the entry");
e.printStackTrace();
System.exit(1);
@@ -236,7 +236,7 @@ public class PostgreSqlTestDatabase impl
System.out.println("Dropping the entity table.");
try {
stmt.execute(_dropEntity);
- } catch (SQLException e) {
+ } catch (final SQLException e) {
System.out.println("Couldn't drop the entity table");
e.printStackTrace();
System.exit(1);
@@ -244,7 +244,7 @@ public class PostgreSqlTestDatabase impl
try {
conn.close();
- } catch (SQLException e) {
+ } catch (final SQLException e) {
System.out.println("Couldn't create the sequense");
e.printStackTrace();
System.exit(1);
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/RemoteHttpTestServer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/RemoteHttpTestServer.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/RemoteHttpTestServer.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/RemoteHttpTestServer.java Tue Jul 15 21:55:09 2014
@@ -22,7 +22,7 @@ import java.util.Properties;
* @version $Revision$ $Date$
*/
public class RemoteHttpTestServer extends RemoteTestServer {
- public void init(Properties props) {
+ public void init(final Properties props) {
super.init(props);
props.put("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
props.put("java.naming.provider.url", "http://127.0.0.1:4204/ejb");
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/RemoteTestServer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/RemoteTestServer.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/RemoteTestServer.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/RemoteTestServer.java Tue Jul 15 21:55:09 2014
@@ -119,7 +119,7 @@ public class RemoteTestServer implements
out.write("Stop".getBytes());
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
}
}
@@ -148,14 +148,14 @@ public class RemoteTestServer implements
try {
final Socket socket = new Socket("localhost", 4200);
out = socket.getOutputStream();
- } catch (Exception e) {
+ } catch (final Exception e) {
//System.out.println(e.getMessage());
if (tries < 2) {
return false;
} else {
try {
Thread.sleep(2000);
- } catch (Exception e2) {
+ } catch (final Exception e2) {
e.printStackTrace();
}
return connect(--tries);
@@ -164,7 +164,7 @@ public class RemoteTestServer implements
if (null != out) {
try {
out.close();
- } catch (Throwable e) {
+ } catch (final Throwable e) {
//Ignore
}
}
@@ -194,7 +194,7 @@ public class RemoteTestServer implements
out.write(i);
}
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/ResultPrinter.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/ResultPrinter.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/ResultPrinter.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/ResultPrinter.java Tue Jul 15 21:55:09 2014
@@ -24,34 +24,34 @@ import junit.framework.TestResult;
public class ResultPrinter extends junit.textui.ResultPrinter {
- public ResultPrinter(PrintStream writer) {
- super(writer);
+ public ResultPrinter(final PrintStream writer) {
+ super(writer);
}
- public PrintStream writer(){
+ public PrintStream writer() {
return getWriter();
}
- public void printFailures(TestResult result) {
+ public void printFailures(final TestResult result) {
if (result.failureCount() != 0) {
writer().println("\n~~ Failure Results ~~~~~~~~~\n");
if (result.failureCount() == 1)
writer().println("There was " + result.failureCount() + " failure:");
else
writer().println("There were " + result.failureCount() + " failures:");
-
+
int i = 1;
writer().println("\nFailure Summary:");
- for (Enumeration e= result.failures(); e.hasMoreElements(); i++) {
- TestFailure failure= (TestFailure) e.nextElement();
+ for (final Enumeration e = result.failures(); e.hasMoreElements(); i++) {
+ final TestFailure failure = (TestFailure) e.nextElement();
writer().println(i + ") " + failure.failedTest());
}
i = 1;
writer().println("\nFailure Details:");
- for (Enumeration e= result.failures(); e.hasMoreElements(); i++) {
- TestFailure failure= (TestFailure) e.nextElement();
- writer().println("\n"+ i + ") " + failure.failedTest());
- Throwable t= failure.thrownException();
+ for (final Enumeration e = result.failures(); e.hasMoreElements(); i++) {
+ final TestFailure failure = (TestFailure) e.nextElement();
+ writer().println("\n" + i + ") " + failure.failedTest());
+ final Throwable t = failure.thrownException();
if (t.getMessage() != null)
writer().println("\t\"" + t.getMessage() + "\"");
else {
@@ -65,71 +65,71 @@ public class ResultPrinter extends junit
/**
* Prints the header of the report
*/
- public void printHeader(TestResult result) {
+ public void printHeader(final TestResult result) {
if (result.wasSuccessful()) {
writer().println();
writer().print("OK");
- writer().println (" (" + result.runCount() + " tests)");
-
+ writer().println(" (" + result.runCount() + " tests)");
+
} else {
writer().println();
writer().println("FAILURES!!!");
writer().println("~~ Test Results ~~~~~~~~~~~~");
- writer().println(" Run: "+result.runCount());
- writer().println(" Failures: "+result.failureCount());
- writer().println(" Errors: "+result.errorCount());
+ writer().println(" Run: " + result.runCount());
+ writer().println(" Failures: " + result.failureCount());
+ writer().println(" Errors: " + result.errorCount());
}
}
- public void printErrors(TestResult result) {
+ public void printErrors(final TestResult result) {
if (result.errorCount() != 0) {
writer().println("\n~~ Error Results ~~~~~~~~~~~\n");
if (result.errorCount() == 1)
- writer().println("There was "+result.errorCount()+" error:");
+ writer().println("There was " + result.errorCount() + " error:");
else
- writer().println("There were "+result.errorCount()+" errors:");
-
+ writer().println("There were " + result.errorCount() + " errors:");
+
writer().println("\nError Summary:");
int i = 1;
- for (Enumeration e= result.errors(); e.hasMoreElements(); i++) {
- TestFailure failure= (TestFailure) e.nextElement();
+ for (final Enumeration e = result.errors(); e.hasMoreElements(); i++) {
+ final TestFailure failure = (TestFailure) e.nextElement();
writer().println(i + ") " + failure.failedTest());
}
writer().println("\nError Details:");
i = 1;
- for (Enumeration e= result.errors(); e.hasMoreElements(); i++) {
- TestFailure failure= (TestFailure)e.nextElement();
- writer().println(i+") "+failure.failedTest());
- String trace = getRelevantStackTrace(failure.thrownException());
+ for (final Enumeration e = result.errors(); e.hasMoreElements(); i++) {
+ final TestFailure failure = (TestFailure) e.nextElement();
+ writer().println(i + ") " + failure.failedTest());
+ final String trace = getRelevantStackTrace(failure.thrownException());
writer().println(trace);
}
}
}
- public String getRelevantStackTrace(Throwable t){
- StringBuffer trace = new StringBuffer();
-
- try{
+ public String getRelevantStackTrace(final Throwable t) {
+ final StringBuffer trace = new StringBuffer();
+
+ try {
// Cut the stack trace after "at junit.framework" is found
// Return just the first part.
- java.io.ByteArrayOutputStream bos = new java.io.ByteArrayOutputStream();
- java.io.PrintWriter pw = new java.io.PrintWriter(bos);
+ final java.io.ByteArrayOutputStream bos = new java.io.ByteArrayOutputStream();
+ final java.io.PrintWriter pw = new java.io.PrintWriter(bos);
t.printStackTrace(pw);
pw.close();
-
- java.io.BufferedReader reader = new java.io.BufferedReader(new java.io.StringReader(bos.toString()));
+
+ final java.io.BufferedReader reader = new java.io.BufferedReader(new java.io.StringReader(bos.toString()));
String line = reader.readLine();
- while(line != null) {
+ while (line != null) {
if (line.indexOf("at junit.framework") != -1) break;
if (line.indexOf("at org.apache.openejb.test.NumberedTestCase") != -1) break;
if (line.indexOf("at org.apache.openejb.test.TestSuite") != -1) break;
-
+
trace.append(line).append('\n');
line = reader.readLine();
}
- } catch(Exception e){
+ } catch (final Exception e) {
}
-
+
return trace.toString();
}