[weld-commits] Weld SVN: r6849 - in core/trunk: tests-arquillian and 1 other directory.

[weld-commits at lists.jboss.org]

Author: aslak
Date: 2010-07-29 14:20:06 -0400 (Thu, 29 Jul 2010)
New Revision: 6849

Modified:
   core/trunk/parent/pom.xml
   core/trunk/tests-arquillian/pom.xml
Log:
WELD-493 Moved JBoss AS Client v. up to parent pom. Added incontainer-remote profile to be used for connecting to a running server

Modified: core/trunk/parent/pom.xml
===================================================================
--- core/trunk/parent/pom.xml	2010-07-29 18:09:04 UTC (rev 6848)
+++ core/trunk/parent/pom.xml	2010-07-29 18:20:06 UTC (rev 6849)
@@ -84,6 +84,10 @@
       <apache.httpclient.version>3.1</apache.httpclient.version>
       <junit.version>4.8.1</junit.version>
       <htmlunit.version>2.4</htmlunit.version>
+
+      <version.jbossas_server_manager>1.0.3.GA</version.jbossas_server_manager>
+      <!-- <version.jbossas_client>6.0.0.20100429-M3</version.jbossas_client> -->
+      <version.jbossas_client>6.0.0.20100721-M4</version.jbossas_client>
    </properties>
 
 
@@ -166,6 +170,18 @@
          </dependency>
 
          <dependency>
+            <groupId>org.jboss.jbossas</groupId>
+            <artifactId>jboss-server-manager</artifactId>
+            <version>${version.jbossas_server_manager}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.jboss.jbossas</groupId>
+            <artifactId>jboss-as-client</artifactId>
+            <version>${version.jbossas_client}</version>
+            <type>pom</type>
+         </dependency>
+
+         <dependency>
             <groupId>org.jboss.metadata</groupId> 
             <artifactId>jboss-metadata</artifactId> 
             <version>${jboss.metadata.version}</version> 

Modified: core/trunk/tests-arquillian/pom.xml
===================================================================
--- core/trunk/tests-arquillian/pom.xml	2010-07-29 18:09:04 UTC (rev 6848)
+++ core/trunk/tests-arquillian/pom.xml	2010-07-29 18:20:06 UTC (rev 6849)
@@ -21,7 +21,6 @@
    </licenses>
    <url>http://www.seamframework.org/Weld</url>
 
-
    <dependencies>
 
       <dependency>
@@ -72,11 +71,6 @@
       </dependency>
 
       <dependency>
-         <groupId>javax.servlet</groupId>
-         <artifactId>servlet-api</artifactId>
-      </dependency>
-
-      <dependency>
          <groupId>org.jboss.weld</groupId>
          <artifactId>weld-core</artifactId>
       </dependency>
@@ -247,13 +241,11 @@
             <dependency>
                <groupId>org.jboss.jbossas</groupId>
                <artifactId>jboss-server-manager</artifactId>
-               <version>1.0.3.GA</version>
                <scope>test</scope>
             </dependency>
             <dependency>
                <groupId>org.jboss.jbossas</groupId>
                <artifactId>jboss-as-client</artifactId>
-               <version>6.0.0.20100429-M3</version>
                <type>pom</type>
                <scope>test</scope>
             </dependency>
@@ -272,6 +264,40 @@
          </build>
       </profile>
       <profile>
+         <id>incontainer-remote</id>
+         <activation>
+            <activeByDefault>false</activeByDefault>
+            <property>
+               <name>incontainer-remote</name>
+            </property>
+         </activation>
+         <dependencies>
+            <dependency>
+               <groupId>org.jboss.arquillian.container</groupId>
+               <artifactId>arquillian-jbossas-remote-6</artifactId>
+               <scope>test</scope>
+            </dependency>
+            <dependency>
+               <groupId>org.jboss.jbossas</groupId>
+               <artifactId>jboss-as-client</artifactId>
+               <version>${version.jbossas_client}</version>
+               <type>pom</type>
+               <scope>test</scope>
+            </dependency>
+         </dependencies>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-surefire-plugin</artifactId>
+                  <configuration>
+                     <parallel>none</parallel>
+                  </configuration>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+      <profile>
          <id>surefireSnapshot</id>
          <activation>
             <property>
@@ -291,26 +317,6 @@
             </pluginManagement>
          </build>
       </profile>
-      <!--
-         <profile> <id>write-artifacts-to-disk</id> <activation>
-         <property> <name>dumpArtifacts</name> </property> </activation>
-         <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId>
-         <artifactId>exec-maven-plugin</artifactId> <executions>
-         <execution> <id>generate-test-artifacts</id>
-         <phase>generate-test-sources</phase> <goals> <goal>java</goal>
-         </goals> </execution> </executions> <configuration>
-         <mainClass>org.jboss.testharness.api.TCK</mainClass>
-         <classpathScope>test</classpathScope> <systemProperties>
-         <systemProperty> <key>dumpArtifacts</key> <value>true</value>
-         </systemProperty> <systemProperty>
-         <key>org.jboss.testharness.outputDirectory</key>
-         <value>target/test-artifacts</value> </systemProperty>
-         <systemProperty>
-         <key>org.jboss.testharness.libraryDirectory</key>
-         <value>target/dependency/lib</value> </systemProperty>
-         </systemProperties> </configuration> </plugin> </plugins>
-         </build> </profile>
-      -->
    </profiles>
 
    <scm>