Skip to content

Commit

Permalink
Cleaning / Remove web client module (ie. ExtJS app) (geonetwork#1464)
Browse files Browse the repository at this point in the history
* Drop ExtJS web-client module.

* Drop ExtJS web-client module Jeeves services ref and configuration.

* Drop ExtJS related db settings.

* Fix travis build.
  • Loading branch information
fxprunayre committed May 23, 2016
1 parent fcc9345 commit a6be949
Show file tree
Hide file tree
Showing 2,089 changed files with 12 additions and 449,140 deletions.
37 changes: 2 additions & 35 deletions core/src/main/java/org/fao/geonet/web/LocaleRedirects.java
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ public class LocaleRedirects {
SPECIAL_HEADERS = Collections.unmodifiableSet(headers);
}

private String _homeRedirectUrl;
private String _homeRedirectUrl = "catalog.search";

private String _defaultLanguage;
private String _defaultLanguage = Geonet.DEFAULT_LANGUAGE;

@RequestMapping(value = "/home")
public ModelAndView home(final HttpServletRequest request,
Expand Down Expand Up @@ -212,37 +212,4 @@ private String lang(String langParam, String langCookie, String langHeader) {

return userLang;
}


@Autowired
private ApplicationContext _appContext;

@PostConstruct
public void init() throws BeansException {
final String configPath = _appContext.getBean("configPath", String.class);
final ServletContext servletContext = _appContext.getBean(ServletContext.class);
try {
final Element guiConfig = ConfigurationOverrides.DEFAULT.loadXmlFileAndUpdate(configPath + "config-gui.xml", servletContext);
final String xpath = "client/@url";
this._homeRedirectUrl = Xml.selectString(guiConfig, xpath);
if (_homeRedirectUrl == null) {
throw new FatalBeanException("No redirect URL was found in " + configPath + "config-gui.xml" + " at xpath: " + xpath);
}
} catch (Exception e) {
throw new FatalBeanException("Error loading guiConfig: " + configPath + "config-gui.xml", e);
}

try {
final Element config = ConfigurationOverrides.DEFAULT.loadXmlFileAndUpdate(configPath + "config.xml", servletContext);
final String xpath = "default/language";
this._defaultLanguage = Xml.selectString(config, xpath);
if (_defaultLanguage == null) {
_defaultLanguage = Geonet.DEFAULT_LANGUAGE;
}
} catch (Exception e) {
throw new FatalBeanException("Error loading config.xml: " + configPath + "config-gui.xml", e);
}


}
}
3 changes: 0 additions & 3 deletions installer/installer-config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,6 @@

<fileset dir="../release/data" targetdir="$INSTALL_PATH/web/geonetwork/data" />
<fileset dir="../release/schemaPlugins" targetdir="$INSTALL_PATH/web/geonetwork/WEB-INF/data/config/schema_plugins" />

<fileset dir="../web-client/target/classes/apps" targetdir="$INSTALL_PATH/web/geonetwork/apps" />


<executable targetfile="$INSTALL_PATH/bin/startup.sh" />
<executable targetfile="$INSTALL_PATH/bin/shutdown.sh" />
Expand Down
1 change: 0 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1134,7 +1134,6 @@
<module>schemas-test</module>
<module>web-ui</module>
<module>web-ui-docs</module>
<module>web-client</module>
<module>web</module>
<module>e2e-tests</module>
<module>geoserver</module>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,7 @@ public Element exec(Element params, ServiceContext context) throws Exception
if (currentTab == null) {
context.info("Creating default metadata tab");

GeonetContext gc = (GeonetContext) context.getHandlerContext(Geonet.CONTEXT_NAME);
String defaultView = gc.getBean(SettingManager.class).getValue("system/metadata/defaultView");
currentTab = (defaultView != null?defaultView:"simple");
currentTab = "simple";

session.setProperty(sessionTabProperty, currentTab);
}
Expand Down
4 changes: 0 additions & 4 deletions software_development/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -306,10 +306,6 @@ An example of the configuration file for JRebel may be the following::
<dir name="--------/web/src/main/webapp">
</dir>
</link>
<link target="/">
<dir name="------/web-client/src/main/resources">
</dir>
</link>
<link target="/">
<dir name="-------/web/target/webapp">
</dir>
Expand Down
1 change: 0 additions & 1 deletion web-client/README.md

This file was deleted.

77 changes: 0 additions & 77 deletions web-client/pom.xml

This file was deleted.

Loading

0 comments on commit a6be949

Please sign in to comment.