Skip to content

Commit 20b7cd1

Browse files
salmonbsalmonb
authored
Merge pull request #16 from kadampabookings/staging
June work + OSSRH -> Central + WebFX Stack -> WebFX Extras
2 parents f776554 + e6388e2 commit 20b7cd1

239 files changed

Lines changed: 764 additions & 10906 deletions

File tree

Some content is hidden

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

‎.github/workflows/build-and-deploy-to-sonatype.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ jobs:
2020
with:
2121
distribution: 'zulu'
2222
java-version: ${{ env.jdk-version }}
23-
server-id: webfx-sonatype-deploy
24-
server-username: SONATYPE_USERNAME
25-
server-password: SONATYPE_PASSWORD
23+
server-id: webfx-sonatype-central-deploy
24+
server-username: SONATYPE_CENTRAL_USERNAME
25+
server-password: SONATYPE_CENTRAL_PASSWORD
2626

2727
# Checkout this repository
2828
- name: Checkout this repository
2929
uses: actions/checkout@v4
3030

3131
# Build all modules and deploy their SNAPSHOT artifacts to sonatype repository
3232
- name: Deploy this repository
33-
run: mvn -B -P '!gwt-compile,!javafx-fatjar,!javapackager' deploy
33+
run: mvn -B deploy
3434
env:
35-
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
36-
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
35+
SONATYPE_CENTRAL_USERNAME: ${{ secrets.SONATYPE_CENTRAL_USERNAME }}
36+
SONATYPE_CENTRAL_PASSWORD: ${{ secrets.SONATYPE_CENTRAL_PASSWORD }}

‎pom.xml‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<repositories>
1818
<repository>
1919
<id>webfx-snapshots</id>
20-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
20+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
2121
<releases>
2222
<enabled>false</enabled>
2323
</releases>
@@ -122,9 +122,6 @@
122122
<module>webfx-stack-hash-md5</module>
123123
<module>webfx-stack-hash-sha1</module>
124124
<module>webfx-stack-http-server-vertx-plugin</module>
125-
<module>webfx-stack-i18n</module>
126-
<module>webfx-stack-i18n-ast</module>
127-
<module>webfx-stack-i18n-controls</module>
128125
<module>webfx-stack-mail</module>
129126
<module>webfx-stack-orm-datasourcemodel-service</module>
130127
<module>webfx-stack-orm-domainmodel</module>
@@ -161,17 +158,6 @@
161158
<module>webfx-stack-session-state-client-fx</module>
162159
<module>webfx-stack-session-state-server</module>
163160
<module>webfx-stack-session-vertx</module>
164-
<module>webfx-stack-ui-action</module>
165-
<module>webfx-stack-ui-action-tuner</module>
166-
<module>webfx-stack-ui-controls</module>
167-
<module>webfx-stack-ui-dialog</module>
168-
<module>webfx-stack-ui-exceptions</module>
169-
<module>webfx-stack-ui-fxraiser</module>
170-
<module>webfx-stack-ui-fxraiser-json</module>
171-
<module>webfx-stack-ui-json</module>
172-
<module>webfx-stack-ui-operation</module>
173-
<module>webfx-stack-ui-operation-action</module>
174-
<module>webfx-stack-ui-validation</module>
175161
</modules>
176162

177163
</project>

‎webfx-stack-authn-login-ui-gateway-magiclink-plugin/pom.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,75 +35,75 @@
3535

3636
<dependency>
3737
<groupId>dev.webfx</groupId>
38-
<artifactId>webfx-extras-styles-bootstrap</artifactId>
38+
<artifactId>webfx-extras-controlfactory</artifactId>
3939
<version>0.1.0-SNAPSHOT</version>
4040
</dependency>
4141

4242
<dependency>
4343
<groupId>dev.webfx</groupId>
44-
<artifactId>webfx-kit-util</artifactId>
44+
<artifactId>webfx-extras-i18n</artifactId>
4545
<version>0.1.0-SNAPSHOT</version>
4646
</dependency>
4747

