svn commit: r1504375 - in /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb: cdi/CdiEjbBean.java config/AnnotationDeployer.java
Author: rmannibucau
Date: Thu Jul 18 06:51:08 2013
New Revision: 1504375
URL: http://svn.apache.org/r1504375
Log:
OPENEJB-2033 @Alternative and @Specializes for EJB was wrong
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java?rev=1504375r1=1504374r2=1504375view=diff
==
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
Thu Jul 18 06:51:08 2013
@@ -96,10 +96,6 @@ public class CdiEjbBeanT extends BaseE
}
}
-public void setEnabled(final boolean enabled) {
-// no-op: ejb parent are not deployed so no need to deactivate it
(will always be the specialization)
-}
-
public String getEjbName() {
return this.beanContext.getEjbName();
}
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1504375r1=1504374r2=1504375view=diff
==
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
Thu Jul 18 06:51:08 2013
@@ -1347,9 +1347,7 @@ public class AnnotationDeployer implemen
for (AnnotatedClass? beanClass :
finder.findMetaAnnotatedClasses(Singleton.class)) {
if (beanClass.isAnnotationPresent(Specializes.class)) {
-managedClasses.remove(beanClass.get().getName());
specializingClasses.add(beanClass.get());
-continue;
}
Singleton singleton = beanClass.getAnnotation(Singleton.class);
@@ -1379,9 +1377,7 @@ public class AnnotationDeployer implemen
for (AnnotatedClass? beanClass :
finder.findMetaAnnotatedClasses(Stateless.class)) {
if (beanClass.isAnnotationPresent(Specializes.class)) {
-managedClasses.remove(beanClass.get().getName());
specializingClasses.add(beanClass.get());
-continue;
}
Stateless stateless = beanClass.getAnnotation(Stateless.class);
@@ -1418,9 +1414,7 @@ public class AnnotationDeployer implemen
for (AnnotatedClass? beanClass :
finder.findMetaAnnotatedClasses(Stateful.class)) {
if (beanClass.isAnnotationPresent(Specializes.class)) {
-managedClasses.remove(beanClass.get().getName());
specializingClasses.add(beanClass.get());
-continue;
}
Stateful stateful = beanClass.getAnnotation(Stateful.class);
@@ -1450,9 +1444,7 @@ public class AnnotationDeployer implemen
for (AnnotatedClass? beanClass :
finder.findMetaAnnotatedClasses(ManagedBean.class)) {
if (beanClass.isAnnotationPresent(Specializes.class)) {
-managedClasses.remove(beanClass.get().getName());
specializingClasses.add(beanClass.get());
-continue;
}
ManagedBean managed =
beanClass.getAnnotation(ManagedBean.class);
@@ -1483,9 +1475,7 @@ public class AnnotationDeployer implemen
for (AnnotatedClass? beanClass :
finder.findMetaAnnotatedClasses(MessageDriven.class)) {
if (beanClass.isAnnotationPresent(Specializes.class)) {
-managedClasses.remove(beanClass.get().getName());
specializingClasses.add(beanClass.get());
-continue;
}
MessageDriven mdb =
beanClass.getAnnotation(MessageDriven.class);
@@ -1504,7 +1494,7 @@ public class AnnotationDeployer implemen
LegacyProcessor.process(beanClass.get(), messageBean);
}
-
+/*
for (Class? specializingClass : sortClassesParentFirst(new
ArrayListClass?(specializingClasses))) {
final Class? parent = specializingClass.getSuperclass();
@@ -1520,7 +1510,6 @@ public class AnnotationDeployer implemen
final String ejbClass = enterpriseBean.getEjbClass();
buildbot exception in ASF Buildbot on tomee-trunk-win-ibmjdk6
The Buildbot has detected a new failure on builder tomee-trunk-win-ibmjdk6 while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomee-trunk-win-ibmjdk6/builds/496 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-2008_windows Build Reason: scheduler Build Source Stamp: [branch tomee/tomee/trunk] 1504375 Blamelist: rmannibucau BUILD FAILED: exception shell test-results sincerely, -The Buildbot
[jira] [Resolved] (TOMEE-1005) tomee maven plugin conf/lib/bin directory needs to be called conf/lib/bin otherwise files are not copied correctly
[ https://issues.apache.org/jira/browse/TOMEE-1005?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Romain Manni-Bucau resolved TOMEE-1005. --- Resolution: Fixed tomee maven plugin conf/lib/bin directory needs to be called conf/lib/bin otherwise files are not copied correctly -- Key: TOMEE-1005 URL: https://issues.apache.org/jira/browse/TOMEE-1005 Project: TomEE Issue Type: Bug Reporter: Romain Manni-Bucau Assignee: Romain Manni-Bucau Fix For: 1.6.0 -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
buildbot failure in ASF Buildbot on tomee-trunk-ubuntu
The Buildbot has detected a new failure on builder tomee-trunk-ubuntu while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomee-trunk-ubuntu/builds/495 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: hemera_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomee/tomee/trunk] 1504375 Blamelist: rmannibucau BUILD FAILED: failed test sincerely, -The Buildbot
[jira] [Created] (TOMEE-1006) servlets with init-param javax.ws.rs.Application fail
Gerhard Petracek created TOMEE-1006: --- Summary: servlets with init-param javax.ws.rs.Application fail Key: TOMEE-1006 URL: https://issues.apache.org/jira/browse/TOMEE-1006 Project: TomEE Issue Type: Bug Affects Versions: 1.5.2 Reporter: Gerhard Petracek Fix For: 1.5.3 one approach to configure a jax-rs implementation is to use: servlet servlet-name.../servlet-name servlet-class.../servlet-class init-param param-namejavax.ws.rs.Application/param-name param-value.../param-value /init-param /servlet once param-name is javax.ws.rs.Application an application with a custom jax-rs implementation can't be deployed on tomee. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
svn commit: r1504391 - in /tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina: OpenEJBContextConfig.java TomcatWebAppBuilder.java
Author: rmannibucau
Date: Thu Jul 18 08:48:10 2013
New Revision: 1504391
URL: http://svn.apache.org/r1504391
Log:
TOMEE-1006 handling custom rest servlets
Modified:
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Modified:
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java?rev=1504391r1=1504390r2=1504391view=diff
==
---
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
(original)
+++
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
Thu Jul 18 08:48:10 2013
@@ -58,6 +58,7 @@ import org.apache.tomee.common.ResourceF
import org.apache.tomee.loader.TomcatHelper;
import javax.servlet.ServletContainerInitializer;
+import javax.servlet.http.HttpServlet;
import javax.ws.rs.core.Application;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -180,9 +181,16 @@ public class OpenEJBContextConfig extend
}
// cleanup
-for (String clazz : webAppInfo.restApplications) {
+for (final String clazz : webAppInfo.restApplications) {
final Container child = mappedChildren.get(clazz);
-if (child != null) {
+try { // remove only fake servlets to let users use their
own stuff
+final String servletClass =
StandardWrapper.class.cast(child).getServletClass();
+if (child != null
(org.apache.openejb.server.rest.OpenEJBRestServlet.equals(servletClass) ||
!HttpServlet.class.isAssignableFrom(info.loader().loadClass(servletClass {
+context.removeChild(child);
+}
+} catch (final NoClassDefFoundError e) {
+context.removeChild(child);
+} catch (final ClassNotFoundException e) {
context.removeChild(child);
}
}
Modified:
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1504391r1=1504390r2=1504391view=diff
==
---
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
(original)
+++
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Thu Jul 18 08:48:10 2013
@@ -905,6 +905,13 @@ public class TomcatWebAppBuilder impleme
return null;
}
+public ClassLoader loader() {
+if (standardContext != null standardContext.getLoader() !=
null) {
+return standardContext.getLoader().getClassLoader();
+}
+return null;
+}
+
@Override
public String toString() {
if (standardContext == null) return super.toString();
[jira] [Closed] (TOMEE-1006) servlets with init-param javax.ws.rs.Application fail
[ https://issues.apache.org/jira/browse/TOMEE-1006?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Romain Manni-Bucau closed TOMEE-1006. - Resolution: Fixed Fix Version/s: (was: 1.5.3) 1.6.0 Assignee: Romain Manni-Bucau servlets with init-param javax.ws.rs.Application fail - Key: TOMEE-1006 URL: https://issues.apache.org/jira/browse/TOMEE-1006 Project: TomEE Issue Type: Bug Affects Versions: 1.5.2 Reporter: Gerhard Petracek Assignee: Romain Manni-Bucau Fix For: 1.6.0 one approach to configure a jax-rs implementation is to use: servlet servlet-name.../servlet-name servlet-class.../servlet-class init-param param-namejavax.ws.rs.Application/param-name param-value.../param-value /init-param /servlet once param-name is javax.ws.rs.Application an application with a custom jax-rs implementation can't be deployed on tomee. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
svn commit: r1504455 - /tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
Author: rmannibucau
Date: Thu Jul 18 13:07:17 2013
New Revision: 1504455
URL: http://svn.apache.org/r1504455
Log:
avoiding NPE when cleaning up rest servlets
Modified:
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
Modified:
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java?rev=1504455r1=1504454r2=1504455view=diff
==
---
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
(original)
+++
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
Thu Jul 18 13:07:17 2013
@@ -184,9 +184,11 @@ public class OpenEJBContextConfig extend
for (final String clazz : webAppInfo.restApplications) {
final Container child = mappedChildren.get(clazz);
try { // remove only fake servlets to let users use their
own stuff
-final String servletClass =
StandardWrapper.class.cast(child).getServletClass();
-if (child != null
(org.apache.openejb.server.rest.OpenEJBRestServlet.equals(servletClass) ||
!HttpServlet.class.isAssignableFrom(info.loader().loadClass(servletClass {
-context.removeChild(child);
+if (child != null) {
+final String servletClass =
StandardWrapper.class.cast(child).getServletClass();
+if
(org.apache.openejb.server.rest.OpenEJBRestServlet.equals(servletClass) ||
!HttpServlet.class.isAssignableFrom(info.loader().loadClass(servletClass))) {
+context.removeChild(child);
+}
}
} catch (final NoClassDefFoundError e) {
context.removeChild(child);
svn commit: r1504488 - /tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
Author: rmannibucau
Date: Thu Jul 18 14:26:44 2013
New Revision: 1504488
URL: http://svn.apache.org/r1504488
Log:
missing protocol in apache snapshot repo
Modified:
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
Modified:
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java?rev=1504488r1=1504487r2=1504488view=diff
==
---
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
(original)
+++
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
Thu Jul 18 14:26:44 2013
@@ -42,7 +42,7 @@ public class ProvisioningUtil {
private static final String ADDITIONAL_LIB_CONFIG =
provisioning.properties;
private static final String REPO1 = http://repo1.maven.org/maven2/;;
-private static final String APACHE_SNAPSHOT =
repository.apache.org/snapshots/;
+private static final String APACHE_SNAPSHOT =
https://repository.apache.org/snapshots/;;
private static final String ZIP_KEY = zip;
private static final String DESTINATION_KEY = destination;
private static final String JAR_KEY = jar;
buildbot success in ASF Buildbot on tomee-trunk-ubuntu
The Buildbot has detected a restored build on builder tomee-trunk-ubuntu while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomee-trunk-ubuntu/builds/498 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: hemera_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomee/tomee/trunk] 1504455 Blamelist: rmannibucau Build succeeded! sincerely, -The Buildbot
