Skip to content

Commit 43a6fbc

Browse files
zonskizonski
committed
Added windows icon support.
1 parent 0dbb1c2 commit 43a6fbc

File tree

5 files changed

+86
-61
lines changed

5 files changed

+86
-61
lines changed

‎src/main/resources/META-INF/maven/archetype-metadata.xml‎

Lines changed: 77 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,79 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="javafx-simple-rest-app"
3-
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
4-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
5-
<modules>
6-
<module id="${rootArtifactId}-common" dir="__rootArtifactId__-common" name="${rootArtifactId}-common">
7-
<fileSets>
8-
<fileSet filtered="true" packaged="true" encoding="UTF-8">
9-
<directory>src/main/java</directory>
10-
<includes>
11-
<include>**/*.java</include>
12-
</includes>
13-
</fileSet>
14-
</fileSets>
15-
</module>
16-
<module id="${rootArtifactId}-client" dir="__rootArtifactId__-client" name="${rootArtifactId}-client">
17-
<fileSets>
18-
<fileSet filtered="true" packaged="true" encoding="UTF-8">
19-
<directory>src/main/java</directory>
20-
<includes>
21-
<include>**/*.java</include>
22-
</includes>
23-
</fileSet>
24-
<fileSet filtered="true" encoding="UTF-8">
25-
<directory>src/main/resources</directory>
26-
<includes>
27-
<include>**/*.xml</include>
28-
<include>**/*.properties</include>
29-
<include>**/*.fxml</include>
30-
<include>**/*.css</include>
31-
</includes>
32-
</fileSet>
33-
</fileSets>
34-
</module>
35-
<module id="${rootArtifactId}-server" dir="__rootArtifactId__-server" name="${rootArtifactId}-server">
36-
<fileSets>
37-
<fileSet filtered="true" packaged="true" encoding="UTF-8">
38-
<directory>src/main/java</directory>
39-
<includes>
40-
<include>**/*.java</include>
41-
</includes>
42-
</fileSet>
43-
<fileSet filtered="true" encoding="UTF-8">
44-
<directory>src/main/webapp</directory>
45-
<includes>
46-
<include>**/*.xml</include>
47-
</includes>
48-
</fileSet>
49-
<fileSet filtered="true" encoding="UTF-8">
50-
<directory>src/main/resources</directory>
51-
<includes>
52-
<include>**/*.xml</include>
53-
</includes>
54-
</fileSet>
55-
</fileSets>
56-
</module>
57-
</modules>
2+
<archetype-descriptor
3+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"
4+
name="javafx-simple-rest-app"
5+
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
6+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
7+
8+
<requiredProperties>
9+
<requiredProperty key="organizationName"/>
10+
</requiredProperties>
11+
12+
<modules>
13+
14+
<module id="${rootArtifactId}-common" dir="__rootArtifactId__-common" name="${rootArtifactId}-common">
15+
<fileSets>
16+
<fileSet filtered="true" packaged="true" encoding="UTF-8">
17+
<directory>src/main/java</directory>
18+
<includes>
19+
<include>**/*.java</include>
20+
</includes>
21+
</fileSet>
22+
</fileSets>
23+
</module>
24+
25+
<module id="${rootArtifactId}-client" dir="__rootArtifactId__-client" name="${rootArtifactId}-client">
26+
<fileSets>
27+
<fileSet filtered="true" packaged="true" encoding="UTF-8">
28+
<directory>src/main/java</directory>
29+
<includes>
30+
<include>**/*.java</include>
31+
</includes>
32+
</fileSet>
33+
<fileSet filtered="true" encoding="UTF-8">
34+
<directory>src/main/resources</directory>
35+
<includes>
36+
<include>**/*.xml</include>
37+
<include>**/*.properties</include>
38+
<include>**/*.fxml</include>
39+
<include>**/*.css</include>
40+
</includes>
41+
</fileSet>
42+
<fileSet encoding="UTF-8">
43+
<directory>src/main/deploy</directory>
44+
<includes>
45+
<include>**/*.icns</include>
46+
<include>**/*.ico</include>
47+
<include>**/*.jpg</include>
48+
<include>**/*.png</include>
49+
<include>**/*.jks</include>
50+
</includes>
51+
</fileSet>
52+
</fileSets>
53+
</module>
54+
55+
<module id="${rootArtifactId}-server" dir="__rootArtifactId__-server" name="${rootArtifactId}-server">
56+
<fileSets>
57+
<fileSet filtered="true" packaged="true" encoding="UTF-8">
58+
<directory>src/main/java</directory>
59+
<includes>
60+
<include>**/*.java</include>
61+
</includes>
62+
</fileSet>
63+
<fileSet filtered="true" encoding="UTF-8">
64+
<directory>src/main/webapp</directory>
65+
<includes>
66+
<include>**/*.xml</include>
67+
</includes>
68+
</fileSet>
69+
<fileSet filtered="true" encoding="UTF-8">
70+
<directory>src/main/resources</directory>
71+
<includes>
72+
<include>**/*.xml</include>
73+
</includes>
74+
</fileSet>
75+
</fileSets>
76+
</module>
77+
78+
</modules>
5879
</archetype-descriptor>

‎src/main/resources/archetype-resources/__rootArtifactId__-client/pom.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
<packaging>jar</packaging>
2424

2525
<build>
26+
27+
<finalName>${artifactId}</finalName>
28+
2629
<plugins>
2730

2831
<!--

‎src/main/resources/archetype-resources/__rootArtifactId__-client/src/main/deploy/package/windows/__artifactId__.ico‎

97.3 KB
Binary file not shown.

‎src/main/resources/archetype-resources/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<!--
4-
The main parent project definition for the entire application (server and client). This defines the modules that
5-
make up the project so that they can be built as one (and opened as a single project in an IDE). This top level
6-
POM does not provide any build steps itself but is just an aggregator of the modules.
3+
<!--
4+
The main parent project definition for the entire application (server and client). This defines the modules that
5+
make up the project so that they can be built as one (and opened as a single project in an IDE). This top level
6+
POM does not provide any build steps itself but is just an aggregator of the modules.
77
-->
88

99
<project 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/maven-4.0.0.xsd">
@@ -17,7 +17,7 @@
1717

1818
<!-- organisation is needed by the JavaFX plugin but we define it here for general use -->
1919
<organization>
20-
<name>My Organisation</name>
20+
<name>${organizationName}</name>
2121
</organization>
2222

2323
<!-- define the common properties used throughout the modules - allows us to keep things consistent -->

‎src/test/resources/projects/basic/archetype.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ package=it.pkg
33
version=0.1-SNAPSHOT
44
groupId=archetype.it
55
artifactId=basic
6+
organizationName=ZenJava

0 commit comments

Comments
 (0)