Skip to content

Commit e10430e

Browse files
sbordetsbordet
committed
Made the whole project compile again.
1 parent d75eb4e commit e10430e

70 files changed

Lines changed: 581 additions & 657 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.

‎cometd-archetypes/dojo-jetty7/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<servlet>
1111
<servlet-name>cometd</servlet-name>
12-
<servlet-class>org.cometd.server.CometdServlet</servlet-class>
12+
<servlet-class>org.cometd.server.CometDServlet</servlet-class>
1313
<init-param>
1414
<param-name>transports</param-name>
1515
<param-value>org.cometd.websocket.server.WebSocketTransport</param-value>

‎cometd-archetypes/dojo-jetty8/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<servlet>
1111
<servlet-name>cometd</servlet-name>
12-
<servlet-class>org.cometd.server.CometdServlet</servlet-class>
12+
<servlet-class>org.cometd.server.CometDServlet</servlet-class>
1313
<init-param>
1414
<param-name>transports</param-name>
1515
<param-value>org.cometd.websocket.server.WebSocketTransport</param-value>

‎cometd-archetypes/jquery-jetty7/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<servlet>
1111
<servlet-name>cometd</servlet-name>
12-
<servlet-class>org.cometd.server.CometdServlet</servlet-class>
12+
<servlet-class>org.cometd.server.CometDServlet</servlet-class>
1313
<init-param>
1414
<param-name>transports</param-name>
1515
<param-value>org.cometd.websocket.server.WebSocketTransport</param-value>

‎cometd-archetypes/jquery-jetty8/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<servlet>
1111
<servlet-name>cometd</servlet-name>
12-
<servlet-class>org.cometd.server.CometdServlet</servlet-class>
12+
<servlet-class>org.cometd.server.CometDServlet</servlet-class>
1313
<init-param>
1414
<param-name>transports</param-name>
1515
<param-value>org.cometd.websocket.server.WebSocketTransport</param-value>

‎cometd-archetypes/spring-dojo-jetty7/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<servlet>
1111
<servlet-name>cometd</servlet-name>
12-
<servlet-class>org.cometd.server.CometdServlet</servlet-class>
12+
<servlet-class>org.cometd.server.CometDServlet</servlet-class>
1313
</servlet>
1414
<servlet-mapping>
1515
<servlet-name>cometd</servlet-name>

‎cometd-archetypes/spring-jquery-jetty7/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<servlet>
1111
<servlet-name>cometd</servlet-name>
12-
<servlet-class>org.cometd.server.CometdServlet</servlet-class>
12+
<servlet-class>org.cometd.server.CometDServlet</servlet-class>
1313
</servlet>
1414
<servlet-mapping>
1515
<servlet-name>cometd</servlet-name>

‎cometd-demo/src/main/java/org/webtide/demo/auction/AuctionChatService.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
public class AuctionChatService extends AbstractService
4242
{
4343
// A map(channel, map(userName, clientId))
44-
private final ConcurrentMap<String, Set<String>> _members = new ConcurrentHashMap<String, Set<String>>();
44+
private final ConcurrentMap<String, Set<String>> _members = new ConcurrentHashMap<>();
4545
private Oort _oort;
4646
private Seti _seti;
4747

@@ -83,7 +83,7 @@ public void trackMembers(final ServerSession joiner, final String channelName, O
8383
Set<String> members = _members.get(channelName);
8484
if (members == null)
8585
{
86-
Set<String> newMembers = new HashSet<String>();
86+
Set<String> newMembers = new HashSet<>();
8787
members = _members.putIfAbsent(channelName, newMembers);
8888
if (members == null)
8989
members = newMembers;
@@ -95,7 +95,7 @@ public void trackMembers(final ServerSession joiner, final String channelName, O
9595
{
9696
_logger.info("Members: {}", members);
9797
// Broadcast the members to all existing members
98-
getBayeux().getChannel(channelName).publish(getServerSession(), members, messageId);
98+
getBayeux().getChannel(channelName).publish(getServerSession(), members);
9999
}
100100
}
101101
else if (data instanceof Map)
@@ -108,7 +108,7 @@ else if (data instanceof Map)
108108
Set<String> members = _members.get(channelName);
109109
if (members == null)
110110
{
111-
Set<String> newMembers = new HashSet<String>();
111+
Set<String> newMembers = new HashSet<>();
112112
members = _members.putIfAbsent(channelName, newMembers);
113113
if (members == null)
114114
members = newMembers;
@@ -132,18 +132,18 @@ public void removed(ServerSession session, boolean timeout)
132132
ServerChannel channel = getBayeux().getChannel(channelName);
133133
if (channel != null)
134134
{
135-
Map<String, Object> leave = new HashMap<String, Object>();
135+
Map<String, Object> leave = new HashMap<>();
136136
leave.put("leave", Boolean.TRUE);
137137
leave.put("user", userName);
138-
channel.publish(null, leave, null);
138+
channel.publish(null, leave);
139139
}
140140
}
141141
}
142142
});
143143