4848
<dependency>
4949
<groupId>dev.webfx</groupId>
50-
<artifactId>webfx-platform-console</artifactId>
50+
<artifactId>webfx-extras-i18n-controls</artifactId>
5151
<version>0.1.0-SNAPSHOT</version>
5252
</dependency>
5353

5454
<dependency>
5555
<groupId>dev.webfx</groupId>
56-
<artifactId>webfx-platform-javatime-emul-j2cl</artifactId>
56+
<artifactId>webfx-extras-operation</artifactId>
5757
<version>0.1.0-SNAPSHOT</version>
58-
<scope>runtime</scope>
59-
<optional>true</optional>
6058
</dependency>
6159

6260
<dependency>
6361
<groupId>dev.webfx</groupId>
64-
<artifactId>webfx-platform-uischeduler</artifactId>
62+
<artifactId>webfx-extras-styles-bootstrap</artifactId>
6563
<version>0.1.0-SNAPSHOT</version>
6664
</dependency>
6765

6866
<dependency>
6967
<groupId>dev.webfx</groupId>
70-
<artifactId>webfx-stack-authn</artifactId>
68+
<artifactId>webfx-extras-validation</artifactId>
7169
<version>0.1.0-SNAPSHOT</version>
7270
</dependency>
7371

7472
<dependency>
7573
<groupId>dev.webfx</groupId>
76-
<artifactId>webfx-stack-authn-login-ui-gateway-password-plugin</artifactId>
74+
<artifactId>webfx-kit-util</artifactId>
7775
<version>0.1.0-SNAPSHOT</version>
7876
</dependency>
7977

8078
<dependency>
8179
<groupId>dev.webfx</groupId>
82-
<artifactId>webfx-stack-i18n</artifactId>
80+
<artifactId>webfx-platform-console</artifactId>
8381
<version>0.1.0-SNAPSHOT</version>
8482
</dependency>
8583

8684
<dependency>
8785
<groupId>dev.webfx</groupId>
88-
<artifactId>webfx-stack-i18n-controls</artifactId>
86+
<artifactId>webfx-platform-javatime-emul-j2cl</artifactId>
8987
<version>0.1.0-SNAPSHOT</version>
88+
<scope>runtime</scope>
89+
<optional>true</optional>
9090
</dependency>
9191

9292
<dependency>
9393
<groupId>dev.webfx</groupId>
94-
<artifactId>webfx-stack-ui-controls</artifactId>
94+
<artifactId>webfx-platform-uischeduler</artifactId>
9595
<version>0.1.0-SNAPSHOT</version>
9696
</dependency>
9797

9898
<dependency>
9999
<groupId>dev.webfx</groupId>
100-
<artifactId>webfx-stack-ui-operation</artifactId>
100+
<artifactId>webfx-stack-authn</artifactId>
101101
<version>0.1.0-SNAPSHOT</version>
102102
</dependency>
103103

104104
<dependency>
105105
<groupId>dev.webfx</groupId>
106-
<artifactId>webfx-stack-ui-validation</artifactId>
106+
<artifactId>webfx-stack-authn-login-ui-gateway-password-plugin</artifactId>
107107
<version>0.1.0-SNAPSHOT</version>
108108
</dependency>
109109

‎webfx-stack-authn-login-ui-gateway-magiclink-plugin/src/main/java/dev/webfx/stack/authn/login/ui/spi/impl/gateway/magiclink/MagicLinkI18nKeys.java‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,30 @@
33

