[jboss-svn-commits] JBoss Common SVN: r4124 - in arquillian/trunk/examples: junit/src/test/resources and 2 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Mar 8 09:44:22 EST 2010


Author: aslak
Date: 2010-03-08 09:44:22 -0500 (Mon, 08 Mar 2010)
New Revision: 4124

Removed:
   arquillian/trunk/examples/junit/src/test/resources/com/
   arquillian/trunk/examples/junit/src/test/resources/jndi.properties
   arquillian/trunk/examples/testng/src/test/resources/jndi.properties
Modified:
   arquillian/trunk/examples/junit/
   arquillian/trunk/examples/junit/pom.xml
   arquillian/trunk/examples/testng/
   arquillian/trunk/examples/testng/pom.xml
Log:
ARQ-44 Added include filters on profiles to ignore unsupported test by contianer. Added argLine with JNDI properties to remove jndi.properties file



Property changes on: arquillian/trunk/examples/junit
___________________________________________________________________
Name: svn:ignore
   - .classpath
.project
.settings
target


   + .classpath
.project
.settings
target
transaction.log



Modified: arquillian/trunk/examples/junit/pom.xml
===================================================================
--- arquillian/trunk/examples/junit/pom.xml	2010-03-08 14:06:48 UTC (rev 4123)
+++ arquillian/trunk/examples/junit/pom.xml	2010-03-08 14:44:22 UTC (rev 4124)
@@ -17,7 +17,7 @@
    <groupId>org.jboss.arquillian.example</groupId>
    <artifactId>arquillian-example-junit</artifactId>
    <name>Arquillian Example JUnit</name>
-   <description>JUnit example of Arquillian Usage</description> 
+   <description>JUnit example of Arquillian Usage</description>
    <!-- Properties -->
    <properties>
 
@@ -64,6 +64,20 @@
                <version>${project.version}</version>
             </dependency>
          </dependencies>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-surefire-plugin</artifactId>
+                  <configuration>
+                     <includes>
+                        <include>com/acme/cdi/payment/*</include>
+                        <include>com/acme/cdi/random/*</include>
+                     </includes>
+                  </configuration>
+               </plugin>
+            </plugins>
+         </build>
       </profile>
       <profile>
          <id>jboss-embedded</id>
@@ -84,6 +98,22 @@
                <version>${project.version}</version>
             </dependency>
          </dependencies>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-surefire-plugin</artifactId>
+                  <configuration>
+                     <includes>
+                        <include>com/acme/ejb/*</include>
+                        <include>com/acme/jms/*</include>
+                        <include>com/acme/resources/*</include>
+                     </includes>
+                     <argLine>-Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces -Djava.naming.provider.url=jnp://localhost:1099</argLine>
+                  </configuration>
+               </plugin>
+            </plugins>
+         </build>
       </profile>
       <profile>
          <id>jboss-remote-60</id>
@@ -94,6 +124,17 @@
                <version>${project.version}</version>
             </dependency>
          </dependencies>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-surefire-plugin</artifactId>
+                  <configuration>
+                     <argLine>-Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces -Djava.naming.provider.url=jnp://localhost:1099</argLine>
+                  </configuration>
+               </plugin>
+            </plugins>
+         </build>
       </profile>
       <profile>
          <id>glassfish-embedded</id>
@@ -104,6 +145,19 @@
                <version>${project.version}</version>
             </dependency>
          </dependencies>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-surefire-plugin</artifactId>
+                  <configuration>
+                     <includes>
+                        <include>com/acme/ejb/*</include>
+                     </includes>
+                  </configuration>
+               </plugin>
+            </plugins>
+         </build>
       </profile>
       <profile>
          <id>openejb</id>
@@ -114,6 +168,22 @@
                <version>${project.version}</version>
             </dependency>
          </dependencies>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-surefire-plugin</artifactId>
+                  <configuration>
+                     <includes>
+                        <include>com/acme/ejb/*</include>
+                     </includes>
+                     <excludes>
+                        <exclude>**/TemperatureConverterTestCase*</exclude>
+                     </excludes>
+                  </configuration>
+               </plugin>
+            </plugins>
+         </build>
       </profile>
    </profiles>
 

