10:06 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2008-04-21 11:06:31 -0400 (Mon, 21 Apr 2008)
New Revision: 6579
Added:
framework/trunk/src/main/scripts/assembly-resources.xml
framework/trunk/src/main/scripts/assembly-testsuite.xml
Removed:
framework/trunk/src/main/ant/
framework/trunk/src/main/assembly/
framework/trunk/src/main/scripts/src.xml
Modified:
framework/trunk/pom.xml
Log:
assemble testsuite
Modified: framework/trunk/pom.xml
===================================================================
--- framework/trunk/pom.xml 2008-04-21 15:00:15 UTC (rev 6578)
+++ framework/trunk/pom.xml 2008-04-21 15:06:31 UTC (rev 6579)
@@ -155,7 +155,7 @@
<!-- http://jira.codehaus.org/browse/MANTRUN-87 -->
<property name="version.id"
value="${project.version}"/>
<property name="jboss.local.repository"
value="${jboss.local.repository}"/>
- <ant antfile="src/main/ant/build-install.xml"
target="install"/>
+ <ant antfile="src/main/scripts/build-install.xml"
target="install"/>
</tasks>
</configuration>
</execution>
@@ -165,16 +165,29 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
+ <id>resources</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
+
<descriptor>src/main/scripts/assembly-resources.xml</descriptor>
</descriptors>
</configuration>
</execution>
+ <execution>
+ <id>testsuite</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/scripts/assembly-testsuite.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
Added: framework/trunk/src/main/scripts/assembly-resources.xml
===================================================================
--- framework/trunk/src/main/scripts/assembly-resources.xml (rev
0)
+++ framework/trunk/src/main/scripts/assembly-resources.xml 2008-04-21 15:06:31 UTC (rev
6579)
@@ -0,0 +1,18 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+ <id>scripts</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/etc</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*.bat</include>
+ <include>*.sh</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: framework/trunk/src/main/scripts/assembly-resources.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/src/main/scripts/assembly-testsuite.xml
===================================================================
--- framework/trunk/src/main/scripts/assembly-testsuite.xml (rev
0)
+++ framework/trunk/src/main/scripts/assembly-testsuite.xml 2008-04-21 15:06:31 UTC (rev
6579)
@@ -0,0 +1,14 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+ <id>testsuite</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>testsuite/test</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: framework/trunk/src/main/scripts/assembly-testsuite.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: framework/trunk/src/main/scripts/src.xml
===================================================================
--- framework/trunk/src/main/scripts/src.xml 2008-04-21 15:00:15 UTC (rev 6578)
+++ framework/trunk/src/main/scripts/src.xml 2008-04-21 15:06:31 UTC (rev 6579)
@@ -1,18 +0,0 @@
-<assembly xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
- <id>scripts</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>src/main/etc</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>*.bat</include>
- <include>*.sh</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file