44
public interface MagicLinkI18nKeys {
55

6-
String ConfirmChange = "ConfirmChange";
7-
String BackToNavigation = "BackToNavigation";
8-
String MagicLinkBusClosedErrorTitle = "MagicLinkBusClosedErrorTitle";
9-
String Recovery = "Recovery";
10-
String MagicLinkUnrecognisedError = "MagicLinkUnrecognisedError";
11-
String MagicLinkUnexpectedErrorTitle = "MagicLinkUnexpectedErrorTitle";
12-
String MagicLinkPushErrorTitle = "MagicLinkPushErrorTitle";
13-
String MagicLinkInitialMessage = "MagicLinkInitialMessage";
14-
String CaseSensitive = "CaseSensitive";
15-
String MagicLinkAlreadyUsedErrorTitle = "MagicLinkAlreadyUsedErrorTitle";
16-
String ChangeYourPassword = "ChangeYourPassword";
17-
String PasswordStrength = "PasswordStrength";
18-
String NewPassword = "NewPassword";
19-
String MagicLinkSentCheckYourMailBox = "MagicLinkSentCheckYourMailBox";
20-
String PasswordChanged = "PasswordChanged";
21-
String MagicLinkBusClosedError = "MagicLinkBusClosedError";
22-
String MagicLinkExpiredError = "MagicLinkExpiredError";
23-
String MagicLinkAlreadyUsedError = "MagicLinkAlreadyUsedError";
24-
String MagicLinkUnrecognisedErrorTitle = "MagicLinkUnrecognisedErrorTitle";
25-
String GoToLogin = "GoToLogin";
26-
String MagicLinkUnexpectedError = "MagicLinkUnexpectedError";
27-
String ErrorWhileUpdatingPassword = "ErrorWhileUpdatingPassword";
28-
String MagicLinkPushError = "MagicLinkPushError";
29-
String MagicLinkExpiredErrorTitle = "MagicLinkExpiredErrorTitle";
30-
String MagicLinkSuccessMessage = "MagicLinkSuccessMessage";
6+
Object ConfirmChange = "ConfirmChange";
7+
Object BackToNavigation = "BackToNavigation";
8+
Object MagicLinkBusClosedErrorTitle = "MagicLinkBusClosedErrorTitle";
9+
Object Recovery = "Recovery";
10+
Object MagicLinkUnrecognisedError = "MagicLinkUnrecognisedError";
11+
Object MagicLinkUnexpectedErrorTitle = "MagicLinkUnexpectedErrorTitle";
12+
Object MagicLinkPushErrorTitle = "MagicLinkPushErrorTitle";
13+
Object MagicLinkInitialMessage = "MagicLinkInitialMessage";
14+
Object CaseSensitive = "CaseSensitive";
15+
Object MagicLinkAlreadyUsedErrorTitle = "MagicLinkAlreadyUsedErrorTitle";
16+
Object ChangeYourPassword = "ChangeYourPassword";
17+
Object PasswordStrength = "PasswordStrength";
18+
Object NewPassword = "NewPassword";
19+
Object MagicLinkSentCheckYourMailBox = "MagicLinkSentCheckYourMailBox";
20+
Object PasswordChanged = "PasswordChanged";
21+
Object MagicLinkBusClosedError = "MagicLinkBusClosedError";
22+
Object MagicLinkExpiredError = "MagicLinkExpiredError";
23+
Object MagicLinkAlreadyUsedError = "MagicLinkAlreadyUsedError";
24+
Object MagicLinkUnrecognisedErrorTitle = "MagicLinkUnrecognisedErrorTitle";
25+
Object GoToLogin = "GoToLogin";
26+
Object MagicLinkUnexpectedError = "MagicLinkUnexpectedError";
27+
Object ErrorWhileUpdatingPassword = "ErrorWhileUpdatingPassword";
28+
Object MagicLinkPushError = "MagicLinkPushError";
29+
Object MagicLinkExpiredErrorTitle = "MagicLinkExpiredErrorTitle";
30+
Object MagicLinkSuccessMessage = "MagicLinkSuccessMessage";
3131

3232
}

