opendev/gerrit
Code Issues Proposed changes

Rename gerrit module to gerrit_ui

Browse Source 
This frees up the name 'gerrit' in the top level page, making it
available for us to start publishing a JavaScript native API for
plugins to connect with the UI.

Change-Id: I71f374d7231859dc1ed7d8a0df27759dbfc1315f
This commit is contained in:
Shawn O. Pearce 2012-10-11 22:24:04 -07:00
parent 073da8a50a
commit 1915b91937
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-gwtui/pom.xml
View File

@ -232,7 +232,7 @@ limitations under the License.
<configuration> <configuration>
<target> <target>
<property name="dst" location="${project.build.directory}/${project.build.finalName}"/> <property name="dst" location="${project.build.directory}/${project.build.finalName}"/>
<property name="app" location="${dst}/gerrit"/> <property name="app" location="${dst}/gerrit_ui"/>
<mkdir dir="${app}"/> <mkdir dir="${app}"/>
<apply executable="gzip" addsourcefile="false"> <apply executable="gzip" addsourcefile="false">
@ -257,7 +257,7 @@ limitations under the License.
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<configuration> <configuration>
<packagingExcludes>WEB-INF/classes/**,WEB-INF/lib/**</packagingExcludes> <packagingExcludes>WEB-INF/classes/**,WEB-INF/deploy/**,WEB-INF/lib/**</packagingExcludes>
<attachClasses>true</attachClasses> <attachClasses>true</attachClasses>
<archive> <archive>
<addMavenDescriptor>false</addMavenDescriptor> <addMavenDescriptor>false</addMavenDescriptor>

2
gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUI.gwt.xml
View File

@ -13,7 +13,7 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<module rename-to="gerrit"> <module rename-to="gerrit_ui">
<inherits name='com.google.gwt.editor.Editor'/> <inherits name='com.google.gwt.editor.Editor'/>
<inherits name='com.google.gwt.user.User'/> <inherits name='com.google.gwt.user.User'/>
<inherits name='com.google.gwt.resources.Resources'/> <inherits name='com.google.gwt.resources.Resources'/>

2
gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUIgecko1_8.gwt.xml
View File

@ -13,7 +13,7 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<module rename-to="gerrit"> <module rename-to="gerrit_ui">
<inherits name='com.google.gerrit.GerritGwtUI'/> <inherits name='com.google.gerrit.GerritGwtUI'/>
<set-property name="user.agent" value="gecko1_8" /> <set-property name="user.agent" value="gecko1_8" />
<set-property name="locale" value="default" /> <set-property name="locale" value="default" />

2
gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUIsafari.gwt.xml
View File

@ -13,7 +13,7 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<module rename-to="gerrit"> <module rename-to="gerrit_ui">
<inherits name='com.google.gerrit.GerritGwtUI'/> <inherits name='com.google.gerrit.GerritGwtUI'/>
<set-property name="user.agent" value="safari" /> <set-property name="user.agent" value="safari" />
<set-property name="locale" value="default" /> <set-property name="locale" value="default" />

4
gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPageServlet.java
View File

@ -102,7 +102,7 @@ public class HostPageServlet extends HttpServlet {
throw new ServletException("No " + HPD_ID + " in " + pageName); throw new ServletException("No " + HPD_ID + " in " + pageName);
} }
String src = "gerrit/gerrit.nocache.js"; String src = "gerrit_ui/gerrit_ui.nocache.js";
if (!IS_DEV) { if (!IS_DEV) {
Element devmode = HtmlDomUtil.find(template, "gwtdevmode"); Element devmode = HtmlDomUtil.find(template, "gwtdevmode");
if (devmode != null) { if (devmode != null) {
@ -132,7 +132,7 @@ public class HostPageServlet extends HttpServlet {
} }
noCacheName = src; noCacheName = src;
selector = new PermutationSelector("gerrit"); selector = new PermutationSelector("gerrit_ui");
if (checkUserAgent && !IS_DEV) { if (checkUserAgent && !IS_DEV) {
selector.init(servletContext); selector.init(servletContext);
} }

2
gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java
View File

@ -491,7 +491,7 @@ public class JettyServer {
for (File e : entries) { for (File e : entries) {
if (e.isDirectory() /* must be a directory */ if (e.isDirectory() /* must be a directory */
&& e.getName().startsWith("gerrit-gwtui-") && e.getName().startsWith("gerrit-gwtui-")
&& new File(e, "gerrit/gerrit.nocache.js").isFile()) { && new File(e, "gerrit_ui/gerrit_ui.nocache.js").isFile()) {
return Resource.newResource(e.toURI()); return Resource.newResource(e.toURI());
} }
} }