1.1 --- a/ko-archetype-test/src/test/java/org/apidesign/html/archetype/test/VerifyArchetypeTest.java Tue Jun 25 12:37:31 2013 +0200
1.2 +++ b/ko-archetype-test/src/test/java/org/apidesign/html/archetype/test/VerifyArchetypeTest.java Tue Jun 25 13:19:12 2013 +0200
1.3 @@ -22,7 +22,6 @@
1.4
1.5 import java.io.File;
1.6 import java.util.Properties;
1.7 -import java.util.zip.ZipFile;
1.8 import org.apache.maven.it.Verifier;
1.9 import org.testng.annotations.Test;
1.10 import static org.testng.Assert.*;
1.11 @@ -32,7 +31,7 @@
1.12 * @author Jaroslav Tulach <jtulach@netbeans.org>
1.13 */
1.14 public class VerifyArchetypeTest {
1.15 - @Test public void fxBrwsrCompiles() throws Exception {
1.16 + @Test public void projectCompiles() throws Exception {
1.17 final File dir = new File("target/tests/fxcompile/").getAbsoluteFile();
1.18 generateFromArchetype(dir);
1.19
1.20 @@ -51,7 +50,7 @@
1.21 }
1.22 }
1.23
1.24 - v.verifyTextInLog("fxcompile/o-a-test/target/o-a-test-1.0-SNAPSHOT-fxbrwsr.zip");
1.25 + v.verifyTextInLog("fxcompile/o-a-test/target/o-a-test-1.0-SNAPSHOT-html.java.net.zip");
1.26 }
1.27
1.28 private Verifier generateFromArchetype(final File dir, String... params) throws Exception {
2.1 --- a/ko-archetype/src/main/resources/archetype-resources/pom.xml Tue Jun 25 12:37:31 2013 +0200
2.2 +++ b/ko-archetype/src/main/resources/archetype-resources/pom.xml Tue Jun 25 13:19:12 2013 +0200
2.3 @@ -39,7 +39,6 @@
2.4 <properties>
2.5 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2.6 <net.java.html.version>${project.version}</net.java.html.version>
2.7 - <brwsr.startpage>\${package.replace('.','/')}/index.html</brwsr.startpage>
2.8 </properties>
2.9 <build>
2.10 <plugins>
2.11 @@ -54,16 +53,6 @@
2.12 </plugin>
2.13 <plugin>
2.14 <groupId>org.apache.maven.plugins</groupId>
2.15 - <artifactId>maven-surefire-plugin</artifactId>
2.16 - <version>2.14.1</version>
2.17 - <configuration>
2.18 - <systemPropertyVariables>
2.19 - <vmtest.brwsrs>\${brwsr}</vmtest.brwsrs>
2.20 - </systemPropertyVariables>
2.21 - </configuration>
2.22 - </plugin>
2.23 - <plugin>
2.24 - <groupId>org.apache.maven.plugins</groupId>
2.25 <artifactId>maven-jar-plugin</artifactId>
2.26 <version>2.4</version>
2.27 <configuration>
2.28 @@ -96,7 +85,7 @@
2.29 </goals>
2.30 <configuration>
2.31 <descriptors>
2.32 - <descriptor>src/main/assembly/fxbrwsr.xml</descriptor>
2.33 + <descriptor>src/main/assembly/html.java.net.xml</descriptor>
2.34 </descriptors>
2.35 </configuration>
2.36 </execution>
3.1 --- a/ko-archetype/src/main/resources/archetype-resources/src/main/assembly/fxbrwsr.xml Tue Jun 25 12:37:31 2013 +0200
3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
3.3 @@ -1,23 +0,0 @@
3.4 -<?xml version="1.0"?>
3.5 -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3.6 - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
3.7 -
3.8 - <id>fxbrwsr</id>
3.9 - <formats>
3.10 - <format>zip</format>
3.11 - </formats>
3.12 - <baseDirectory>${project.build.finalName}-fxbrwsr</baseDirectory>
3.13 - <dependencySets>
3.14 - <dependencySet>
3.15 - <useProjectArtifact>false</useProjectArtifact>
3.16 - <scope>runtime</scope>
3.17 - <outputDirectory>lib</outputDirectory>
3.18 - </dependencySet>
3.19 - </dependencySets>
3.20 - <files>
3.21 - <file>
3.22 - <source>${project.build.directory}/${project.build.finalName}.jar</source>
3.23 - <outputDirectory>/</outputDirectory>
3.24 - </file>
3.25 - </files>
3.26 -</assembly>
3.27 \ No newline at end of file
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
4.2 +++ b/ko-archetype/src/main/resources/archetype-resources/src/main/assembly/html.java.net.xml Tue Jun 25 13:19:12 2013 +0200
4.3 @@ -0,0 +1,23 @@
4.4 +<?xml version="1.0"?>
4.5 +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4.6 + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
4.7 +
4.8 + <id>html.java.net</id>
4.9 + <formats>
4.10 + <format>zip</format>
4.11 + </formats>
4.12 + <baseDirectory>${project.build.finalName}-fxbrwsr</baseDirectory>
4.13 + <dependencySets>
4.14 + <dependencySet>
4.15 + <useProjectArtifact>false</useProjectArtifact>
4.16 + <scope>runtime</scope>
4.17 + <outputDirectory>lib</outputDirectory>
4.18 + </dependencySet>
4.19 + </dependencySets>
4.20 + <files>
4.21 + <file>
4.22 + <source>${project.build.directory}/${project.build.finalName}.jar</source>
4.23 + <outputDirectory>/</outputDirectory>
4.24 + </file>
4.25 + </files>
4.26 +</assembly>
4.27 \ No newline at end of file