‎webfx-stack-authn-login-ui-gateway-magiclink-plugin/src/main/java/dev/webfx/stack/authn/login/ui/spi/impl/gateway/magiclink/MagicLinkUi.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
import dev.webfx.stack.authn.*;
88
import dev.webfx.stack.authn.login.ui.spi.impl.gateway.password.PasswordI18nKeys;
99
import dev.webfx.stack.authn.login.ui.spi.impl.gateway.password.UILoginView;
10-
import dev.webfx.stack.i18n.I18n;
11-
import dev.webfx.stack.i18n.controls.I18nControls;
12-
import dev.webfx.stack.ui.controls.MaterialFactoryMixin;
13-
import dev.webfx.stack.ui.operation.OperationUtil;
14-
import dev.webfx.stack.ui.validation.ValidationSupport;
10+
import dev.webfx.extras.i18n.I18n;
11+
import dev.webfx.extras.i18n.controls.I18nControls;
12+
import dev.webfx.extras.controlfactory.MaterialFactoryMixin;
13+
import dev.webfx.extras.operation.OperationUtil;
14+
import dev.webfx.extras.validation.ValidationSupport;
1515
import javafx.application.Platform;
1616
import javafx.beans.property.StringProperty;
1717
import javafx.scene.Node;
@@ -20,7 +20,7 @@
2020
import java.util.function.Consumer;
2121