Deleted: arquillian/trunk/examples/junit/src/test/resources/jndi.properties
===================================================================
--- arquillian/trunk/examples/junit/src/test/resources/jndi.properties	2010-03-08 14:06:48 UTC (rev 4123)
+++ arquillian/trunk/examples/junit/src/test/resources/jndi.properties	2010-03-08 14:44:22 UTC (rev 4124)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces 
-java.naming.provider.url=jnp://localhost:1099 


Property changes on: arquillian/trunk/examples/testng
___________________________________________________________________
Name: svn:ignore
   - .classpath
.project
.settings
target


   + .classpath
.project
.settings
target
test-output
transaction.log


Modified: arquillian/trunk/examples/testng/pom.xml
===================================================================
--- arquillian/trunk/examples/testng/pom.xml	2010-03-08 14:06:48 UTC (rev 4123)
+++ arquillian/trunk/examples/testng/pom.xml	2010-03-08 14:44:22 UTC (rev 4124)
@@ -71,7 +71,10 @@
                   <groupId>org.apache.maven.plugins</groupId>
                   <artifactId>maven-surefire-plugin</artifactId>
                   <configuration>
-                     <excludedGroups>integration</excludedGroups>
+                     <includes>
+                        <include>com/acme/cdi/payment/*</include>
+                        <include>com/acme/cdi/random/*</include>
+                     </includes>
                   </configuration>
                </plugin>
             </plugins>
@@ -96,6 +99,22 @@
                <version>${project.version}</version>
             </dependency>
          </dependencies>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-surefire-plugin</artifactId>
+                  <configuration>
+                     <includes>
+                        <include>com/acme/ejb/*</include>
+                        <include>com/acme/jms/*</include>
+                        <include>com/acme/resources/*</include>
+                     </includes>
+                     <argLine>-Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces -Djava.naming.provider.url=jnp://localhost:1099</argLine>
+                  </configuration>
+               </plugin>
+            </plugins>
+         </build>
       </profile>
       <profile>
          <id>jboss-remote-60</id>
@@ -106,6 +125,17 @@
                <version>${project.version}</version>
             </dependency>
          </dependencies>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-surefire-plugin</artifactId>
+                  <configuration>
+                     <argLine>-Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces -Djava.naming.provider.url=jnp://localhost:1099</argLine>
+                  </configuration>
+               </plugin>
+            </plugins>
+         </build>
       </profile>
       <profile>
          <id>glassfish-embedded</id>
@@ -116,6 +146,19 @@
                <version>${project.version}</version>
             </dependency>
          </dependencies>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-surefire-plugin</artifactId>
+                  <configuration>
+                     <includes>
+                        <include>com/acme/ejb/*</include>
+                     </includes>
+                  </configuration>
+               </plugin>
+            </plugins>
+         </build>
       </profile>
       <profile>
          <id>openejb</id>
@@ -126,6 +169,22 @@
                <version>${project.version}</version>
             </dependency>
          </dependencies>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-surefire-plugin</artifactId>
+                  <configuration>
+                     <includes>
+                        <include>com/acme/ejb/*</include>
+                     </includes>
+                     <excludes>
+                        <exclude>**/TemperatureConverterTestCase*</exclude>
+                     </excludes>
+                  </configuration>
+               </plugin>
+            </plugins>
+         </build>
       </profile>
    </profiles>
 
@@ -151,20 +210,6 @@
          <scope>test</scope>
       </dependency>
 
-      <dependency>
-         <groupId>javax.enterprise</groupId>
-         <artifactId>cdi-api</artifactId>
-         <version>1.0-SP1</version>
-         <scope>provided</scope>
-      </dependency>
-
-      <dependency>
-         <groupId>javax.ejb</groupId>
-         <artifactId>ejb-api</artifactId>
-         <version>3.0</version>
-         <scope>provided</scope>
-      </dependency>
-
    </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Deleted: arquillian/trunk/examples/testng/src/test/resources/jndi.properties
===================================================================
--- arquillian/trunk/examples/testng/src/test/resources/jndi.properties	2010-03-08 14:06:48 UTC (rev 4123)
+++ arquillian/trunk/examples/testng/src/test/resources/jndi.properties	2010-03-08 14:44:22 UTC (rev 4124)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces 
-java.naming.provider.url=jnp://localhost:1099 



More information about the jboss-svn-commits mailing list