Author: sshafroi
Date: 2008-04-21 12:25:37 +0200 (Mon, 21 Apr 2008)
New Revision: 6508
Modified:
trunk/generic.sesam/sesam.com/war/pom.xml
trunk/generic.sesam/war/pom.xml
trunk/pom.xml
Log:
Validate the modes.xml files during test, I did not manage to get it to work by
defining the test in the top pom.xml file, and get it to run after the compile
phase in the sub modules. So now the code is duplicated in every pom file that
generates a modes.xsd.
Modified: trunk/generic.sesam/sesam.com/war/pom.xml
===================================================================
--- trunk/generic.sesam/sesam.com/war/pom.xml 2008-04-21 09:07:41 UTC (rev
6507)
+++ trunk/generic.sesam/sesam.com/war/pom.xml 2008-04-21 10:25:37 UTC (rev
6508)
@@ -78,6 +78,32 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <validationSets>
+ <validationSet>
+ <dir>.</dir>
+ <includes>
+ <include>**/modes.xml</include>
+ </includes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ <validating>true</validating>
+ </validationSet>
+ </validationSets>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
Modified: trunk/generic.sesam/war/pom.xml
===================================================================
--- trunk/generic.sesam/war/pom.xml 2008-04-21 09:07:41 UTC (rev 6507)
+++ trunk/generic.sesam/war/pom.xml 2008-04-21 10:25:37 UTC (rev 6508)
@@ -30,6 +30,59 @@
<phase>install</phase>
<goals><goal>deploy</goal></goals>
</execution></executions>
+ </plugin>
+ <plugin>
+ <groupId>sesat</groupId>
+ <artifactId>sesat-mojo</artifactId>
+ <version>${pom.version}</version>
+ <configuration>
+ <outputDir>
+ src/main/conf/
+ </outputDir>
+ <classpaths>
+
<classpath>../query-transform-config/src/main/java/</classpath>
+
<classpath>../search-command-config/src/main/java/</classpath>
+
<classpath>../result-handler-config/src/main/java/</classpath>
+
+
<classpath>../../query-transform-config-spi/src/main/java/</classpath>
+
<classpath>../../search-command-config-spi/src/main/java/</classpath>
+
<classpath>../../result-handler-config-spi/src/main/java/</classpath>
+ </classpaths>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>searchModesSchemaGenerator</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <validationSets>
+ <validationSet>
+ <dir>.</dir>
+ <includes>
+ <include>**/modes.xml</include>
+ </includes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ <validating>true</validating>
+ </validationSet>
+ </validationSets>
+ </configuration>
</plugin></plugins></build>
</profile>
<profile>
@@ -205,36 +258,4 @@
<version>${pom.version}</version>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>sesat</groupId>
- <artifactId>sesat-mojo</artifactId>
- <version>${pom.version}</version>
- <configuration>
- <outputDir>
- src/main/conf/
- </outputDir>
- <classpaths>
-
<classpath>../query-transform-config/src/main/java/</classpath>
-
<classpath>../search-command-config/src/main/java/</classpath>
-
<classpath>../result-handler-config/src/main/java/</classpath>
-
-
<classpath>../../query-transform-config-spi/src/main/java/</classpath>
-
<classpath>../../search-command-config-spi/src/main/java/</classpath>
-
<classpath>../../result-handler-config-spi/src/main/java/</classpath>
- </classpaths>
- </configuration>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>searchModesSchemaGenerator</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-04-21 09:07:41 UTC (rev 6507)
+++ trunk/pom.xml 2008-04-21 10:25:37 UTC (rev 6508)
@@ -242,35 +242,7 @@
</goals>
</execution>
</executions>
- </plugin>
-
- <!-- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xml-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>test</phase>
- <goals>
- <goal>validate</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <validationSets>
- <validationSet>
- <dir>.</dir>
- <includes>
- <include>**/modes.xml</include>
- </includes>
- <excludes>
- <exclude>**/target/**</exclude>
- <exclude>skin-archetype/**</exclude>
- </excludes>
- <validating>true</validating>
- </validationSet>
- </validationSets>
- </configuration>
- </plugin> -->
+ </plugin>
</plugins>
</build>
</profile>
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
