geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r984572 - /geronimo/tck/branches/3.0/jcdi-tck-runner/pom.xml
Date Wed, 11 Aug 2010 20:35:06 GMT
Author: dwoods
Date: Wed Aug 11 20:35:06 2010
New Revision: 984572

URL: http://svn.apache.org/viewvc?rev=984572&view=rev
Log:
add geronimo-assembly profile and fix whitespaces

Modified:
    geronimo/tck/branches/3.0/jcdi-tck-runner/pom.xml

Modified: geronimo/tck/branches/3.0/jcdi-tck-runner/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/tck/branches/3.0/jcdi-tck-runner/pom.xml?rev=984572&r1=984571&r2=984572&view=diff
==============================================================================
--- geronimo/tck/branches/3.0/jcdi-tck-runner/pom.xml (original)
+++ geronimo/tck/branches/3.0/jcdi-tck-runner/pom.xml Wed Aug 11 20:35:06 2010
@@ -62,7 +62,6 @@
             <artifactId>testng</artifactId>
             <classifier>jdk15</classifier>
         </dependency>
-
     </dependencies>
 
     <properties>
@@ -70,195 +69,224 @@
         <remote.debug />
     </properties>
    
-   <build>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>copy</id>
-                  <phase>process-resources</phase>
-                  <goals>
-                     <goal>copy</goal>
-                  </goals>
-                  <configuration>
-                     <stripVersion>true</stripVersion>
-                     <artifactItems>
-                        <artifactItem>
-                           <groupId>org.jboss.jsr299.tck</groupId>
-                           <artifactId>jsr299-tck-impl</artifactId>
-                           <type>xml</type>
-                           <classifier>suite</classifier>
-                           <overWrite>true</overWrite>
-                        </artifactItem>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <stripVersion>true</stripVersion>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.jboss.jsr299.tck</groupId>
+                                    <artifactId>jsr299-tck-impl</artifactId>
+                                    <type>xml</type>
+                                    <classifier>suite</classifier>
+                                    <overWrite>true</overWrite>
+                                </artifactItem>
 <!--
-                        <artifactItem>
-                           <groupId>org.jboss.weld</groupId>
-                           <artifactId>weld-porting-package</artifactId>
-                           <overWrite>true</overWrite>
-                           <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
-                        </artifactItem>
-                        <artifactItem>
-                           <groupId>org.jboss.weld</groupId>
-                           <artifactId>weld-core-test</artifactId>
-                           <overWrite>true</overWrite>
-                           <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
-                        </artifactItem>
-                        <artifactItem>
-                           <groupId>org.glassfish.web</groupId>
-                           <artifactId>el-impl</artifactId>
-                           <overWrite>true</overWrite>
-                           <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
-                        </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.jboss.weld</groupId>
+                                    <artifactId>weld-porting-package</artifactId>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.jboss.weld</groupId>
+                                    <artifactId>weld-core-test</artifactId>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.glassfish.web</groupId>
+                                    <artifactId>el-impl</artifactId>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+                                </artifactItem>
 -->
-                     </artifactItems>
-                  </configuration>
-               </execution>
-            </executions>
-         </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-               <suiteXmlFiles>
-                  <suiteXmlFile>src/test/resources/tck-tests.xml</suiteXmlFile>
-               </suiteXmlFiles>
-               <argLine>-Xmx748m</argLine>
-               <forkMode>once</forkMode>
-            </configuration>
-         </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-report-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>generate-test-report</id>
-                  <phase>test</phase>
-                  <goals>
-                     <goal>report-only</goal>
-                  </goals>
-               </execution>
-            </executions>
-            <configuration>
-               <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory>
-               <outputName>test-report</outputName>
-            </configuration>
-         </plugin>
-      </plugins>
-   </build>
-   
-   <profiles>
-      <profile>
-         <id>incontainer-debug</id>
-         <activation>
-            <property>
-               <name>incontainer-debug</name>
-            </property>
-         </activation>
-         <properties>
-            <remote.debug>-Xnoagent -Djava.compiler=NONE -Xdebug
-                          -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
-            </remote.debug>
-         </properties>
-      </profile>
-      <profile>
-         <id>incontainer</id>
-         <activation>
-            <property>
-               <name>incontainer</name>
-            </property>
-         </activation>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-surefire-plugin</artifactId>
-                  <configuration>
-                     <suiteXmlFiles>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <suiteXmlFiles>
                         <suiteXmlFile>src/test/resources/tck-tests.xml</suiteXmlFile>