2222
/**
23-
* @author Bruno Salmon
23+
* @author David Hello
2424
*/
2525
public class MagicLinkUi implements MaterialFactoryMixin {
2626

@@ -104,7 +104,7 @@ private void onFailure(Throwable e) {
104104
Console.log("Technical error: " + technicalMessage);
105105

106106
if (technicalMessage != null) {
107-
//The error Message are defined in ModalityMagicLinkAuthenticationGatewayProvider
107+
//The technical error messages are defined in ModalityMagicLinkAuthenticationGatewayProvider
108108
if (technicalMessage.contains("not found")) {
109109
uiLoginView.getInfoMessageForPasswordFieldLabel().setVisible(false);
110110
uiLoginView.setTitle(MagicLinkI18nKeys.MagicLinkUnrecognisedErrorTitle);

‎webfx-stack-authn-login-ui-gateway-magiclink-plugin/src/main/java/module-info.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
requires javafx.base;
77
requires javafx.controls;
88
requires javafx.graphics;
9+
requires webfx.extras.controlfactory;
10+
requires webfx.extras.i18n;
11+
requires webfx.extras.i18n.controls;
12+
requires webfx.extras.operation;
913
requires webfx.extras.styles.bootstrap;
14+
requires webfx.extras.validation;
1015
requires webfx.kit.util;
1116
requires webfx.platform.console;
1217
requires webfx.platform.uischeduler;
1318
requires webfx.stack.authn;
1419
requires webfx.stack.authn.login.ui.gateway.password.plugin;
15-
requires webfx.stack.i18n;
16-
requires webfx.stack.i18n.controls;
17-
requires webfx.stack.ui.controls;
18-
requires webfx.stack.ui.operation;
19-
requires webfx.stack.ui.validation;
2020

2121
// Exported packages
2222
exports dev.webfx.stack.authn.login.ui.spi.impl.gateway.magiclink;

‎webfx-stack-authn-login-ui-gateway-password-plugin/pom.xml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,105 +35,105 @@
3535

3636
<dependency>
3737
<groupId>dev.webfx</groupId>
38-
<artifactId>webfx-extras-panes</artifactId>
38+
<artifactId>webfx-extras-controlfactory</artifactId>
3939
<version>0.1.0-SNAPSHOT</version>
4040
</dependency>
4141

4242
<dependency>
4343
<groupId>dev.webfx</groupId>
44-
<artifactId>webfx-extras-styles-bootstrap</artifactId>
44+
<artifactId>webfx-extras-i18n</artifactId>
4545
<version>0.1.0-SNAPSHOT</version>
4646
</dependency>
4747

4848
<dependency>
4949
<groupId>dev.webfx</groupId>
50-
<artifactId>webfx-extras-util-control</artifactId>
50+
<artifactId>webfx-extras-i18n-controls</artifactId>
5151
<version>0.1.0-SNAPSHOT</version>
5252
</dependency>
5353

5454
<dependency>
5555
<groupId>dev.webfx</groupId>
56-
<artifactId>webfx-extras-util-scene</artifactId>
56+
<artifactId>webfx-extras-operation</artifactId>
5757
<version>0.1.0-SNAPSHOT</version>
5858
</dependency>
5959

6060
<dependency>
6161
<groupId>dev.webfx</groupId>
62-
<artifactId>webfx-kit-util</artifactId>
62+
<artifactId>webfx-extras-panes</artifactId>
6363
<version>0.1.0-SNAPSHOT</version>
6464
</dependency>
6565

6666
<dependency>
6767
<groupId>dev.webfx</groupId>
68-
<artifactId>webfx-platform-javatime-emul-j2cl</artifactId>
68+
<artifactId>webfx-extras-styles-bootstrap</artifactId>
6969
<version>0.1.0-SNAPSHOT</version>
70-
<scope>runtime</scope>
71-
<optional>true</optional>
7270
</dependency>
7371

7472
<dependency>
7573
<groupId>dev.webfx</groupId>
76-
<artifactId>webfx-platform-uischeduler</artifactId>
74+
<artifactId>webfx-extras-util-control</artifactId>
7775
<version>0.1.0-SNAPSHOT</version>
7876
</dependency>
7977

8078
<dependency>
8179
<groupId>dev.webfx</groupId>
82-
<artifactId>webfx-platform-windowlocation</artifactId>
80+
<artifactId>webfx-extras-util-scene</artifactId>
8381
<version>0.1.0-SNAPSHOT</version>
8482
</dependency>
8583

8684
<dependency>
8785
<groupId>dev.webfx</groupId>
88-
<artifactId>webfx-stack-authn</artifactId>
86+
<artifactId>webfx-extras-validation</artifactId>
8987
<version>0.1.0-SNAPSHOT</version>
9088
</dependency>
9189

9290
<dependency>
9391
<groupId>dev.webfx</groupId>
94-
<artifactId>webfx-stack-authn-login-ui</artifactId>
92+
<artifactId>webfx-kit-util</artifactId>
9593
<version>0.1.0-SNAPSHOT</version>
9694
</dependency>
9795

9896
<dependency>
9997
<groupId>dev.webfx</groupId>
100-
<artifactId>webfx-stack-authn-login-ui-gateway</artifactId>
98+
<artifactId>webfx-platform-javatime-emul-j2cl</artifactId>
10199
<version>0.1.0-SNAPSHOT</version>
100+
<scope>runtime</scope>
101+
<optional>true</optional>
102102
</dependency>
103103

104104
<dependency>
105105
<groupId>dev.webfx</groupId>
106-
<artifactId>webfx-stack-i18n</artifactId>
106+
<artifactId>webfx-platform-uischeduler</artifactId>
107107
<version>0.1.0-SNAPSHOT</version>
108108
</dependency>
109109

110110
<dependency>
111111
<groupId>dev.webfx</groupId>
112-
<artifactId>webfx-stack-i18n-controls</artifactId>
112+
<artifactId>webfx-platform-windowlocation</artifactId>
113113
<version>0.1.0-SNAPSHOT</version>
114114
</dependency>
115115

116116
<dependency>
117117
<groupId>dev.webfx</groupId>
118-
<artifactId>webfx-stack-session-state-client-fx</artifactId>
118+
<artifactId>webfx-stack-authn</artifactId>
119119
<version>0.1.0-SNAPSHOT</version>
120120
</dependency>
121121

122122
<dependency>
123123
<groupId>dev.webfx</groupId>
124-
<artifactId>webfx-stack-ui-controls</artifactId>
124+
<artifactId>webfx-stack-authn-login-ui</artifactId>
125125
<version>0.1.0-SNAPSHOT</version>
126126
</dependency>
127127

128128
<dependency>
129129
<groupId>dev.webfx</groupId>
130-
<artifactId>webfx-stack-ui-operation</artifactId>
130+
<artifactId>webfx-stack-authn-login-ui-gateway</artifactId>
131131
<version>0.1.0-SNAPSHOT</version>
132132
</dependency>
133133

134134
<dependency>
135135
<groupId>dev.webfx</groupId>
136-
<artifactId>webfx-stack-ui-validation</artifactId>
136+
<artifactId>webfx-stack-session-state-client-fx</artifactId>
137137
<version>0.1.0-SNAPSHOT</version>
138138
</dependency>
139139

0 commit comments

Comments
 (0)