144144
_logger.info("Members: {}", members);
145145
// Broadcast the members to all existing members
146-
getBayeux().getChannel(channelName).publish(getServerSession(), members, messageId);
146+
getBayeux().getChannel(channelName).publish(getServerSession(), members);
147147

148148
}
149149

@@ -152,7 +152,7 @@ public void removed(ServerSession session, boolean timeout)
152152
Set<String> members = _members.get(channelName);
153153
if (members == null)
154154
{
155-
Set<String> newMembers = new HashSet<String>();
155+
Set<String> newMembers = new HashSet<>();
156156
members = _members.putIfAbsent(channelName, newMembers);
157157
if (members == null)
158158
members = newMembers;
@@ -163,7 +163,7 @@ public void removed(ServerSession session, boolean timeout)
163163

164164
_logger.info("Members: {}", members);
165165
// Broadcast the members to all existing members
166-
getBayeux().getChannel(channelName).publish(getServerSession(), members, messageId);
166+
getBayeux().getChannel(channelName).publish(getServerSession(), members);
167167
}
168168
}
169169
}

‎cometd-demo/src/main/java/org/webtide/demo/auction/AuctionService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public synchronized void bid(ServerSession source, String channel, Map<String, O
146146
bid.setAmount(amount);
147147
bid.setBidder(bidder);
148148
_auctionDao.saveAuctionBid(bid);
149-
getBayeux().getChannel(AUCTION_ROOT + "item" + itemId).publish(getServerSession(), bid, messageId);
149+
getBayeux().getChannel(AUCTION_ROOT + "item" + itemId).publish(getServerSession(), bid);
150150
}
151151
}
152152
}

‎cometd-demo/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,32 @@
11
<?xml version="1.0" encoding="ISO-8859-1"?>
22
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
5-
version="2.5">
4+
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
5+
version="3.0">
66

7-
<display-name>Cometd Test WebApp</display-name>
7+
<display-name>CometD Test WebApp</display-name>
88

99
<!-- Request that Jetty create an MBean to manage the Bayeux instance -->
1010
<context-param>
1111
<param-name>org.eclipse.jetty.server.context.ManagedAttributes</param-name>
1212
<param-value>org.cometd.bayeux,org.cometd.oort.Oort</param-value>
1313
</context-param>
1414

