You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/04/22 10:57:16 UTC

[1/5] git commit: Optimize imports

Repository: wicket
Updated Branches:
  refs/heads/wicket-6.x 9b1f12524 -> dff86ea5c


Optimize imports


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2fbfa72b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2fbfa72b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2fbfa72b

Branch: refs/heads/wicket-6.x
Commit: 2fbfa72bd6aac319806f2bd20b8e8008fa7acff7
Parents: 1ac237d
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Apr 22 11:51:50 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Apr 22 11:52:11 2014 +0300

----------------------------------------------------------------------
 .../extensions/ajax/markup/html/form/upload/UploadProgressBar.java  | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/2fbfa72b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
index 0240319..f6d3f4b 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
@@ -19,7 +19,6 @@ package org.apache.wicket.extensions.ajax.markup.html.form.upload;
 import java.util.Formatter;
 
 import org.apache.wicket.Application;
-import org.apache.wicket.Component;
 import org.apache.wicket.IInitializer;
 import org.apache.wicket.MarkupContainer;
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;


[2/5] git commit: Fix typos in javadoc

Posted by mg...@apache.org.
Fix typos in javadoc


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1ac237de
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1ac237de
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1ac237de

Branch: refs/heads/wicket-6.x
Commit: 1ac237de24ac4412ef5e3d98807b8063e9f1806a
Parents: b8ebc24
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Apr 22 11:51:37 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Apr 22 11:52:11 2014 +0300

----------------------------------------------------------------------
 .../java/org/apache/wicket/feedback/FencedFeedbackPanel.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/1ac237de/wicket-core/src/main/java/org/apache/wicket/feedback/FencedFeedbackPanel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/feedback/FencedFeedbackPanel.java b/wicket-core/src/main/java/org/apache/wicket/feedback/FencedFeedbackPanel.java
index f6916f2..f7df59e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/feedback/FencedFeedbackPanel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/feedback/FencedFeedbackPanel.java
@@ -59,7 +59,7 @@ import org.apache.wicket.markup.html.panel.FeedbackPanel;
  * <p>
  * This is where the {@link FencedFeedbackPanel} comes in. All we have to do is to make
  * FeedbackPanel2 a {@link FencedFeedbackPanel} with the fencing component defined as Form2 and
- * Feedback1 a {@link FencedFeedbackPanel} with the fencing component defiend as Form1.
+ * Feedback1 a {@link FencedFeedbackPanel} with the fencing component defined as Form1.
  * {@link FencedFeedbackPanel} will only show messages that original from inside its fencing
  * component and not from inside any descendant component that acts as a fence for another
  * {@link FencedFeedbackPanel}.
@@ -68,7 +68,7 @@ import org.apache.wicket.markup.html.panel.FeedbackPanel;
  * When created with a {@code null} fencing component or using a constructor that does not take one
  * the panel will only display messages that do not come from inside a fence. It will also display
  * messages that come from {@link Session}. This acts as a catch-all panels showing messages that
- * would not be shown using any other instance of the {@link FencedFeedbackPanel} created witha
+ * would not be shown using any other instance of the {@link FencedFeedbackPanel} created with a
  * fencing component. There is usually one instance of such a panel at the top of the page to
  * display notifications of success.
  * </p>
@@ -110,7 +110,7 @@ public class FencedFeedbackPanel extends FeedbackPanel
 	}
 
 	/**
-	 * Creates a catch-all instance witha filter.
+	 * Creates a catch-all instance with a filter.
 	 * 
 	 * @see #FencedFeedbackPanel(String)
 	 * 


[5/5] git commit: Fix wicket-atmosphere module groupId (fixes the build)

Posted by mg...@apache.org.
Fix wicket-atmosphere module groupId (fixes the build)


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/dff86ea5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/dff86ea5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/dff86ea5

Branch: refs/heads/wicket-6.x
Commit: dff86ea5c56d545e3d3441ea83781aa77656a308
Parents: 2fbfa72
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Apr 22 11:56:37 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Apr 22 11:56:37 2014 +0300

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/dff86ea5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 153583c..4641d5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -316,7 +316,7 @@
 				<type>jar</type>
 			</dependency>
 			<dependency>
-				<groupId>org.apache.wicket.experimental.wicket-6.x</groupId>
+				<groupId>org.apache.wicket.experimental.wicket6</groupId>
 				<artifactId>wicket-atmosphere</artifactId>
 				<version>0.18-SNAPSHOT</version>
 				<type>jar</type>


[4/5] git commit: Remove unused variable

Posted by mg...@apache.org.
Remove unused variable


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b8ebc24b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b8ebc24b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b8ebc24b

Branch: refs/heads/wicket-6.x
Commit: b8ebc24b3e19b598e11f8b5dfa7923b1229d4f3e
Parents: 66de7a3
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Apr 22 11:51:04 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Apr 22 11:52:11 2014 +0300

----------------------------------------------------------------------
 .../apache/wicket/RestartResponseAtInterceptPageException.java    | 3 ---
 1 file changed, 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/b8ebc24b/wicket-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java b/wicket-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java
index 7af800e..431dc5b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java
+++ b/wicket-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java
@@ -94,7 +94,6 @@ public class RestartResponseAtInterceptPageException extends ResetResponseExcept
 
 		private Url originalUrl;
 		private Map<String, List<StringValue>> postParameters;
-		private boolean continueOk;
 
 		public Url getOriginalUrl()
 		{
@@ -137,7 +136,6 @@ public class RestartResponseAtInterceptPageException extends ResetResponseExcept
 				data.postParameters.put(s, new ArrayList<StringValue>(request.getPostParameters()
 					.getParameterValues(s)));
 			}
-			data.continueOk = false;
 			session.setMetaData(key, data);
 		}
 
@@ -169,7 +167,6 @@ public class RestartResponseAtInterceptPageException extends ResetResponseExcept
 		InterceptData data = InterceptData.get();
 		if (data != null)
 		{
-			data.continueOk = true;
 			String url = RequestCycle.get().getUrlRenderer().renderUrl(data.originalUrl);
 			RequestCycle.get().replaceAllRequestHandlers(new RedirectRequestHandler(url));
 		}


[3/5] git commit: Update Jetty 7.x to 7.6.15

Posted by mg...@apache.org.
Update Jetty 7.x to 7.6.15


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/66de7a3e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/66de7a3e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/66de7a3e

Branch: refs/heads/wicket-6.x
Commit: 66de7a3e24e4c7c95ff638399d5f3edf2d271f6c
Parents: 9b1f125
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Apr 22 11:50:35 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Apr 22 11:52:11 2014 +0300

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/66de7a3e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 344eaca..153583c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 	<description>Wicket is a Java-based open source component web application framework.</description>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<jetty.version>7.6.3.v20120416</jetty.version>
+		<jetty.version>7.6.15.v20140411</jetty.version>
 		<jetty9.version>9.0.6.v20130930</jetty9.version>
 		<spring.version>3.0.7.RELEASE</spring.version>
 		<maven.javadoc.version>2.9.1</maven.javadoc.version>