Did not got it locally yesterday. Lemme give it a try again. Jean-Louis
2014-02-20 2:27 GMT+01:00 Thiago Veronezi <[email protected]>: > Hi Jean-Louis, > It looks like the BeforeAppInfoBuilderEvent class breaks the build. > > Tests run: 1, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.543 > sec <<< FAILURE! - in org.apache.openejb.DependenceValidationTest > testAssembler(org.apache.openejb.DependenceValidationTest) Time > elapsed: 0.504 sec <<< FAILURE! > junit.framework.AssertionFailedError: org.apache.openejb.config.event > should have no dependencies on org.apache.openejb.config expected:<0> > but was:<2> > at junit.framework.Assert.fail(Assert.java:57) > at junit.framework.Assert.failNotEquals(Assert.java:329) > at junit.framework.Assert.assertEquals(Assert.java:78) > at junit.framework.Assert.assertEquals(Assert.java:234) > at junit.framework.TestCase.assertEquals(TestCase.java:401) > at > org.apache.openejb.DependenceValidationTest.assertNotDependentOn(DependenceValidationTest.java:94) > at > org.apache.openejb.DependenceValidationTest.testAssembler(DependenceValidationTest.java:69) > > > It has an invalid import. Can you check it out? > > []s, > Thiago. > > > > > > On Wed, Feb 19, 2014 at 6:15 PM, <[email protected]> wrote: > > > Author: jlmonteiro > > Date: Wed Feb 19 23:15:06 2014 > > New Revision: 1569966 > > > > URL: http://svn.apache.org/r1569966 > > Log: > > OPENEJB-2074 add a new event before AppInfoBuilder > > > > Added: > > > > > tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/event/BeforeAppInfoBuilderEvent.java > > - copied, changed from r1569938, > > > tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/event/BeforeDeploymentEvent.java > > Modified: > > > > > tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java > > > > Modified: > > > tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java > > URL: > > > http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java?rev=1569966&r1=1569965&r2=1569966&view=diff > > > > > ============================================================================== > > --- > > > tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java > > (original) > > +++ > > > tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java > > Wed Feb 19 23:15:06 2014 > > @@ -41,6 +41,7 @@ import org.apache.openejb.assembler.clas > > import org.apache.openejb.assembler.classic.ServletInfo; > > import org.apache.openejb.assembler.classic.ValidatorBuilder; > > import org.apache.openejb.assembler.classic.WebAppInfo; > > +import org.apache.openejb.config.event.BeforeAppInfoBuilderEvent; > > import org.apache.openejb.config.sys.Container; > > import org.apache.openejb.config.sys.Resource; > > import org.apache.openejb.config.sys.Service; > > @@ -115,6 +116,10 @@ class AppInfoBuilder { > > } > > > > public AppInfo build(final AppModule appModule) throws > > OpenEJBException { > > + // send an event so that it becomes pretty easy at this step to > > dynamically change the module description > > + // before going into the info tree. Pretty easy to hack on > > portability issues. > > + SystemInstance.get().fireEvent(new > > BeforeAppInfoBuilderEvent(appModule)); > > + > > final AppInfo appInfo = new AppInfo(); > > appInfo.appId = appModule.getModuleId(); > > appInfo.path = appModule.getJarLocation(); > > > > Copied: > > > tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/event/BeforeAppInfoBuilderEvent.java > > (from r1569938, > > > tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/event/BeforeDeploymentEvent.java) > > URL: > > > http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/event/BeforeAppInfoBuilderEvent.java?p2=tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/event/BeforeAppInfoBuilderEvent.java&p1=tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/event/BeforeDeploymentEvent.java&r1=1569938&r2=1569966&rev=1569966&view=diff > > > > > ============================================================================== > > --- > > > tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/event/BeforeDeploymentEvent.java > > (original) > > +++ > > > tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/event/BeforeAppInfoBuilderEvent.java > > Wed Feb 19 23:15:06 2014 > > @@ -16,40 +16,23 @@ > > */ > > package org.apache.openejb.config.event; > > > > +import org.apache.openejb.config.AppModule; > > import org.apache.openejb.observer.Event; > > > > -import java.net.URL; > > -import java.util.Arrays; > > - > > @Event > > -public class BeforeDeploymentEvent { > > - private final URL[] urls; > > - private final ClassLoader parentClassLoader; > > +public class BeforeAppInfoBuilderEvent { > > > > - public BeforeDeploymentEvent(final URL[] files) { > > - this(files, null); > > - } > > + private final AppModule appModule; > > > > - public BeforeDeploymentEvent(final URL[] files, final ClassLoader > > parent) { > > - urls = files; > > - parentClassLoader = parent; > > + public BeforeAppInfoBuilderEvent(final AppModule appModule) { > > + this.appModule = appModule; > > } > > > > - public URL[] getUrls() { > > - return urls; > > - } > > - > > - public ClassLoader getParentClassLoader() { > > - if (parentClassLoader != null) { > > - return parentClassLoader; > > - } > > - return getClass().getClassLoader(); > > - } > > > > @Override > > public String toString() { > > - return "BeforeDeploymentEvent{" + > > - "urls=" + Arrays.asList(urls) + > > - '}'; > > + return "BeforeAppInfoBuilderEvent{" + > > + "appModule=" + appModule + > > + '}'; > > } > > } > > > > > > > -- Jean-Louis
