openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
Subject svn commit: r836314 - in /incubator/openwebbeans/trunk/webbeans-tck: ./ src/main/ src/test/java/ src/test/resources/META-INF/ src/test/resources/org/ src/test/resources/org/jboss/ src/test/resources/org/jboss/testharness/ src/test/resources/org/jboss/t...
Date Sun, 15 Nov 2009 01:53:01 GMT
Author: gerdogdu
Date: Sun Nov 15 01:53:00 2009
New Revision: 836314

URL: http://svn.apache.org/viewvc?rev=836314&view=rev
Log:
Update while running TCK.

Added:
    incubator/openwebbeans/trunk/webbeans-tck/src/main/
    incubator/openwebbeans/trunk/webbeans-tck/src/test/resources/org/
    incubator/openwebbeans/trunk/webbeans-tck/src/test/resources/org/jboss/
    incubator/openwebbeans/trunk/webbeans-tck/src/test/resources/org/jboss/testharness/
    incubator/openwebbeans/trunk/webbeans-tck/src/test/resources/org/jboss/testharness/impl/
    incubator/openwebbeans/trunk/webbeans-tck/src/test/resources/org/jboss/testharness/impl/packaging/
    incubator/openwebbeans/trunk/webbeans-tck/src/test/resources/org/jboss/testharness/impl/packaging/war/
    incubator/openwebbeans/trunk/webbeans-tck/src/test/resources/org/jboss/testharness/impl/packaging/war/custom-web.xml
  (with props)
Removed:
    incubator/openwebbeans/trunk/webbeans-tck/src/test/java/
Modified:
    incubator/openwebbeans/trunk/webbeans-tck/pom.xml
    incubator/openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/jboss-test-harness.properties

Modified: incubator/openwebbeans/trunk/webbeans-tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-tck/pom.xml?rev=836314&r1=836313&r2=836314&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-tck/pom.xml (original)
+++ incubator/openwebbeans/trunk/webbeans-tck/pom.xml Sun Nov 15 01:53:00 2009
@@ -33,41 +33,48 @@
 	<description>All TCK tests for the  OpenWebBeans Implementation</description>
 
     <properties>
-        <webbeans.tck.version>1.0.0-CR2</webbeans.tck.version>
+        <webbeans.tck.version>1.0.0</webbeans.tck.version>
     </properties>
     
     <dependencies>
 		
-		 <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-porting</artifactId>
-        </dependency>
-		                            
-        <dependency>
-            <groupId>org.jboss.jsr299.tck</groupId>
-            <artifactId>jsr299-tck-impl</artifactId>
-            <version>${webbeans.tck.version}</version>
-            <scope>test</scope>
-            <exclusions>
-            	<exclusion>
-            		<artifactId>jsr299-api</artifactId>
-            		<groupId>org.jboss.webbeans</groupId>
-            	</exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <version>5.8</version>
-            <scope>test</scope>
-            <classifier>jdk15</classifier>
-        </dependency>
+	 <dependency>
+           <groupId>org.apache.openwebbeans</groupId>
+           <artifactId>openwebbeans-porting</artifactId>
+      </dependency>
         
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <scope>test</scope>
-        </dependency>
+      <dependency>
+         <groupId>org.jboss.test-harness</groupId>
+         <artifactId>jboss-test-harness-tomcat</artifactId>         
+         <version>1.1.0-CR3</version>
+      </dependency>
+        		                            
+       <dependency>
+           <groupId>org.jboss.jsr299.tck</groupId>
+           <artifactId>jsr299-tck-impl</artifactId>
+           <version>${webbeans.tck.version}</version>
+           <scope>test</scope>
+           <exclusions>
+           	<exclusion>
+           		<artifactId>jsr299-api</artifactId>
+           		<groupId>org.jboss.webbeans</groupId>
+           	</exclusion>
+           </exclusions>
+       </dependency>
+     
+       <dependency>
+           <groupId>org.testng</groupId>
+           <artifactId>testng</artifactId>
+           <version>5.8</version>
+           <scope>test</scope>
+           <classifier>jdk15</classifier>
+       </dependency>
+       
+       <dependency>
+           <groupId>log4j</groupId>
+           <artifactId>log4j</artifactId>
+           <scope>test</scope>
+       </dependency>
       
         
 	</dependencies>
@@ -87,6 +94,7 @@
                         </goals>
                         <configuration>
                             <artifactItems>
+                                
                                 <artifactItem>
                                     <groupId>org.jboss.jsr299.tck</groupId>
                                     <artifactId>jsr299-tck-impl</artifactId>
@@ -95,6 +103,157 @@
                                     <classifier>suite</classifier>
                                     <overWrite>true</overWrite>
                                 </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>
+                                
+                              <!-- javassist -->
+                                <artifactItem>
+									<groupId>javassist</groupId>
+									<artifactId>javassist</artifactId>
+                                    <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>
+                                
+                              <!-- 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>
+
+                              <!-- 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>
+
+                              <!-- 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>
+
+                              <!-- 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>
+
+                              <!-- 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>
+
+                              <!-- 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>
+                                
+                              <!-- log4j -->
+                                <artifactItem>
+									<groupId>log4j</groupId>
+									<artifactId>log4j</artifactId>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
                                   
+                                </artifactItem>
+                                                                                        
       
                             </artifactItems>
                         </configuration>
                     </execution>
@@ -107,6 +266,14 @@
                     <suiteXmlFiles>
                         <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-${webbeans.tck.version}-suite.xml</suiteXmlFile>
                     </suiteXmlFiles>
