You can subscribe to this list here.
2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(76) |
Oct
(8) |
Nov
(13) |
Dec
(7) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2005 |
Jan
(41) |
Feb
(2) |
Mar
(68) |
Apr
(4) |
May
(12) |
Jun
(54) |
Jul
(56) |
Aug
(95) |
Sep
(21) |
Oct
(45) |
Nov
(33) |
Dec
(265) |
2006 |
Jan
(306) |
Feb
(158) |
Mar
(152) |
Apr
(498) |
May
(427) |
Jun
(594) |
Jul
(1378) |
Aug
(1374) |
Sep
(991) |
Oct
(713) |
Nov
(1129) |
Dec
(629) |
2007 |
Jan
(706) |
Feb
(662) |
Mar
(816) |
Apr
(814) |
May
(664) |
Jun
(914) |
Jul
(372) |
Aug
(356) |
Sep
(258) |
Oct
(360) |
Nov
(128) |
Dec
(304) |
2008 |
Jan
(190) |
Feb
(204) |
Mar
(551) |
Apr
(378) |
May
(89) |
Jun
(66) |
Jul
(84) |
Aug
(15) |
Sep
(34) |
Oct
(4) |
Nov
(2) |
Dec
(12) |
2009 |
Jan
(3) |
Feb
(77) |
Mar
(20) |
Apr
(17) |
May
(70) |
Jun
(5) |
Jul
(11) |
Aug
(25) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
From: Kyle B. <kb...@us...> - 2009-09-25 10:05:06
|
Update of /cvsroot/gbif/portal-core In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31746 Modified Files: pom.xml Log Message: pom modified to be able to deploy new version of jar to GBIF maven repository Index: pom.xml =================================================================== RCS file: /cvsroot/gbif/portal-core/pom.xml,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** pom.xml 10 Aug 2009 08:07:54 -0000 1.24 --- pom.xml 25 Sep 2009 10:04:52 -0000 1.25 *************** *** 8,12 **** <name>GBIF Portal Core</name> <version>1.0-SNAPSHOT</version> ! <url>http://TODO</url> <dependencies> <dependency> --- 8,38 ---- <name>GBIF Portal Core</name> <version>1.0-SNAPSHOT</version> ! <url>http://code.google.com/p/gbif-dataportal/</url> ! ! <distributionManagement> ! <repository> ! <id>gbif</id> ! <name>GBIF Repository</name> ! <url>sftp://kiwaia.gbif.org/var/www/html/tools/maven/repository</url> ! </repository> ! </distributionManagement> ! ! <developers> ! <developer> ! <name>Tim Robertson</name> ! <email>tro...@gb...</email> ! </developer> ! <developer> ! <name>Jose Cuadra</name> ! <email>jc...@gb...</email> ! </developer> ! </developers> ! <contributors> ! <contributor> ! <name>Kyle Braak</name> ! <email>kb...@gb...</email> ! </contributor> ! </contributors> ! <dependencies> <dependency> *************** *** 168,171 **** --- 194,198 ---- </dependency> </dependencies> + <build> <testResources> *************** *** 201,210 **** </plugins> </build> ! <repositories> ! <repository> ! <id>gbif-remote</id> ! <name>gbif-remote</name> ! <url>http://tools.gbif.org/maven/repository</url> ! </repository> ! </repositories> ! </project> \ No newline at end of file --- 228,237 ---- </plugins> </build> ! <repositories> ! <repository> ! <id>gbif</id> ! <url>http://tools.gbif.org/maven/repository/</url> ! </repository> ! </repositories> ! ! </project> |
From: Jose C. <jos...@us...> - 2009-08-13 08:36:30
|
Update of /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/classes In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26500/src/main/webapp/WEB-INF/classes Modified Files: portal.properties Log Message: tyding up portal properties file Index: portal.properties =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/classes/portal.properties,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** portal.properties 10 Aug 2009 08:57:25 -0000 1.27 --- portal.properties 13 Aug 2009 08:36:19 -0000 1.28 *************** *** 1,6 **** ! # # The configuration for the portal web application # dataSource.username=root dataSource.password= --- 1,7 ---- ! # # The configuration for the portal web application # + # Portal index credentials dataSource.username=root dataSource.password= *************** *** 12,15 **** --- 13,17 ---- harvestingDataSource.url=jdbc:mysql://localhost:3306/portal?autoReconnect=true&useUnicode=true&characterEncoding=UTF8&characterSetResults=UTF8 + # Database credentials for the database that is used for writing the log entries logDataSource.username=root logDataSource.password= *************** *** 23,26 **** --- 25,29 ---- # Portal version (visible within HTML source of front page) version=1.2.5 + # Date of latest release versionDate=August 6, 2009 *************** *** 28,32 **** repatriationMaplayers=http://data.gbif.org/maplayers/homeCountry/ ! #Geoserver URL mapContentProvider.defaultGeoServerValue=http://ogc.gbif.org/wms --- 31,35 ---- repatriationMaplayers=http://data.gbif.org/maplayers/homeCountry/ ! #GeoServer map content provider URL mapContentProvider.defaultGeoServerValue=http://ogc.gbif.org/wms |
From: Jose C. <jos...@us...> - 2009-08-10 09:30:13
|
Update of /cvsroot/gbif/portal-index In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19961 Modified Files: .classpath .project Log Message: just some sync stuff - just to be able to tag the project Index: .project =================================================================== RCS file: /cvsroot/gbif/portal-index/.project,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .project 14 Nov 2006 10:53:44 -0000 1.2 --- .project 10 Aug 2009 09:30:05 -0000 1.3 *************** *** 6,10 **** <buildCommand> <name>org.eclipse.jdt.core.javabuilder</name> - <arguments/> </buildCommand> </buildSpec> --- 6,9 ---- Index: .classpath =================================================================== RCS file: /cvsroot/gbif/portal-index/.classpath,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** .classpath 10 Apr 2008 08:31:18 -0000 1.6 --- .classpath 10 Aug 2009 09:30:05 -0000 1.7 *************** *** 1,65 **** <classpath> <classpathentry kind="src" path="src/main/java"/> ! <classpathentry kind="src" path="src/main/resources"/> <classpathentry kind="src" path="src/test/java" output="target/test-classes"/> <classpathentry kind="output" path="target/classes"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> ! <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.2.1/commons-dbcp-1.2.1.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"/> ! <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/> ! <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.0.2/xercesImpl-2.0.2.jar"/> <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar"/> ! <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/> <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/> <classpathentry kind="var" path="M2_REPO/dom4j/dom4j-core/1.4-dev-8/dom4j-core-1.4-dev-8.jar"/> ! <classpathentry kind="var" path="M2_REPO/gbif/gis/1.0-SNAPSHOT/gis-1.0-SNAPSHOT.jar"/> ! <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.0/spring-core-2.0.jar"/> ! <classpathentry kind="var" path="M2_REPO/org/springframework/spring-dao/2.0/spring-dao-2.0.jar"/> ! <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/2.0/spring-aop-2.0.jar"/> <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.0/spring-beans-2.0.jar"/> <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/2.0/spring-context-2.0.jar"/> <classpathentry kind="var" path="M2_REPO/org/springframework/spring-jdbc/2.0/spring-jdbc-2.0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-support/2.0/spring-support-2.0.jar"/> - <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-math/commons-math/1.1/commons-math-1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar"/> - <classpathentry kind="var" path="M2_REPO/postgresql/postgresql/8.2-507.jdbc3/postgresql-8.2-507.jdbc3.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.0.2/activation-1.0.2.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar" sourcepath="M2_REPO/javax/mail/mail/1.4/mail-1.4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/> - <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1-beta-9/jaxen-1.1-beta-9.jar"/> - <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar" sourcepath="M2_REPO/jdom/jdom/1.0/jdom-1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/> - <classpathentry kind="var" path="M2_REPO/xom/xom/1.0b3/xom-1.0b3.jar"/> - <classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/2.6.1/icu4j-2.6.1.jar"/> - <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.6.0/xalan-2.6.0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/ccil/cowan/tagsoup/tagsoup/0.9.7/tagsoup-0.9.7.jar"/> - <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/3.1.13/mysql-connector-java-3.1.13.jar"/> - <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop-cache/2.0/spring-aop-cache-2.0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-mock/2.0/spring-mock-2.0.jar"/> <classpathentry kind="var" path="M2_REPO/org/springframework/spring-jpa/2.0/spring-jpa-2.0.jar"/> <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/2.0/spring-web-2.0.jar"/> <classpathentry kind="var" path="M2_REPO/org/springframework/spring-webmvc/2.0/spring-webmvc-2.0.jar"/> <classpathentry kind="var" path="M2_REPO/struts/struts/1.2.9/struts-1.2.9.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-digester/commons-digester/1.6/commons-digester-1.6.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.0/commons-fileupload-1.0.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-validator/commons-validator/1.1.4/commons-validator-1.1.4.jar"/> ! <classpathentry kind="var" path="M2_REPO/oro/oro/2.0.7/oro-2.0.7.jar"/> ! <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.2/antlr-2.7.2.jar"/> ! <classpathentry kind="var" path="M2_REPO/portal/portal-core/1.0-SNAPSHOT/portal-core-1.0-SNAPSHOT.jar"/> ! <classpathentry kind="var" path="M2_REPO/velocity/velocity/1.4/velocity-1.4.jar" sourcepath="M2_REPO/velocity/velocity/1.4/velocity-1.4-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/velocity/velocity-dep/1.4/velocity-dep-1.4.jar" sourcepath="M2_REPO/velocity/velocity-dep/1.4/velocity-dep-1.4-sources.jar"/> <classpathentry kind="var" path="M2_REPO/uddi4j/uddi4j/2.0.5/uddi4j-2.0.5.jar"/> ! <classpathentry kind="var" path="M2_REPO/soap/soap/2.3.1/soap-2.3.1.jar"/> ! <classpathentry kind="var" path="M2_REPO/quartz/quartz/1.6.0/quartz-1.6.0.jar"/> ! <classpathentry kind="var" path="M2_REPO/saxpath/saxpath/1.0-FCS/saxpath-1.0-FCS.jar"/> ! <classpathentry kind="var" path="M2_REPO/javax/media/jai-core/1.1.3/jai-core-1.1.3.jar"/> ! <classpathentry kind="var" path="M2_REPO/javax/media/jai-codec/1.1.3/jai-codec-1.1.3.jar"/> </classpath> \ No newline at end of file --- 1,64 ---- <classpath> <classpathentry kind="src" path="src/main/java"/> ! <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> <classpathentry kind="src" path="src/test/java" output="target/test-classes"/> <classpathentry kind="output" path="target/classes"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> ! <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.0.2/activation-1.0.2.jar"/> ! <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.2/antlr-2.7.2.jar"/> ! <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"/> <classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.2.1/commons-dbcp-1.2.1.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-digester/commons-digester/1.6/commons-digester-1.6.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.0/commons-fileupload-1.0.jar"/> <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.2/commons-io-1.2.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar"/> <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-math/commons-math/1.1/commons-math-1.1.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-validator/commons-validator/1.1.4/commons-validator-1.1.4.jar"/> ! <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/> <classpathentry kind="var" path="M2_REPO/dom4j/dom4j-core/1.4-dev-8/dom4j-core-1.4-dev-8.jar"/> ! <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/> ! <classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/2.6.1/icu4j-2.6.1.jar"/> ! <classpathentry kind="var" path="M2_REPO/javax/media/jai-codec/1.1.3/jai-codec-1.1.3.jar"/> ! <classpathentry kind="var" path="M2_REPO/javax/media/jai-core/1.1.3/jai-core-1.1.3.jar"/> ! <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1-beta-9/jaxen-1.1-beta-9.jar"/> ! <classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar"/> ! <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/> ! <classpathentry kind="var" path="M2_REPO/jump/jts/1.7/jts-1.7.jar"/> ! <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/> ! <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/> ! <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/> ! <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/3.1.13/mysql-connector-java-3.1.13.jar"/> ! <classpathentry kind="var" path="M2_REPO/oro/oro/2.0.8/oro-2.0.8.jar"/> ! <classpathentry kind="var" path="M2_REPO/portal/portal-core/1.0-SNAPSHOT/portal-core-1.0-SNAPSHOT.jar"/> ! <classpathentry kind="var" path="M2_REPO/quartz/quartz/1.6.0/quartz-1.6.0.jar"/> ! <classpathentry kind="var" path="M2_REPO/saxpath/saxpath/1.0-FCS/saxpath-1.0-FCS.jar"/> ! <classpathentry kind="var" path="M2_REPO/soap/soap/2.3.1/soap-2.3.1.jar"/> <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/2.0/spring-aop-2.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop-cache/2.0/spring-aop-cache-2.0.jar"/> <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.0/spring-beans-2.0.jar"/> <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/2.0/spring-context-2.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.0/spring-core-2.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-dao/2.0/spring-dao-2.0.jar"/> <classpathentry kind="var" path="M2_REPO/org/springframework/spring-jdbc/2.0/spring-jdbc-2.0.jar"/> <classpathentry kind="var" path="M2_REPO/org/springframework/spring-jpa/2.0/spring-jpa-2.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-mock/2.0/spring-mock-2.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-support/2.0/spring-support-2.0.jar"/> <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/2.0/spring-web-2.0.jar"/> <classpathentry kind="var" path="M2_REPO/org/springframework/spring-webmvc/2.0/spring-webmvc-2.0.jar"/> <classpathentry kind="var" path="M2_REPO/struts/struts/1.2.9/struts-1.2.9.jar"/> ! <classpathentry kind="var" path="M2_REPO/org/ccil/cowan/tagsoup/tagsoup/0.9.7/tagsoup-0.9.7.jar"/> <classpathentry kind="var" path="M2_REPO/uddi4j/uddi4j/2.0.5/uddi4j-2.0.5.jar"/> ! <classpathentry kind="var" path="M2_REPO/org/apache/velocity/velocity/1.6/velocity-1.6.jar"/> ! <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.6.0/xalan-2.6.0.jar"/> ! <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.0.2/xercesImpl-2.0.2.jar"/> ! <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/> ! <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/> ! <classpathentry kind="var" path="M2_REPO/xom/xom/1.0b3/xom-1.0b3.jar"/> </classpath> \ No newline at end of file |
From: Jose C. <jos...@us...> - 2009-08-10 09:30:12
|
Update of /cvsroot/gbif/portal-core In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19905 Removed Files: .classpath .project Log Message: just some sync stuff - just to be able to tag the project --- .project DELETED --- --- .classpath DELETED --- |
From: Jose C. <jos...@us...> - 2009-08-10 09:30:11
|
Update of /cvsroot/gbif/portal-core/db In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19905/db Added Files: portal.clay Log Message: just some sync stuff - just to be able to tag the project --- NEW FILE: portal.clay --- <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <clay-model clay-version="1.4.1"> <database-model alias="" author="" begin-script="" end-script="" name="portal" remarks="" sql-dialect-id="jp.azzurri.clay.dialect.MySQL_5_0_Dialect" uid="2e885e:1220c07b0de:-7a31" version="1.0"> <database-model-description></database-model-description> <schema-list> <schema alias="" name="DEFAULT_SCHEMA" remarks="" uid="24e1bf:1220c31c3dc:-7fff"> <schema-description></schema-description> <domain-list/> <table-list> <table alias="" name="agent" remarks="" uid="24e1bf:1220c31c3dc:-7ffe"> <table-description></table-description> <table-figure-bounds height="-1" width="-1" x="1023" y="1090"/> <column-list> <column alias="" auto-increment="true" column-size="10" decimal-digits="0" default-value="" mandatory="true" name="id" remarks="" uid="24e1bf:1220c31c3dc:-7ffc"> <column-description></column-description> <data-type jdbc-type="4" name="INT" selected-variant-pattern="INT(%n)"> <variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n)"/> <variant type-name-pattern="INT"/> <variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) UNSIGNED"/> [...6094 lines suppressed...] <index-list> <index alias="" name="ix_typification_record_occurrence" remarks="" uid="24e1bf:1220c31c3dc:-7d4b" unique="false"> <index-description></index-description> <index-column name="occurrence_id" sort="ASC"/> </index> <index alias="" name="ix_typification_record_name" remarks="" uid="24e1bf:1220c31c3dc:-7d4a" unique="false"> <index-description></index-description> <index-column name="taxon_name_id" sort="ASC"/> </index> <index alias="" name="ix_typification_record_resource" remarks="" uid="24e1bf:1220c31c3dc:-7d49" unique="false"> <index-description></index-description> <index-column name="data_resource_id" sort="ASC"/> </index> </index-list> </table> </table-list> </schema> </schema-list> </database-model> </clay-model> |
From: Jose C. <jos...@us...> - 2009-08-10 09:30:08
|
Update of /cvsroot/gbif/portal-web/trace.db In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19893/trace.db Log Message: Directory /cvsroot/gbif/portal-web/trace.db added to the repository |
From: Jose C. <jos...@us...> - 2009-08-10 09:30:06
|
Update of /cvsroot/gbif/portal-web/logs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19893/logs Log Message: Directory /cvsroot/gbif/portal-web/logs added to the repository |
From: Jose C. <jos...@us...> - 2009-08-10 08:58:11
|
Update of /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/jsp In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15245/src/main/webapp/WEB-INF/jsp Modified Files: bugs.jsp version.jsp Log Message: just list of bug fixes, version # Index: bugs.jsp =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/jsp/bugs.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bugs.jsp 18 Jun 2009 13:24:05 -0000 1.1 --- bugs.jsp 10 Aug 2009 08:58:01 -0000 1.2 *************** *** 5,8 **** --- 5,17 ---- </div> <ul class="genericList"> + <li>Maps - Switch from Mapserver to Geoserver as map content provider -- <a href="${pageContext.request.contextPath}/countries/AR">SAMPLE</a></li> + <li>Occurrence search results - Fixed centi-cell accuracy when returning occurrence records within a 1 degree area -- <a href="${pageContext.request.contextPath}/occurrences/searchWithTable.htm?c[1].p=0&c[0].s=24&c[1].o=16.1W%2C28.6N%2C16.0W%2C28.7N&c[0].o=1896&c[0].p=0&c[1].s=19">SAMPLE</a></li> + <li>Retrieve original record from data provider - Added a 'graceful' error message when the provider is inaccesible -- <a href="${pageContext.request.contextPath}/occurrences/45340996/rawProviderMessage/">SAMPLE</a></li> + <li>Dataset Portal logs - Fixed display of the "Date" field in the log events when using Spanish as the preferred language in browser -- <a href="${pageContext.request.contextPath}/datasets/resource/240/logs/?event=&logGroup=&logLevel=40000&sd_day=20&sd_month=06&sd_year=2007&ed_day=20&ed_month=08&ed_year=2008">SAMPLE</a></li> + <li>All pages - All pages now provide link to communications portal (www.gbif.org) -- <a href="${pageContext.request.contextPath}/">SAMPLE</a></li> + </ul> + + <h4>Bug fixes in version 1.2.4</h4> + <ul class="genericList"> <li>Species pages - In "Explore All Occurrences," on each species page, the expected number of records is given -- <a href="${pageContext.request.contextPath}/species/13140809">SAMPLE</a></li> <li>Occurrence search - Countries sorted by their name instead of their ISO Code -- <a href="${pageContext.request.contextPath}/occurrences/searchCountries.htm?c[0].s=0&c[0].p=0&c[0].o=Inga vera">SAMPLE</a></li> *************** *** 22,24 **** <li>Dataset page - Non-active access points were removed -- <a href="{pageContext.request.contextPath}/datasets/resource/2023">SAMPLE</a></li> <li>General fixes to memory related problems</li> ! </ul> --- 31,33 ---- <li>Dataset page - Non-active access points were removed -- <a href="{pageContext.request.contextPath}/datasets/resource/2023">SAMPLE</a></li> <li>General fixes to memory related problems</li> ! </ul> \ No newline at end of file Index: version.jsp =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/jsp/version.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** version.jsp 18 Jun 2009 13:24:05 -0000 1.5 --- version.jsp 10 Aug 2009 08:58:01 -0000 1.6 *************** *** 1,15 **** <%@ include file="/common/taglibs.jsp"%> <div id="twopartheader"> ! <h2><spring:message code="version"/> <gbif:propertyLoader bundle="portal" property="version"/></h2> <h3><spring:message code="version.features"/></h3> </div> <ul class="genericList"> <li><a href="${pageContext.request.contextPath}/occurrences/search.htm?c[0].s=0&c[0].p=0&c[0].o=Desmidium+swartzii&c[1].s=37&c[1].p=0&c[1].o=0">Image filter for Occurrence search</a> - Occurrence search now includes searching for records with images</li> <li><a href="${pageContext.request.contextPath}/countries/AR">Data statistics on Countries' pages</a> - New statistics on host countries providing georeferenced records for other countries</li> <li>Several GUI enhancements</li> </ul> - <a href="${pageContext.request.contextPath}/bugs.htm">Click here</a> for a complete list of fixes/enhancements in this version ! <h4>Features added in version 1.2.3</h4> <ul class="genericList"> <li><a href="${pageContext.request.contextPath}/ws/">Web Services performance improvement</a> - response times have been lowered considerably</li> --- 1,22 ---- <%@ include file="/common/taglibs.jsp"%> <div id="twopartheader"> ! <h2><spring:message code="version"/> <gbif:propertyLoader bundle="portal" property="version"/> (Published: <gbif:propertyLoader bundle="portal" property="versionDate"/>)</h2> <h3><spring:message code="version.features"/></h3> </div> <ul class="genericList"> + <li><a href="${pageContext.request.contextPath}/countries/AR">Maps</a> - Switched from MapServer to GeoServer as the map content provider for the data portal</li> + <li><a href="${pageContext.request.contextPath}/occurrences/45340996/rawProviderMessage/">Original record from data provider</a> - Improved user experience while downloading the original record from the provider</li> + <li>Several GUI enhancements</li> + </ul> + <a href="${pageContext.request.contextPath}/bugs.htm">Click here</a> for a complete list of fixes/enhancements in this version + + <h4>Features added in version 1.2.4 (Published: June, 2009)</h4> + <ul class="genericList"> <li><a href="${pageContext.request.contextPath}/occurrences/search.htm?c[0].s=0&c[0].p=0&c[0].o=Desmidium+swartzii&c[1].s=37&c[1].p=0&c[1].o=0">Image filter for Occurrence search</a> - Occurrence search now includes searching for records with images</li> <li><a href="${pageContext.request.contextPath}/countries/AR">Data statistics on Countries' pages</a> - New statistics on host countries providing georeferenced records for other countries</li> <li>Several GUI enhancements</li> </ul> ! <h4>Features added in version 1.2.3 (Published: February, 2009)</h4> <ul class="genericList"> <li><a href="${pageContext.request.contextPath}/ws/">Web Services performance improvement</a> - response times have been lowered considerably</li> *************** *** 18,27 **** </ul> ! <h4>Features added in version 1.2.2</h4> <ul class="genericList"> <li><a href="${pageContext.request.contextPath}/occurrences/">Indexing & search capabilites for altitude and depth fields</a></li> </ul> ! <h4>Features added in version 1.2.1</h4> <ul class="genericList"> <li><a href="${pageContext.request.contextPath}/species/Puma_concolor">OGC Mapping Services (Beta)</a> - incorporate mapping into your own application</li> --- 25,34 ---- </ul> ! <h4>Features added in version 1.2.2 (Published: 2008)</h4> <ul class="genericList"> <li><a href="${pageContext.request.contextPath}/occurrences/">Indexing & search capabilites for altitude and depth fields</a></li> </ul> ! <h4>Features added in version 1.2.1 (Published: 2008)</h4> <ul class="genericList"> <li><a href="${pageContext.request.contextPath}/species/Puma_concolor">OGC Mapping Services (Beta)</a> - incorporate mapping into your own application</li> |
From: Jose C. <jos...@us...> - 2009-08-10 08:57:35
|
Update of /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/classes In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15179/src/main/webapp/WEB-INF/classes Modified Files: portal.properties Log Message: added geoserver WMS service URL to portal.properties for ease of configuration Index: portal.properties =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/classes/portal.properties,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** portal.properties 18 Jun 2009 13:24:05 -0000 1.26 --- portal.properties 10 Aug 2009 08:57:25 -0000 1.27 *************** *** 22,30 **** # Portal version (visible within HTML source of front page) ! version=1.2.4 #Redirect for datasharing page repatriationMaplayers=http://data.gbif.org/maplayers/homeCountry/ # Map Layer server #mapContentProvider.mapLayerServerURL=http://aoraia.gbif.org/portaldev/maplayer/ --- 22,34 ---- # Portal version (visible within HTML source of front page) ! version=1.2.5 ! versionDate=August 6, 2009 #Redirect for datasharing page repatriationMaplayers=http://data.gbif.org/maplayers/homeCountry/ + #Geoserver URL + mapContentProvider.defaultGeoServerValue=http://ogc.gbif.org/wms + # Map Layer server #mapContentProvider.mapLayerServerURL=http://aoraia.gbif.org/portaldev/maplayer/ |
From: Jose C. <jos...@us...> - 2009-08-10 08:54:07
|
Update of /cvsroot/gbif/portal-web/src/main/webapp/javascript In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14331/src/main/webapp/javascript Added Files: request.js Log Message: increased "user experience" when downloading original record form data provider --- NEW FILE: request.js --- /** Functions to assist requesting data from providers */ function requestDataFromProvider(ajaxUrl){ var ajaxCallback = { success:function(o){ document.location = o.responseText; }, failure:function(o){ document.location = document.location; } } YAHOO.util.Connect.asyncRequest('GET', ajaxUrl, ajaxCallback, null); } |
From: Jose C. <jos...@us...> - 2009-08-10 08:54:04
|
Update of /cvsroot/gbif/portal-web/src/main/webapp/common In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14331/src/main/webapp/common Modified Files: scripts.jsp Log Message: increased "user experience" when downloading original record form data provider Index: scripts.jsp =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/webapp/common/scripts.jsp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** scripts.jsp 25 Feb 2008 10:24:21 -0000 1.20 --- scripts.jsp 10 Aug 2009 08:53:52 -0000 1.21 *************** *** 16,18 **** <script src="${pageContext.request.contextPath}/javascript/viewMore.js" type="text/javascript" language="javascript"></script> <script src="${pageContext.request.contextPath}/javascript/download.js" type="text/javascript" language="javascript"></script> ! <script src="${pageContext.request.contextPath}/javascript/registration.js" type="text/javascript" language="javascript"></script> \ No newline at end of file --- 16,19 ---- <script src="${pageContext.request.contextPath}/javascript/viewMore.js" type="text/javascript" language="javascript"></script> <script src="${pageContext.request.contextPath}/javascript/download.js" type="text/javascript" language="javascript"></script> ! <script src="${pageContext.request.contextPath}/javascript/registration.js" type="text/javascript" language="javascript"></script> ! <script src="${pageContext.request.contextPath}/javascript/request.js" type="text/javascript" language="javascript"></script> \ No newline at end of file |
From: Jose C. <jos...@us...> - 2009-08-10 08:54:04
|
Update of /cvsroot/gbif/portal-web/src/main/webapp/skins/standard In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14331/src/main/webapp/skins/standard Modified Files: speciesGlobal.css Log Message: increased "user experience" when downloading original record form data provider Index: speciesGlobal.css =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/webapp/skins/standard/speciesGlobal.css,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** speciesGlobal.css 14 May 2008 14:01:55 -0000 1.74 --- speciesGlobal.css 10 Aug 2009 08:53:52 -0000 1.75 *************** *** 175,177 **** --- 175,181 ---- .downloadInfo { padding-left:20px; } + /* Provider request */ + .providerRequest { margin-left:80px;margin-top:20px; margin-bottom:40px; } + .providerInfo { padding-left:20px; } + .hidden { display: none; visibility: hidden; } |
From: Jose C. <jos...@us...> - 2009-08-10 08:54:04
|
Update of /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/jsp/request In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14331/src/main/webapp/WEB-INF/jsp/request Added Files: providerMessageSubtitle.jsp ajaxProviderURL.jsp providerOffline.jsp providerMessage.jsp Log Message: increased "user experience" when downloading original record form data provider --- NEW FILE: providerOffline.jsp --- <%@ include file="/common/taglibs.jsp"%> <div id="twopartheader"> <h2><spring:message code="provider.offline"/></h2> <h3><spring:message code="provider.offline.subheader"/></h3> </div><!-- End twopartheader --> <table class="providerRequest"> <tr> <td> </td> <td class="providerInfo"> <b><spring:message code="provider.offline.description"/></b> <p/> Back to the <a href="${pageContext.request.contextPath}/occurrences/${occurrenceRecordKey}/">occurrence page</a> </td> </tr> </table> --- NEW FILE: ajaxProviderURL.jsp --- ${pageContext.request.contextPath}/occurrences/${occurrenceRecordKey}/providerMessage.xml --- NEW FILE: providerMessageSubtitle.jsp --- <%@ include file="/common/taglibs.jsp"%><spring:message code="provider.requesting.title" text="Provider request"/> --- NEW FILE: providerMessage.jsp --- <%@ include file="/common/taglibs.jsp"%> <div id="twopartheader"> <h2><spring:message code="provider.requesting"/></h2> <h3><spring:message code="provider.requesting.subheader"/></h3> </div><!-- End twopartheader --> <table class="providerRequest"> <tr> <td> <img src="${pageContext.request.contextPath}/skins/shared/images/icons/loading.gif"/> </td> <td class="providerInfo"> <p> <b><spring:message code="provider.requesting.wait"/></b> </p> </td> </tr> </table> <script> requestDataFromProvider('${pageContext.request.contextPath}/occurrences/${occurrenceRecordKey}/providerUrl/'); </script> |
From: Jose C. <jos...@us...> - 2009-08-10 08:54:03
|
Update of /cvsroot/gbif/portal-web/src/main/java/org/gbif/portal/web/controller/occurrence In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14331/src/main/java/org/gbif/portal/web/controller/occurrence Modified Files: OccurrenceController.java Log Message: increased "user experience" when downloading original record form data provider Index: OccurrenceController.java =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/java/org/gbif/portal/web/controller/occurrence/OccurrenceController.java,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** OccurrenceController.java 3 Jul 2009 08:53:23 -0000 1.46 --- OccurrenceController.java 10 Aug 2009 08:53:52 -0000 1.47 *************** *** 86,92 **** /** the cell width for the bounding box links */ protected int cellWidth; ! /** Raw XML message view */ protected String providerXmlSubview = "providerMessage"; /** Raw XML message view */ protected String requestXmlSubview = "providerRequest"; /** large map view */ --- 86,96 ---- /** the cell width for the bounding box links */ protected int cellWidth; ! /** Preparing provider request message view */ protected String providerXmlSubview = "providerMessage"; /** Raw XML message view */ + protected String providerXmlRawView = "rawProviderMessage"; + /** Raw XML message view */ + protected String providerUrlView = "providerUrl"; + /** Raw XML message view */ protected String requestXmlSubview = "providerRequest"; /** large map view */ *************** *** 94,97 **** --- 98,103 ---- /** Raw XML message view */ protected String rawXmlStylesheet = "rawXml.jsp"; + /** Provider not available view */ + protected String providerOffline = "providerOffline"; /** The results limit for a distinct query */ *************** *** 154,157 **** --- 160,169 ---- return retrieveProviderMessage(occurrenceRecordKey, properties, request, response); } + if(view.equals(providerUrlView)) { + return retrieveProviderUrl(occurrenceRecordKey, properties, request, response); + } + if(view.equals(providerXmlRawView)) { + return retrieveRawProviderMessage(occurrenceRecordKey, properties, request, response); + } if(view.equals(requestXmlSubview)){ return retrieveProviderRequest(occurrenceRecordKey, properties, request, response); *************** *** 196,202 **** return redirectToDefaultView(); } /** ! * Retrieve and render the original provider message. * @param occurrenceRecordKey * @param request --- 208,229 ---- return redirectToDefaultView(); } + + /** + * Retrieves the URL that is going to be used to request the original data from the provider + * @param occurrenceRecordKey + * @param request + * @param response + * @return + */ + public ModelAndView retrieveProviderUrl(String occurrenceRecordKey, Map<String, String>properties, HttpServletRequest request, HttpServletResponse response) { + + ModelAndView mav = resolveAndCreateView(properties, request, false); + mav.addObject("occurrenceRecordKey", occurrenceRecordKey); + return mav; + } + /** ! * Prepare the request for the data resource * @param occurrenceRecordKey * @param request *************** *** 217,223 **** } catch (Exception e) { logger.debug(e.getMessage(), e); } ! return null; ! } /** --- 244,270 ---- } catch (Exception e) { logger.debug(e.getMessage(), e); + ModelAndView mav = new ModelAndView(providerOffline); + mav.addObject("occurrenceRecordKey", occurrenceRecordKey); + return mav; } ! return null; ! ! ! ! } ! ! /** ! * Retrieve and render the original provider message. ! * @param occurrenceRecordKey ! * @param request ! * @param response ! * @return ! */ ! public ModelAndView retrieveRawProviderMessage(String occurrenceRecordKey, Map<String, String>properties, HttpServletRequest request, HttpServletResponse response) { ! ! ModelAndView mav = resolveAndCreateView(properties, request, false); ! mav.addObject("occurrenceRecordKey", occurrenceRecordKey); ! return mav; ! } /** |
From: Jose C. <jos...@us...> - 2009-08-10 08:54:02
|
Update of /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/jsp/occurrence/drilldown In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14331/src/main/webapp/WEB-INF/jsp/occurrence/drilldown Modified Files: actions.jsp Log Message: increased "user experience" when downloading original record form data provider Index: actions.jsp =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/jsp/occurrence/drilldown/actions.jsp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** actions.jsp 27 Jun 2007 13:22:16 -0000 1.10 --- actions.jsp 10 Aug 2009 08:53:53 -0000 1.11 *************** *** 26,30 **** <ul class="actionsListInline"> <c:set var="dataProvider">${occurrenceRecord.dataResourceName}</c:set> ! <li><a href="${pageContext.request.contextPath}/occurrences/${occurrenceRecord.key}/providerMessage.xml"><spring:message code="occurrence.record.dynamic.details"/></a></li> <c:if test="${georeferenced}"> <li><a href="${pageContext.request.contextPath}/occurrences/occurrence-${occurrenceRecord.key}.kml"><spring:message code="occurrence.record.geospatial.google.earth"/></a></li> --- 26,30 ---- <ul class="actionsListInline"> <c:set var="dataProvider">${occurrenceRecord.dataResourceName}</c:set> ! <li><a href="${pageContext.request.contextPath}/occurrences/${occurrenceRecord.key}/rawProviderMessage/" target="_blank"><spring:message code="occurrence.record.dynamic.details"/></a></li> <c:if test="${georeferenced}"> <li><a href="${pageContext.request.contextPath}/occurrences/occurrence-${occurrenceRecord.key}.kml"><spring:message code="occurrence.record.geospatial.google.earth"/></a></li> |
From: Jose C. <jos...@us...> - 2009-08-10 08:54:02
|
Update of /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/jsp/request In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14285/src/main/webapp/WEB-INF/jsp/request Log Message: Directory /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/jsp/request added to the repository |
From: Jose C. <jos...@us...> - 2009-08-10 08:54:02
|
Update of /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14331/src/main/webapp/WEB-INF Modified Files: tiles-def.xml Log Message: increased "user experience" when downloading original record form data provider Index: tiles-def.xml =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/tiles-def.xml,v retrieving revision 1.148 retrieving revision 1.149 diff -C2 -d -r1.148 -r1.149 *** tiles-def.xml 18 Jun 2009 13:24:06 -0000 1.148 --- tiles-def.xml 10 Aug 2009 08:53:52 -0000 1.149 *************** *** 1048,1051 **** --- 1048,1068 ---- </definition> + <!-- Tiles to use when requesting data directly from the access points --> + <definition name="occurrenceRecord.rawProviderMessage" extends="mainLayout"> + <put name="subtitle" value="/WEB-INF/jsp/request/providerMessageSubtitle.jsp"/> + <put name="headcontent" value="/WEB-INF/jsp/occurrence/headcontent.jsp"/> + <put name="content" value="/WEB-INF/jsp/request/providerMessage.jsp"/> + </definition> + + <definition name="occurrenceRecord.providerUrl" extends="ajaxHtmlLayout"> + <put name="content" value="/WEB-INF/jsp/request/ajaxProviderURL.jsp"/> + </definition> + + <definition name="providerOffline" extends="mainLayout"> + <put name="subtitle" value="/WEB-INF/jsp/request/providerMessageSubtitle.jsp"/> + <put name="headcontent" value="/WEB-INF/jsp/occurrence/headcontent.jsp"/> + <put name="content" value="/WEB-INF/jsp/request/providerOffline.jsp"/> + </definition> + <!-- Web service tutorial page --> |
From: Jose C. <jos...@us...> - 2009-08-10 08:54:02
|
Update of /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/classes In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14331/src/main/webapp/WEB-INF/classes Modified Files: messages.properties Log Message: increased "user experience" when downloading original record form data provider Index: messages.properties =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/classes/messages.properties,v retrieving revision 1.268 retrieving revision 1.269 diff -C2 -d -r1.268 -r1.269 *** messages.properties 23 Jul 2009 09:51:30 -0000 1.268 --- messages.properties 10 Aug 2009 08:53:52 -0000 1.269 *************** *** 1220,1223 **** --- 1220,1232 ---- download.monitor=Download monitor + # Downloading Provider XML Message + provider.requesting = Requesting data from provider... + provider.requesting.title = Provider request + provider.requesting.subheader = The request is being sent + provider.requesting.wait = Please wait while the request is sent to the provider. This may take up to 30 seconds. + provider.offline = Error while connecting to the provider + provider.offline.subheader = Provider not available or offline + provider.offline.description = We are sorry, but the requested data is not available at this moment due to connectivity problems with the provider. + #Open Modeller model.description=Niche Model generation using openModeller using occurrence data from the search: |
From: Jose C. <jos...@us...> - 2009-08-10 08:23:21
|
Update of /cvsroot/gbif/portal-web/src/main/java/org/gbif/portal/web/content/map In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10060/src/main/java/org/gbif/portal/web/content/map Modified Files: MapContentProvider.java Log Message: mapserver to geoserver migration Index: MapContentProvider.java =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/java/org/gbif/portal/web/content/map/MapContentProvider.java,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** MapContentProvider.java 29 Apr 2008 10:58:58 -0000 1.35 --- MapContentProvider.java 10 Aug 2009 08:23:11 -0000 1.36 *************** *** 54,57 **** --- 54,59 ---- /**The default Map Server used if the preference key is missing **/ protected String defaultMapServerValue; + /**The default Geo Server used if the preference key is missing **/ + protected String defaultGeoServerValue; /**The default Map Layers Key **/ protected String defaultMapLayerKey; *************** *** 130,134 **** //adds the map server and map layer details ! addMapServerDetails2Request(request, mapLayerPathRoot, idOrQueryString, minLongitude, minLatitude, zoom); } --- 132,138 ---- //adds the map server and map layer details ! //addMapServerDetails2Request(request, mapLayerPathRoot, idOrQueryString, minLongitude, minLatitude, zoom); ! //adds the geo server details ! addGeoServerDetails2Request(request, mapLayerPathRoot, idOrQueryString, minLongitude, minLatitude, zoom); } *************** *** 276,280 **** request.setAttribute(maxMapLatRequestKey, (int) llbb.getMaxLat()); //adds the map server and map layer details ! addMapServerDetails2Request(request, mapLayerPathRoot, idOrQuery, (int) llbb.getMinLong(), (int) llbb.getMinLat(), zoomLevel.getLevel()); } --- 280,286 ---- request.setAttribute(maxMapLatRequestKey, (int) llbb.getMaxLat()); //adds the map server and map layer details ! //addMapServerDetails2Request(request, mapLayerPathRoot, idOrQuery, (int) llbb.getMinLong(), (int) llbb.getMinLat(), zoomLevel.getLevel()); ! //adds the geo server details ! addGeoServerDetails2Request(request, mapLayerPathRoot, idOrQuery, (int) llbb.getMinLong(), (int) llbb.getMinLat(), zoomLevel.getLevel()); } *************** *** 367,370 **** --- 373,407 ---- /** + * Adds map content to the request. + * + * @param request + * @param mapLayerPathRoot + * @param idOrQuery + */ + private void addGeoServerDetails2Request(HttpServletRequest request, String mapLayerPathRoot, String idOrQuery, float minLongitude, float minLatitude, int zoom) { + + StringBuffer sb = new StringBuffer(); + sb.append(mapLayerPathRoot); + sb.append('/'); + sb.append(idOrQuery); + String mapLayerUrl = getMapLayerURL(zoom, sb.toString(), (int)minLongitude, (int)minLatitude); + String mapLayerUrlEscaped = mapLayerUrl; + try { + mapLayerUrlEscaped = URLEncoder.encode(mapLayerUrl, "UTF-8"); + } catch (UnsupportedEncodingException e) { + logger.error(e.getMessage(), e); + } + + ZoomLevel zoomLevel = ZoomLevel.getZoomLevel(zoom); + String extent = createExtent(minLongitude, minLatitude, minLongitude+zoomLevel.getLongitudeRange(), minLatitude+zoomLevel.getLatitudeRange()); + + //map server urls + request.setAttribute("geoServerUrl", getGeoServerURL()); + request.setAttribute("mapLayerUrl", mapLayerUrlEscaped); + request.setAttribute("unEscapedMapLayerUrl", mapLayerUrl); + request.setAttribute("overviewMapUrl", getMapServerURL()+"?dtype=box&imgonly=1&path="+mapLayerUrlEscaped+"&mode=browse&refresh=Refresh&layer=countryborders&extent="+extent); + } + + /** * Retrieve a bounding box for the given zoom level and centre point. * *************** *** 606,609 **** --- 643,660 ---- /** + * @return the defaultGeoServerValue + */ + public String getGeoServerURL() { + return defaultGeoServerValue; + } + + /** + * @param defaultGeoServerValue the defaultGeoServerValue to set + */ + public void setDefaultGeoServerValue(String defaultGeoServerValue) { + this.defaultGeoServerValue = defaultGeoServerValue; + } + + /** * @param geospatialManager the geospatialManager to set */ |
From: Jose C. <jos...@us...> - 2009-08-10 08:23:20
|
Update of /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/jsp/geography In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10060/src/main/webapp/WEB-INF/jsp/geography Modified Files: gbifMap.jsp Log Message: mapserver to geoserver migration Index: gbifMap.jsp =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/jsp/geography/gbifMap.jsp,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** gbifMap.jsp 14 May 2008 15:23:17 -0000 1.47 --- gbifMap.jsp 10 Aug 2009 08:23:11 -0000 1.48 *************** *** 1,3 **** ! <%@ include file="/common/taglibs.jsp"%> <script src="${pageContext.request.contextPath}/javascript/mapserver.js" type="text/javascript" language="javascript"></script> <c:set var="minMapLat" scope="request">${minMapLat==null ? -90 : minMapLat}</c:set> <c:set var="maxMapLat" scope="request">${maxMapLat==null ? 90 : maxMapLat}</c:set> <c:set var="minMapLong"scope="request">${minMapLong==null ? -180 : minMapLong}</c:set> <c:set var="maxMapLong" scope="request">${maxMapLong==null ? 180 : maxMapLong}</c:set> <c:set var="zoom" scope="request">${zoom==null ? 1 : zoom}</c:set> <c:set var="extent" scope="request">${extent==null ? param.extent : extent}</c:set> <script type="text/javascript"> <% String ua = (String) request.getHeader( "User-Agent" ); boolean isMSIE = ( ua != null && ua.indexOf( "MSIE" ) != -1 ); pageContext.setAttribute("isMSIE", isMSIE); %> <c:if test="${isMSIE}">isIE=true;</c:if> <c:if test='${zoom ==2}'> boxWidth = 80; boxHeight = 40; </c:if> <c:if test='${zoom ==3}'> boxWidth = 180; boxHeight = 90; </c:if> <c:if test='${zoom ==4}'> boxWidth = 360; boxHeight = 180; </c:if> minMapLat = ${minMapLat}; maxMapLat = ${maxMapLat}; minMapLong = ${minMapLong}; maxMapLong = ${maxMapLong}; zoom = ${zoom}; <c:if test='${zoom >4}'> boxWidth = 72; boxHeight = 36; snapHalf=false; </c:if> <c:if test='${zoom == 5}'> boxWidthInDegrees=2; boxHeightInDegrees=1; </c:if> <c:if test='${zoom == 6}'> nudge = 1; boxWidth = 36; boxWidthInDegrees=0.1; boxHeightInDegrees=0.1; </c:if> var extraParams="${extraParams}"; var unescapeMapLayerUrl="${unEscapedMapLayerUrl}"; document.onmousemove = mouseMove; //Redirects to filter search with bounding box function redirectToCell (minX, minY, maxX, maxY){ document.location.href = "${pageContext.request.contextPath}/occurrences/boundingBoxWithCriteria.htm?" +extraParams +"&minX="+minX +"&minY="+minY +"&maxX="+maxX +"&maxY="+maxY; } </script> <table class="gbifMap"> <tr class="top"> <td class="first"/> <td class="labelLeft">${minMapLong}</td> <td class="up"> <c:if test='${maxMapLat < 90}'> <a href="javascript:nudgeUp()" <c:if test="${zoom<6}"> title="<spring:message code="maps.move.fivedegree.north"/>"</c:if> <c:if test="${zoom==6}"> title="<spring:message code="maps.move.onedegree.north"/>"</c:if> ><img src="${pageContext.request.contextPath}/<spring:theme code="shared.root"/>/images/icons/up.gif"/></a> </c:if> </td> <td align="right" class="labelRight">${maxMapLong}</td> <td class="zoom"> <c:if test='${zoom>1}'> <a href="javascript:zoomOut()" title="Zoom out"><img src="${pageContext.request.contextPath}/<spring:theme code="shared.root"/>/images/icons/zoom_out.png"/></a> </c:if> </td> <td class="key"/> </tr> <tr class="firstRow"> <td class="labelTopLeft">${maxMapLat}</td> <td class="map" colspan="3" rowspan="3" align="center" valign="middle"> <c:if test="${pointsTotal==0}"> <h5 id="noGeoreferencedPoints"><spring:message code="maps.no.georeferenced.points"/> ${entityName}</h5> </c:if> <img id="overviewMap" class="overviewMap" alt="${mapTitle} occurrences distribution map" name="${mapTitle} occurrences distribution map" title="${mapTitle} occurrences distribution map" src="${mapServerUrl}?dtype=box&imgonly=1&path=${mapLayerUrl}&extent=${extent}&mode=browse&refresh=Refresh&layer=countryborders<c:if test="${zoom>1}">&layer=countrylabels</c:if><c:if test="${zoom==6}">°ree=0.1</c:if>" <c:choose> <c:when test="${pointsTotal>0}"> onMouseOver='javascript:capture=true;' onMouseOut='javascript:capture=false;' <c:choose> <c:when test='${zoom == 6}'> onclick="javascript:occurrenceSearch();" </c:when> <c:otherwise> onclick="javascript:selectBox();" </c:otherwise> </c:choose> </c:when> </c:choose> /> </td> <td class="labelTopRight">${maxMapLat}</td> <td class="key"/> </tr> <tr> <td class="left"> <c:if test='${minMapLong > -180}'> <a href="javascript:nudgeLeft()" <c:if test="${zoom<6}"> title="<spring:message code="maps.move.fivedegree.west"/>"</c:if> <c:if test="${zoom==6}"> title="<spring:message code="maps.move.onedegree.west"/>"</c:if> ><img src="${pageContext.request.contextPath}/<spring:theme code="shared.root"/>/images/icons/left.gif"/></a> </c:if> </td> <td class="right"> <c:if test='${maxMapLong < 180}'> <a href="javascript:nudgeRight()" <c:if test="${zoom<6}"> title="<spring:message code="maps.move.fivedegree.east"/>"</c:if> <c:if test="${zoom==6}"> title="<spring:message code="maps.move.onedegree.east"/>"</c:if> ><img src="${pageContext.request.contextPath}/<spring:theme code="shared.root"/>/images/icons/right.gif"/></a> </c:if> </td> <td> <table class="mapKey"> <c:choose> <c:when test='${zoom == 6}'> <caption><spring:message code="maps.count.pointone.cell"/></caption> </c:when> <c:otherwise> <caption><spring:message code="maps.count.onedeg.cell"/></caption> </c:otherwise> </c:choose> <tr><td class="key" bgcolor="#ffff00"/><td class="detail">1 - 9</td></tr> <tr><td class="key" bgcolor="#ffcc00"/><td class="detail">10 - 99</td></tr> <tr><td class="key" bgcolor="#ff9900"/><td class="detail">100 - 999</td></tr> <tr><td class="key" bgcolor="#ff6600"/><td class="detail">1000 - 9999</td></tr> <tr><td class="key" bgcolor="#ff3300"/><td class="detail">10000 - 99999</td></tr> <tr><td class="key" bgcolor="#cc0000"/><td class="detail">100000+</td></tr> </table> <br/><br/> <ul id="markerPosition"> <li id="northCoordinate">90</li> <li id="westCoordinate">-180</li> <li id="eastCoordinate">180</li> <li id="southCoordinate">-90</li> </ul> </td> </tr> <tr class="lastRow"> <td class="labelBottomLeft">${minMapLat}</td> <td class="labelBottomRight">${minMapLat}</td> <td class="key"/> </tr> <tr class="bottom"> <td class="first"/> <td class="labelLeft">${minMapLong}</td> <td class="down"> <c:if test='${minMapLat>-90}'> <a href="javascript:nudgeDown()" <c:if test="${zoom<6}"> title="<spring:message code="maps.move.fivedegree.south"/>"</c:if> <c:if test="${zoom==6}"> title="<spring:message code="maps.move.onedegree.south"/>"</c:if> ><img src="${pageContext.request.contextPath}/<spring:theme code="shared.root"/>/images/icons/down.gif"/></a> </c:if> </td> <td class="labelRight">${maxMapLong}</td> <td class="last"/> </tr> <c:if test="${not empty wmsFilter}"> <tr> <td class="link" colspan="6" align="right"><span class="new">Beta: </span><a href="${pageContext.request.contextPath}/countries/gbifWMSMap?wmsFilter=${wmsFilter}">GBIF Open Geospatial Consortium <spring:message code="maps.services" text="services"/></a></td> </tr> </c:if> </table> <div id="mapSelector" class="zoom${zoom}" onMouseOver='javascript:capture=true;' onMouseOut='javascript:capture=false;' <c:choose> <c:when test='${zoom == 6}'> onclick="javascript:occurrenceSearch();" </c:when> <c:otherwise> onclick="javascript:selectBox();" </c:otherwise> </c:choose> > </div> \ No newline at end of file --- 1,3 ---- ! <%@ include file="/common/taglibs.jsp"%> <script src="${pageContext.request.contextPath}/javascript/mapserver.js" type="text/javascript" language="javascript"></script> <c:set var="minMapLat" scope="request">${minMapLat==null ? -90 : minMapLat}</c:set> <c:set var="maxMapLat" scope="request">${maxMapLat==null ? 90 : maxMapLat}</c:set> <c:set var="minMapLong"scope="request">${minMapLong==null ? -180 : minMapLong}</c:set> <c:set var="maxMapLong" scope="request">${maxMapLong==null ? 180 : maxMapLong}</c:set> <c:set var="zoom" scope="request">${zoom==null ? 1 : zoom}</c:set> <c:set var="extent" scope="request">${extent==null ? param.extent : extent}</c:set> <c:set var="mapWidth" scope="request">${mapWidth==null ? 721 : mapWidth}</c:set> <c:set var="mapHeight" scope="request">${mapHeight==null ? 362 : mapHeight}</c:set> <script type="text/javascript"> <% String ua = (String) request.getHeader( "User-Agent" ); boolean isMSIE = ( ua != null && ua.indexOf( "MSIE" ) != -1 ); pageContext.setAttribute("isMSIE", isMSIE); %> <c:if test="${isMSIE}">isIE=true;</c:if> <c:if test='${zoom ==2}'> boxWidth = 80; boxHeight = 40; </c:if> <c:if test='${zoom ==3}'> boxWidth = 180; boxHeight = 90; </c:if> <c:if test='${zoom ==4}'> boxWidth = 360; boxHeight = 180; </c:if> minMapLat = ${minMapLat}; maxMapLat = ${maxMapLat}; minMapLong = ${minMapLong}; maxMapLong = ${maxMapLong}; zoom = ${zoom}; <c:if test='${zoom >4}'> boxWidth = 72; boxHeight = 36; snapHalf=false; </c:if> <c:if test='${zoom == 5}'> boxWidthInDegrees=2; boxHeightInDegrees=1; </c:if> <c:if test='${zoom == 6}'> nudge = 1; boxWidth = 36; boxWidthInDegrees=0.1; boxHeightInDegrees=0.1; </c:if> var extraParams="${extraParams}"; var unescapeMapLayerUrl="${unEscapedMapLayerUrl}"; document.onmousemove = mouseMove; //Redirects to filter search with bounding box function redirectToCell (minX, minY, maxX, maxY){ document.location.href = "${pageContext.request.contextPath}/occurrences/boundingBoxWithCriteria.htm?" +extraParams +"&minX="+minX +"&minY="+minY +"&maxX="+maxX +"&maxY="+maxY; } </script> <table class="gbifMap"> <tr class="top"> <td class="first"/> <td class="labelLeft">${minMapLong}</td> <td class="up"> <c:if test='${maxMapLat < 90}'> <a href="javascript:nudgeUp()" <c:if test="${zoom<6}"> title="<spring:message code="maps.move.fivedegree.north"/>"</c:if> <c:if test="${zoom==6}"> title="<spring:message code="maps.move.onedegree.north"/>"</c:if> ><img src="${pageContext.request.contextPath}/<spring:theme code="shared.root"/>/images/icons/up.gif"/></a> </c:if> </td> <td align="right" class="labelRight">${maxMapLong}</td> <td class="zoom"> <c:if test='${zoom>1}'> <a href="javascript:zoomOut()" title="Zoom out"><img src="${pageContext.request.contextPath}/<spring:theme code="shared.root"/>/images/icons/zoom_out.png"/></a> </c:if> </td> <td class="key"/> </tr> <tr class="firstRow"> <td class="labelTopLeft">${maxMapLat}</td> <td class="map" colspan="3" rowspan="3" align="center" valign="middle"> <c:if test="${pointsTotal==0}"> <h5 id="noGeoreferencedPoints"><spring:message code="maps.no.georeferenced.points"/> ${entityName}</h5> </c:if> <img id="overviewMap" class="overviewMap" alt="${mapTitle} occurrences distribution map" name="${mapTitle} occurrences distribution map" title="${mapTitle} occurrences distribution map" <c:if test="${zoom==1}"> src="${geoServerUrl}?request=GetMap&bgcolor=0x666698&styles=,,&layers=gbif:country_fill,gbif:tabDensityLayer,gbif:country_borders&srs=EPSG:4326&filter=()(<Filter><PropertyIsEqualTo><PropertyName>url</PropertyName><Literal><![CDATA[${mapLayerUrl}]]></Literal></PropertyIsEqualTo></Filter>)()&width=${mapWidth}&height=${mapHeight}&Format=image/png&bbox=${minMapLong},${minMapLat},${maxMapLong},${maxMapLat}" </c:if> <c:if test="${zoom>1 && zoom<6}"> src="${geoServerUrl}?request=GetMap&bgcolor=0x666698&styles=,,,&layers=gbif:country_fill,gbif:tabDensityLayer,gbif:country_borders,gbif:country_names&srs=EPSG:4326&filter=()(<Filter><PropertyIsEqualTo><PropertyName>url</PropertyName><Literal><![CDATA[${mapLayerUrl}]]></Literal></PropertyIsEqualTo></Filter>)()()&width=${mapWidth}&height=${mapHeight}&Format=image/png&bbox=${minMapLong},${minMapLat},${maxMapLong},${maxMapLat}" </c:if> <c:if test="${zoom==6}"> src="${geoServerUrl}?request=GetMap&bgcolor=0x666698&styles=,,country_borders_black,country_names_blue&layers=bluemarble,gbif:tabDensityLayer,gbif:country_borders,gbif:country_names&srs=EPSG:4326&filter=()(<Filter><PropertyIsEqualTo><PropertyName>url</PropertyName><Literal><![CDATA[${mapLayerUrl}]]></Literal></PropertyIsEqualTo></Filter>)()()&width=${mapWidth}&height=${mapHeight}&Format=image/png&bbox=${minMapLong},${minMapLat},${maxMapLong},${maxMapLat}" </c:if> <%-- src="${mapServerUrl}?dtype=box&imgonly=1&path=${mapLayerUrl}&extent=${extent}&mode=browse&refresh=Refresh&layer=countryborders<c:if test="${zoom>1}">&layer=countrylabels</c:if><c:if test="${zoom==6}">°ree=0.1</c:if>" --%> <c:choose> <c:when test="${pointsTotal>0}"> onMouseOver='javascript:capture=true;' onMouseOut='javascript:capture=false;' <c:choose> <c:when test='${zoom == 6}'> onclick="javascript:occurrenceSearch();" </c:when> <c:otherwise> onclick="javascript:selectBox();" </c:otherwise> </c:choose> </c:when> </c:choose> /> </td> <td class="labelTopRight">${maxMapLat}</td> <td class="key"/> </tr> <tr> <td class="left"> <c:if test='${minMapLong > -180}'> <a href="javascript:nudgeLeft()" <c:if test="${zoom<6}"> title="<spring:message code="maps.move.fivedegree.west"/>"</c:if> <c:if test="${zoom==6}"> title="<spring:message code="maps.move.onedegree.west"/>"</c:if> ><img src="${pageContext.request.contextPath}/<spring:theme code="shared.root"/>/images/icons/left.gif"/></a> </c:if> </td> <td class="right"> <c:if test='${maxMapLong < 180}'> <a href="javascript:nudgeRight()" <c:if test="${zoom<6}"> title="<spring:message code="maps.move.fivedegree.east"/>"</c:if> <c:if test="${zoom==6}"> title="<spring:message code="maps.move.onedegree.east"/>"</c:if> ><img src="${pageContext.request.contextPath}/<spring:theme code="shared.root"/>/images/icons/right.gif"/></a> </c:if> </td> <td> <table class="mapKey"> <c:choose> <c:when test='${zoom == 6}'> <caption><spring:message code="maps.count.pointone.cell"/></caption> </c:when> <c:otherwise> <caption><spring:message code="maps.count.onedeg.cell"/></caption> </c:otherwise> </c:choose> <tr><td class="key" bgcolor="#ffff00"/><td class="detail">1 - 9</td></tr> <tr><td class="key" bgcolor="#ffcc00"/><td class="detail">10 - 99</td></tr> <tr><td class="key" bgcolor="#ff9900"/><td class="detail">100 - 999</td></tr> <tr><td class="key" bgcolor="#ff6600"/><td class="detail">1000 - 9999</td></tr> <tr><td class="key" bgcolor="#ff3300"/><td class="detail">10000 - 99999</td></tr> <tr><td class="key" bgcolor="#cc0000"/><td class="detail">100000+</td></tr> </table> <br/><br/> <ul id="markerPosition"> <li id="northCoordinate">90</li> <li id="westCoordinate">-180</li> <li id="eastCoordinate">180</li> <li id="southCoordinate">-90</li> </ul> </td> </tr> <tr class="lastRow"> <td class="labelBottomLeft">${minMapLat}</td> <td class="labelBottomRight">${minMapLat}</td> <td class="key"/> </tr> <tr class="bottom"> <td class="first"/> <td class="labelLeft">${minMapLong}</td> <td class="down"> <c:if test='${minMapLat>-90}'> <a href="javascript:nudgeDown()" <c:if test="${zoom<6}"> title="<spring:message code="maps.move.fivedegree.south"/>"</c:if> <c:if test="${zoom==6}"> title="<spring:message code="maps.move.onedegree.south"/>"</c:if> ><img src="${pageContext.request.contextPath}/<spring:theme code="shared.root"/>/images/icons/down.gif"/></a> </c:if> </td> <td class="labelRight">${maxMapLong}</td> <td class="last"/> </tr> <c:if test="${not empty wmsFilter}"> <tr> <td class="link" colspan="6" align="right"><span class="new">Beta: </span><a href="${pageContext.request.contextPath}/countries/gbifWMSMap?wmsFilter=${wmsFilter}">GBIF Open Geospatial Consortium <spring:message code="maps.services" text="services"/></a></td> </tr> </c:if> </table> <div id="mapSelector" class="zoom${zoom}" onMouseOver='javascript:capture=true;' onMouseOut='javascript:capture=false;' <c:choose> <c:when test='${zoom == 6}'> onclick="javascript:occurrenceSearch();" </c:when> <c:otherwise> onclick="javascript:selectBox();" </c:otherwise> </c:choose> > </div> \ No newline at end of file |
From: Jose C. <jos...@us...> - 2009-08-10 08:23:19
|
Update of /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/classes In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10060/src/main/webapp/WEB-INF/classes Modified Files: applicationContext-contentProviders.xml Log Message: mapserver to geoserver migration Index: applicationContext-contentProviders.xml =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/classes/applicationContext-contentProviders.xml,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** applicationContext-contentProviders.xml 15 May 2009 10:29:34 -0000 1.58 --- applicationContext-contentProviders.xml 10 Aug 2009 08:23:10 -0000 1.59 *************** *** 70,73 **** --- 70,74 ---- <property name="mapLayerServerURL" value="http://data.gbif.org/maplayer/"/> <property name="defaultMapServerKey" value="map_server_url"/> + <property name="defaultGeoServerValue" value="http://db3:8080/geoserver/wms"/> <property name="defaultMapServerValue" value="http://maps.gbif.org/mapserver/draw.pl"/> <property name="defaultMapLayerKey" value="map_server_layers_url"/> |
From: Jose C. <jos...@us...> - 2009-08-10 08:23:19
|
Update of /cvsroot/gbif/portal-web/src/main/webapp/skins/shared In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10060/src/main/webapp/skins/shared Modified Files: gbifmap.css Log Message: mapserver to geoserver migration Index: gbifmap.css =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/webapp/skins/shared/gbifmap.css,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** gbifmap.css 11 Apr 2008 11:46:32 -0000 1.18 --- gbifmap.css 10 Aug 2009 08:23:11 -0000 1.19 *************** *** 1 **** ! table.gbifMap { border-collapse: collapse; } table.gbifMap td { padding: 0px; margin: 0px; } table.gbifMap td.zoom { padding-left: 4px; } table.gbifMap td.map { padding: 0px; margin: 0px; width: 720px; height: 360px; } table.gbifMap td.up, td.down { padding: 0px; width: 660px; margin:0px; } table.gbifMap a img { border: none; padding: 0px; margin: 0px; } table.gbifMap a { border-bottom:0px; } table.gbifMap td.link a:link { color: #333366;text-decoration: none; border-bottom: 1px dashed gray; } table.gbifMap td.link a:visited { color: #333366; text-decoration: none; border-bottom: 1px dashed gray; } table.gbifMap td.link a:hover { text-decoration: underline; border: 0; } table.gbifMap tr.top td { border-bottom: 1px dashed #cccccc; } table.gbifMap tr.bottom td { border-top: 1px dashed #cccccc; } table.gbifMap td.labelLeft, table.gbifMap td.labelTopLeft, table.gbifMap td.labelBottomLeft, table.gbifMap td.labelRight, table.gbifMap td.labelTopRight, table.gbifMap td.labelBottomRight { width: 25px; height: 25px; /* vertical-align: center;*/ text-align: center; } table.gbifMap td.first, table.gbifMap td.left, table.gbifMap td.labelTopLeft, table.gbifMap td.labelBottomLeft { border-right: 1px dashed #cccccc; } table.gbifMap td.last, table.gbifMap td.right, table.gbifMap td.labelTopRight, table.gbifMap td.labelBottomRight, table.gbifMap td.zoom { border-left: 1px dashed #cccccc; } table.gbifMap table.gbifMap td.zoom { /* vertical-align: center;*/ text-align: center; } table.gbifMap td.labelLeft, table.gbifMap td.labelRight, table.gbifMap td.labelTopLeft, table.gbifMap td.labelBottomLeft, table.gbifMap td.labelTopRight, table.gbifMap td.labelBottomRight { font-size: 10px; color: #999999; } table.gbifMap td.up, table.gbifMap td.down, table.gbifMap td.left, table.gbifMap td.right { /* vertical-align: center;*/ text-align: center; } table.gbifMap td.left { height: 310px; } table.gbifMap tr.top td.key, table.gbifMap tr.bottom td.key { border: none; } table.mapKey { border: 1px solid #999999; font-size: 10px; color: #999999; width:120px; } table.mapKey td.key { width: 10px; height: 10px; } table.latlongs { border: 1px solid #999999; font-size: 9px; color: #999999; width:150px; margin-left:5px; } table.markerPosition { border: 1px solid #999999; font-size: 10px; color: #999999; width:120px; } table.markerPosition td { width: 40px; } /* The map selector for global 180x360*/ div.zoom1 { position: absolute; left: -50px; top: 0px; width: 38px; height: 18px; border: 2px solid #990000; } /* The map selector for 90x180 */ div.zoom2 { position: absolute; left: -100px; top: 0px; width: 74px; height: 36px; border: 2px solid #990000; } /* The map selector for 40x80 */ div.zoom3 { position: absolute; left: -300px; top: 0px; width: 178px; height: 88px; border: 2px solid #990000; } /* The map selector for 20x40 */ div.zoom4 { position: absolute; left: -600px; top: 0px; width: 358px; height: 178px; border: 2px solid #990000; } /* The map selector for 10x20 */ div.zoom5 { position: absolute; left: -100px; top: 0px; width: 70px; height: 34px; border: 2px solid #990000; } /* The map selector for 1x2 */ div.zoom6 { position: absolute; left: -100px; top: 0px; width: 34px; height: 34px; border: 2px solid #990000; } div.boundingBoxMarker{ position:absolute; left:-200px; border: 1px solid #33FF00; } img#overviewMapSmall { margin-left:30px; } img.boundingBoxMap { width:600px; height:300px; } img.boundingBoxMapFullScreen { width:1400px; height:700px; } h5#noGeoreferencedPoints { color:#FFFFFF; margin:0px; padding-top:5px; padding-bottom:5px; text-align:center; valign:center; background-color:#000000; width:100%; font-size: 1.1em ;} /* map marker */ ul#markerPosition { width: 120px; height: 60px ; margin: 0 ; padding: 0; background: url('images/latLongBG.gif') 11px 5px no-repeat ; font: 10px Verdana, Arial, Helvetica, sans-serif; } ul#markerPosition li {text-align:center;} li#northCoordinate { margin: 0 0 10px 0; padding: 0 ; text-align:center ; list-style: none } li#westCoordinate { float: left; text-align: left ; margin: 0 ; padding: 0 ; list-style:none; display: inline } li#eastCoordinate { float: right; text-align: right; margin: 0 ; padding: 0 ; list-style:none; display: inline } li#southCoordinate { margin: 35px 0 0 0 ; padding: 0; text-align:center; list-style: none } \ No newline at end of file --- 1 ---- ! table.gbifMap { border-collapse: collapse; } table.gbifMap td { padding: 0px; margin: 0px; } table.gbifMap td.zoom { padding-left: 4px; } table.gbifMap td.map { padding: 0px; margin: 0px; width: 720px; height: 360px; } table.gbifMap td.up, td.down { padding: 0px; width: 660px; margin:0px; } table.gbifMap a img { border: none; padding: 0px; margin: 0px; } table.gbifMap a { border-bottom:0px; } table.gbifMap td.link a:link { color: #333366;text-decoration: none; border-bottom: 1px dashed gray; } table.gbifMap td.link a:visited { color: #333366; text-decoration: none; border-bottom: 1px dashed gray; } table.gbifMap td.link a:hover { text-decoration: underline; border: 0; } table.gbifMap tr.top td { border-bottom: 1px dashed #cccccc; } table.gbifMap tr.bottom td { border-top: 1px dashed #cccccc; } table.gbifMap td.labelLeft, table.gbifMap td.labelTopLeft, table.gbifMap td.labelBottomLeft, table.gbifMap td.labelRight, table.gbifMap td.labelTopRight, table.gbifMap td.labelBottomRight { width: 25px; height: 25px; /* vertical-align: center;*/ text-align: center; } table.gbifMap td.first, table.gbifMap td.left, table.gbifMap td.labelTopLeft, table.gbifMap td.labelBottomLeft { border-right: 1px dashed #cccccc; } table.gbifMap td.last, table.gbifMap td.right, table.gbifMap td.labelTopRight, table.gbifMap td.labelBottomRight, table.gbifMap td.zoom { border-left: 1px dashed #cccccc; } table.gbifMap table.gbifMap td.zoom { /* vertical-align: center;*/ text-align: center; } table.gbifMap td.labelLeft, table.gbifMap td.labelRight, table.gbifMap td.labelTopLeft, table.gbifMap td.labelBottomLeft, table.gbifMap td.labelTopRight, table.gbifMap td.labelBottomRight { font-size: 10px; color: #999999; } table.gbifMap td.up, table.gbifMap td.down, table.gbifMap td.left, table.gbifMap td.right { /* vertical-align: center;*/ text-align: center; } table.gbifMap td.left { height: 310px; } table.gbifMap tr.top td.key, table.gbifMap tr.bottom td.key { border: none; } table.mapKey { border: 1px solid #999999; font-size: 10px; color: #999999; width:120px; } table.mapKey td.key { width: 10px; height: 10px; } table.latlongs { border: 1px solid #999999; font-size: 9px; color: #999999; width:150px; margin-left:5px; } table.markerPosition { border: 1px solid #999999; font-size: 10px; color: #999999; width:120px; } table.markerPosition td { width: 40px; } /* The map selector for global 180x360*/ div.zoom1 { position: absolute; left: -50px; top: 0px; width: 38px; height: 18px; border: 3px solid #990000; } /* The map selector for 90x180 */ div.zoom2 { position: absolute; left: -100px; top: 0px; width: 74px; height: 36px; border: 3px solid #990000; } /* The map selector for 40x80 */ div.zoom3 { position: absolute; left: -300px; top: 0px; width: 178px; height: 88px; border: 3px solid #990000; } /* The map selector for 20x40 */ div.zoom4 { position: absolute; left: -600px; top: 0px; width: 358px; height: 178px; border: 3px solid #990000; } /* The map selector for 10x20 */ div.zoom5 { position: absolute; left: -100px; top: 0px; width: 70px; height: 34px; border: 3px solid #990000; } /* The map selector for 1x2 */ div.zoom6 { position: absolute; left: -100px; top: 0px; width: 34px; height: 34px; border: 3px solid #990000; } div.boundingBoxMarker{ position:absolute; left:-200px; border: 1px solid #33FF00; } img#overviewMapSmall { margin-left:30px; } img.boundingBoxMap { width:600px; height:300px; } img.boundingBoxMapFullScreen { width:1400px; height:700px; } h5#noGeoreferencedPoints { color:#FFFFFF; margin:0px; padding-top:5px; padding-bottom:5px; text-align:center; valign:center; background-color:#000000; width:100%; font-size: 1.1em ;} /* map marker */ ul#markerPosition { width: 120px; height: 60px ; margin: 0 ; padding: 0; background: url('images/latLongBG.gif') 11px 5px no-repeat ; font: 10px Verdana, Arial, Helvetica, sans-serif; } ul#markerPosition li {text-align:center;} li#northCoordinate { margin: 0 0 10px 0; padding: 0 ; text-align:center ; list-style: none } li#westCoordinate { float: left; text-align: left ; margin: 0 ; padding: 0 ; list-style:none; display: inline } li#eastCoordinate { float: right; text-align: right; margin: 0 ; padding: 0 ; list-style:none; display: inline } li#southCoordinate { margin: 35px 0 0 0 ; padding: 0; text-align:center; list-style: none } li#view { margin: 15x 0 0 0 ; padding: 0; text-align:center; list-style: none; font: 12px Verdana, Arial, Helvetica, sans-serif; } \ No newline at end of file |
From: Jose C. <jos...@us...> - 2009-08-10 08:10:55
|
Update of /cvsroot/gbif/portal-service/src/main/java/org/gbif/portal/service/util In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7803/src/main/java/org/gbif/portal/service/util Modified Files: PropertyStoreQueryBuilder.java Log Message: postamble now filters out for deleted providers/datasets Index: PropertyStoreQueryBuilder.java =================================================================== RCS file: /cvsroot/gbif/portal-service/src/main/java/org/gbif/portal/service/util/PropertyStoreQueryBuilder.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** PropertyStoreQueryBuilder.java 10 Dec 2007 10:27:42 -0000 1.10 --- PropertyStoreQueryBuilder.java 10 Aug 2009 08:10:43 -0000 1.11 *************** *** 177,180 **** --- 177,184 ---- } sb.append(" ) "); + + sb.append(propertyStore.getProperty(namespace, postambleKey)); + + sb.append(" "); //add group clauses if they exist *************** *** 198,206 **** } ! sb.append(" "); if (descending) sb.append(propertyStore.getProperty(namespace, postambleDescKey)); ! else ! sb.append(propertyStore.getProperty(namespace, postambleKey)); return sb.toString(); } --- 202,210 ---- } ! //sb.append(" "); if (descending) sb.append(propertyStore.getProperty(namespace, postambleDescKey)); ! //else ! //sb.append(propertyStore.getProperty(namespace, postambleKey)); return sb.toString(); } |
From: Jose C. <jos...@us...> - 2009-08-10 08:10:55
|
Update of /cvsroot/gbif/portal-service/src/main/resources/org/gbif/portal/util/propertystore/gbif_service_1_0 In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7803/src/main/resources/org/gbif/portal/util/propertystore/gbif_service_1_0 Modified Files: applicationContext-triplets.xml Log Message: postamble now filters out for deleted providers/datasets Index: applicationContext-triplets.xml =================================================================== RCS file: /cvsroot/gbif/portal-service/src/main/resources/org/gbif/portal/util/propertystore/gbif_service_1_0/applicationContext-triplets.xml,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** applicationContext-triplets.xml 15 May 2009 10:29:37 -0000 1.59 --- applicationContext-triplets.xml 10 Aug 2009 08:10:43 -0000 1.60 *************** *** 155,159 **** <entry key="SERVICE.OCCURRENCE.GEOREF.QUERY.POSTAMBLE" value=" and oc.cellId is not null "/> ! <!-- Show only non-deleted providers --> <entry key="SERVICE.OCCURRENCE.QUERY.COUNTS.POSTAMBLE" value=" and oc.dataProvider.deleted is null and oc.dataResource.deleted is null "/> --- 155,159 ---- <entry key="SERVICE.OCCURRENCE.GEOREF.QUERY.POSTAMBLE" value=" and oc.cellId is not null "/> ! <!-- Show only non-deleted providers/datasets --> <entry key="SERVICE.OCCURRENCE.QUERY.COUNTS.POSTAMBLE" value=" and oc.dataProvider.deleted is null and oc.dataResource.deleted is null "/> *************** *** 163,167 **** <!--entry key="SERVICE.OCCURRENCE.QUERY.POSTAMBLE" value=" order by oc.id"/> <entry key="SERVICE.OCCURRENCE.QUERY.POSTAMBLEDESC" value=" order by oc.id desc"/--> ! <entry key="SERVICE.OCCURRENCE.QUERY.POSTAMBLE" value=""/> <entry key="SERVICE.OCCURRENCE.QUERY.POSTAMBLEDESC" value=""/> --- 163,167 ---- <!--entry key="SERVICE.OCCURRENCE.QUERY.POSTAMBLE" value=" order by oc.id"/> <entry key="SERVICE.OCCURRENCE.QUERY.POSTAMBLEDESC" value=" order by oc.id desc"/--> ! <entry key="SERVICE.OCCURRENCE.QUERY.POSTAMBLE" value=" and oc.dataProvider.deleted is null and oc.dataResource.deleted is null "/> <entry key="SERVICE.OCCURRENCE.QUERY.POSTAMBLEDESC" value=""/> |
From: Jose C. <jos...@us...> - 2009-08-10 08:08:08
|
Update of /cvsroot/gbif/portal-core/src/main/java/org/gbif/portal/util/request In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7301/src/main/java/org/gbif/portal/util/request Modified Files: RequestUtils.java Log Message: httpclient dependency upgrade (3.0.1 --> 3.1) Index: RequestUtils.java =================================================================== RCS file: /cvsroot/gbif/portal-core/src/main/java/org/gbif/portal/util/request/RequestUtils.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** RequestUtils.java 8 Aug 2007 12:37:56 -0000 1.7 --- RequestUtils.java 10 Aug 2009 08:07:54 -0000 1.8 *************** *** 13,18 **** --- 13,22 ---- import org.apache.commons.httpclient.HttpClient; + import org.apache.commons.httpclient.HttpConnectionManager; import org.apache.commons.httpclient.HttpException; + import org.apache.commons.httpclient.SimpleHttpConnectionManager; import org.apache.commons.httpclient.methods.GetMethod; + import org.apache.commons.httpclient.params.HttpClientParams; + import org.apache.commons.httpclient.params.HttpConnectionManagerParams; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; *************** *** 64,69 **** GetMethod method = null; try { ! HttpClient client = new HttpClient(); ! client.getParams().setSoTimeout(timeoutInMillisec); client.getParams().setContentCharset("UTF-8"); method = new GetMethod(request); --- 68,81 ---- GetMethod method = null; try { ! ! ! HttpConnectionManagerParams cmparams = new HttpConnectionManagerParams(); ! cmparams.setSoTimeout(timeoutInMillisec); ! cmparams.setConnectionTimeout(timeoutInMillisec); ! HttpConnectionManager manager = new SimpleHttpConnectionManager(); ! manager.setParams(cmparams); ! HttpClientParams params = new HttpClientParams(); ! HttpClient client = new HttpClient(params, manager); ! //client.getParams().setSoTimeout(timeoutInMillisec); client.getParams().setContentCharset("UTF-8"); method = new GetMethod(request); |