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/08/13 17:10:17 UTC
[1/3] git commit: Remove custom executors - they are no needed
because of TesterBroadcaster#executeBlockingWrite(AtmosphereResource, Entry)
Repository: wicket
Updated Branches:
refs/heads/5674-jquery-atmo-webjar 9c7478408 -> eb7427358
Remove custom executors - they are no needed because of TesterBroadcaster#executeBlockingWrite(AtmosphereResource, Entry)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5e04d430
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5e04d430
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5e04d430
Branch: refs/heads/5674-jquery-atmo-webjar
Commit: 5e04d4304484957153fee01b2ed2199b2c020ba0
Parents: 5ee5396
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Aug 13 15:57:02 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Aug 13 15:57:02 2014 +0200
----------------------------------------------------------------------
.../wicket/atmosphere/tester/TesterEventBus.java | 14 --------------
1 file changed, 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/5e04d430/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterEventBus.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterEventBus.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterEventBus.java
index be88777..48e97cb 100644
--- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterEventBus.java
+++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterEventBus.java
@@ -16,14 +16,10 @@
*/
package org.apache.wicket.atmosphere.tester;
-import java.util.concurrent.Executors;
-
import org.apache.wicket.atmosphere.EventBus;
import org.apache.wicket.protocol.http.WebApplication;
import org.atmosphere.cpr.AtmosphereConfig;
import org.atmosphere.cpr.AtmosphereFramework;
-import org.atmosphere.cpr.BroadcasterConfig;
-import org.atmosphere.util.VoidExecutorService;
/**
*
@@ -47,16 +43,6 @@ class TesterEventBus extends EventBus
broadcaster.initialize("wicket-atmosphere-tester", config);
- VoidExecutorService sameThreadExecutorService = new VoidExecutorService();
- BroadcasterConfig broadcasterConfig = new BroadcasterConfig(
- sameThreadExecutorService,
- sameThreadExecutorService,
- Executors.newSingleThreadScheduledExecutor(),
- config, "tester-broadcaster-config");
- broadcaster.setBroadcasterConfig(broadcasterConfig);
- broadcasterConfig.setAsyncWriteService(sameThreadExecutorService);
- broadcasterConfig.setExecutorService(sameThreadExecutorService);
-
return broadcaster;
}
[3/3] git commit: Merge branch 'wicket-atmosphere-tester' into
5674-jquery-atmo-webjar
Posted by mg...@apache.org.
Merge branch 'wicket-atmosphere-tester' into 5674-jquery-atmo-webjar
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/eb742735
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/eb742735
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/eb742735
Branch: refs/heads/5674-jquery-atmo-webjar
Commit: eb74273589d77713df8d315f28886ce658eeccd6
Parents: 9c74784 6155d89
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Aug 13 17:10:07 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Aug 13 17:10:07 2014 +0200
----------------------------------------------------------------------
.../wicket/atmosphere/tester/TesterBroadcaster.java | 16 ++++++++++++++++
.../atmosphere/tester/TesterBroadcasterFactory.java | 16 ++++++++++++++++
.../wicket/atmosphere/tester/TesterEventBus.java | 14 --------------
3 files changed, 32 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: Add ASL2 headers
Posted by mg...@apache.org.
Add ASL2 headers
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6155d89e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6155d89e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6155d89e
Branch: refs/heads/5674-jquery-atmo-webjar
Commit: 6155d89e885b34d5a28046f8a1735d4ac1a213de
Parents: 5e04d43
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Aug 13 17:08:08 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Aug 13 17:08:08 2014 +0200
----------------------------------------------------------------------
.../wicket/atmosphere/tester/TesterBroadcaster.java | 16 ++++++++++++++++
.../atmosphere/tester/TesterBroadcasterFactory.java | 16 ++++++++++++++++
2 files changed, 32 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/6155d89e/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterBroadcaster.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterBroadcaster.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterBroadcaster.java
index ead9f3c..4fae2da 100644
--- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterBroadcaster.java
+++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterBroadcaster.java
@@ -1,3 +1,19 @@
+/*
+ * 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.wicket.atmosphere.tester;
import org.atmosphere.cpr.AtmosphereConfig;
http://git-wip-us.apache.org/repos/asf/wicket/blob/6155d89e/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterBroadcasterFactory.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterBroadcasterFactory.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterBroadcasterFactory.java
index d1b5008..ef559c1 100644
--- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterBroadcasterFactory.java
+++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterBroadcasterFactory.java
@@ -1,3 +1,19 @@
+/*
+ * 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.wicket.atmosphere.tester;
import org.atmosphere.cpr.AtmosphereConfig;