Hi! Gurkan, you reintroduced the unpacking of all OWB dependencies to the tck-lib directory. Has this slipped through, or did you have problems by getting them via the maven dependency mechanism? I can run the TCK tests without unpacking them, because all we need is already on the classpath (except the one library from jboss which we need to dependency:copy).
It's really heavily error prone to maintain the list an unpack all those jars manually (jarmageddon!), so I'd strongly recommend reverting that section of the commit and using the normal dependency mechanism as coded originally. txs and LieGrue, strub --- On Wed, 12/23/09, [email protected] <[email protected]> wrote: > From: [email protected] <[email protected]> > Subject: svn commit: r893513 - in /openwebbeans/trunk: ./ > distribution/src/assembly/ webbeans-porting/ > webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ > webbeans-porting/src/main/resources/META-INF/ webbeans-tck/ > To: [email protected] > Date: Wednesday, December 23, 2009, 2:52 PM > Author: gerdogdu > Date: Wed Dec 23 13:52:24 2009 > New Revision: 893513 > > URL: http://svn.apache.org/viewvc?rev=893513&view=rev > Log: > Remove DISCLAIMER and update TCK poms > > Removed: > openwebbeans/trunk/DISCLAIMER > Modified: > > openwebbeans/trunk/distribution/src/assembly/dist-binary.xml > openwebbeans/trunk/pom.xml > openwebbeans/trunk/webbeans-porting/pom.xml > > openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java > > openwebbeans/trunk/webbeans-porting/src/main/resources/META-INF/jboss-test-harness.properties > openwebbeans/trunk/webbeans-tck/pom.xml > > Modified: > openwebbeans/trunk/distribution/src/assembly/dist-binary.xml > URL: > http://svn.apache.org/viewvc/openwebbeans/trunk/distribution/src/assembly/dist-binary.xml?rev=893513&r1=893512&r2=893513&view=diff > ============================================================================== > --- > openwebbeans/trunk/distribution/src/assembly/dist-binary.xml > (original) > +++ > openwebbeans/trunk/distribution/src/assembly/dist-binary.xml > Wed Dec 23 13:52:24 2009 > @@ -45,10 +45,6 @@ > </file> > > <file> > - > <source>../DISCLAIMER</source> > - </file> > - > - <file> > > <outputDirectory>config</outputDirectory> > > <source>../samples/guess/src/main/webapp/WEB-INF/web.xml</source> > </file> > > Modified: openwebbeans/trunk/pom.xml > URL: > http://svn.apache.org/viewvc/openwebbeans/trunk/pom.xml?rev=893513&r1=893512&r2=893513&view=diff > ============================================================================== > --- openwebbeans/trunk/pom.xml (original) > +++ openwebbeans/trunk/pom.xml Wed Dec 23 13:52:24 2009 > @@ -193,7 +193,6 @@ > > > > <include>LICENCE.txt</include> > > > > <include>NOTICE.txt</include> > > > <include>licences/*</include> > - > > <include>DISCLAIMER</include> > > > </includes> > > > </resource> > > > </webResources> > > Modified: openwebbeans/trunk/webbeans-porting/pom.xml > URL: > http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/pom.xml?rev=893513&r1=893512&r2=893513&view=diff > ============================================================================== > --- openwebbeans/trunk/webbeans-porting/pom.xml (original) > +++ openwebbeans/trunk/webbeans-porting/pom.xml Wed Dec 23 > 13:52:24 2009 > @@ -33,13 +33,6 @@ > <description>TCK Porting Package > OpenWebBeans Implementation</description> > > <dependencies> > - <!-- we need some test > classes like e.g. MockMangager from webbeans-impl --> > - <dependency> > - > <groupId>org.apache.openwebbeans</groupId> > - > <artifactId>openwebbeans-impl</artifactId> > - > <version>${project.version}</version> > - > <type>test-jar</type> > - </dependency> > > <dependency> > > <groupId>org.apache.openwebbeans</groupId> > > Modified: > openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java > URL: > http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java?rev=893513&r1=893512&r2=893513&view=diff > ============================================================================== > --- > openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java > (original) > +++ > openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java > Wed Dec 23 13:52:24 2009 > @@ -120,26 +120,26 @@ > > public void setup() > { > - if ( > SystemInstance.get().getComponent(ContainerSystem.class) == > null ) > - { > - // > which means OpenEJB is not yet started! > - // > this happens if you start the TCK in 'standalone mode' > - // > which means we have to bootstrap OpenEJB now: > - try > - { > - > OpenEJB.init(System.getProperties()); > - } > - catch( > OpenEJBException e ) > - { > - > throw new RuntimeException("failure in OpenWebBeans > ejb-plugin while starting OpenEJB!", e); > - } > - } > +// if ( > SystemInstance.get().getComponent(ContainerSystem.class) == > null ) > +// { > +// // > which means OpenEJB is not yet started! > +// // > this happens if you start the TCK in 'standalone mode' > +// // > which means we have to bootstrap OpenEJB now: > +// try > +// { > +// > OpenEJB.init(System.getProperties()); > +// } > +// catch( > OpenEJBException e ) > +// { > +// > throw new RuntimeException("failure in OpenWebBeans > ejb-plugin while starting OpenEJB!", e); > +// } > +// } > > } > > public void cleanup() > { > - OpenEJB.destroy(); > + > // OpenEJB.destroy(); > } > > > > Modified: > openwebbeans/trunk/webbeans-porting/src/main/resources/META-INF/jboss-test-harness.properties > URL: > http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/resources/META-INF/jboss-test-harness.properties?rev=893513&r1=893512&r2=893513&view=diff > ============================================================================== > --- > openwebbeans/trunk/webbeans-porting/src/main/resources/META-INF/jboss-test-harness.properties > (original) > +++ > openwebbeans/trunk/webbeans-porting/src/main/resources/META-INF/jboss-test-harness.properties > Wed Dec 23 13:52:24 2009 > @@ -19,8 +19,9 @@ > > org.jboss.jsr299.tck.spi.Beans=org.apache.webbeans.test.tck.BeansImpl > > org.jboss.jsr299.tck.spi.Contexts=org.apache.webbeans.test.tck.ContextsImpl > > org.jboss.jsr299.tck.spi.EL=org.apache.webbeans.test.tck.ELImpl > +org.jboss.testharness.spi.StandaloneContainers=org.apache.webbeans.test.tck.StandaloneContainersImpl > > -org.jboss.testharness.standalone=false > -org.jboss.testharness.runIntegrationTests=true > +#org.jboss.testharness.standalone=true > +#org.jboss.testharness.runIntegrationTests=false > > -org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher > +#org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher > > Modified: openwebbeans/trunk/webbeans-tck/pom.xml > URL: > http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tck/pom.xml?rev=893513&r1=893512&r2=893513&view=diff > ============================================================================== > --- openwebbeans/trunk/webbeans-tck/pom.xml (original) > +++ openwebbeans/trunk/webbeans-tck/pom.xml Wed Dec 23 > 13:52:24 2009 > @@ -132,94 +132,170 @@ > > > <type>xml</type> > > > > <classifier>suite</classifier> > > > > <overWrite>true</overWrite> > - > > </artifactItem> > - > -<!-- most probably of no use > > > > - > > <artifactItem> > + > > </artifactItem> > + > > > > > + > > <!-- OWB Porting > Package --> > + > > <artifactItem> > + > > > <groupId>org.apache.openwebbeans</groupId> > + > > > <artifactId>openwebbeans-porting</artifactId> > + > > > <overWrite>true</overWrite> > + > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > + > > </artifactItem> > + > > > + > > <!-- OWB > Implementation Package --> > + > > <artifactItem> > + > > > <groupId>org.apache.openwebbeans</groupId> > + > > > <artifactId>openwebbeans-impl</artifactId> > + > > > <overWrite>true</overWrite> > + > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > + > > </artifactItem> > + > > > + > > <!-- OWB JSF Plugin > Package --> > + > > <artifactItem> > + > > > <groupId>org.apache.openwebbeans</groupId> > + > > > <artifactId>openwebbeans-jsf</artifactId> > + > > > <overWrite>true</overWrite> > + > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > + > > </artifactItem> > + > > > + > > <!-- MyFaces API > Package --> > + > > <artifactItem> > + > > > <groupId>org.apache.myfaces.core</groupId> > + > > > <artifactId>myfaces-api</artifactId> > + > > > <overWrite>true</overWrite> > + > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > + > > </artifactItem> > + > > > + > > <!-- MyFaces Impl > Package --> > + > > <artifactItem> > + > > > <groupId>org.apache.myfaces.core</groupId> > + > > > <artifactId>myfaces-impl</artifactId> > + > > > <overWrite>true</overWrite> > + > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > + > > </artifactItem> > + > > > + > > <!-- OWB EJB Plugin > Package --> > + > > <artifactItem> > + > > > <groupId>org.apache.openwebbeans</groupId> > + > > > <artifactId>openwebbeans-ejb</artifactId> > + > > > <overWrite>true</overWrite> > + > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > + > > </artifactItem> > + > > > + > > <!-- OWB Resource > Plugin Package --> > + > > <artifactItem> > + > > > <groupId>org.apache.openwebbeans</groupId> > + > > > <artifactId>openwebbeans-resource</artifactId> > + > > > <overWrite>true</overWrite> > + > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > + > > </artifactItem> > + > > > + > > <!-- OWB Geronimo > Plugin Package --> > + > > <artifactItem> > + > > > <groupId>org.apache.openwebbeans</groupId> > + > > > <artifactId>openwebbeans-geronimo</artifactId> > + > > > <overWrite>true</overWrite> > + > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > + > > </artifactItem> > + > > > + > > <!-- Dom4j --> > + > > <artifactItem> > > > > <groupId>dom4j</groupId> > > > > <artifactId>dom4j</artifactId> > - > > <overWrite>true</overWrite> > - > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > > > > - > > </artifactItem> > - > > - > > <artifactItem> > + > > > <overWrite>true</overWrite> > + > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > + > > </artifactItem> > + > > > + > > <!-- javassist > --> > + > > <artifactItem> > > > > <groupId>javassist</groupId> > > > > <artifactId>javassist</artifactId> > - > > <overWrite>true</overWrite> > - > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > > > > - > > </artifactItem> > - > - > > <artifactItem> > + > > > <overWrite>true</overWrite> > + > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > + > > </artifactItem> > + > > > + > > <!-- scannotation > --> > + > > <artifactItem> > > > > <groupId>net.sf.scannotation</groupId> > > > > <artifactId>scannotation</artifactId> > - > > <overWrite>true</overWrite> > - > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > > > > - > > </artifactItem> > - > > - > > <artifactItem> > + > > > <overWrite>true</overWrite> > + > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > + > > </artifactItem> > + > > > + > > <!-- > commons-logging --> > + > > <artifactItem> > > > > <groupId>commons-logging</groupId> > > > > <artifactId>commons-logging</artifactId> > - > > <overWrite>true</overWrite> > - > > <version>1.1.1</version> > - > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > > > > - > > </artifactItem> > - > - > > <artifactItem> > + > > > <overWrite>true</overWrite> > + > > > <version>1.1.1</version> > + > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > + > > </artifactItem> > + > > > + > > <!-- > commons-digester --> > + > > <artifactItem> > > > > <groupId>commons-digester</groupId> > > > > <artifactId>commons-digester</artifactId> > - > > <overWrite>true</overWrite> > - > > <version>1.6</version> > - > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > > > > - > > </artifactItem> > - > - > > <artifactItem> > + > > > <overWrite>true</overWrite> > + > > > <version>1.6</version> > + > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > + > > </artifactItem> > + > > > + > > <!-- > commons-validator --> > + > > <artifactItem> > > > > <groupId>commons-validator</groupId> > > > > <artifactId>commons-validator</artifactId> > - > > <overWrite>true</overWrite> > - > > <version>1.3.1</version> > - > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > > > > - > > </artifactItem> > - > - > > <artifactItem> > + > > > <overWrite>true</overWrite> > + > > > <version>1.3.1</version> > + > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > + > > </artifactItem> > + > > > + > > <!-- > commons-collections --> > + > > <artifactItem> > > > > <groupId>commons-collections</groupId> > > > > <artifactId>commons-collections</artifactId> > - > > <overWrite>true</overWrite> > - > > <version>2.1</version> > - > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > > > > - > > </artifactItem> > - > - > > <artifactItem> > + > > > <overWrite>true</overWrite> > + > > > <version>2.1</version> > + > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > + > > </artifactItem> > + > > > + > > <!-- > commons-beanutils --> > + > > <artifactItem> > > > > <groupId>commons-beanutils</groupId> > > > > <artifactId>commons-beanutils</artifactId> > - > > <overWrite>true</overWrite> > - > > <version>1.7.0</version> > - > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > > > > - > > </artifactItem> > - > > - > > <artifactItem> > + > > > <overWrite>true</overWrite> > + > > > <version>1.7.0</version> > + > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > + > > </artifactItem> > + > > > + > > <!-- > commons-discovery --> > + > > <artifactItem> > > > > <groupId>commons-discovery</groupId> > > > > <artifactId>commons-discovery</artifactId> > - > > <overWrite>true</overWrite> > - > > <version>0.4</version> > - > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > > > > - > > </artifactItem> > - > > - > - > > <artifactItem> > + > > > <overWrite>true</overWrite> > + > > > <version>0.4</version> > + > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > + > > </artifactItem> > + > > > + > > > + > > <!-- xml-apis > --> > + > > <artifactItem> > > > > <groupId>xml-apis</groupId> > > > > <artifactId>xml-apis</artifactId> > - > > <overWrite>true</overWrite> > - > > <version>1.0.b2</version> > - > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > > > > - > > </artifactItem> > - > > - > > <artifactItem> > + > > > <overWrite>true</overWrite> > + > > > <version>1.0.b2</version> > + > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > + > > </artifactItem> > + > > > + > > <!-- log4j --> > + > > <artifactItem> > > > > <groupId>log4j</groupId> > > > > <artifactId>log4j</artifactId> > - > > <overWrite>true</overWrite> > - > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > > > > - > > </artifactItem> > - --> > > > > > > > + > > > <overWrite>true</overWrite> > + > > > <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> > + > > </artifactItem> > + > > > + > > > + > > > > > > > > > > </artifactItems> > > > </configuration> > > </execution> > > >