15-
<!-- Portability Filter, needed only to run on non Jetty or non Servlet-3.0 containers -->
16-
<!--
17-
<filter>
18-
<filter-name>continuation</filter-name>
19-
<filter-class>org.eclipse.jetty.continuation.ContinuationFilter</filter-class>
20-
</filter>
21-
<filter-mapping>
22-
<filter-name>continuation</filter-name>
23-
<url-pattern>/cometd/*</url-pattern>
24-
</filter-mapping>
25-
-->
26-
2715
<!-- Filter to support cross domain requests -->
2816
<filter>
2917
<filter-name>cross-origin</filter-name>
3018
<filter-class>org.eclipse.jetty.servlets.CrossOriginFilter</filter-class>
31-
<!--async-supported>true</async-supported-->
19+
<async-supported>true</async-supported>
3220
</filter>
3321
<filter-mapping>
3422
<filter-name>cross-origin</filter-name>
3523
<url-pattern>/cometd/*</url-pattern>
3624
</filter-mapping>
3725

38-
<!-- Cometd Servlet -->
26+
<!-- CometD Servlet -->
3927
<servlet>
4028
<servlet-name>cometd</servlet-name>
41-
<servlet-class>org.cometd.annotation.AnnotationCometdServlet</servlet-class>
42-
<!--async-supported>true</async-supported-->
29+
<servlet-class>org.cometd.annotation.AnnotationCometDServlet</servlet-class>
4330
<init-param>
4431
<param-name>timeout</param-name>
4532
<param-value>20000</param-value>
@@ -73,6 +60,7 @@
7360
<param-value>org.cometd.examples.ChatService</param-value>
7461
</init-param>
7562
<load-on-startup>1</load-on-startup>
63+
<async-supported>true</async-supported>
7664
</servlet>
7765
<servlet-mapping>
7866
<servlet-name>cometd</servlet-name>
@@ -81,7 +69,7 @@
8169

8270
<servlet>
8371
<servlet-name>cometdDemo</servlet-name>
84-
<servlet-class>org.cometd.examples.CometdDemoServlet</servlet-class>
72+
<servlet-class>org.cometd.examples.CometDDemoServlet</servlet-class>
8573
<load-on-startup>2</load-on-startup>
8674
</servlet>
8775

‎cometd-demo/src/test/java/com/webtide/demo/auction/AuctionDemo.java‎

Lines changed: 24 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
import org.cometd.oort.Oort;
2020
import org.cometd.oort.OortStaticConfigServlet;
2121
import org.cometd.oort.SetiServlet;
22-
import org.cometd.server.CometdServlet;
22+
import org.cometd.server.CometDServlet;
2323
import org.eclipse.jetty.server.Server;
24+
import org.eclipse.jetty.server.ServerConnector;
2425
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
25-
import org.eclipse.jetty.server.nio.SelectChannelConnector;
2626
import org.eclipse.jetty.servlet.ServletContextHandler;
2727
import org.eclipse.jetty.servlet.ServletHolder;
2828
import org.eclipse.jetty.util.resource.Resource;
@@ -36,59 +36,47 @@
3636
*/
3737
public class AuctionDemo
3838
{
39-
private static int _testHandshakeFailure;
40-
private Oort _oort;
41-
42-
/**
43-
* @param args
44-
*/
4539
public static void main(String[] args) throws Exception
4640
{
47-
AuctionDemo d8080=new AuctionDemo(8080);
48-
// AuctionDemo d8081=new AuctionDemo(8081);
41+
new AuctionDemo(8080);
4942
}
5043

5144
public AuctionDemo(int port) throws Exception
5245
{
53-
String base=".";
46+
String base = ".";
5447

55-
// Manually contruct context to avoid hassles with webapp classloaders for now.
56-
Server server = new Server();
5748
QueuedThreadPool qtp = new QueuedThreadPool();
5849
qtp.setMinThreads(5);
5950
qtp.setMaxThreads(200);
60-
server.setThreadPool(qtp);
51+
Server server = new Server(qtp);
6152

62-
SelectChannelConnector connector=new SelectChannelConnector();
63-
// SocketConnector connector=new SocketConnector();
53+
ServerConnector connector = new ServerConnector(server);
6454
connector.setPort(port);
6555
server.addConnector(connector);
6656

6757
ContextHandlerCollection contexts = new ContextHandlerCollection();
6858
server.setHandler(contexts);
6959

70-
ServletContextHandler context = new ServletContextHandler(contexts,"/",ServletContextHandler.SESSIONS);
71-
72-
context.setBaseResource(new ResourceCollection(new Resource[]
73-
{
74-
Resource.newResource(base+"/src/main/webapp/"),
75-
Resource.newResource(base+"/target/cometd-demo-2.0.beta1-SNAPSHOT/"),
76-
}));
77-
78-
// Cometd servlet
79-
ServletHolder cometd_holder = new ServletHolder(CometdServlet.class);
80-
cometd_holder.setInitParameter("timeout","200000");
81-
cometd_holder.setInitParameter("interval","100");
82-
cometd_holder.setInitParameter("maxInterval","100000");
83-
cometd_holder.setInitParameter("multiFrameInterval","1500");
84-
cometd_holder.setInitParameter("directDeliver","true");
85-
cometd_holder.setInitParameter("logLevel","0");
60+
ServletContextHandler context = new ServletContextHandler(contexts, "/", ServletContextHandler.SESSIONS);
61+
62+
context.setBaseResource(new ResourceCollection(
63+
Resource.newResource(base + "/src/main/webapp/"),
64+
Resource.newResource(base + "/target/cometd-demo-2.0.beta1-SNAPSHOT/"))
65+
);
66+
67+
// CometD servlet
68+
ServletHolder cometd_holder = new ServletHolder(CometDServlet.class);
69+
cometd_holder.setInitParameter("timeout", "200000");
70+
cometd_holder.setInitParameter("interval", "100");
71+
cometd_holder.setInitParameter("maxInterval", "100000");
72+
cometd_holder.setInitParameter("multiSessionInterval", "1500");
73+
cometd_holder.setInitParameter("logLevel", "0");
8674
cometd_holder.setInitOrder(1);
8775
context.addServlet(cometd_holder, "/cometd/*");
8876

8977
ServletHolder oort_holder = new ServletHolder(OortStaticConfigServlet.class);
90-
oort_holder.setInitParameter(OortStaticConfigServlet.OORT_URL_PARAM,"http://localhost:"+port+"/cometd");
91-
oort_holder.setInitParameter(OortStaticConfigServlet.OORT_CLOUD_PARAM,"");
78+
oort_holder.setInitParameter(OortStaticConfigServlet.OORT_URL_PARAM, "http://localhost:" + port + "/cometd");
79+
oort_holder.setInitParameter(OortStaticConfigServlet.OORT_CLOUD_PARAM, "");
9280
// oort_holder.setInitParameter(OortStaticConfigServlet.OORT_CLOUD_PARAM,(port==8080)?"http://localhost:"+8081+"/cometd":"http://localhost:"+8080+"/cometd");
9381
oort_holder.setInitOrder(2);
9482
context.addServlet(oort_holder, "/oort/*");
@@ -105,8 +93,7 @@ public AuctionDemo(int port) throws Exception
10593

10694
server.start();
10795

108-
_oort = (Oort)context.getServletContext().getAttribute(Oort.OORT_ATTRIBUTE);
109-
assert(_oort!=null);
110-
96+
Oort oort = (Oort)context.getServletContext().getAttribute(Oort.OORT_ATTRIBUTE);
97+
assert (oort != null);
11198
}
11299
}

0 commit comments

Comments
 (0)