Skip to content

Commit 145a041

Browse files
kausandrkausandr
committed
Made project.properties to be bundled into deliverables.
Distribution assemblies and deploy components needs review - it all shall be done through modulesets instead hard-coding.
1 parent 9ca5aa9 commit 145a041

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+612
-255
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Check out the benchmarks from other users and analyze your results here [here](h
1313
- Download the selected benchmark package from the [release page](https://github.com/K2NIO/cybench-java-benchmarks/releases)
1414
- Extract the files and run cybench.bat (on Windows) or cybench.sh (on Unix).
1515
- Analyze results in your console, reports folder or [app.cybench.io](https://app.cybench.io/cybench/)
16-
- **Otional:** manage your benchmarking run configuration located in `<cybench-home>/conf/cybench-launcher.properties`
16+
- **Otional:** manage your benchmarking run configuration located in `<cybench-home>/config/cybench-launcher.properties`
1717

1818
#### CyBench launcher configuration
1919

@@ -39,7 +39,7 @@ Check out the benchmarks from other users and analyze your results here [here](h
3939

4040
### Adding Custom Benchmarks for Execution
4141

42-
Update CyBench Launcher configuration located in `<cybench-home>/conf/cybench-launcher.properties`:
42+
Update CyBench Launcher configuration located in `<cybench-home>/config/cybench-launcher.properties`:
4343

4444
* __required__: add or update property `benchmarks`, set path to jar file which contains your JMH benchmarks, this path will be added to the `CLASSPATH` of the JVM. Values must be semicolon separated!
4545

‎cybench-java-benchmark-archetype/pom.xml‎

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

33
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5-
<modelVersion>4.0.0</modelVersion>
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
66

7-
<groupId>io.cybench</groupId>
8-
<artifactId>cybench-java-benchmark-archetype</artifactId>
9-
<version>1.0.0</version>
10-
<packaging>maven-archetype</packaging>
7+
<groupId>io.cybench</groupId>
8+
<artifactId>cybench-java-benchmark-archetype</artifactId>
9+
<version>1.0.0</version>
10+
<packaging>maven-archetype</packaging>
1111

12-
<name>Archetype - cybench-java-benchmark-archetype</name>
12+
<name>Archetype - cybench-java-benchmark-archetype</name>
1313

14-
<!-- FIXME change it to the project's website -->
15-
<url>http://www.example.com</url>
14+
<!-- FIXME change it to the project's website -->
15+
<url>http://www.example.com</url>
1616

17-
<properties>
18-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
19-
<maven.compiler.source>1.7</maven.compiler.source>
20-
<maven.compiler.target>1.7</maven.compiler.target>
21-
</properties>
17+
<properties>
18+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
19+
<maven.compiler.source>1.8</maven.compiler.source>
20+
<maven.compiler.target>1.8</maven.compiler.target>
21+
</properties>
2222

23-
<build>
24-
<extensions>
25-
<extension>
26-
<groupId>org.apache.maven.archetype</groupId>
27-
<artifactId>archetype-packaging</artifactId>
28-
<version>3.0.1</version>
29-
</extension>
30-
</extensions>
23+
<build>
24+
<extensions>
25+
<extension>
26+
<groupId>org.apache.maven.archetype</groupId>
27+
<artifactId>archetype-packaging</artifactId>
28+
<version>3.0.1</version>
29+
</extension>
30+
</extensions>
3131

32-
<pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
33-
<plugins>
34-
<plugin>
35-
<artifactId>maven-clean-plugin</artifactId>
36-
<version>3.1.0</version>
37-
</plugin>
38-
<plugin>
39-
<artifactId>maven-archetype-plugin</artifactId>
40-
<version>3.0.1</version>
41-
</plugin>
42-
<plugin>
43-
<artifactId>maven-resources-plugin</artifactId>
44-
<version>3.0.2</version>
45-
</plugin>
46-
<plugin>
47-
<artifactId>maven-install-plugin</artifactId>
48-
<version>2.5.2</version>
49-
</plugin>
50-
<plugin>
51-
<artifactId>maven-deploy-plugin</artifactId>
52-
<version>2.8.2</version>
53-
</plugin>
54-
</plugins>
55-
</pluginManagement>
56-
</build>
32+
<pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
33+
<plugins>
34+
<plugin>
35+
<artifactId>maven-clean-plugin</artifactId>
36+
<version>3.1.0</version>
37+
</plugin>
38+
<plugin>
39+
<artifactId>maven-archetype-plugin</artifactId>
40+
<version>3.0.1</version>
41+
</plugin>
42+
<plugin>
43+
<artifactId>maven-resources-plugin</artifactId>
44+
<version>3.0.2</version>
45+
</plugin>
46+
<plugin>
47+
<artifactId>maven-install-plugin</artifactId>
48+
<version>2.5.2</version>
49+
</plugin>
50+
<plugin>
51+
<artifactId>maven-deploy-plugin</artifactId>
52+
<version>2.8.2</version>
53+
</plugin>
54+
</plugins>
55+
</pluginManagement>
56+
</build>
5757
</project>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ under the License.
4141
</requiredProperties>
4242

4343
<fileSets>
44+
<fileSet filtered="true" packaged="false">
45+
<directory>config/</directory>
46+
</fileSet>
4447
<fileSet filtered="true" packaged="true">
4548
<directory>src/main/java</directory>
4649
</fileSet>

‎cybench-java-benchmark-archetype/src/main/resources/archetype-resources/config/project.properties‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#
2+
# Copyright (C) 2020-2022, K2N.IO.
3+
#
4+
# This library is free software; you can redistribute it and/or
5+
# modify it under the terms of the GNU Lesser General Public
6+
# License as published by the Free Software Foundation; either
7+
# version 2.1 of the License, or (at your option) any later version.
8+
#
9+
# This library is distributed in the hope that it will be useful,
10+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12+
# Lesser General Public License for more details.
13+
#
14+
# You should have received a copy of the GNU Lesser General Public
15+
# License along with this library; if not, write to the Free Software
16+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17+
#
18+
#
19+
20+
#Tue, 22 Feb 2022 08:32:35 -0500
21+
22+
PROJECT_ARTIFACT=__shortName__
23+
PROJECT_ROOT=root project 'cybench-java-benchmark'
24+
PROJECT_VERSION=1.0.6
25+
PROJECT_PARENT=root project 'cybench-java-benchmark'
26+
PROJECT_GROUP=cybench.io

‎cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentDir.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</file>
3535
<file>
3636
<source>${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties</source>
37-
<outputDirectory>conf</outputDirectory>
37+
<outputDirectory>config</outputDirectory>
3838
</file>
3939
<file>
4040
<source>${prefix}${shortName}${sufix}</source>
@@ -49,5 +49,13 @@
4949
</includes>
5050
<outputDirectory></outputDirectory>
5151
</fileSet>
52+
<fileSet>
53+
<directory>${project.${shortName}.home}/config</directory>
54+
<includes>
55+
<include>*.properties</include>
56+
</includes>
57+
<outputDirectory>config/</outputDirectory>
58+
<lineEnding>crlf</lineEnding>
59+
</fileSet>
5260
</fileSets>
5361
</component>

‎cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentUnix.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</file>
3535
<file>
3636
<source>${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties</source>
37-
<outputDirectory>conf</outputDirectory>
37+
<outputDirectory>config</outputDirectory>
3838
</file>
3939
<file>
4040
<source>${prefix}${shortName}${sufix}</source>
@@ -49,5 +49,13 @@
4949
</includes>
5050
<outputDirectory></outputDirectory>
5151
</fileSet>
52+
<fileSet>
53+
<directory>${project.${shortName}.home}/config</directory>
54+
<includes>
55+
<include>*.properties</include>
56+
</includes>
57+
<outputDirectory>config/</outputDirectory>
58+
<lineEnding>unix</lineEnding>
59+
</fileSet>
5260
</fileSets>
5361
</component>

‎cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentWin.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</file>
3535
<file>
3636
<source>${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties</source>
37-
<outputDirectory>conf</outputDirectory>
37+
<outputDirectory>config</outputDirectory>
3838
</file>
3939
<file>
4040
<source>${prefix}${shortName}${sufix}</source>
@@ -49,5 +49,13 @@
4949
</includes>
5050
<outputDirectory></outputDirectory>
5151
</fileSet>
52+
<fileSet>
53+
<directory>${project.${shortName}.home}/config</directory>
54+
<includes>
55+
<include>*.properties</include>
56+
</includes>
57+
<outputDirectory>config/</outputDirectory>
58+
<lineEnding>crlf</lineEnding>
59+
</fileSet>
5260
</fileSets>
5361
</component>

‎cybench-java-benchmark-security-rsa/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<artifactId>cybench-java-benchmark-security-rsa</artifactId>
1414
<packaging>jar</packaging>
1515

16-
<version>${project.security-rsa.version}</version>
16+
<version>${project.security.rsa.version}</version>
1717
<name>cybench-java-benchmark-security-rsa</name>
1818

1919
<properties>

‎cybench-java-benchmarks-distribution/pom.xml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
</includes>
125125
</fileset>
126126
<fileset>
127-
<directory>${release.deploy.dir.security-rsa}</directory>
127+
<directory>${release.deploy.dir.security.rsa}</directory>
128128
<includes>
129129
<include>${release.deploy.finalName}-security-rsa-${project.version}/</include>
130130
<include>${release.deploy.finalName}-security-rsa-${project.version}.*</include>
@@ -286,7 +286,8 @@
286286
</descriptors>
287287
<outputDirectory>${release.deploy.dir.httpServers}</outputDirectory>
288288
<attach>${build.assemblies.attach}</attach>
289-
<finalName>${release.deploy.finalName}-http-servers-${project.httpServers.version}</finalName>
289+
<finalName>${release.deploy.finalName}-http-servers-${project.httpServers.version}
290+
</finalName>
290291
</configuration>
291292
</execution>
292293
<execution>
@@ -305,7 +306,8 @@
305306
</descriptors>
306307
<outputDirectory>${release.deploy.dir.security.crypto}</outputDirectory>
307308
<attach>${build.assemblies.attach}</attach>
308-
<finalName>${release.deploy.finalName}-security-${project.security.crypto.version}</finalName>
309+
<finalName>${release.deploy.finalName}-security-${project.security.crypto.version}
310+
</finalName>
309311
</configuration>
310312
</execution>
311313
<execution>
@@ -315,16 +317,17 @@
315317
<goal>single</goal>
316318
</goals>
317319
<configuration>
318-
<skipAssembly>${skip.security-rsa.assembly}</skipAssembly>
320+
<skipAssembly>${skip.security.rsa.assembly}</skipAssembly>
319321
<appendAssemblyId>false</appendAssemblyId>
320322
<descriptors>
321-
<descriptor>${release.security-rsa}/${release.deploy.zip.assembly}</descriptor>
322-
<descriptor>${release.security-rsa}/${release.deploy.gz.assembly}</descriptor>
323-
<descriptor>${release.security-rsa}/${release.deploy.dir.assembly}</descriptor>
323+
<descriptor>${release.security.rsa}/${release.deploy.zip.assembly}</descriptor>
324+
<descriptor>${release.security.rsa}/${release.deploy.gz.assembly}</descriptor>
325+
<descriptor>${release.security.rsa}/${release.deploy.dir.assembly}</descriptor>
324326
</descriptors>
325-
<outputDirectory>${release.deploy.dir.security-rsa}</outputDirectory>
327+
<outputDirectory>${release.deploy.dir.security.rsa}</outputDirectory>
326328
<attach>${build.assemblies.attach}</attach>
327-
<finalName>${release.deploy.finalName}-security-rsa-${project.security-rsa.version}</finalName>
329+
<finalName>${release.deploy.finalName}-security-rsa-${project.security.rsa.version}
330+
</finalName>
328331
</configuration>
329332
</execution>
330333
<execution>

‎cybench-java-benchmarks-distribution/resources/cybench.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ set argument2=%2
3131
IF ["%1%"] EQU ["-conf"] set resConfig=T
3232
IF ["%1%"] EQU ["-config"] set resConfig=T
3333
IF ["%resConfig%"] EQU ["T"] set CONFIGURATION_PATH=%2%
34-
IF ["%resConfig%"] EQU ["F"] set CONFIGURATION_PATH=conf/cybench-launcher.properties
34+
IF ["%resConfig%"] EQU ["F"] set CONFIGURATION_PATH=config/cybench-launcher.properties
3535

3636
:detectHelpFlag
3737
set resHelp=F

0 commit comments

Comments
 (0)