-                     </suiteXmlFiles>
-                     <systemProperties>
-                        <property>
-                           <name>org.jboss.testharness.standalone</name>
-                           <value>false</value>
-                        </property>
-                        <property>
-                           <name>GERONIMO_HOME</name>
-                           <value>${geronimo.home}</value>
-                        </property>
-                        <property>
-                            <name>JAVA_OPTS</name>
-                            <value>-Xms128m -Xmx384m -XX:MaxPermSize=128m 
-                                   -Djline.terminal=jline.UnsupportedTerminal
-                                   -DXorg.apache.geronimo.deployment.LenientMFCP=true
-                                   ${remote.debug}
-                            </value>
-                        </property>
-                        <property>
-                           <name>org.jboss.testharness.container.forceRestart</name>
-                           <value>true</value>
-                        </property>
-                        <property>
-                           <name>org.jboss.testharness.runIntegrationTests</name>
-                           <value>true</value>
-                        </property>
-                        <property>
-                           <name>org.jboss.testharness.libraryDirectory</name>
-                           <value>target/dependency/lib</value>
-                        </property>
-                        <property>
-                           <name>org.jboss.testharness.outputDirectory</name>
-                           <value>target</value>
-                        </property>
-                     </systemProperties>
-                  </configuration>
-               </plugin>
-            </plugins>
-         </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-jsr-299-artifacts</id>
-                        <phase>generate-test-sources</phase> 
+                    </suiteXmlFiles>
+                    <argLine>-Xmx748m</argLine>
+                    <forkMode>once</forkMode>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate-test-report</id>
+                        <phase>test</phase>
                         <goals>
-                        <goal>java</goal>
+                            <goal>report-only</goal>
                         </goals>
-                     </execution>
-                  </executions>
-                  <configuration>
-                     <mainClass>org.jboss.testharness.api.TCK</mainClass>
-                     <systemProperties>
-                        <systemProperty>
-                           <key>dumpArtifacts</key>
-                           <value>true</value>
-                        </systemProperty>
-                        <systemProperty>
-                           <key>org.jboss.testharness.outputDirectory</key>
-                           <value>target/jsr299-artifacts</value>
-                        </systemProperty>
-                        <systemProperty>
-                           <key>org.jboss.testharness.libraryDirectory</key>
-                           <value>target/dependency/lib</value>
-                        </systemProperty>
-                     </systemProperties>
-                  </configuration>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-   </profiles>
-   
+                    </execution>
+                </executions>
+                <configuration>
+                    <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory>
+                    <outputName>test-report</outputName>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>geronimo-assembly</id>
+            <activation>
+                <property>
+                    <name>geronimo-assembly</name>
+                </property>
+            </activation>
+            <properties>
+                <geronimo.home>${project.build.directory}/geronimo-${assemblyId}-${geronimoVersion}</geronimo.home>
+                <!-- Geronimo assembly configuration -->
+                <assemblyId>${assemblyId}</assemblyId>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>install-assembly</id>
+                                <phase>generate-test-sources</phase>
+                                <goals>
+                                    <goal>install-assembly</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>incontainer-debug</id>
+            <activation>
+                <property>
+                    <name>incontainer-debug</name>
+                </property>
+            </activation>
+            <properties>
+                <remote.debug>-Xnoagent -Djava.compiler=NONE -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</remote.debug>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>incontainer</id>
+            <activation>
+                <property>
+                    <name>incontainer</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>src/test/resources/tck-tests.xml</suiteXmlFile>
+                            </suiteXmlFiles>
+                            <systemProperties>
+                                <property>
+                                    <name>org.jboss.testharness.standalone</name>
+                                    <value>false</value>
+                                </property>
+                                <property>
+                                    <name>GERONIMO_HOME</name>
+                                    <value>${geronimo.home}</value>
+                                </property>
+                                <property>
+                                    <name>JAVA_OPTS</name>
+                                    <value>-Xms128m -Xmx512m -XX:MaxPermSize=256m 
+                                        -Djline.terminal=jline.UnsupportedTerminal
+                                        -Dvalidation.provider=${validation.provider} ${remote.debug}
+                                    </value>
+                                </property>
+                                <property>
+                                    <name>org.jboss.testharness.container.forceRestart</name>
+                                    <value>true</value>
+                                </property>
+                                <property>
+                                    <name>org.jboss.testharness.runIntegrationTests</name>
+                                    <value>true</value>
+                                </property>
+                                <property>
+                                    <name>org.jboss.testharness.libraryDirectory</name>
+                                    <value>target/dependency/lib</value>
+                                </property>
+                                <property>
+                                    <name>org.jboss.testharness.outputDirectory</name>
+                                    <value>target</value>
+                                </property>
+                            </systemProperties>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </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-jsr-299-artifacts</id>
+                                <phase>generate-test-sources</phase> 
+                                <goals>
+                                    <goal>java</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <mainClass>org.jboss.testharness.api.TCK</mainClass>
+                            <systemProperties>
+                                <systemProperty>
+                                    <key>dumpArtifacts</key>
+                                    <value>true</value>
+                                </systemProperty>
+                                <systemProperty>
+                                    <key>org.jboss.testharness.outputDirectory</key>
+                                    <value>target/jsr299-artifacts</value>
+                                </systemProperty>
+                                <systemProperty>
+                                    <key>org.jboss.testharness.libraryDirectory</key>
+                                    <value>target/dependency/lib</value>
+                                </systemProperty>
+                            </systemProperties>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>



Mime
View raw message