You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/01/07 00:25:40 UTC
[02/47] isis git commit: ISIS-987 Provide some sort of mechanism to
allow users to self-register for an Isis application.
ISIS-987 Provide some sort of mechanism to allow users to self-register for an Isis application.
Add SignUp page and mail sending service
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/46758a3b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/46758a3b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/46758a3b
Branch: refs/heads/ISIS-985
Commit: 46758a3b0b649b15ade2ee6cf9b32605b377dba3
Parents: 6d8f153
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Dec 25 16:41:51 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Dec 29 22:12:42 2014 +0200
----------------------------------------------------------------------
.../wicket/viewer/IsisWicketApplication.java | 29 ++++
.../viewer/wicket/viewer/IsisWicketModule.java | 7 +-
.../registries/pages/PageClassListDefault.java | 25 ++++
.../viewer/wicket/model/models/PageType.java | 5 +-
.../wicket/ui/pages/login/IsisSignInPanel.html | 19 ++-
.../wicket/ui/pages/login/IsisSignInPanel.java | 22 +++
.../wicket/ui/pages/login/WicketSignInPage.html | 2 +-
.../wicket/ui/pages/login/WicketSignInPage.java | 7 +-
.../ui/pages/login/WicketSignInPage.properties | 7 +
.../wicket/ui/pages/signup/IsisSignUpPanel.html | 38 +++++
.../wicket/ui/pages/signup/IsisSignUpPanel.java | 73 ++++++++++
.../wicket/ui/pages/signup/WicketSignUpPage.css | 100 +++++++++++++
.../ui/pages/signup/WicketSignUpPage.html | 66 +++++++++
.../ui/pages/signup/WicketSignUpPage.java | 140 +++++++++++++++++++
.../ui/pages/signup/WicketSignUpPage.properties | 25 ++++
.../services/email/EmailSendingService.java | 12 ++
.../email/events/UserCreationEvent.java | 23 +++
core/runtime/pom.xml | 5 +
.../core/runtime/runner/IsisInjectModule.java | 3 +-
.../email/EmailSendingServiceDefault.java | 51 +++++++
20 files changed, 647 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/46758a3b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index 11a1f9f..1e12a33 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -554,6 +554,11 @@ public class IsisWicketApplication extends AuthenticatedWebApplication implement
*/
protected void mountPages() {
+ mountPage("/signin", PageType.SIGN_IN);
+ mountPage("/signup", PageType.SIGN_UP);
+ mountPage("/signup/verify", PageType.SIGN_UP_VERIFY);
+ mountPage("/password/recovery", PageType.FORGOT_PASSWORD);
+
mountPage("/entity/${objectOid}", PageType.ENTITY);
// nb: action mount cannot contain {actionArgs}, because the default
@@ -737,6 +742,30 @@ public class IsisWicketApplication extends AuthenticatedWebApplication implement
return (Class<? extends WebPage>) getPageClassRegistry().getPageClass(PageType.SIGN_IN);
}
+ /**
+ * Delegates to the {@link #getPageClassRegistry() PageClassRegistry}.
+ */
+ @SuppressWarnings("unchecked")
+ public Class<? extends WebPage> getSignUpPageClass() {
+ return (Class<? extends WebPage>) getPageClassRegistry().getPageClass(PageType.SIGN_UP);
+ }
+
+ /**
+ * Delegates to the {@link #getPageClassRegistry() PageClassRegistry}.
+ */
+ @SuppressWarnings("unchecked")
+ public Class<? extends WebPage> getSignUpVerifyPageClass() {
+ return (Class<? extends WebPage>) getPageClassRegistry().getPageClass(PageType.SIGN_UP_VERIFY);
+ }
+
+ /**
+ * Delegates to the {@link #getPageClassRegistry() PageClassRegistry}.
+ */
+ @SuppressWarnings("unchecked")
+ public Class<? extends WebPage> getForgotPasswordPageClass() {
+ return (Class<? extends WebPage>) getPageClassRegistry().getPageClass(PageType.FORGOT_PASSWORD);
+ }
+
// /////////////////////////////////////////////////
// Authentication Session
http://git-wip-us.apache.org/repos/asf/isis/blob/46758a3b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java
index 8f00317..ed6d736 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java
@@ -23,6 +23,8 @@ import com.google.inject.AbstractModule;
import com.google.inject.name.Names;
import com.google.inject.util.Providers;
+import org.apache.isis.applib.services.email.EmailSendingService;
+import org.apache.isis.core.runtime.services.email.EmailSendingServiceDefault;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.models.ImageResourceCache;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar;
@@ -68,11 +70,12 @@ public class IsisWicketModule extends AbstractModule {
bind(ComponentFactoryRegistrar.class).to(ComponentFactoryRegistrarDefault.class);
bind(ImageResourceCache.class).to(ImageResourceCacheClassPath.class);
bind(WicketViewerSettings.class).to(WicketViewerSettingsDefault.class);
-
+ bind(EmailSendingService.class).to(EmailSendingServiceDefault.class);
+
bind(String.class).annotatedWith(Names.named("applicationName")).toInstance("Apache Isis Wicket Viewer");
bind(String.class).annotatedWith(Names.named("applicationCss")).toProvider(Providers.of((String)null));
bind(String.class).annotatedWith(Names.named("applicationJs")).toProvider(Providers.of((String)null));
bind(String.class).annotatedWith(Names.named("welcomeMessage")).toProvider(Providers.of((String)null));
bind(String.class).annotatedWith(Names.named("aboutMessage")).toProvider(Providers.of((String)null));
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/46758a3b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
index 4a51c84..f5ba6c7 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
@@ -31,6 +31,7 @@ import org.apache.isis.viewer.wicket.ui.pages.actionprompt.ActionPromptPage;
import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
import org.apache.isis.viewer.wicket.ui.pages.home.HomePage;
import org.apache.isis.viewer.wicket.ui.pages.login.WicketSignInPage;
+import org.apache.isis.viewer.wicket.ui.pages.signup.WicketSignUpPage;
import org.apache.isis.viewer.wicket.ui.pages.standalonecollection.StandaloneCollectionPage;
import org.apache.isis.viewer.wicket.ui.pages.value.ValuePage;
import org.apache.isis.viewer.wicket.ui.pages.voidreturn.VoidReturnPage;
@@ -47,6 +48,9 @@ public class PageClassListDefault implements PageClassList {
@Override
public void registerPages(final PageClassRegistrySpi pageRegistry) {
pageRegistry.registerPage(PageType.SIGN_IN, getSignInPageClass());
+ pageRegistry.registerPage(PageType.SIGN_UP, getSignUpPageClass());
+ pageRegistry.registerPage(PageType.SIGN_UP_VERIFY, getSignUpVerifyPageClass());
+ pageRegistry.registerPage(PageType.FORGOT_PASSWORD, getForgotPasswordPageClass());
pageRegistry.registerPage(PageType.ABOUT, getAboutPageClass());
pageRegistry.registerPage(PageType.ENTITY, getEntityPageClass());
pageRegistry.registerPage(PageType.HOME, getHomePageClass());
@@ -101,6 +105,27 @@ public class PageClassListDefault implements PageClassList {
/**
* For subclassing if required.
*/
+ protected Class<? extends Page> getSignUpPageClass() {
+ return WicketSignUpPage.class;
+ }
+
+ /**
+ * For subclassing if required.
+ */
+ protected Class<? extends Page> getSignUpVerifyPageClass() {
+ return WicketSignUpPage.class;
+ }
+
+ /**
+ * For subclassing if required.
+ */
+ protected Class<? extends Page> getForgotPasswordPageClass() {
+ return WicketSignUpPage.class;
+ }
+
+ /**
+ * For subclassing if required.
+ */
protected Class<? extends Page> getHomePageClass() {
return HomePage.class;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/46758a3b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageType.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageType.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageType.java
index 9058a05..10d081f 100644
--- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageType.java
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageType.java
@@ -30,7 +30,10 @@ package org.apache.isis.viewer.wicket.model.models;
* layout (eg headers, footers) to be altered.
*/
public enum PageType {
- SIGN_IN,
+ SIGN_IN,
+ SIGN_UP,
+ SIGN_UP_VERIFY,
+ FORGOT_PASSWORD,
HOME,
ABOUT,
ENTITY,
http://git-wip-us.apache.org/repos/asf/isis/blob/46758a3b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.html
index 1f0ce87..bd6dcf3 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.html
@@ -22,20 +22,29 @@
<form wicket:id="signInForm" role="form">
<div class="form-group">
- <label wicket:for="username">Username</label>
+ <label wicket:for="username"><wicket:message key="usernameLabel"/></label>
<input type="text" class="form-control" wicket:id="username" placeholder="Enter username"/>
</div>
<div class="form-group">
- <label wicket:for="password">Password</label>
+ <label wicket:for="password"><wicket:message key="passwordLabel"/></label>
<input type="password" class="form-control" wicket:id="password" placeholder="Enter password"/>
</div>
<div class="checkbox" wicket:id="rememberMeRow">
<label>
- <input type="checkbox" wicket:id="rememberMe"/> Remember me
+ <input type="checkbox" wicket:id="rememberMe"/> <wicket:message key="rememberMeLabel"/>
</label>
</div>
- <button type="submit" class="btn btn-primary">Sign in</button>
- <button type="reset" class="btn btn-default">Reset</button>
+
+ <button type="submit" class="btn btn-primary"><wicket:message key="signInButtonLabel"/></button>
+ <button type="reset" class="btn btn-default"><wicket:message key="resetButtonLabel"/></button>
+
+ <div class="form-group">
+ <button type="button" class="btn btn-block btn-link"><wicket:message key="forgotPasswordLinkLabel"/></button>
+ </div>
+
+ <div class="form-group">
+ <a wicket:id="signUpLink" class="btn btn-block btn-info"><wicket:message key="signUpButtonLabel"/></a>
+ </div>
</form>
</wicket:panel>
http://git-wip-us.apache.org/repos/asf/isis/blob/46758a3b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
index 92f1a0a..146add6 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
@@ -21,7 +21,12 @@ package org.apache.isis.viewer.wicket.ui.pages.login;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import javax.inject.Inject;
+import org.apache.wicket.MarkupContainer;
import org.apache.wicket.authroles.authentication.panel.SignInPanel;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.isis.viewer.wicket.model.models.PageType;
+import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
/**
* An extension of Wicket's default SignInPanel that provides
@@ -32,6 +37,7 @@ import org.apache.wicket.authroles.authentication.panel.SignInPanel;
public class IsisSignInPanel extends SignInPanel {
private final boolean clearOriginalDestination;
+ private final boolean forgotPassword;
/**
* Constructor
@@ -46,13 +52,26 @@ public class IsisSignInPanel extends SignInPanel {
public IsisSignInPanel(
final String id,
final boolean rememberMe,
+ final boolean forgotPassword,
final boolean continueToOriginalDestination) {
super(id, rememberMe);
+ this.forgotPassword = forgotPassword;
this.clearOriginalDestination = !continueToOriginalDestination;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ getSignInForm().addOrReplace(new BookmarkablePageLink<Void>("signUpLink", pageClassRegistry.getPageClass(PageType.SIGN_UP)));
addOrReplace(new NotificationPanel("feedback"));
}
+ private MarkupContainer getSignInForm() {
+ return (MarkupContainer) get("signInForm");
+ }
+
@Override
protected void onSignInSucceeded() {
@@ -69,4 +88,7 @@ public class IsisSignInPanel extends SignInPanel {
}
super.onSignInRemembered();
}
+
+ @Inject
+ private PageClassRegistry pageClassRegistry;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/46758a3b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html
index a1db7ba..1348d57 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html
@@ -19,7 +19,7 @@
under the License.
-->
<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
+ xmlns:wicket="http://wicket.apache.org"
xml:lang="en"
lang="en">
<head>
http://git-wip-us.apache.org/repos/asf/isis/blob/46758a3b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
index 4804574..a2d9a17 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
@@ -107,16 +107,19 @@ public class WicketSignInPage extends WebPage {
protected SignInPanel addSignInPanel() {
final boolean suppressRememberMe = getConfiguration().getBoolean("isis.viewer.wicket.suppressRememberMe", false);
+ final boolean suppressForgotPassword = getConfiguration().getBoolean("isis.viewer.wicket.suppressForgotPassword", false);
final boolean clearOriginalDestination = getConfiguration().getBoolean("isis.viewer.wicket.clearOriginalDestination", false);
final boolean rememberMe = !suppressRememberMe;
+ final boolean forgotPassword = !suppressForgotPassword;
final boolean continueToOriginalDestination = !clearOriginalDestination;
- return addSignInPanel(rememberMe, continueToOriginalDestination);
+ return addSignInPanel(rememberMe, forgotPassword, continueToOriginalDestination);
}
private SignInPanel addSignInPanel(
final boolean rememberMe,
+ final boolean forgotPassword,
final boolean continueToOriginalDestination) {
- final SignInPanel signInPanel = new IsisSignInPanel("signInPanel", rememberMe, continueToOriginalDestination);
+ final SignInPanel signInPanel = new IsisSignInPanel("signInPanel", rememberMe, forgotPassword, continueToOriginalDestination);
add(signInPanel);
return signInPanel;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/46758a3b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.properties
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.properties b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.properties
index 12cbc83..d1e79e7 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.properties
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.properties
@@ -18,3 +18,10 @@
#
loginHeader=Login
+usernameLabel=Username
+passwordLabel=Password
+rememberMeLabel=Remember me
+signInButtonLabel=Sign in
+resetButtonLabel=Reset
+forgotPasswordLinkLabel=Forgot your password ?
+signUpButtonLabel=Don't have an account ? Sign up now ?
http://git-wip-us.apache.org/repos/asf/isis/blob/46758a3b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/signup/IsisSignUpPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/signup/IsisSignUpPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/signup/IsisSignUpPanel.html
new file mode 100644
index 0000000..b1fa69f
--- /dev/null
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/signup/IsisSignUpPanel.html
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<html xmlns:wicket="http://wicket.apache.org">
+ <body>
+ <wicket:panel>
+ <span wicket:id="feedback"></span>
+
+ <form wicket:id="signUpForm" role="form">
+ <div class="form-group">
+ <label wicket:for="email"><wicket:message key="emailLabel"/></label>
+ <input type="text" class="form-control" wicket:id="email" wicket:message="placeholder:emailPlaceholder"/>
+ </div>
+ <div class="form-group">
+ <label wicket:for="password"><wicket:message key="signUpPasswordLabel"/></label>
+ <input type="password" class="form-control" wicket:id="password" wicket:message="placeholder:passwordPlaceholder"/>
+ </div>
+
+ <button type="submit" wicket:id="signUp" class="btn btn-primary"><wicket:message key="signUpButtonLabel"/></button>
+ </form>
+
+ </wicket:panel>
+ </body>
+</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/46758a3b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/signup/IsisSignUpPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/signup/IsisSignUpPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/signup/IsisSignUpPanel.java
new file mode 100644
index 0000000..e52ba2a
--- /dev/null
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/signup/IsisSignUpPanel.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.viewer.wicket.ui.pages.signup;
+
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+
+import javax.inject.Inject;
+import org.apache.wicket.markup.html.form.Button;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.PasswordTextField;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.validation.validator.EmailAddressValidator;
+import org.apache.isis.applib.services.email.EmailSendingService;
+import org.apache.isis.applib.services.email.events.UserCreationEvent;
+
+/**
+ * A panel with a form for creation of new users
+ */
+public class IsisSignUpPanel extends Panel {
+
+ /**
+ * Constructor
+ *
+ * @param id
+ * the component id
+ */
+ public IsisSignUpPanel(final String id) {
+ super(id);
+
+ addOrReplace(new NotificationPanel("feedback"));
+
+ Form<Void> form = new Form<>("signUpForm");
+ addOrReplace(form);
+
+ final TextField<String> emailField = new TextField<>("email", Model.of(""));
+ emailField.add(EmailAddressValidator.getInstance());
+ final PasswordTextField passwordField = new PasswordTextField("password", Model.of(""));
+ Button signUpButton = new Button("signUp") {
+ @Override
+ public void onSubmit() {
+ super.onSubmit();
+
+ String email = emailField.getModelObject();
+ String password = passwordField.getModelObject();
+
+ emailService.send(new UserCreationEvent(email, password));
+ }
+ };
+ form.add(emailField, passwordField, signUpButton);
+ }
+
+ @Inject
+ private EmailSendingService emailService;
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/46758a3b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/signup/WicketSignUpPage.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/signup/WicketSignUpPage.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/signup/WicketSignUpPage.css
new file mode 100644
index 0000000..3727ba1
--- /dev/null
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/signup/WicketSignUpPage.css
@@ -0,0 +1,100 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+#header .applicationName {
+ display:none;
+}
+
+ .loginPanel {
+ width:310px;
+ background-color:#FFFFFF;
+ padding:20px;
+ border-radius:4px;
+ -moz-border-radius:4px;
+ -webkit-border-radius:4px;
+ margin-bottom:1%;
+ position:absolute;
+ clear:both;
+ height:200px;
+ left:50%;
+ top:50%;
+ margin-left:-175px;
+ margin-top:-100px;
+ }
+
+ .loginPanel h2 {
+ color:#423D37;
+ font-size:1.6em;
+ letter-spacing:0px;
+ line-height:150%;
+ margin-bottom:10px;
+ }
+
+ .loginPanel table {
+ width:100%;
+}
+
+.loginPanel table tr td {
+ padding:5px 0px;
+ text-align:left !important;
+}
+
+.loginPanel form input[type=text],
+.loginPanel form input[type=password] {
+ border-radius:4px;
+ -moz-borer-radius:4px;
+ -webkit-border-radius:4px;
+ padding:6px;
+ background-color:#F0EFEA;
+ border:1px solid #F0EFEA;
+ border-top:1px solid #CCCBC7;
+}
+
+
+.loginPanel form input[type=submit] {
+ background-color: #20B5C2;
+ border: 0 none;
+ border-radius: 4px 4px 4px 4px;
+ color: #FFFFFF;
+ cursor: pointer;
+ display: inline-block;
+ font-size: 0.9em;
+ padding: 5px 10px;
+}
+
+.loginPanel form input[type=reset] {
+ background-color: #E4E4DB;
+ border: 0 none;
+ border-radius: 4px 4px 4px 4px;
+ color: #46423C;
+ cursor: pointer;
+ display: inline-block;
+ font-size: 0.9em;
+ padding: 5px 10px;
+ text-transform: uppercase;
+}
+
+.loginPanel table tr td {
+ color:#46423C;
+}
+
+.wicketSignInPanel .mainMessage {
+ margin-top: 550px;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/46758a3b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/signup/WicketSignUpPage.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/signup/WicketSignUpPage.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/signup/WicketSignUpPage.html
new file mode 100644
index 0000000..5942a93
--- /dev/null
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/signup/WicketSignUpPage.html
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
+ xml:lang="en"
+ lang="en">
+ <head>
+ <wicket:header-items/>
+ <title wicket:id="pageTitle"></title>
+ </head>
+ <body>
+ <div id="container" class="wicketSignInPanel container-fluid">
+ <div class="jumbotron" style="background-color: transparent">
+
+ <div class="row">
+ <div class="col-sm-12"> </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-12"> </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-12"> </div>
+ </div>
+
+ <div class="row">
+ <div class="headerContainer col-sm-offset-4 col-sm-4">
+ <h1 wicket:id="applicationName" class="applicationName">[application name]</h1>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-sm-12"> </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-12"> </div>
+ </div>
+
+ <div class="row">
+ <div class="loginPanel col-sm-offset-4 col-sm-4">
+ <h2><wicket:message key="signUpHeader"/></h2>
+ <div wicket:id="signUpPanel"></div>
+ </div>
+ </div>
+ </div>
+ <div wicket:id="exceptionStackTrace" class="exceptionStackTrace"></div>
+ </div>
+ </body>
+</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/46758a3b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/signup/WicketSignUpPage.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/signup/WicketSignUpPage.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/signup/WicketSignUpPage.java
new file mode 100644
index 0000000..82479d2
--- /dev/null
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/signup/WicketSignUpPage.java
@@ -0,0 +1,140 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.viewer.wicket.ui.pages.signup;
+
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+import org.apache.wicket.Application;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.markup.head.CssReferenceHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;
+import org.apache.wicket.markup.head.PriorityHeaderItem;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.viewer.wicket.ui.errors.ExceptionModel;
+import org.apache.isis.viewer.wicket.ui.errors.ExceptionStackTracePanel;
+import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
+
+/**
+ * Boilerplate, pick up our HTML and CSS.
+ */
+public class WicketSignUpPage extends WebPage {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final String ID_PAGE_TITLE = "pageTitle";
+ private static final String ID_APPLICATION_NAME = "applicationName";
+
+ private static final String ID_EXCEPTION_STACK_TRACE = "exceptionStackTrace";
+
+ /**
+ * {@link com.google.inject.Inject}ed when {@link #init() initialized}.
+ */
+ @Inject
+ @Named("applicationName")
+ private String applicationName;
+
+ /**
+ * {@link com.google.inject.Inject}ed when {@link #init() initialized}.
+ */
+ @Inject
+ @Named("applicationCss")
+ private String applicationCss;
+
+ /**
+ * {@link com.google.inject.Inject}ed when {@link #init() initialized}.
+ */
+ @Inject
+ @Named("applicationJs")
+ private String applicationJs;
+
+ /**
+ * If set by {@link org.apache.isis.viewer.wicket.ui.pages.PageAbstract}.
+ */
+ private static ExceptionModel getAndClearExceptionModelIfAny() {
+ ExceptionModel exceptionModel = PageAbstract.EXCEPTION.get();
+ PageAbstract.EXCEPTION.remove();
+ return exceptionModel;
+ }
+
+ public WicketSignUpPage() {
+ this(null);
+ }
+
+ public WicketSignUpPage(final PageParameters parameters) {
+ this(parameters, getAndClearExceptionModelIfAny());
+ }
+
+ public WicketSignUpPage(final PageParameters parameters, ExceptionModel exceptionModel) {
+ addPageTitle();
+ addApplicationName();
+ addSignInPanel();
+
+ if(exceptionModel != null) {
+ add(new ExceptionStackTracePanel(ID_EXCEPTION_STACK_TRACE, exceptionModel));
+ } else {
+ add(new WebMarkupContainer(ID_EXCEPTION_STACK_TRACE).setVisible(false));
+ }
+ }
+
+ private MarkupContainer addPageTitle() {
+ return add(new Label(ID_PAGE_TITLE, applicationName));
+ }
+
+ private void addApplicationName() {
+ add(new Label(ID_APPLICATION_NAME, applicationName));
+ }
+
+ protected IsisSignUpPanel addSignInPanel() {
+ final IsisSignUpPanel signInPanel = new IsisSignUpPanel("signUpPanel");
+ add(signInPanel);
+ return signInPanel;
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(Application.get().getJavaScriptLibrarySettings().getJQueryReference())));
+
+ if(applicationCss != null) {
+ response.render(CssReferenceHeaderItem.forUrl(applicationCss));
+ }
+ if(applicationJs != null) {
+ response.render(JavaScriptReferenceHeaderItem.forUrl(applicationJs));
+ }
+ }
+
+
+
+ // ///////////////////////////////////////////////////
+ // System components
+ // ///////////////////////////////////////////////////
+
+ protected IsisConfiguration getConfiguration() {
+ return IsisContext.getConfiguration();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/46758a3b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/signup/WicketSignUpPage.properties
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/signup/WicketSignUpPage.properties b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/signup/WicketSignUpPage.properties
new file mode 100644
index 0000000..046b998
--- /dev/null
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/signup/WicketSignUpPage.properties
@@ -0,0 +1,25 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+signUpHeader=Sign Up
+emailLabel=Email
+emailPlaceholder=Enter email
+signUpPasswordLabel=Password
+passwordPlaceholder=Enter password
+signUpButtonLabel=Sign Up
http://git-wip-us.apache.org/repos/asf/isis/blob/46758a3b/core/applib/src/main/java/org/apache/isis/applib/services/email/EmailSendingService.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/email/EmailSendingService.java b/core/applib/src/main/java/org/apache/isis/applib/services/email/EmailSendingService.java
new file mode 100644
index 0000000..31b845b
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/email/EmailSendingService.java
@@ -0,0 +1,12 @@
+package org.apache.isis.applib.services.email;
+
+import java.io.Serializable;
+import org.apache.isis.applib.services.email.events.UserCreationEvent;
+
+/**
+ *
+ */
+public interface EmailSendingService extends Serializable {
+
+ void send(UserCreationEvent userCreationEvent);
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/46758a3b/core/applib/src/main/java/org/apache/isis/applib/services/email/events/UserCreationEvent.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/email/events/UserCreationEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/email/events/UserCreationEvent.java
new file mode 100644
index 0000000..058b56c
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/email/events/UserCreationEvent.java
@@ -0,0 +1,23 @@
+package org.apache.isis.applib.services.email.events;
+
+/**
+ *
+ */
+public class UserCreationEvent {
+
+ private final String email;
+ private final String password;
+
+ public UserCreationEvent(String email, String password) {
+ this.email = email;
+ this.password = password;
+ }
+
+ public String getEmail() {
+ return email;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/46758a3b/core/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index d309788..e110f27 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -179,6 +179,11 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-email</artifactId>
+ <version>1.3.3</version>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/46758a3b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisInjectModule.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisInjectModule.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisInjectModule.java
index 5640ac5..bdf5932 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisInjectModule.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisInjectModule.java
@@ -134,4 +134,5 @@ public class IsisInjectModule extends AbstractModule {
return system;
}
-}
\ No newline at end of file
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/46758a3b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailSendingServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailSendingServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailSendingServiceDefault.java
new file mode 100644
index 0000000..0bb4bc5
--- /dev/null
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailSendingServiceDefault.java
@@ -0,0 +1,51 @@
+package org.apache.isis.core.runtime.services.email;
+
+import java.util.Properties;
+import org.apache.commons.mail.DefaultAuthenticator;
+import org.apache.commons.mail.Email;
+import org.apache.commons.mail.EmailException;
+import org.apache.commons.mail.HtmlEmail;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.services.email.EmailSendingService;
+import org.apache.isis.applib.services.email.events.UserCreationEvent;
+
+/**
+ *
+ */
+@DomainService
+public class EmailSendingServiceDefault implements EmailSendingService {
+
+ private static final String EMAIL = "apache.isis.test@gmail.com";
+ private static final String PASSWD = "ApacheIsis987^";
+
+ @Override
+ public void send(UserCreationEvent userCreationEvent) {
+
+ try {
+ Email email = new HtmlEmail();
+ email.setHostName("smtp.gmail.com");
+ email.setSmtpPort(587);
+ email.setAuthenticator(new DefaultAuthenticator(EMAIL, PASSWD));
+ email.setStartTLSEnabled(true);
+ Properties properties = email.getMailSession().getProperties();
+ properties.put("mail.smtps.auth", "true");
+ properties.put("mail.debug", "true");
+ properties.put("mail.smtps.port", "587");
+ properties.put("mail.smtps.socketFactory.port", "587");
+ properties.put("mail.smtps.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
+ properties.put("mail.smtps.socketFactory.fallback", "false");
+ properties.put("mail.smtp.starttls.enable", "true");
+
+ email.setFrom("apache.isis.test@gmail.com");
+
+ email.setSubject("SignUp verification");
+ email.setMsg("This is a test mail ... :-)\n\nEmail: " +
+ userCreationEvent.getEmail() + "\n\nPasswd: " + userCreationEvent.getPassword());
+ email.addTo("martin.grigorov@gmail.com");
+ email.send();
+
+ } catch (EmailException e) {
+ e.printStackTrace();
+ }
+ }
+}