Author: rmannibucau
Date: Thu Aug 4 14:54:12 2011
New Revision: 1153897
URL: http://svn.apache.org/viewvc?rev=1153897&view=rev
Log:
enhancing port management in cdi tomee
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
openejb/trunk/openejb3/tck/cdi-tomee/pom.xml
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1153897&r1=1153896&r2=1153897&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
Thu Aug 4 14:54:12 2011
@@ -1353,7 +1353,7 @@ public class AnnotationDeployer implemen
return false;
}
- if (isAbstract(beanClass.get().getModifiers())) {
+ if (!beanClass.get().isInterface() &&
isAbstract(beanClass.get().getModifiers())) {
ejbModule.getValidation().fail(ejbName,
"abstractAnnotatedAsBean", annotationClass.getSimpleName(),
beanClass.get().getName());
return false;
}
Modified: openejb/trunk/openejb3/tck/cdi-tomee/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-tomee/pom.xml?rev=1153897&r1=1153896&r2=1153897&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/cdi-tomee/pom.xml (original)
+++ openejb/trunk/openejb3/tck/cdi-tomee/pom.xml Thu Aug 4 14:54:12 2011
@@ -29,6 +29,8 @@
<properties>
<!-- where we will unpack tomcat -->
<openejb.home>${project.build.directory}${file.separator}apache-tomee-${project.version}</openejb.home>
+ <tomee.port>7180</tomee.port>
+ <tomee.shutdown.port>7105</tomee.shutdown.port>
</properties>
<dependencies>
<dependency>
@@ -148,9 +150,9 @@
<delete dir="${openejb.home}/webapps/docs"/>
<delete dir="${openejb.home}/webapps/manager"/>
<delete dir="${openejb.home}/webapps/host-manager"/>
- <replace file="${openejb.home}/conf/server.xml" token="8080"
value="7180"/>
+ <replace file="${openejb.home}/conf/server.xml" token="8080"
value="${tomee.port}"/>
<replace file="${openejb.home}/conf/server.xml" token="8443"
value="7143"/>
- <replace file="${openejb.home}/conf/server.xml" token="8005"
value="7105"/>
+ <replace file="${openejb.home}/conf/server.xml" token="8005"
value="${tomee.shutdown.port}"/>
<replace file="${openejb.home}/conf/server.xml" token="8009"
value="7109"/>
</target>
</configuration>
@@ -174,14 +176,14 @@
<org.jboss.testharness.runIntegrationTests>true</org.jboss.testharness.runIntegrationTests>
<org.jboss.testharness.container.forceRestart>true</org.jboss.testharness.container.forceRestart>
<org.jboss.testharness.libraryDirectory>${project.build.directory}/dependency/lib</org.jboss.testharness.libraryDirectory>
-
<org.jboss.testharness.host>http://localhost:7180/openejb/ejb</org.jboss.testharness.host>
+
<org.jboss.testharness.host>http://localhost:${tomee.port}/openejb/ejb</org.jboss.testharness.host>
<!--<org.jboss.testharness.outputDirectory>target</org.jboss.testharness.outputDirectory>-->
<deleteArtifacts>true</deleteArtifacts>
<!--<openejb.server.debug>true</openejb.server.debug>-->
-
<java.naming.provider.url>http://localhost:7180/openejb/ejb</java.naming.provider.url>
+
<java.naming.provider.url>http://localhost:${tomee.port}/openejb/ejb</java.naming.provider.url>
<connect.tries>90</connect.tries>
- <server.shutdown.port>7105</server.shutdown.port>
+ <server.shutdown.port>${tomee.shutdown.port}</server.shutdown.port>
<java.opts>-Xmx128m -XX:MaxPermSize=128m</java.opts>
<openejb.home>${project.build.directory}${file.separator}apache-tomee-${project.version}</openejb.home>
</systemPropertyVariables>
