Skip to content

Commit ee133af

Browse files
m0verm0ver
authored
Merge pull request m0ver#19 from tinystruct/master
Merge it back to original project.
2 parents 348a7e4 + 82655eb commit ee133af

File tree

96 files changed

+230
-1482
lines changed

Some content is hidden

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

96 files changed

+230
-1482
lines changed

‎.mvn/wrapper/MavenWrapperDownloader.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
6+
* You may obtain RequestMerger copy of the License at
77
*
88
* http://www.apache.org/licenses/LICENSE-2.0
99
*
@@ -28,7 +28,7 @@ public class MavenWrapperDownloader {
2828
+ WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
2929

3030
/**
31-
* Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
31+
* Path to the maven-wrapper.properties file, which might contain RequestMerger downloadUrl property to
3232
* use instead of the default one.
3333
*/
3434
private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
@@ -50,7 +50,7 @@ public static void main(String args[]) {
5050
File baseDirectory = new File(args[0]);
5151
System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
5252

53-
// If the maven-wrapper.properties exists, read it and check if it contains a custom
53+
// If the maven-wrapper.properties exists, read it and check if it contains RequestMerger custom
5454
// wrapperUrl parameter.
5555
File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
5656
String url = DEFAULT_DOWNLOAD_URL;

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ To execute it in CLI mode
1414
$ bin/dispatcher --version
1515

1616
_/ ' _ _/ _ _ _/
17-
/ / /) (/ _) / / (/ ( / 2.0
17+
/ / /) (/ _) / / (/ ( / 0.3.3
1818
/
1919
```
2020
```tcsh
@@ -32,7 +32,7 @@ Praise to the Lord
3232
Run it in a servlet container
3333
---
3434
```tcsh
35-
# bin/dispatcher --start-server --import-applications=org.tinystruct.system.TomcatServer
35+
# bin/dispatcher --start --import org.tinystruct.system.TomcatServer
3636
```
3737
Run it in docker container
3838
---

‎WEB-INF/classes/ApplicationGenerator.class

-1.62 KB
Binary file not shown.

‎WEB-INF/classes/application.properties

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎WEB-INF/classes/custom/objects/User.class

-7.19 KB
Binary file not shown.

‎WEB-INF/classes/custom/objects/User.map.xml

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎WEB-INF/classes/custom/objects/article.class

-3.08 KB
Binary file not shown.

‎WEB-INF/classes/custom/objects/article.map.xml

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎WEB-INF/classes/custom/objects/book.class

-3.88 KB
Binary file not shown.

‎WEB-INF/classes/custom/objects/book.map.xml

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)