Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(16)

Delta Between Two Patch Sets: java/server/src/main/webapp/WEB-INF/web.full.xml

Issue 10269: Adding local file rendering support to Sample Container Base URL: http://svn.apache.org/repos/asf/incubator/shindig/trunk/
Left Patch Set: Updated LocalServlet to use IOUtils, commented it out in web.xml files Created 16 years, 3 months ago
Right Patch Set: Moved LocalFileServlet to server/src/main/java/.../sample Created 16 years, 2 months ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « java/server/src/main/webapp/WEB-INF/web.xml ('k') | java/server/src/main/webapp/WEB-INF/web.gadgets.xml » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 <?xml version="1.0"?> 1 <?xml version="1.0"?>
2 <!-- 2 <!--
3 Licensed to the Apache Software Foundation (ASF) under one 3 Licensed to the Apache Software Foundation (ASF) under one
4 or more contributor license agreements. See the NOTICE file 4 or more contributor license agreements. See the NOTICE file
5 distributed with this work for additional information 5 distributed with this work for additional information
6 regarding copyright ownership. The ASF licenses this file 6 regarding copyright ownership. The ASF licenses this file
7 to you under the Apache License, Version 2.0 (the 7 to you under the Apache License, Version 2.0 (the
8 "License"); you may not use this file except in compliance 8 "License"); you may not use this file except in compliance
9 with the License. You may obtain a copy of the License at 9 with the License. You may obtain a copy of the License at
10 10
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 <servlet-name>jsonRpcServlet</servlet-name> 125 <servlet-name>jsonRpcServlet</servlet-name>
126 <servlet-class> 126 <servlet-class>
127 org.apache.shindig.social.opensocial.service.JsonRpcServlet 127 org.apache.shindig.social.opensocial.service.JsonRpcServlet
128 </servlet-class> 128 </servlet-class>
129 </servlet> 129 </servlet>
130 130
131 <!-- local file serving (for dev) --> 131 <!-- local file serving (for dev) -->
132 <!-- (uncomment to enable)· 132 <!-- (uncomment to enable)·
133 <servlet> 133 <servlet>
134 <servlet-name>localfile</servlet-name> 134 <servlet-name>localfile</servlet-name>
135 <servlet-class>org.apache.shindig.gadgets.servlet.localfile.LocalFileServlet </servlet-class> 135 <servlet-class>org.apache.shindig.server.sample.LocalFileServlet</servlet-cl ass>
136 </servlet> 136 </servlet>
137 · 137 ·
138 <servlet-mapping> 138 <servlet-mapping>
139 <servlet-name>localfile</servlet-name> 139 <servlet-name>localfile</servlet-name>
140 <url-pattern>/localfile/*</url-pattern> 140 <url-pattern>/localfile/*</url-pattern>
141 </servlet-mapping> 141 </servlet-mapping>
142 --> 142 -->
143 143
144 <servlet-mapping> 144 <servlet-mapping>
145 <servlet-name>js</servlet-name> 145 <servlet-name>js</servlet-name>
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 <servlet-mapping> 179 <servlet-mapping>
180 <servlet-name>restapiServlet</servlet-name> 180 <servlet-name>restapiServlet</servlet-name>
181 <url-pattern>/social/rest/*</url-pattern> 181 <url-pattern>/social/rest/*</url-pattern>
182 </servlet-mapping> 182 </servlet-mapping>
183 183
184 <servlet-mapping> 184 <servlet-mapping>
185 <servlet-name>jsonRpcServlet</servlet-name> 185 <servlet-name>jsonRpcServlet</servlet-name>
186 <url-pattern>/social/rpc/*</url-pattern> 186 <url-pattern>/social/rpc/*</url-pattern>
187 </servlet-mapping> 187 </servlet-mapping>
188 </web-app> 188 </web-app>
LEFTRIGHT

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b