Updated Branches:
refs/heads/master 0a5c65f8f -> d5720e633
replaced deprecated import, formatted
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d5720e63
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d5720e63
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d5720e63
Branch: refs/heads/master
Commit: d5720e633dd130735028c19fe5bcf92a1acc6a6e
Parents: 0a5c65f
Author: svenmeier <sv...@apache.org>
Authored: Sat Oct 27 10:45:45 2012 +0200
Committer: svenmeier <sv...@apache.org>
Committed: Sat Oct 27 10:45:45 2012 +0200
----------------------------------------------------------------------
.../src/main/java/HomePage.java | 8 +++---
.../archetype-resources/src/test/java/Start.java | 16 +++++++-------
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d5720e63/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HomePage.java
----------------------------------------------------------------------
diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HomePage.java b/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HomePage.java
index 2d5866d..68c4976 100644
--- a/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HomePage.java
+++ b/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HomePage.java
@@ -7,12 +7,12 @@ import org.apache.wicket.markup.html.WebPage;
public class HomePage extends WebPage {
private static final long serialVersionUID = 1L;
- public HomePage(final PageParameters parameters) {
- super(parameters);
+ public HomePage(final PageParameters parameters) {
+ super(parameters);
- add(new Label("version", getApplication().getFrameworkSettings().getVersion()));
+ add(new Label("version", getApplication().getFrameworkSettings().getVersion()));
- // TODO Add your page's components here
+ // TODO Add your page's components here
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d5720e63/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/Start.java
----------------------------------------------------------------------
diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/Start.java b/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/Start.java
index 3057ea6..7b6a462 100644
--- a/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/Start.java
+++ b/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/Start.java
@@ -1,11 +1,11 @@
package ${package};
import org.apache.wicket.util.time.Duration;
-import org.eclipse.jetty.http.ssl.SslContextFactory;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.bio.SocketConnector;
import org.eclipse.jetty.server.ssl.SslSocketConnector;
import org.eclipse.jetty.util.resource.Resource;
+import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.webapp.WebAppContext;
public class Start {
@@ -21,15 +21,15 @@ public class Start {
connector.setPort(8080);
server.addConnector(connector);
- // check if a keystore for a SSL certificate is available, and
- // if so, start a SSL connector on port 8443. By default, the
- // quickstart comes with a Apache Wicket Quickstart Certificate
- // that expires about half way september 2021. Do not use this
- // certificate anywhere important as the passwords are available
- // in the source.
-
Resource keystore = Resource.newClassPathResource("/keystore");
if (keystore != null && keystore.exists()) {
+ // if a keystore for a SSL certificate is available, start a SSL
+ // connector on port 8443.
+ // By default, the quickstart comes with a Apache Wicket Quickstart
+ // Certificate that expires about half way september 2021. Do not
+ // use this certificate anywhere important as the passwords are
+ // available in the source.
+
connector.setConfidentialPort(8443);
SslContextFactory factory = new SslContextFactory();