From: <tic...@us...> - 2009-02-25 15:46:06
|
Revision: 2367 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=2367&view=rev Author: ticheler Date: 2009-02-25 15:45:44 +0000 (Wed, 25 Feb 2009) Log Message: ----------- - Upgrade to Jetty 1.6.14 - Modifications to installer & GAST. -- Disabled option to change the default servlet name 'geonetwork' into something else. -- Disabled the option to not install GeoServer. - Integration of geonetwork-ebrim web application. Service can for now be accessed under http://localhost:8080/geonetwork-web-ebrim-3.0.0/ and is deployed as a war file. - Renamed log directories from "log" into "logs" to be more in line with common practice Modified Paths: -------------- sandbox/3.0.x/geonetwork_legacy/src/org/fao/gast/gui/panels/config/jetty/MainPanel.java sandbox/3.0.x/geonetwork_legacy/src/org/fao/gast/lib/EmbeddedSCLib.java sandbox/3.0.x/geonetwork_legacy/web/geonetwork/WEB-INF/db/db.conf sandbox/3.0.x/geonetwork_legacy/web/geonetwork/WEB-INF/log4j.cfg sandbox/3.0.x/geonetwork_legacy/web/intermap/WEB-INF/log4j.cfg sandbox/3.0.x/geonetwork_legacy/web/intermap/WEB-INF/web.xml Added Paths: ----------- sandbox/3.0.x/geonetwork_legacy/web/geonetwork/WEB-INF/db/logs/ sandbox/3.0.x/geonetwork_legacy/web/geonetwork/images/csw_ebrim.png sandbox/3.0.x/geonetwork_legacy/web/intermap/logs/ sandbox/3.0.x/geonetwork_legacy/web/root/ sandbox/3.0.x/geonetwork_legacy/web/root/index.html Removed Paths: ------------- sandbox/3.0.x/geonetwork_legacy/web/geonetwork/WEB-INF/db/log/ sandbox/3.0.x/geonetwork_legacy/web/intermap/log/ Modified: sandbox/3.0.x/geonetwork_legacy/src/org/fao/gast/gui/panels/config/jetty/MainPanel.java =================================================================== --- sandbox/3.0.x/geonetwork_legacy/src/org/fao/gast/gui/panels/config/jetty/MainPanel.java 2009-02-25 15:42:36 UTC (rev 2366) +++ sandbox/3.0.x/geonetwork_legacy/src/org/fao/gast/gui/panels/config/jetty/MainPanel.java 2009-02-25 15:45:44 UTC (rev 2367) @@ -45,7 +45,6 @@ public MainPanel() { - txtServlet.setText(Lib.embeddedSC.getServlet()); txtPort .setText(Lib.embeddedSC.getPort()); } @@ -68,7 +67,6 @@ Lib.gui.showError(this, "The port must be an integer"); else { - Lib.embeddedSC.setServlet(txtServlet.getText()); Lib.embeddedSC.setPort(txtPort.getText()); try @@ -93,14 +91,12 @@ { JPanel p = new JPanel(); - FlexLayout fl = new FlexLayout(2,2); + FlexLayout fl = new FlexLayout(2,1); fl.setColProp(1, FlexLayout.EXPAND); p.setLayout(fl); - p.add("0,0", new JLabel("Servlet")); - p.add("0,1", new JLabel("Port")); - p.add("1,0,x", txtServlet); - p.add("1,1,x", txtPort); + p.add("0,0", new JLabel("Port")); + p.add("1,0,x", txtPort); return p; } @@ -111,7 +107,6 @@ //--- //--------------------------------------------------------------------------- - private JTextField txtServlet = new JTextField(20); private JTextField txtPort = new JTextField(20); } Modified: sandbox/3.0.x/geonetwork_legacy/src/org/fao/gast/lib/EmbeddedSCLib.java =================================================================== --- sandbox/3.0.x/geonetwork_legacy/src/org/fao/gast/lib/EmbeddedSCLib.java 2009-02-25 15:42:36 UTC (rev 2366) +++ sandbox/3.0.x/geonetwork_legacy/src/org/fao/gast/lib/EmbeddedSCLib.java 2009-02-25 15:45:44 UTC (rev 2367) @@ -56,27 +56,29 @@ { Element elCall = (Element) call; - if ("addListener".equals(elCall.getAttributeValue("name"))) + if ("addConnector".equals(elCall.getAttributeValue("name"))) { - Element elNew = elCall.getChild("Arg").getChild("New"); - - for (Object set : elNew.getChildren("Set")) - { - Element elSet = (Element) set; - - if ("host".equals(elSet.getAttributeValue("name"))) - hostElem = elSet; - - else if ("port".equals(elSet.getAttributeValue("name"))) - portElem = elSet; + if ("org.mortbay.jetty.nio.SelectChannelConnector".equals(elCall.getChild("Arg").getChild("New").getAttributeValue("class"))){ + Element elNew = elCall.getChild("Arg").getChild("New"); + + for (Object set : elNew.getChildren("Set")) + { + Element elSet = (Element) set; + + if ("host".equals(elSet.getAttributeValue("name"))) + hostElem = elSet; + + else if ("port".equals(elSet.getAttributeValue("name"))) + portElem = elSet; + } } } - else if ("addWebApplication".equals(elCall.getAttributeValue("name"))) - { - if (servletElem == null) - servletElem = elCall.getChild("Arg"); - } +// else if ("addWebApplication".equals(elCall.getAttributeValue("name"))) // doesn't work with new Jetty 1.6.14 +// { +// if (servletElem == null) +// servletElem = elCall.getChild("Arg"); +// } } } @@ -103,7 +105,8 @@ public String getServlet() { //--- we have to skip the initial '/' - return (servletElem == null) ? null : servletElem.getText().substring(1); + // return (servletElem == null) ? null : servletElem.getText().substring(1); + return "geonetwork"; } //--------------------------------------------------------------------------- @@ -124,19 +127,22 @@ public void setServlet(String name) { - if (servletElem != null) - servletElem.setText("/"+name); - - for (Object e : webXml.getRootElement().getChildren()) - { - Element elem = (Element) e; - - if (elem.getName().equals("display-name")) - { - elem.setText(name); - return; - } - } + // Disabled for Jetty 1.6.14 + return; +// if (servletElem != null) +// servletElem.setText("/"+name); +// +// for (Object e : webXml.getRootElement().getChildren()) +// { +// Element elem = (Element) e; +// +// if (elem.getName().equals("display-name")) +// { +// elem.setText(name); +// return; +// } +// } + } //--------------------------------------------------------------------------- Modified: sandbox/3.0.x/geonetwork_legacy/web/geonetwork/WEB-INF/db/db.conf =================================================================== --- sandbox/3.0.x/geonetwork_legacy/web/geonetwork/WEB-INF/db/db.conf 2009-02-25 15:42:36 UTC (rev 2366) +++ sandbox/3.0.x/geonetwork_legacy/web/geonetwork/WEB-INF/db/db.conf 2009-02-25 15:45:44 UTC (rev 2367) @@ -25,7 +25,7 @@ # no log files are to be kept, then comment out (or # remove) the 'log_path' variable. -log_path=./log +log_path=./logs # # root_path - If this is set to 'jvm' then the root Property changes on: sandbox/3.0.x/geonetwork_legacy/web/geonetwork/WEB-INF/db/logs ___________________________________________________________________ Added: svn:ignore + *.log Added: svn:mergeinfo + Modified: sandbox/3.0.x/geonetwork_legacy/web/geonetwork/WEB-INF/log4j.cfg =================================================================== --- sandbox/3.0.x/geonetwork_legacy/web/geonetwork/WEB-INF/log4j.cfg 2009-02-25 15:42:36 UTC (rev 2366) +++ sandbox/3.0.x/geonetwork_legacy/web/geonetwork/WEB-INF/log4j.cfg 2009-02-25 15:45:44 UTC (rev 2367) @@ -19,7 +19,7 @@ log4j.appender.jeeves =org.apache.log4j.DailyRollingFileAppender log4j.appender.jeeves.DatePattern='.'yyyy-MM-dd -log4j.appender.jeeves.file = log/geonetwork.log +log4j.appender.jeeves.file = logs/geonetwork.log log4j.appender.jeeves.layout = org.apache.log4j.PatternLayout log4j.appender.jeeves.layout.ConversionPattern=%d{ISO8601} %-5p [%c] - %m%n Added: sandbox/3.0.x/geonetwork_legacy/web/geonetwork/images/csw_ebrim.png =================================================================== (Binary files differ) Property changes on: sandbox/3.0.x/geonetwork_legacy/web/geonetwork/images/csw_ebrim.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Modified: sandbox/3.0.x/geonetwork_legacy/web/intermap/WEB-INF/log4j.cfg =================================================================== --- sandbox/3.0.x/geonetwork_legacy/web/intermap/WEB-INF/log4j.cfg 2009-02-25 15:42:36 UTC (rev 2366) +++ sandbox/3.0.x/geonetwork_legacy/web/intermap/WEB-INF/log4j.cfg 2009-02-25 15:45:44 UTC (rev 2367) @@ -14,7 +14,7 @@ log4j.appender.jeeves =org.apache.log4j.DailyRollingFileAppender log4j.appender.jeeves.DatePattern='.'yyyy-MM-dd -log4j.appender.jeeves.file = log/intermap.log +log4j.appender.jeeves.file = logs/intermap.log log4j.appender.jeeves.layout = org.apache.log4j.PatternLayout log4j.appender.jeeves.layout.ConversionPattern=%d{ISO8601} %-5p [%c] - %m%n Modified: sandbox/3.0.x/geonetwork_legacy/web/intermap/WEB-INF/web.xml =================================================================== --- sandbox/3.0.x/geonetwork_legacy/web/intermap/WEB-INF/web.xml 2009-02-25 15:42:36 UTC (rev 2366) +++ sandbox/3.0.x/geonetwork_legacy/web/intermap/WEB-INF/web.xml 2009-02-25 15:45:44 UTC (rev 2367) @@ -13,12 +13,12 @@ <init-param> <param-name>systemLog</param-name> - <param-value>log/intermap.log</param-value> + <param-value>logs/intermap.log</param-value> </init-param> <init-param> <param-name>moduleLog</param-name> - <param-value>log/modules.log</param-value> + <param-value>logs/modules.log</param-value> </init-param> <load-on-startup>1</load-on-startup> Property changes on: sandbox/3.0.x/geonetwork_legacy/web/intermap/logs ___________________________________________________________________ Added: svn:ignore + *.log Added: svn:mergeinfo + Added: sandbox/3.0.x/geonetwork_legacy/web/root/index.html =================================================================== --- sandbox/3.0.x/geonetwork_legacy/web/root/index.html (rev 0) +++ sandbox/3.0.x/geonetwork_legacy/web/root/index.html 2009-02-25 15:45:44 UTC (rev 2367) @@ -0,0 +1,16 @@ +<html> + <head> + <meta http-equiv="Pragma" content="no-cache"> + <meta http-equiv="Cache-Control" content="no-cache,no-store"> + <link rel="stylesheet" type="text/css" href="geonetwork.css"> + <script language="Javascript1.5" type="text/javascript"> + var search = window.location.search; + window.location="/geonetwork/srv/en/main.home" + search + </script> + </head> + <body> + <h2>JavaScript warning</h2> + <p>To use GeoNetwork you need to enable JavaScript in your browser</p> + </body> +</html> + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |