Menu
▾
▴
[GeoNetwork-commit] SF.net SVN: geonetwork: [1357] sandbox/BlueNetMEST
|
From: <blu...@us...> - 2008-07-02 02:46:57
|
Revision: 1357
http://geonetwork.svn.sourceforge.net/geonetwork/?rev=1357&view=rev
Author: bluenetdevteam
Date: 2008-07-01 19:46:54 -0700 (Tue, 01 Jul 2008)
Log Message:
-----------
Move TransformerFactory choice from Jeeves to library meta-inf, move geoserver
back into same servlet container as geonetwork and intermap
Modified Paths:
--------------
sandbox/BlueNetMEST/bin/jetty.xml_with_geoserver
sandbox/BlueNetMEST/bin/start-geonetwork.bat
sandbox/BlueNetMEST/bin/start-geonetwork.sh
sandbox/BlueNetMEST/bin/stop-geonetwork.bat
sandbox/BlueNetMEST/bin/stop-geonetwork.sh
sandbox/BlueNetMEST/build.xml
sandbox/BlueNetMEST/csw/lib/csw-client.jar
sandbox/BlueNetMEST/csw/lib/csw-common.jar
sandbox/BlueNetMEST/docs/bluenetmest.html
sandbox/BlueNetMEST/docs/readme.html
sandbox/BlueNetMEST/gast/gast.jar
sandbox/BlueNetMEST/jeeves/lib/jeeves.jar
sandbox/BlueNetMEST/jeeves/src/jeeves/server/JeevesEngine.java
sandbox/BlueNetMEST/jeeves/src/jeeves/utils/Xml.java
sandbox/BlueNetMEST/src/services/javax.xml.transform.TransformerFactory
sandbox/BlueNetMEST/web/geonetwork/WEB-INF/lib/geonetwork.jar
sandbox/BlueNetMEST/web/geonetwork/WEB-INF/lib/jeeves.jar
sandbox/BlueNetMEST/web/geonetwork/WEB-INF/lib/oaipmh-lib.jar
sandbox/BlueNetMEST/web/geonetwork/WEB-INF/server.prop
sandbox/BlueNetMEST/web/intermap/WEB-INF/lib/intermap.jar
sandbox/BlueNetMEST/web/intermap/WEB-INF/lib/jeeves.jar
sandbox/BlueNetMEST/web/intermap/WEB-INF/mapServers.xml_with_geoserver
Removed Paths:
-------------
sandbox/BlueNetMEST/bin/jetty_geoserver.xml
Modified: sandbox/BlueNetMEST/bin/jetty.xml_with_geoserver
===================================================================
--- sandbox/BlueNetMEST/bin/jetty.xml_with_geoserver 2008-07-02 02:28:43 UTC (rev 1356)
+++ sandbox/BlueNetMEST/bin/jetty.xml_with_geoserver 2008-07-02 02:46:54 UTC (rev 1357)
@@ -52,6 +52,13 @@
<Arg>../gcmdfinder/GCMDFinder</Arg>
</Call>
+ <!-- ============================================================ -->
+
+ <Call name="addWebApplication">
+ <Arg>/geoserver</Arg>
+ <Arg>../web/geoserver</Arg>
+ </Call>
+
<!-- =============================================================== -->
<Set name="RequestLog">
Deleted: sandbox/BlueNetMEST/bin/jetty_geoserver.xml
===================================================================
--- sandbox/BlueNetMEST/bin/jetty_geoserver.xml 2008-07-02 02:28:43 UTC (rev 1356)
+++ sandbox/BlueNetMEST/bin/jetty_geoserver.xml 2008-07-02 02:46:54 UTC (rev 1357)
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "jetty-configure_1_3.dtd">
-<Configure class="org.mortbay.jetty.Server">
-
- <Call name="addListener">
- <Arg>
- <New class="org.mortbay.http.SocketListener">
- <Set name="port">8078</Set>
- <Set name="MinThreads">10</Set>
- <Set name="MaxThreads">200</Set>
- <Set name="MaxIdleTimeMs">30000</Set>
- <Set name="lowResources">50</Set>
- <Set name="LowResourcePersistTimeMs">2000</Set>
- </New>
- </Arg>
- </Call>
-
- <!-- ============================================================ -->
-
- <Set name="WebApplicationConfigurationClassNames">
- <Array type="java.lang.String">
- <Item>org.mortbay.jetty.servlet.XMLConfiguration</Item>
- <Item>org.mortbay.jetty.servlet.JettyWebConfiguration</Item>
- </Array>
- </Set>
-
- <!-- ============================================================ -->
-
- <Call name="addWebApplication">
- <Arg>/geoserver</Arg>
- <Arg>../web/geoserver</Arg>
- </Call>
-
- <!-- =============================================================== -->
-
- <Set name="RequestLog">
- <New class="org.mortbay.http.NCSARequestLog">
- <Arg>../jetty/log/yyyy_mm_dd.geoserver.request.log</Arg>
- <Set name="retainDays">90</Set>
- <Set name="append">false</Set>
- <Set name="extended">false</Set>
- <Set name="LogTimeZone">GMT</Set>
- </New>
- </Set>
-
-</Configure>
Modified: sandbox/BlueNetMEST/bin/start-geonetwork.bat
===================================================================
--- sandbox/BlueNetMEST/bin/start-geonetwork.bat 2008-07-02 02:28:43 UTC (rev 1356)
+++ sandbox/BlueNetMEST/bin/start-geonetwork.bat 2008-07-02 02:46:54 UTC (rev 1357)
@@ -9,5 +9,4 @@
rem if you want to hide the dos window when GeoNetwork is started,
rem comment out the next line and comment the last line
-start javaw -Xms48m -Xmx512m -DSTOP.PORT=8077 -Djava.awt.headless=true -jar start.jar ..\bin\jetty_geoserver.xml &
java -Xms48m -Xmx512m -DSTOP.PORT=8079 -Djava.awt.headless=true -jar start.jar ..\bin\jetty.xml
Modified: sandbox/BlueNetMEST/bin/start-geonetwork.sh
===================================================================
--- sandbox/BlueNetMEST/bin/start-geonetwork.sh 2008-07-02 02:28:43 UTC (rev 1356)
+++ sandbox/BlueNetMEST/bin/start-geonetwork.sh 2008-07-02 02:46:54 UTC (rev 1357)
@@ -7,7 +7,5 @@
# try changing the Xmx parameter if your machine has little RAM
#java -Xms48m -Xmx256m -DSTOP.PORT=8079 -Djava.awt.headless=true -jar start.jar ../bin/jetty.xml &
-java -Xms48m -Xmx512m -DSTOP.PORT=8077 -Djava.awt.headless=true -jar start.jar ../bin/jetty_geoserver.xml > log/geoserver.log 2>&1 &
-
java -Xms48m -Xmx512m -DSTOP.PORT=8079 -Djava.awt.headless=true -jar start.jar ../bin/jetty.xml > log/output.log 2>&1 &
Modified: sandbox/BlueNetMEST/bin/stop-geonetwork.bat
===================================================================
--- sandbox/BlueNetMEST/bin/stop-geonetwork.bat 2008-07-02 02:28:43 UTC (rev 1356)
+++ sandbox/BlueNetMEST/bin/stop-geonetwork.bat 2008-07-02 02:46:54 UTC (rev 1357)
@@ -1,3 +1,2 @@
cd ..\jetty
java -DSTOP.PORT=8079 -jar stop.jar
-java -DSTOP.PORT=8077 -jar stop.jar
Modified: sandbox/BlueNetMEST/bin/stop-geonetwork.sh
===================================================================
--- sandbox/BlueNetMEST/bin/stop-geonetwork.sh 2008-07-02 02:28:43 UTC (rev 1356)
+++ sandbox/BlueNetMEST/bin/stop-geonetwork.sh 2008-07-02 02:46:54 UTC (rev 1357)
@@ -1,3 +1,2 @@
cd ../jetty
java -DSTOP.PORT=8079 -jar stop.jar
-java -DSTOP.PORT=8077 -jar stop.jar
Modified: sandbox/BlueNetMEST/build.xml
===================================================================
--- sandbox/BlueNetMEST/build.xml 2008-07-02 02:28:43 UTC (rev 1356)
+++ sandbox/BlueNetMEST/build.xml 2008-07-02 02:46:54 UTC (rev 1357)
@@ -19,9 +19,21 @@
<!-- =============================================================== -->
- <target name="compile" depends="gn, im" />
+ <target name="compile" depends="jeeves, gn, im" />
<!-- =============================================================== -->
+
+ <target name="jeeves">
+ <ant dir="jeeves" target="compile"/>
+ <copy file="jeeves/lib/jeeves.jar"
+ tofile="web/geonetwork/WEB-INF/lib/jeeves.jar"
+ overwrite="yes"/>
+ <copy file="jeeves/lib/jeeves.jar"
+ tofile="web/intermap/WEB-INF/lib/jeeves.jar"
+ overwrite="yes"/>
+ </target>
+
+ <!-- =============================================================== -->
<target name="gn">
<delete file="web/geonetwork/WEB-INF/lib/geonetwork.jar" />
Modified: sandbox/BlueNetMEST/csw/lib/csw-client.jar
===================================================================
(Binary files differ)
Modified: sandbox/BlueNetMEST/csw/lib/csw-common.jar
===================================================================
(Binary files differ)
Modified: sandbox/BlueNetMEST/docs/bluenetmest.html
===================================================================
--- sandbox/BlueNetMEST/docs/bluenetmest.html 2008-07-02 02:28:43 UTC (rev 1356)
+++ sandbox/BlueNetMEST/docs/bluenetmest.html 2008-07-02 02:46:54 UTC (rev 1357)
@@ -5,7 +5,7 @@
</head>
<body>
<div style="text-align: center;"><span style="color: rgb(255, 153, 0);">Welcome
-to the MEST Version 1.1 (10/06/08)</span> <br>
+to the BlueNet MEST Version 1.1 (10/06/08)</span> <br>
</div>
<br>
The following sections outline a set of steps you should follow to
@@ -42,7 +42,7 @@
</span></font></li>
</ul>
<span style="font-weight: bold;"></span>
-<h2>2. Migrating a previous MEST installation (BETA3 and earlier) -
+<h2>2. Migrating a previous BlueNet MEST installation (BETA3 and earlier) -
geonetwork 2.0.3<br>
</h2>
<p><font color="#ff0000">
@@ -95,19 +95,11 @@
</ul>
<h2>3. Web server ports</h2>
<p> The MEST is a web application with three servlets: geonetwork,
-intermap and geoserver. All servlets run under jetty: the geonetwork
-and intermap components on port 8080 (with stop port 8079) and
-geoserver on port 8078 (with stop port 8077). (All servlets used to run
-under port 8080 but geoserver doesn't seem to like SAXON.) If you want
-to
-change the
-port number(s) because something else is using a port in the range
-8077-8080 on your
-machine then
+intermap and geoserver. All servlets run under jetty and are installed by
+default on port 8080 (with stop port 8079). If you want to change the port
+number because something else is using port 8080 on your machine then
you can do this as follows:<br>
</p>
-<p>For geonetwork and intermap (ports 8079 and 8080):<br>
-</p>
<ul>
<li>Start GAST - the GeoNetwork Administrator
Survival Tool (from the <code>bin</code> directory of your
@@ -126,22 +118,6 @@
</ul>
</li>
</ul>
-<p>For geoserver (ports 8077 and 8078):<br>
-</p>
-<ul>
- <li>Edit <code>jetty_geoserver.xml</code> in the <code>bin</code>
-directory of your installation.</li>
- <li>To change the stop port from <code>8079</code> you have to
-modify the startup
-scripts in the <code>bin</code> directory of your
-installation (see the next section).</li>
- <li>You will also need to manually modify the geoserver ports for
-Intermap. The following xml file needs to be edited:
- <ul>
- <li><code>web/intermap/WEB-INF/mapServers.xml</code></li>
- </ul>
- </li>
-</ul>
<h2>4. Running the MEST</h2>
<p>Make sure that the
port(s) you have setup or the default ports are clear before you try to
Modified: sandbox/BlueNetMEST/docs/readme.html
===================================================================
--- sandbox/BlueNetMEST/docs/readme.html 2008-07-02 02:28:43 UTC (rev 1356)
+++ sandbox/BlueNetMEST/docs/readme.html 2008-07-02 02:46:54 UTC (rev 1357)
@@ -95,19 +95,11 @@
</ul>
<h2>3. Web server ports</h2>
<p> The MEST is a web application with three servlets: geonetwork,
-intermap and geoserver. All servlets run under jetty: the geonetwork
-and intermap components on port 8080 (with stop port 8079) and
-geoserver on port 8078 (with stop port 8077). (All servlets used to run
-under port 8080 but geoserver doesn't seem to like SAXON.) If you want
-to
-change the
-port number(s) because something else is using a port in the range
-8077-8080 on your
-machine then
+intermap and geoserver. All servlets run under jetty and are installed by
+default on port 8080 (with stop port 8079). If you want to change the port
+number because something else is using port 8080 on your machine then
you can do this as follows:<br>
</p>
-<p>For geonetwork and intermap (ports 8079 and 8080):<br>
-</p>
<ul>
<li>Start GAST - the GeoNetwork Administrator
Survival Tool (from the <code>bin</code> directory of your
@@ -126,22 +118,6 @@
</ul>
</li>
</ul>
-<p>For geoserver (ports 8077 and 8078):<br>
-</p>
-<ul>
- <li>Edit <code>jetty_geoserver.xml</code> in the <code>bin</code>
-directory of your installation.</li>
- <li>To change the stop port from <code>8079</code> you have to
-modify the startup
-scripts in the <code>bin</code> directory of your
-installation (see the next section).</li>
- <li>You will also need to manually modify the geoserver ports for
-Intermap. The following xml file needs to be edited:
- <ul>
- <li><code>web/intermap/WEB-INF/mapServers.xml</code></li>
- </ul>
- </li>
-</ul>
<h2>4. Running the MEST</h2>
<p>Make sure that the
port(s) you have setup or the default ports are clear before you try to
Modified: sandbox/BlueNetMEST/gast/gast.jar
===================================================================
(Binary files differ)
Modified: sandbox/BlueNetMEST/jeeves/lib/jeeves.jar
===================================================================
(Binary files differ)
Modified: sandbox/BlueNetMEST/jeeves/src/jeeves/server/JeevesEngine.java
===================================================================
--- sandbox/BlueNetMEST/jeeves/src/jeeves/server/JeevesEngine.java 2008-07-02 02:28:43 UTC (rev 1356)
+++ sandbox/BlueNetMEST/jeeves/src/jeeves/server/JeevesEngine.java 2008-07-02 02:46:54 UTC (rev 1357)
@@ -107,9 +107,10 @@
PropertyConfigurator.configure(configPath +"log4j.cfg");
- System.setProperty("javax.xml.transform.TransformerFactory",
- "net.sf.saxon.TransformerFactoryImpl");
- // "de.fzi.dbs.xml.transform.CachingTransformerFactory");
+ // System.setProperty("javax.xml.transform.TransformerFactory",
+ // "net.sf.saxon.TransformerFactoryImpl");
+ // Do this using library meta-inf to avoid affecting other servlets
+ // in the same container
info("=== Starting system ========================================");
Modified: sandbox/BlueNetMEST/jeeves/src/jeeves/utils/Xml.java
===================================================================
--- sandbox/BlueNetMEST/jeeves/src/jeeves/utils/Xml.java 2008-07-02 02:28:43 UTC (rev 1356)
+++ sandbox/BlueNetMEST/jeeves/src/jeeves/utils/Xml.java 2008-07-02 02:46:54 UTC (rev 1357)
@@ -259,31 +259,15 @@
return errors;
}
- public String findPath(Element element) {
- String path;
- if (!element.isRootElement()) {
- path = "[" + element.getParent().indexOf(element) + "]";
- while (element.getParent() != null) {
- Element parent = (Element)element.getParent();
- if (path.startsWith("["))
- path = parent.getQualifiedName() + path;
- else
- path = parent.getQualifiedName() + "/" + path;
- element = parent;
- }
- } else {
- path = element.getQualifiedName();
- }
- path = "/" + path;
- return path;
- }
-
public void addMessage ( SAXParseException exception, String typeOfError ) {
Element elem = (Element) so.getLocator().getNode();
String parentName;
if (!elem.isRootElement()) {
Element parent = (Element)elem.getParent();
- parentName = parent.getQualifiedName();
+ if (parent != null)
+ parentName = parent.getQualifiedName();
+ else
+ parentName = "Unknown";
} else {
parentName = "/";
}
Modified: sandbox/BlueNetMEST/src/services/javax.xml.transform.TransformerFactory
===================================================================
--- sandbox/BlueNetMEST/src/services/javax.xml.transform.TransformerFactory 2008-07-02 02:28:43 UTC (rev 1356)
+++ sandbox/BlueNetMEST/src/services/javax.xml.transform.TransformerFactory 2008-07-02 02:46:54 UTC (rev 1357)
@@ -1 +1 @@
-de.fzi.dbs.xml.transform.CachingTransformerFactory
+net.sf.saxon.TransformerFactoryImpl
Modified: sandbox/BlueNetMEST/web/geonetwork/WEB-INF/lib/geonetwork.jar
===================================================================
(Binary files differ)
Modified: sandbox/BlueNetMEST/web/geonetwork/WEB-INF/lib/jeeves.jar
===================================================================
(Binary files differ)
Modified: sandbox/BlueNetMEST/web/geonetwork/WEB-INF/lib/oaipmh-lib.jar
===================================================================
(Binary files differ)
Modified: sandbox/BlueNetMEST/web/geonetwork/WEB-INF/server.prop
===================================================================
--- sandbox/BlueNetMEST/web/geonetwork/WEB-INF/server.prop 2008-07-02 02:28:43 UTC (rev 1356)
+++ sandbox/BlueNetMEST/web/geonetwork/WEB-INF/server.prop 2008-07-02 02:46:54 UTC (rev 1357)
@@ -1,9 +1,9 @@
#GeoNetwork opensource properties. These are also used by both gast and geonetwork at runtime
-#Wed Jun 11 10:14:44 EST 2008
+#Wed Jul 02 12:26:28 EST 2008
release=2.2.0
version=2.2.0
-day=11-6-2008
-date=0814111014
+day=02-7-2008
+date=0826021226
javaVersion=1.5.0
jre_url=http\://java.sun.com/javase/downloads/index_jdk5.jsp
OS=Compiled on Linux (unix)
Modified: sandbox/BlueNetMEST/web/intermap/WEB-INF/lib/intermap.jar
===================================================================
(Binary files differ)
Modified: sandbox/BlueNetMEST/web/intermap/WEB-INF/lib/jeeves.jar
===================================================================
(Binary files differ)
Modified: sandbox/BlueNetMEST/web/intermap/WEB-INF/mapServers.xml_with_geoserver
===================================================================
--- sandbox/BlueNetMEST/web/intermap/WEB-INF/mapServers.xml_with_geoserver 2008-07-02 02:28:43 UTC (rev 1356)
+++ sandbox/BlueNetMEST/web/intermap/WEB-INF/mapServers.xml_with_geoserver 2008-07-02 02:46:54 UTC (rev 1357)
@@ -9,7 +9,7 @@
<config>
<mapServers>
<server type="2" name="Local GeoServer Web Mapping Server (WMS)">
- <url>http://localhost:8078/geoserver/wms</url>
+ <url>http://localhost:8080/geoserver/wms</url>
</server>
<server type="2" name="NASA JPL OneEarth Web Mapping Server (WMS)">
<url>http://wms.jpl.nasa.gov/wms.cgi</url>
@@ -60,10 +60,10 @@
<mapContexts>
<default name="Layers for default map -- DUMMY NAME:not used">
- <server url="http://localhost:8078/geoserver/wms" type="2" >
+ <server url="http://localhost:8080/geoserver/wms" type="2" >
<layer name="gn:world"></layer>
</server>
- <server url="http://localhost:8078/geoserver/wms" type="2" >
+ <server url="http://localhost:8080/geoserver/wms" type="2" >
<layer name="gn:gboundaries"></layer>
</server>
<!-- <server url="http://www2.demis.nl/mapserver/request.asp" type="2" >
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|