src/main/java/com/google/gerrit/server/http/AccountCookie.java src/main/java/com/google/gerrit/server/http/BecomeAnyAccountLoginServlet.java src/main/java/com/google/gerrit/server/http/CatServlet.java src/main/java/com/google/gerrit/server/http/GerritCall.java src/main/java/com/google/gerrit/server/http/GerritJsonServlet.java src/main/java/com/google/gerrit/server/http/GerritJsonServletProvider.java src/main/java/com/google/gerrit/server/http/GerritServletConfig.java src/main/java/com/google/gerrit/server/http/HostPageServlet.java src/main/java/com/google/gerrit/server/http/HtmlDomUtil.java src/main/java/com/google/gerrit/server/http/HttpCurrentUserProvider.java src/main/java/com/google/gerrit/server/http/HttpRemotePeerProvider.java src/main/java/com/google/gerrit/server/http/PrettifyServlet.java src/main/java/com/google/gerrit/server/http/RpcServletModule.java src/main/java/com/google/gerrit/server/http/ServletName.java src/main/java/com/google/gerrit/server/http/ServletNameImpl.java src/main/java/com/google/gerrit/server/http/SshServlet.java src/main/java/com/google/gerrit/server/http/StaticServlet.java src/main/java/com/google/gerrit/server/http/UrlRewriteFilter.java @@ -23,5 +23,5 @@ <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-war ${resource_loc:/gerrit/src/main/webapp} -startupUrl /Gerrit com.google.gerrit.Gerrit"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="gerrit"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.sourcepathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx256M -DGerritServer=${resource_loc:/gerrit/src/main/java/GerritServer.properties} -Dcom.google.gerrit.server.BecomeAnyAccountLoginServlet=true"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx256M -DGerritServer=${resource_loc:/gerrit/src/main/java/GerritServer.properties} -Dcom.google.gerrit.server.http.BecomeAnyAccountLoginServlet=true"/> </launchConfiguration> gerrit_debug.launch @@ -23,5 +23,5 @@ <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-war ${resource_loc:/gerrit/src/main/webapp} -startupUrl /Gerrit com.google.gerrit.Gerrit"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="gerrit"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.sourcepathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx256M -XstartOnFirstThread -DGerritServer=${resource_loc:/gerrit/src/main/java/GerritServer.properties} -Dcom.google.gerrit.server.BecomeAnyAccountLoginServlet=true"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx256M -XstartOnFirstThread -DGerritServer=${resource_loc:/gerrit/src/main/java/GerritServer.properties} -Dcom.google.gerrit.server.http.BecomeAnyAccountLoginServlet=true"/> </launchConfiguration> gerrit_macos.launch @@ -25,12 +25,12 @@ import com.google.gerrit.client.reviewdb.AccountExternalIdAccess; import com.google.gerrit.client.reviewdb.ReviewDb; import com.google.gerrit.client.reviewdb.SystemConfig; import com.google.gerrit.client.rpc.Common; -import com.google.gerrit.server.GerritCall; import com.google.gerrit.server.GerritServer; import com.google.gerrit.server.UrlEncoded; import com.google.gerrit.server.config.AuthConfig; import com.google.gerrit.server.config.CanonicalWebUrl; import com.google.gerrit.server.config.Nullable; +import com.google.gerrit.server.http.GerritCall; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwtorm.client.KeyUtil; import com.google.gwtorm.client.OrmException; src/main/java/com/google/gerrit/server/rpc/OpenIdServiceImpl.java @@ -14,15 +14,15 @@ package com.google.gerrit.server.rpc; -import com.google.gerrit.server.config.ServletNameImpl; +import com.google.gerrit.server.http.RpcServletModule; import com.google.gerrit.server.patch.PatchDetailServiceImpl; -import com.google.gwtjsonrpc.client.RemoteJsonService; -import com.google.inject.Key; -import com.google.inject.Scopes; -import com.google.inject.servlet.ServletModule; /** Registers servlets to answer RPCs from client UI. */ -public class UiRpcModule extends ServletModule { +public class UiRpcModule extends RpcServletModule { + public UiRpcModule() { + super("/gerrit/rpc/"); + } + @Override protected void configureServlets() { serve("/login").with(OpenIdLoginServlet.class); @@ -39,21 +39,4 @@ public class UiRpcModule extends ServletModule { rpc(SuggestServiceImpl.class); rpc(SystemInfoServiceImpl.class); } - - private void rpc(Class<? extends RemoteJsonService> clazz) { - String name = clazz.getSimpleName(); - if (name.endsWith("Impl")) { - name = name.substring(0, name.length() - 4); - } - rpc(name, clazz); - } - - private void rpc(final String name, Class<? extends RemoteJsonService> clazz) { - final Key<GerritJsonServlet> srv = - Key.get(GerritJsonServlet.class, ServletNameImpl.named(name)); - final GerritJsonServletProvider provider = - new GerritJsonServletProvider(clazz); - serve("/gerrit/rpc/" + name).with(srv); - bind(srv).toProvider(provider).in(Scopes.SINGLETON); - } } src/main/java/com/google/gerrit/server/rpc/UiRpcModule.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.ssh; -import com.google.gerrit.server.SshServlet; +import com.google.gerrit.server.http.SshServlet; import org.apache.sshd.server.ShellFactory; import org.spearce.jgit.lib.Constants; src/main/java/com/google/gerrit/server/ssh/NoShell.java @@ -16,6 +16,6 @@ </filter-mapping> <listener> - <listener-class>com.google.gerrit.server.GerritServletConfig</listener-class> + <listener-class>com.google.gerrit.server.http.GerritServletConfig</listener-class> </listener> </web-app> src/main/webapp/WEB-INF/web.xml src/main/java/com/google/gerrit/server/AccountCookie.java src/main/java/com/google/gerrit/server/BecomeAnyAccountLoginServlet.java src/main/java/com/google/gerrit/server/CatServlet.java src/main/java/com/google/gerrit/server/GerritCall.java src/main/java/com/google/gerrit/server/GerritServletConfig.java src/main/java/com/google/gerrit/server/HostPageServlet.java src/main/java/com/google/gerrit/server/HtmlDomUtil.java src/main/java/com/google/gerrit/server/HttpCurrentUserProvider.java src/main/java/com/google/gerrit/server/HttpRemotePeerProvider.java src/main/java/com/google/gerrit/server/PrettifyServlet.java src/main/java/com/google/gerrit/server/SshServlet.java src/main/java/com/google/gerrit/server/StaticServlet.java src/main/java/com/google/gerrit/server/UrlRewriteFilter.java src/main/java/com/google/gerrit/server/config/ServletName.java src/main/java/com/google/gerrit/server/config/ServletNameImpl.java src/main/java/com/google/gerrit/server/rpc/GerritJsonServlet.java src/main/java/com/google/gerrit/server/rpc/GerritJsonServletProvider.java 4760516da65fa5a7c96e5b16f6e6c850619f0bd5 Shawn O. Pearce sop@google.com http://github.com/android/tools_gerrit/commit/b9e93f7ad5639dd15ee480c5e38fb60cd6c9d8b8 b9e93f7ad5639dd15ee480c5e38fb60cd6c9d8b8 2009-08-01T08:58:42-07:00 2009-08-01T08:40:23-07:00 Move HTTP related classes to an HTTP specific package This cleans up the top level directory a bit, making it easier to determine what the major purpose is for each section of code in the server implementation. Signed-off-by: Shawn O. Pearce <sop@google.com> 3b379945c250b00e9610d445766e1bdaa3bf7e5f Shawn O. Pearce sop@google.com