+                    
+                    <systemProperties>
+                    	<property>
+                           <name>org.jboss.testharness.libraryDirectory</name>
+                           <value>target/dependency/lib</value>
+                        </property>
+                    </systemProperties>
+                    
                 </configuration>
             </plugin>
             

Modified: incubator/openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/jboss-test-harness.properties
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/jboss-test-harness.properties?rev=836314&r1=836313&r2=836314&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/jboss-test-harness.properties
(original)
+++ incubator/openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/jboss-test-harness.properties
Sun Nov 15 01:53:00 2009
@@ -19,13 +19,13 @@
 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.testharness.spi.StandaloneContainers=org.apache.webbeans.test.tck.StandaloneContainersImpl
-org.jboss.testharness.spi.Containers=org.apache.webbeans.test.tck.ContainersImpl
+org.jboss.testharness.spi.Containers=org.jboss.testharness.integration.tomcat.TomcatConnector
 org.jboss.jsr299.tck.spi.EL=org.apache.webbeans.test.tck.ELImpl
 
-org.jboss.testharness.standalone=true
+org.jboss.testharness.standalone=false
 #jboss-as.dir=/tmp
 #jboss.force.restart=false
-org.jboss.testharness.libraryDirectory=/tmp/lib
-org.jboss.testharness.runIntegrationTests=false
+org.jboss.testharness.libraryDirectory=target/dependency/lib
+org.jboss.testharness.runIntegrationTests=true
 
-#org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher
+org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher

Added: incubator/openwebbeans/trunk/webbeans-tck/src/test/resources/org/jboss/testharness/impl/packaging/war/custom-web.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-tck/src/test/resources/org/jboss/testharness/impl/packaging/war/custom-web.xml?rev=836314&view=auto
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-tck/src/test/resources/org/jboss/testharness/impl/packaging/war/custom-web.xml
(added)
+++ incubator/openwebbeans/trunk/webbeans-tck/src/test/resources/org/jboss/testharness/impl/packaging/war/custom-web.xml
Sun Nov 15 01:53:00 2009
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.5"
+    xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+   
+   <display-name>JBoss Test Harness</display-name>
+   
+   <!-- ##############################Test servlets used to test session contexts. ####################

+   
+   <listener>
+      <listener-class>org.jboss.jsr299.tck.tests.context.application.TestServletContextListener</listener-class>
+   </listener>
+   
+   <listener>
+      <listener-class>org.jboss.jsr299.tck.tests.context.application.TestHttpSessionListener</listener-class>
+   </listener>
+   
+   <listener>
+      <listener-class>org.jboss.jsr299.tck.tests.context.application.TestServletRequestListener</listener-class>
+   </listener>
+   
+   <filter>
+      <display-name>Test Filter for Sessions</display-name>
+      <filter-name>filterTest</filter-name>
+      <filter-class>org.jboss.jsr299.tck.tests.context.application.TestFilter</filter-class>
+   </filter>
+   
+   <filter-mapping>
+      <filter-name>filterTest</filter-name>
+      <url-pattern>/SimplePage.html</url-pattern>
+   </filter-mapping>
+
+   <servlet>
+      <display-name>TestServlet</display-name>
+      <servlet-name>TestServlet</servlet-name>
+      <servlet-class>org.jboss.jsr299.tck.tests.context.application.TestServlet</servlet-class>
+   </servlet>
+
+   <servlet>
+      <display-name>Introspection Service for Application Context</display-name>
+      <servlet-name>applicationIntrospector</servlet-name>
+      <servlet-class>org.jboss.jsr299.tck.tests.context.application.IntrospectApplication</servlet-class>
+   </servlet>
+
+   <servlet-mapping>
+      <servlet-name>TestServlet</servlet-name>
+      <url-pattern>/TestServlet</url-pattern>
+   </servlet-mapping>
+
+   <servlet-mapping>
+      <servlet-name>applicationIntrospector</servlet-name>
+      <url-pattern>/IntrospectApplication</url-pattern>
+   </servlet-mapping>
+   
+   ###################################################################################################
-->
+   
+   
+   <listener>
+      <listener-class>org.jboss.testharness.impl.runner.servlet.HarnessServletListener</listener-class>
+   </listener>
+   
+   <servlet>
+      <servlet-name>JBoss Test Harness Test Runner</servlet-name>
+      <servlet-class>org.jboss.testharness.impl.runner.servlet.ServletTestRunner</servlet-class>
+   </servlet>
+   
+   <servlet-mapping>
+      <servlet-name>JBoss Test Harness Test Runner</servlet-name>
+      <url-pattern>/*</url-pattern>
+   </servlet-mapping>
+
+	 <filter>
+  <filter-name>webbeans</filter-name>
+  <filter-class>org.apache.webbeans.jsf.WebBeansJSFFilter</filter-class>
+ </filter>
+ <filter-mapping>
+  <filter-name>webbeans</filter-name>
+  <servlet-name>Faces Servlet</servlet-name>
+ </filter-mapping>
+ <listener>
+  <listener-class>org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
+ </listener>
+ <servlet>
+  <servlet-name>Faces Servlet</servlet-name>
+  <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+  <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+  <servlet-name>Faces Servlet</servlet-name>
+  <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+
+
+</web-app>
\ No newline at end of file

Propchange: incubator/openwebbeans/trunk/webbeans-tck/src/test/resources/org/jboss/testharness/impl/packaging/war/custom-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message