Menu
▾
▴
treebase-guts
|
From: <rv...@us...> - 2010-01-13 17:31:37
|
Revision: 427
http://treebase.svn.sourceforge.net/treebase/?rev=427&view=rev
Author: rvos
Date: 2010-01-13 17:31:31 +0000 (Wed, 13 Jan 2010)
Log Message:
-----------
Implemented getDomainName() method, which returns the domain name as specified in the treebase.properties file. This domain name is to be used in the view layer if we want to display absolute URLs that cannot be computed by the web app (e.g. if we start using PURLs).
Modified Paths:
--------------
trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java 2010-01-13 17:29:26 UTC (rev 426)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java 2010-01-13 17:31:31 UTC (rev 427)
@@ -3,6 +3,8 @@
import java.io.BufferedReader;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.text.ParseException;
@@ -12,6 +14,7 @@
import java.util.Collection;
import java.util.Date;
import java.util.Iterator;
+import java.util.Properties;
import java.util.TimeZone;
import org.cipres.treebase.domain.study.Citation;
@@ -422,6 +425,27 @@
return date + " GMT";
}
+
+ /**
+ * This method returns the domain name (possibly with port number)
+ * which can be used to construct URLs by prefixing with "http://"
+ * and suffixing with the full path (e.g. "/treebase-web")
+ *
+ * @return domain name
+ */
+ public static String getDomainName() {
+ Properties properties = new Properties();
+ String domainName = "";
+ try {
+ properties.load( new FileInputStream("treebase.properties") );
+ domainName = properties.getProperty("treebase.domain.name");
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return domainName;
+ }
/**
* This method appends header information upon formatting to the nexus file.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2010-02-15 15:07:06
|
Revision: 504
http://treebase.svn.sourceforge.net/treebase/?rev=504&view=rev
Author: rvos
Date: 2010-02-15 15:06:59 +0000 (Mon, 15 Feb 2010)
Log Message:
-----------
Changed getDomainName() to getPurlDomain(), changed the name of the property it looks up from treebase.domain.name to treebase.purl.domain
Modified Paths:
--------------
trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java 2010-02-15 15:05:38 UTC (rev 503)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java 2010-02-15 15:06:59 UTC (rev 504)
@@ -433,12 +433,12 @@
*
* @return domain name
*/
- public static String getDomainName() {
+ public static String getPurlDomain() {
Properties properties = new Properties();
String domainName = "";
try {
properties.load( new FileInputStream("treebase.properties") );
- domainName = properties.getProperty("treebase.domain.name");
+ domainName = properties.getProperty("treebase.purl.domain");
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2010-02-15 15:55:53
|
Revision: 507
http://treebase.svn.sourceforge.net/treebase/?rev=507&view=rev
Author: rvos
Date: 2010-02-15 15:55:46 +0000 (Mon, 15 Feb 2010)
Log Message:
-----------
Loading properties file as ResourceStream instead.
Modified Paths:
--------------
trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java 2010-02-15 15:29:39 UTC (rev 506)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java 2010-02-15 15:55:46 UTC (rev 507)
@@ -439,7 +439,11 @@
Properties properties = new Properties();
String domainName = "";
try {
- properties.load( new FileInputStream("treebase.properties") );
+ properties.load(
+ TreebaseUtil.class
+ .getClassLoader()
+ .getResourceAsStream("treebase.properties"));
+ //properties.load( new FileInputStream("treebase.properties") );
LOGGER.info("properties loaded successfully");
domainName = properties.getProperty("treebase.purl.domain");
LOGGER.info("domain name: "+domainName);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2011-12-13 20:14:25
|
Revision: 1005
http://treebase.svn.sourceforge.net/treebase/?rev=1005&view=rev
Author: rvos
Date: 2011-12-13 20:14:19 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
Changed header from "Downloaded on..." to "Generated on..." because of Apache level caching, so that pre-generated files don't have confusing time stamps.
Modified Paths:
--------------
trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java 2011-12-12 18:21:28 UTC (rev 1004)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java 2011-12-13 20:14:19 UTC (rev 1005)
@@ -519,7 +519,7 @@
public static void attachStudyHeader(Study pStudy, StringBuilder pBuilder) {
pBuilder
.append(
- "[!This data set was downloaded from TreeBASE, a relational database of phylogenetic knowledge. TreeBASE has been supported by the NSF, Harvard University, Yale University, SDSC and UC Davis. Please do not remove this acknowledgment from the Nexus file.\n\n\nDownloaded on "
+ "[!This data set was downloaded from TreeBASE, a relational database of phylogenetic knowledge. TreeBASE has been supported by the NSF, Harvard University, Yale University, SDSC and UC Davis. Please do not remove this acknowledgment from the Nexus file.\n\n\nGenerated on "
+ getTimeAndDateAtGMT()).append(TreebaseUtil.LINESEP).append(
"\nTreeBASE (cc) 1994-2008").append(TreebaseUtil.LINESEP);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2012-02-06 19:56:22
|
Revision: 1058
http://treebase.svn.sourceforge.net/treebase/?rev=1058&view=rev
Author: rvos
Date: 2012-02-06 19:56:11 +0000 (Mon, 06 Feb 2012)
Log Message:
-----------
Added <?> parameterization to generics, removed unused imports. This to suppress some warnings. Trivial commit.
Modified Paths:
--------------
trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java 2012-02-06 19:48:09 UTC (rev 1057)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java 2012-02-06 19:56:11 UTC (rev 1058)
@@ -3,14 +3,8 @@
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CodingErrorAction;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Arrays;
@@ -18,7 +12,6 @@
import java.util.Collection;
import java.util.Date;
import java.util.Iterator;
-import java.util.Properties;
import java.util.TimeZone;
import javax.naming.InitialContext;
@@ -244,14 +237,14 @@
* @param pAllElement
* @return
*/
- public static String printElement(Collection pCollection, boolean pAllElement) {
+ public static String printElement(Collection<?> pCollection, boolean pAllElement) {
int size = pCollection.size();
if (!pAllElement && size > 10) {
size = 10;
}
StringBuffer buf = new StringBuffer();
- Iterator iter = pCollection.iterator();
+ Iterator<?> iter = pCollection.iterator();
for (int i = 0; i < size; i++) {
buf.append(i).append("= ").append(iter.next()).append(ANEMPTYSPACE);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2010-03-15 01:34:04
|
Revision: 590
http://treebase.svn.sourceforge.net/treebase/?rev=590&view=rev
Author: rvos
Date: 2010-03-15 01:33:56 +0000 (Mon, 15 Mar 2010)
Log Message:
-----------
Now lazily loads the purl domain.
Modified Paths:
--------------
trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java 2010-03-15 01:32:50 UTC (rev 589)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java 2010-03-15 01:33:56 UTC (rev 590)
@@ -3,7 +3,6 @@
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
@@ -41,6 +40,7 @@
public static final String LINESEP = System.getProperty("line.separator");
public static final int citationMaxLength = 5000;
private static final Logger LOGGER = Logger.getLogger(TreebaseUtil.class);
+ private static String mPurlDomain;
private TreebaseUtil() {
super();
@@ -436,25 +436,28 @@
* @return domain name
*/
public static String getPurlDomain() {
- Properties properties = new Properties();
- String domainName = "";
- try {
- properties.load(
- TreebaseUtil.class
- .getClassLoader()
- .getResourceAsStream("treebase.properties"));
- //properties.load( new FileInputStream("treebase.properties") );
- LOGGER.info("properties loaded successfully");
- domainName = properties.getProperty("treebase.purl.domain");
- LOGGER.info("domain name: "+domainName);
- } catch (FileNotFoundException e) {
- LOGGER.warn("FileNotFoundException: " + e.getMessage());
- e.printStackTrace();
- } catch (IOException e) {
- LOGGER.warn("IOException: "+e.getMessage());
- e.printStackTrace();
+ if ( null == mPurlDomain ) {
+ Properties properties = new Properties();
+ try {
+ properties.load(
+ TreebaseUtil.class
+ .getClassLoader()
+ .getResourceAsStream("treebase.properties"));
+ LOGGER.info("properties loaded successfully");
+ mPurlDomain = properties.getProperty("treebase.purl.domain");
+ LOGGER.info("domain name: "+mPurlDomain);
+ } catch (FileNotFoundException e) {
+ LOGGER.warn("FileNotFoundException: " + e.getMessage());
+ e.printStackTrace();
+ } catch (IOException e) {
+ LOGGER.warn("IOException: "+e.getMessage());
+ e.printStackTrace();
+ }
+ return mPurlDomain;
}
- return domainName;
+ else {
+ return mPurlDomain;
+ }
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2011-04-19 11:20:20
|
Revision: 792
http://treebase.svn.sourceforge.net/treebase/?rev=792&view=rev
Author: rvos
Date: 2011-04-19 11:20:14 +0000 (Tue, 19 Apr 2011)
Log Message:
-----------
Now giving a sane default base URI if it can't be read from JNDI.
Modified Paths:
--------------
trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java 2011-04-19 11:19:03 UTC (rev 791)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java 2011-04-19 11:20:14 UTC (rev 792)
@@ -483,7 +483,7 @@
*/
public static String getPurlBase() {
if (null == mPurlBase)
- mPurlBase = lookupJndiEnvironmentString("tb2/PurlBase", "http://DUMMY_PURL_BASE/");
+ mPurlBase = lookupJndiEnvironmentString("tb2/PurlBase", Constants.BaseURI.toString());
return mPurlBase;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X