/ - Diff - Metacat - Ecoinformatics Redmine

test/JDBCTest.java
29	29	import java.lang.*;
30	30	import java.sql.*;
31	31	import edu.ucsb.nceas.metacat.*;
	32	import edu.ucsb.nceas.metacat.database.*;
32	33	import edu.ucsb.nceas.metacat.service.PropertyService;
33	34	import edu.ucsb.nceas.utilities.PropertyNotFoundException;
34	35

test/MaxmumDBConnection.java
31	31	import java.lang.*;
32	32	import java.sql.*;
33	33	import edu.ucsb.nceas.metacat.*;
	34	import edu.ucsb.nceas.metacat.database.*;
34	35
35	36
36	37	/**

test/test.properties
1	1	# Set this to the location of the metacat application context
2	2	# directory. The tests will use this to find metacat.properties
3		#metacat.contextDir=/usr/local/tomcat/webapps/knb
4		metacat.contextDir=/usr/share/tomcat5.5/webapps/knb
	3	metacat.contextDir=/usr/local/tomcat/webapps/knb
	4	#metacat.contextDir=/usr/share/tomcat5.5/webapps/knb

     import edu.ucsb.nceas.metacat.client.MetacatFactory;
     import edu.ucsb.nceas.metacat.client.MetacatInaccessibleException;
     import edu.ucsb.nceas.metacat.service.PropertyService;
     import edu.ucsb.nceas.metacat.service.ServiceException;
     import edu.ucsb.nceas.metacat.shared.ServiceException;
     import edu.ucsb.nceas.metacat.util.RequestUtil;
     import edu.ucsb.nceas.utilities.IOUtil;
     import edu.ucsb.nceas.utilities.PropertyNotFoundException;
-...
     	protected void setUp() throws Exception {
     		try {
     			if (metacatConnectionNeeded)
     			debug("Test Metacat: " + metacatUrl);
     			debug("setUp() - Testing Metacat Url: " + metacatUrl);
     			m = MetacatFactory.createMetacatConnection(metacatUrl);
     		} catch (MetacatInaccessibleException mie) {
     			System.err.println("Metacat is: " + metacatUrl);
-...
     	protected String insertDocumentId(String docid, String docText, boolean result,
     			boolean expectKarmaException) {
     		debug("insertDocid(): docid=" + docid + " expectedResult=" + result
     		debug("insertDocumentId() - docid=" + docid + " expectedResult=" + result
     				+ " expectKarmaException=" + expectKarmaException);
     		String response = null;
     		try {
-...
     	protected String uploadDocumentId(String docid, String filePath, boolean result,
     			boolean expectedKarmaException) {
     		debug("uploadDocid(): docid=" + docid + " filePath=" + filePath
     		debug("uploadDocumentId() - docid=" + docid + " filePath=" + filePath
     				+ " expectedResult=" + result + " expectedKarmaException="
     				+ expectedKarmaException);
     		String response = null;
-...
     	 */
     	protected String updateDocumentId(String docid, String docText, boolean result,
     			boolean expectedKarmaFailure) {
     		debug("updateDocid(): docid=" + docid + " expectedResult=" + result
     		debug("updateDocumentId() - docid=" + docid + " expectedResult=" + result
     				+ " expectedKarmaFailure=" + expectedKarmaFailure);
     		String response = null;
     		try {
     			response = m.update(docid, new StringReader(testdocument), null);
     			debug("updateDocumentId() - response=" + response);
     			if (result) {
     				assertTrue(response, (response.indexOf("<success>") != -1));
     				assertTrue(response, response.indexOf(docid) != -1);
     			} else {
     				assertTrue(response, (response.indexOf("<success>") == -1));
+    			}
     			debug("updateDocid(): response=" + response);
+    			}
     		} catch (MetacatInaccessibleException mie) {
     			fail("Metacat Inaccessible:\n" + mie.getMessage());
     		} catch (InsufficientKarmaException ike) {
-...
     	 * Delete a document into metacat. The expected result is passed as result
     	 */
     	protected void deleteDocumentId(String docid, boolean result, boolean expectedKarmaFailure) {
     		debug("deleteDocid(): docid=" + docid + " expectedResult=" + result
     		debug("deleteDocumentId() - docid=" + docid + " expectedResult=" + result
     				+ " expectedKarmaFailure=" + expectedKarmaFailure);
     		try {
     			Thread.sleep(5000);
     			String response = m.delete(docid);
     			debug("deleteDocumentId() -  response=" + response);
     			if (result) {
     				assertTrue(response, response.indexOf("<success>") != -1);
     			} else {
     				assertTrue(response, response.indexOf("<success>") == -1);
+    			}
     			debug("deleteDocid():  response=" + response);
     		} catch (MetacatInaccessibleException mie) {
     			fail("Metacat Inaccessible:\n" + mie.getMessage());
     		} catch (InsufficientKarmaException ike) {
-...
     	 */
     	protected void readDocumentIdWhichEqualsDoc(String docid, String testDoc, boolean result,
     			boolean expectedKarmaFailure) {
     		debug("readDocidWhichEqualsDoc(): docid=" + docid + " expectedResult=" + result
     		debug("readDocumentIdWhichEqualsDoc() - docid=" + docid + " expectedResult=" + result
     				+ " expectedKarmaFailure=" + expectedKarmaFailure);
     		try {
     			Reader r = m.read(docid);
     			String doc = IOUtil.getAsString(r, true);
     			debug("readDocumentIdWhichEqualsDoc() -  doc=" + doc);
     			if (result) {
     				if (!testDoc.equals(doc)) {
-...
     			} else {
     				assertTrue(doc.indexOf("<error>") != -1);
+    			}
     			debug("readDocidWhichEqualsDoc():  doc=" + doc);
     		} catch (MetacatInaccessibleException mie) {
     			fail("Metacat Inaccessible:\n" + mie.getMessage());
     		} catch (InsufficientKarmaException ike) {

     	/**
     	 * Tests Tests a version 2.1.0 EML document when permission order is
     	 * denyFirst, the combination of allow and deny rules affect user to read,
     	 * update and delete a document. Here are test cases 1.An user inserts a
     	 * document with access rules (denyFirst) - allow READ rule for another
     	 * user, deny READ rule for public. Another user reads this document -
     	 * success Another user updates this document(except access part) -failure
     	 * Another user updates this document(access part) -failure Another user
     	 * deletes this document - failure 2. The user updates this documents with
     	 * access rules (denyFirst) - allow READ and WRITE rule for another user,
     	 * deny READ and WRITE rule for public. Another user reads this document -
     	 * success Another user updates this document(except access part) -success
     	 * Another user updates this document(access part) -failure Another user
     	 * deletes this document - failure 3. The user updates this documents with
     	 * access rules (denyFirst) - allow ALL rule for another user, deny ALL rule
     	 * for public. Another user reads this document - success Another user
     	 * updates this document(except access part) -success Another user updates
     	 * this document(access part) -success Another user deletes this document -
     	 * success 4. The user updates this documents with access rules (denyFirst) -
     	 * update and delete a document. Here are test cases
+    	 *
     	 * 1. A user inserts a document with access rules (denyFirst) - allow READ
     	 * rule for another user, deny READ rule for public. Another user reads this
     	 * document - success. Another user updates this document(except access part)
     	 * - failure. Another user updates this document(access part) -failure Another
     	 * user deletes this document - failure
+    	 *
     	 * 2. The user updates this documents with access rules (denyFirst) - allow
     	 * READ and WRITE rule for another user, deny READ and WRITE rule for public.
     	 * Another user reads this document - success. Another user updates this
     	 * document(except access part) - success. Another user updates this
     	 * document(access part) -failure. Another user deletes this document - failure.
+    	 *
     	 * 3. The user updates this documents with access rules (denyFirst) - allow
     	 * ALL rule for another user, deny ALL rule for public. Another user reads
     	 * this document - success. Another user updates this document(except access part)
     	 * - success. Another user updates this document(access part) - success. Another
     	 * user deletes this document - success.
+    	 *
     	 * 4. The user updates this documents with access rules (denyFirst) -
     	 * allow READ and WRITE rule for another user, deny WRITE rule for public.
     	 * Another user reads this document - success Another user updates this
     	 * document(except access part) -success Another user updates this
     	 * document(access part) -failure Another user deletes this document -
     	 * failure 5. The user updates this documents with access rules (denyFirst) -
     	 * Another user reads this document - success. Another user updates this
     	 * document(except access part) - success. Another user updates this
     	 * document(access part) -failure. Another user deletes this document -
     	 * failure.
+    	 *
     	 * 5. The user updates this documents with access rules (denyFirst) -
     	 * allow READ and WRITE rule for another user, deny READ rule for public.
     	 * Another user reads this document - success Another user updates this
     	 * document(except access part) - success Another user updates this
     	 * document(access part) -failure Another user deletes this document -
     	 * failure 6. The user updates this documents with access rules (denyFirst) -
     	 * Another user reads this document - success. Another user updates this
     	 * document(except access part) - success. Another user updates this
     	 * document(access part) - failure. Another user deletes this document -
     	 * failure.
+    	 *
     	 * 6. The user updates this documents with access rules (denyFirst) -
     	 * allow READ rule for another user, deny READ rule for a group (which
     	 * another user is in the group) Another user reads this document - success
     	 * Another user updates this document(except access part) -failure Another
     	 * user updates this document(access part) -failure Another user deletes
     	 * this document - failure 7. The user updates this documents with access
     	 * rules (denyFirst) - allow READ and WRITE rule for another user, deny READ
     	 * and WRITE rule for a group (which another user is in the group) Another
     	 * user reads this document - success Another user updates this
     	 * document(except access part) - success Another user updates this
     	 * document(access part) -failure Another user deletes this document -
     	 * failure 8. The user updates this documents with access rules (denyFirst) -
     	 * another user is in the group). Another user reads this document - success.
     	 * Another user updates this document(except access part) - failure. Another
     	 * user updates this document(access part) -failure. Another user deletes
     	 * this document - failure.
+    	 *
     	 * 7. The user updates this documents with access rules (denyFirst) - allow
     	 * READ and WRITE rule for another user, deny READ and WRITE rule for a
     	 * group (which another user is in the group). Another user reads this document
     	 * - success. Another user updates this document(except access part) - success.
     	 * Another user updates this document(access part) -failure. Another user deletes
     	 * this document - failure.
+    	 *
     	 * 8. The user updates this documents with access rules (denyFirst) -
     	 * allow ALL rule for another user, deny ALL rule for a group (which another
     	 * user is in the group) Another user reads this document - success Another
     	 * user updates this document(except access part) - success Another user
     	 * updates this document(access part) - success Another user deletes this
     	 * document - success 9. The user updates this documents with access rules
     	 * (denyFirst) - allow READ and WRITE rule for another user, deny WRITE rule
     	 * for a group (which another user is in the group) Another user reads this
     	 * document - success Another user updates this document(except access part) -
     	 * success Another user updates this document(access part) - failure Another
     	 * user deletes this document - failure 10. The user updates this documents
     	 * with access rules (denyFirst) - allow READ and WRITE rule for another
     	 * user, deny READ rule for a group (which another user is in the group)
     	 * Another user reads this document - success Another user updates this
     	 * document(except access part) - success Another user updates this
     	 * document(access part) -failure Another user deletes this document -
     	 * failure
     	 * user is in the group). Another user reads this document - success. Another
     	 * user updates this document(except access part) - success. Another user
     	 * updates this document(access part) - success. Another user deletes this
     	 * document - success.
+    	 *
     	 * 9. The user updates this documents with access rules (denyFirst) - allow
     	 * READ and WRITE rule for another user, deny WRITE rule for a group (which
     	 * another user is in the group). Another user reads this document - success.
     	 * Another user updates this document(except access part) - success. Another
     	 * user updates this document(access part) - failure. Another user deletes
     	 * this document - failure.
+    	 *
     	 * 10. The user updates this documents with access rules (denyFirst) - allow
     	 * READ and WRITE rule for another user, deny READ rule for a group (which
     	 * another user is in the group). Another user reads this document - success.
     	 * Another user updates this document(except access part) - success. Another
     	 * user updates this document(access part) -failure. Another user deletes
     	 * this document - failure.
     	 */
     	public void test210DenyFirst() {
     		debug("\nRunning: test210DenyFirst()");
-...
     	/***************************************************************************
     	 * Test the case when no access is specified and owner is logged in No
     	 * online or inline data is involved -> an user inserts a document and is
     	 * able to read it, update it, set permissions on it and delete it ->
     	 * another user is not able to do anything with the document when no access
     	 * online or inline data is involved
+    	 *
          * 1) a user inserts a document and is able to read it, update it, set
          * permissions on it and delete it.
+         *
     	 * 2) another user is not able to do anything with the document when no access
     	 * is specified for that user -> test what all the other user can do when
     	 * read only, write only and change permissions only permissions are
     	 * specified
-...
     	 */
     	public void document201Test() {
     		try {
     			debug("\nRunning: document201Test()");
     			debug("\ndocument201Test() : Starting");
     			String emlVersion = EML2_0_1;
     			newdocid = generateDocumentId();

     import edu.ucsb.nceas.MCTestCase;
     import edu.ucsb.nceas.metacat.*;
     import edu.ucsb.nceas.metacat.database.*;
     import edu.ucsb.nceas.metacat.replication.*;
     import edu.ucsb.nceas.metacat.service.PropertyService;
     import edu.ucsb.nceas.metacat.util.MetacatUtil;

test/edu/ucsb/nceas/metacattest/UploadIPCCDataTest.java
29	29	import edu.ucsb.nceas.metacat.*;
30	30	import edu.ucsb.nceas.metacat.client.Metacat;
31	31	import edu.ucsb.nceas.metacat.client.MetacatFactory;
	32	import edu.ucsb.nceas.metacat.replication.*;
32	33	import edu.ucsb.nceas.metacat.service.PropertyService;
33	34	import edu.ucsb.nceas.metacat.util.MetacatUtil;
34	35	import edu.ucsb.nceas.utilities.IOUtil;

     import edu.ucsb.nceas.metacat.client.MetacatInaccessibleException;
     import edu.ucsb.nceas.metacat.database.DatabaseService;
     import edu.ucsb.nceas.metacat.service.PropertyService;
     import edu.ucsb.nceas.metacat.service.ServiceException;
     import edu.ucsb.nceas.metacat.shared.ServiceException;
     import edu.ucsb.nceas.metacat.util.MetacatUtil;
     import edu.ucsb.nceas.utilities.IOUtil;
     import edu.ucsb.nceas.utilities.PropertyNotFoundException;

     import edu.ucsb.nceas.MCTestCase;
     import edu.ucsb.nceas.metacat.*;
     import edu.ucsb.nceas.metacat.database.*;
     import edu.ucsb.nceas.metacat.replication.*;
     import edu.ucsb.nceas.metacat.service.PropertyService;
     import edu.ucsb.nceas.metacat.util.MetacatUtil;
     import junit.framework.Test;

     <?xml version="1.0"?>
     <metadataConfig>
     	<group>
     		<index>1</index>
     		<name>Database</name>
     		<description>Database Configuration Values.</description>
     	</group>
     	<group>
     		<index>2</index>
     		<name>Server Configuration</name>
     		<description>Server Configuration Values.</description>
     	</group>
     	<group>
     		<index>3</index>
     		<name>Application Configuration</name>
     		<description>Application Configuration Values.</description>
     	</group>
     	<group>
     		<index>4</index>
     		<name>Data Manager Configuration</name>
     		<description>Data Manager Configuration Values.</description>
     	</group>
     	<config>
     		<key>database.user</key>
     		<label>Database Username</label>
     		<group>1</group>
     		<index>1</index>
     		<description>
     			Name of database user to own all tables.
     		</description>
     		<helpFile>properties.html#database.user</helpFile>
     	</config>
     	<config>
     		<key>database.password</key>
     		<label>Database Password</label>
     		<group>1</group>
     		<index>2</index>
     		<fieldType>password</fieldType>
     		<description>Password for database user.</description>
     		<helpFile>properties.html#database.password</helpFile>
     	</config>
     	<config>
     		<key>database.type</key>
     		<label>Database Type</label>
     		<group>1</group>
     		<index>3</index>
     		<fieldType>select</fieldType>
     		<option>
     			<name>PostgreSQL</name>
     			<value>postgres</value>
     		</option>
     		<option>
     			<name>Oracle</name>
     			<value>oracle</value>
     		</option>
     		<!-- option>
     			<name>SQL Server</name>
     			<value>sqlserver</value>
     		</option -->
     		<description>What kind of database is running.</description>
     		<helpFile>properties.html#database.type</helpFile>
     	</config>
     	<config>
     		<key>database.driver</key>
     		<label>Database Driver</label>
     		<group>1</group>
     		<index>4</index>
     		<fieldType>select</fieldType>
     		<option>
     			<name>org.postgresql.Driver</name>
     			<value>org.postgresql.Driver</value>
     		</option>
     		<option>
     			<name>oracle.jdbc.driver.OracleDriver</name>
     			<value>oracle.jdbc.driver.OracleDriver</value>
     		</option>
     		<!-- option>
     			<name>com.microsoft.jdbc.sqlserver.SQLServerDriver</name>
     			<value>com.microsoft.jdbc.sqlserver.SQLServerDriver</value>
     		</option -->
     		<description>
     			Which driver is required. This should conform to your
     			database type.
     		</description>
     		<helpFile>properties.html#database.driver</helpFile>
     	</config>
     	<config>
     		<key>database.adapter</key>
     		<label>Database Adapter</label>
     		<group>1</group>
     		<index>5</index>
     		<fieldType>select</fieldType>
     		<option>
     			<name>edu.ucsb.nceas.dbadapter.PostgresqlAdapter</name>
     			<value>edu.ucsb.nceas.dbadapter.PostgresqlAdapter</value>
     		</option>
     		<option>
     			<name>edu.ucsb.nceas.dbadapter.OracleAdapter</name>
     			<value>edu.ucsb.nceas.dbadapter.OracleAdapter</value>
     		</option>
     		<!-- option>
     			<name>edu.ucsb.nceas.dbadapter.SqlserverAdapter</name>
     			<value>edu.ucsb.nceas.dbadapter.SqlserverAdapter</value>
     		</option -->
     		<description>
     			Which adapter is required. This should conform to your
     			database type.
     		</description>
     		<helpFile>properties.html#database.adapter</helpFile>
     	</config>
     	<config>
     		<key>database.connectionURI</key>
     		<label>JDBC Connection String</label>
     		<group>1</group>
     		<index>6</index>
     		<description>Database connection string.</description>
     		<helpFile>properties.html#database.connectionURI</helpFile>
     	</config>
     	<config>
     		<key>server.name</key>
     		<label>Server Name</label>
     		<group>2</group>
     		<index>1</index>
     		<description>
     			Name of the server where Metacat will be available.
     		</description>
     		<helpFile>properties.html#server.name</helpFile>
     	</config>
     	<config>
     		<key>server.httpPort</key>
     		<label>HTTP Port</label>
     		<group>2</group>
     		<index>2</index>
     		<description>
     			Non secure port where Metacat will be available.
     		</description>
     		<helpFile>properties.html#server.httpPort</helpFile>
     	</config>
     	<config>
     		<key>server.httpSSLPort</key>
     		<label>HTTP SSL Port</label>
     		<group>2</group>
     		<index>3</index>
     		<description>
     			Secure port where Metacat will be available.
     		</description>
     		<helpFile>properties.html#server.httpSSLPort</helpFile>
     	</config>
     	<config>
     		<key>application.deployDir</key>
     		<label>Deploy Location</label>
     		<group>2</group>
     		<index>4</index>
     		<description>
     			The directory where the application is deployed.
     		</description>
     		<helpFile>properties.html#application.deployDir</helpFile>
     	</config>
     	<config>
     		<key>auth.allowedSubmitters</key>
     		<label>Allowed Submitters</label>
     		<group>3</group>
     		<index>1</index>
     		<description>Allowed Submitters</description>
     		<helpFile>properties.html#auth.allowedSubmitters</helpFile>
     	</config>
     	<config>
     		<key>auth.deniedSubmitters</key>
     		<label>Denied Submitters</label>
     		<group>3</group>
     		<index>2</index>
     		<description>Denied Submitters</description>
     		<helpFile>properties.html#auth.deniedSubmitters</helpFile>
     	</config>
     	<config>
     		<key>application.context</key>
     		<label>Metacat Context</label>
     		<group>3</group>
     		<index>3</index>
     		<description>
     			Name of the context under which Metacat will run. This is
     			the directory in which the Metacat war file is deployed.
     		</description>
     		<helpFile>properties.html#application.context</helpFile>
     	</config>
     	<config>
     		<key>application.knbSiteURL</key>
     		<label>KNB Site URL</label>
     		<group>3</group>
     		<index>4</index>
     		<description>
     			Location of KNB website. Usually left as
     			http://knb.ecoinformatics.org
     		</description>
     		<helpFile>properties.html#application.knbSiteURL</helpFile>
     	</config>
     	<config>
     		<key>application.datafilepath</key>
     		<label>Data File Path</label>
     		<group>3</group>
     		<index>5</index>
     		<description>
     			Where to store data. This should be some location outside
     			the knb install direcories.
     		</description>
     		<helpFile>properties.html#application.datafilepath</helpFile>
     	</config>
     	<config>
     		<key>application.inlinedatafilepath</key>
     		<label>Inline Data File Path</label>
     		<group>3</group>
     		<index>6</index>
     		<description>
     			Where to store inline data. This should be some location
     			outside the knb install direcories.
     		</description>
     		<helpFile>properties.html#application.inlinedatafilepath</helpFile>
     	</config>
     	<config>
     		<key>application.documentfilepath</key>
     		<label>Document File Path</label>
     		<group>3</group>
     		<index>7</index>
     		<description>
     			Where to store metadata documents. This should be some location
     			outside the knb install direcories.
     		</description>
     		<helpFile>properties.html#application.documentfilepath</helpFile>
     	</config>
     	<config>
     		<key>application.tempDir</key>
     		<label>Temporary File Path</label>
     		<group>3</group>
     		<index>8</index>
     		<description>
     			Where to store temporary documents. This is primarily used by
     			the data registry code. &lt;font color="red"&gt; Note: this must be
     			set to a directory that is dedicated solely to temporary data,
     			since the contents may be deleted programatically.&lt;/font&gt;
     		</description>
     		<helpFile>properties.html#application.tempDir</helpFile>
     	</config>
     	<config>
     		<key>replication.logdir</key>
     		<label>Replication Log Directory</label>
     		<group>3</group>
     		<index>9</index>
     		<description>
     			The directory where replication log should be located.
     		</description>
     		<helpFile>properties.html#replication.logdir</helpFile>
     	</config>
     	<!-- START Data Manager configuration -->
     	<config>
     		<key>datamanager.server</key>
     		<label>Database Server</label>
     		<group>4</group>
     		<index>1</index>
     		<description>
     			Host or IP of database server
     		</description>
     		<helpFile>properties.html#datamanager.server</helpFile>
     	</config>
     	<config>
     		<key>datamanager.database</key>
     		<label>Database Name</label>
     		<group>4</group>
     		<index>2</index>
     		<description>
     			Name of the data manager database
     		</description>
     		<helpFile>properties.html#datamanager.database</helpFile>
     	</config>
     	<config>
     		<key>datamanager.user</key>
     		<label>Database Username</label>
     		<group>4</group>
     		<index>3</index>
     		<description>
     			Name of database user to own all tables.
     		</description>
     		<helpFile>properties.html#datamanager.user</helpFile>
     	</config>
     	<config>
     		<key>datamanager.password</key>
     		<label>Database Password</label>
     		<group>4</group>
     		<index>4</index>
     		<fieldType>password</fieldType>
     		<description>Password for database user.</description>
     		<helpFile>properties.html#datamanager.password</helpFile>
     	</config>
     	<!-- END Data Manager configuration -->
     </metadataConfig>

     <!DOCTYPE web-app
         PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
             "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
     <web-app>
     	<display-name>Workflow Scheduler</display-name>
     	<context-param>
     		<param-name>jones</param-name>
     		<param-value>jones@nceas.ucsb.edu</param-value>
     		<description></description>
     	</context-param>
         <context-param>
           <param-name>configFileName</param-name>
           <param-value>workflowscheduler.properties</param-value>
           <description>The main configuration file for application</description>
         </context-param>
     	<context-param>
     		<param-name>serviceStratagy</param-name>
     		<!-- Meaning of the different values :
     			PARTIAL-BUFFER
     			- Partially buffers the first xKb to disk. Once that has buffered, the the
     			result is streamed to the user. This will allow for most errors to be caught
     			early.
     			BUFFER
     			- stores the entire response in memory first, before sending it off to
     			the user (may run out of memory)
     			SPEED
     			- outputs directly to the response (and cannot recover in the case of an
     			error)
     			FILE
     			- outputs to the local filesystem first, before sending it off to the user
     		-->
     		<param-value>PARTIAL-BUFFER</param-value>
     	</context-param>
     	<context-param>
     		<param-name>PARTIAL_BUFFER_STRATEGY_SIZE</param-name>
     		<param-value>50</param-value>
     	</context-param>
     	<servlet>
     		<servlet-name>WorkflowScheduler</servlet-name>
     		<servlet-class>
     			edu.ucsb.nceas.metacat.workflow.WorkflowSchedulerServlet
     		</servlet-class>
     		<init-param>
     			<param-name>debug</param-name>
     			<param-value>1</param-value>
     		</init-param>
     		<init-param>
     			<param-name>listings</param-name>
     			<param-value>true</param-value>
     		</init-param>
     		<load-on-startup>1</load-on-startup>
     	</servlet>
     	<servlet-mapping>
     		<servlet-name>WorkflowScheduler</servlet-name>
     		<url-pattern>/scheduler</url-pattern>
     	</servlet-mapping>
     	<servlet-mapping>
     		<servlet-name>WorkflowScheduler</servlet-name>
     		<url-pattern>/scheduler/*</url-pattern>
     	</servlet-mapping>
     	<servlet-mapping>
     		<servlet-name>WorkflowScheduler</servlet-name>
     		<url-pattern>/servlet/scheduler</url-pattern>
     	</servlet-mapping>
     	<session-config>
     		<session-timeout>30000</session-timeout>
     	</session-config>
     	<!-- currently the W3C havent settled on a media type for WSDL;
     		http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
     		for now we go with the basic 'it's XML' response -->
     	<mime-mapping>
     		<extension>wsdl</extension>
     		<mime-type>text/xml</mime-type>
     	</mime-mapping>
     	<mime-mapping>
     		<extension>xsd</extension>
     		<mime-type>text/xml</mime-type>
     	</mime-mapping>
     	<mime-mapping>
     		<extension>xsl</extension>
     		<mime-type>text/xml</mime-type>
     	</mime-mapping>
     	<welcome-file-list>
     		<welcome-file>index.jsp</welcome-file>
     		<welcome-file>index.html</welcome-file>
     	</welcome-file-list>
     	<taglib>
     		<taglib-uri>
     			http://jakarta.apache.org/taglibs/xtags-1.0
     		</taglib-uri>
     		<taglib-location>/WEB-INF/xtags.tld</taglib-location>
     	</taglib>
     	<taglib>
     		<taglib-uri>/tags/struts-bean</taglib-uri>
     		<taglib-location>/WEB-INF/struts-bean.tld</taglib-location>
     	</taglib>
     	<taglib>
     		<taglib-uri>/tags/struts-html</taglib-uri>
     		<taglib-location>/WEB-INF/struts-html.tld</taglib-location>
     	</taglib>
     	<taglib>
     		<taglib-uri>/tags/struts-logic</taglib-uri>
     		<taglib-location>/WEB-INF/struts-logic.tld</taglib-location>
     	</taglib>
     	<taglib>
     		<taglib-uri>/tags/struts-nested</taglib-uri>
     		<taglib-location>/WEB-INF/struts-nested.tld</taglib-location>
     	</taglib>
     	<taglib>
     		<taglib-uri>/tags/struts-tiles</taglib-uri>
     		<taglib-location>/WEB-INF/struts-tiles.tld</taglib-location>
     	</taglib>
     	<!-- spring taglib -->
     	<taglib>
     		<taglib-uri>/tags/spring</taglib-uri>
     		<taglib-location>/WEB-INF/tld/spring.tld</taglib-location>
     	</taglib>
     	<!--
     		<error-page>
     		<exception-type>java.lang.Exception</exception-type>
     		<location>/WEB-INF/pages/errors/Exception.jsp</location>
     		</error-page>
     		<error-page>
     		<exception-type>javax.servlet.ServletException</exception-type>
     		<location>/WEB-INF/pages/errors/Exception.jsp</location>
     		</error-page>
     		<error-page>
     		<exception-type>org.vfny.geoserver.global.ConfigurationException</exception-type>
     		<location>/WEB-INF/pages/errors/Exception.jsp</location>
     		</error-page>
     	-->
     	<security-constraint>
     		<web-resource-collection>
     			<web-resource-name>CFG</web-resource-name>
     			<url-pattern>*.cfg</url-pattern>
     		</web-resource-collection>
     		<auth-constraint />
     	</security-constraint>
     	<security-constraint>
     		<web-resource-collection>
     			<web-resource-name>PROPERTIES</web-resource-name>
     			<url-pattern>*.properties</url-pattern>
     		</web-resource-collection>
     		<auth-constraint />
     	</security-constraint>
     </web-app>

src/edu/ucsb/nceas/metacat/database/DBConnection.java
359	359	}
360	360	catch (ClassNotFoundException e)
361	361	{
362		logMetacat.error("Error in DBConnectionPool "+e.getMessage());
	362	logMetacat.error("DBConnectionPool.openConnection - Class not found: " + e.getMessage());
363	363	return null;
364	364	}
365	365	// Connect to the database

     import org.apache.log4j.Logger;
     import edu.ucsb.nceas.metacat.MetaCatVersion;
     import edu.ucsb.nceas.metacat.MetacatVersion;
     import edu.ucsb.nceas.metacat.database.DBVersion;
     import edu.ucsb.nceas.metacat.service.PropertyService;
     import edu.ucsb.nceas.metacat.service.ServiceService;
-...
      * Control the display of the main properties configuration page and the
      * processing of the configuration values.
      */
     public class PropertiesAdmin extends MetaCatAdmin {
     public class PropertiesAdmin extends MetacatAdmin {
     	private static PropertiesAdmin propertiesAdmin = null;
     	private static Logger logMetacat = Logger.getLogger(PropertiesAdmin.class);
-...
     				// Forward the request to the JSP page
     				RequestUtil.forwardRequest(request, response,
     						"/admin/properties-configuration.jsp");
     						"/admin/properties-configuration.jsp", null);
     			} catch (GeneralPropertyException gpe) {
     				throw new AdminException("Problem getting or setting property while "
-...
     			Vector<String> processingErrors = new Vector<String>();
     			Vector<String> processingSuccess = new Vector<String>();
     			MetaCatVersion metacatVersion = null;
     			MetacatVersion metacatVersion = null;
     			try {
     				metacatVersion = SystemUtil.getMetacatVersion();
-...
     					RequestUtil.clearRequestMessages(request);
     					RequestUtil.setRequestFormErrors(request, validationErrors);
     					RequestUtil.setRequestErrors(request, processingErrors);
     					RequestUtil.forwardRequest(request, response, "/admin");
     					RequestUtil.forwardRequest(request, response, "/admin", null);
     				} else {
     					// Now that the options have been set, change the
     					// 'propertiesConfigured' option to 'true'
-...
     					RequestUtil.clearRequestMessages(request);
     					RequestUtil.setRequestSuccess(request, processingSuccess);
     					RequestUtil.forwardRequest(request, response,
     							"/admin?configureType=configure&processForm=false");
     							"/admin?configureType=configure&processForm=false", null);
+    				}
     			} catch (ServletException se) {

     /**
      * Control the display of the login page
      */
     public class BackupAdmin extends MetaCatAdmin {
     public class BackupAdmin extends MetacatAdmin {
     	private static BackupAdmin Admin = null;
     	private static Logger logMetacat = Logger.getLogger(BackupAdmin.class);
-...
     				// Forward the request to the JSP page
     				RequestUtil.forwardRequest(request, response,
     						"/admin/backup-configuration.jsp");
     						"/admin/backup-configuration.jsp", null);
     			} catch (IOException ioe) {
     				throw new AdminException("IO problem while initializing "
     						+ "backup configuration page:" + ioe.getMessage());
-...
     					RequestUtil.clearRequestMessages(request);
     					RequestUtil.setRequestFormErrors(request, validationErrors);
     					RequestUtil.setRequestErrors(request, processingErrors);
     					RequestUtil.forwardRequest(request, response, "/admin");
     					RequestUtil.forwardRequest(request, response, "/admin", null);
     				} else {
     					// Reload the main metacat configuration page
     					processingSuccess.add("Directory: " + backupDir + " configured.");
     					RequestUtil.clearRequestMessages(request);
     					RequestUtil.setRequestSuccess(request, processingSuccess);
     					RequestUtil.forwardRequest(request, response,
     							"/admin?configureType=configure&processForm=false");
     							"/admin?configureType=configure&processForm=false", null);
+    				}
     			} catch (IOException ioe) {
     				throw new AdminException("IO problem while processing login page: "

     	public static final String UNCONFIGURED = "false";
     	public static final String BYPASSED = "bypassed";
     	private static final String MAIN_CONFIG_NAME = "metacat.properties";
     	private static String MAIN_CONFIG_NAME = "";
     	private static final String AUTH_CONFIG_NAME = "auth.properties";
     	private static boolean bypassAlreadyChecked = false;
-...
     	private PropertyService() throws ServiceException {
     		_serviceName = "PropertyService";
     		MAIN_CONFIG_NAME = ServiceService.CONFIG_FILE_NAME;
     		initialize();
+    	}

     package edu.ucsb.nceas.metacat.workflow;
     import java.io.IOException;
     import java.io.PrintWriter;
     import java.util.Calendar;
     import java.util.Hashtable;
     import java.util.HashMap;
     import javax.servlet.http.HttpServletRequest;
     import javax.servlet.http.HttpServletResponse;
     import javax.servlet.ServletException;
     import org.apache.log4j.Logger;
     import edu.ucsb.nceas.metacat.MetaCatServlet;
     import edu.ucsb.nceas.metacat.scheduler.BaseScheduler;
     import edu.ucsb.nceas.metacat.scheduler.ScheduledJobAccess;
     import edu.ucsb.nceas.metacat.scheduler.ScheduledJobDAO;
     import edu.ucsb.nceas.metacat.scheduler.ScheduledJobParamDAO;
     import edu.ucsb.nceas.metacat.scheduler.SchedulerService;
     import edu.ucsb.nceas.metacat.scheduler.MetacatSchedulerException;
     import edu.ucsb.nceas.metacat.shared.AccessException;
     import edu.ucsb.nceas.metacat.shared.ServiceException;
     import edu.ucsb.nceas.metacat.util.ErrorSendingErrorException;
     import edu.ucsb.nceas.metacat.util.ResponseUtil;
     import edu.ucsb.nceas.metacat.util.RequestUtil;
     import edu.ucsb.nceas.utilities.DateUtil;
     import edu.ucsb.nceas.utilities.UtilException;
-...
      * @author daigle
+     *
      */
     /**
      * @author daigle
+     *
      */
     public class WorkflowScheduler extends BaseScheduler {
     	private static WorkflowScheduler workflowScheduler = null;
-...
     			// Schedule the job
     			String xmlResult = schedulerService.scheduleJob(jobName, startCal, endCal, intervalValue, intervalUnit,
     					WORKFLOW_JOB_CLASS, WORKFLOW_JOB_GROUP, jobParams, username, groups);
     			// if there is a forwardto param on the request, then send the user to the page
     			// referenced in that param, otherwise, just send the xml back.
     			String forwardtos[] = params.get("forwardto");
     			String forwardto = null;
     			if (forwardtos != null && forwardtos.length > 0) {
     				forwardto = forwardtos[0];
+    			}
     			if (forwardto != null) {
     				String qformats[] = params.get("qformat");
     				String qformat = null;
     				if (qformats != null && qformats.length > 0) {
     					qformat = qformats[0];
+    				}
     				String destination = "/style/skins/" + qformat + "/" + forwardto
     					+ "?workflowid=" + jobParams.get("workflowid")
     					+ "&karid=" + jobParams.get("karid");
     				RequestUtil.forwardRequest(request, response, destination);
     			} else {
     				ResponseUtil.sendSuccessXML(response, xmlResult);
+    			}
     			ResponseUtil.sendSuccessXML(response, xmlResult);
     		} catch (UtilException ue) {
     			throw new MetacatSchedulerException("WorkflowScheduler.scheduleJob - Utility issue when scheduling job: " + ue.getMessage());
     			throw new MetacatSchedulerException("WorkflowScheduler.scheduleJob - "
     					+ "Utility issue when scheduling job: " + ue.getMessage());
     		} catch (ServiceException se) {
     			throw new MetacatSchedulerException("WorkflowScheduler.scheduleJob - Service issue when scheduling job", se);
     		} catch (IOException ioe) {
     			throw new MetacatSchedulerException("WorkflowScheduler.scheduleJob - I/O issue when scheduling job: " + ioe.getMessage());
     		} catch (ServletException se) {
     			throw new MetacatSchedulerException("WorkflowScheduler.scheduleJob - Servlet issue when scheduling job: " + se.getMessage());
     			throw new MetacatSchedulerException("WorkflowScheduler.scheduleJob - "
     					+ "Service issue when scheduling job", se);
     		} catch (ErrorSendingErrorException esee) {
     			throw new MetacatSchedulerException("WorkflowScheduler.scheduleJob - Issue sending error when scheduling job: " + esee.getMessage());
     			throw new MetacatSchedulerException("WorkflowScheduler.scheduleJob - "
     					+ "Issue sending error when scheduling job: " + esee.getMessage());
+    		}
+    	}
-...
     			SchedulerService schedulerService = SchedulerService.getInstance();
     			String xmlResult = schedulerService.unScheduleJob(jobName, username, groups);
     			String forwardtos[] = params.get("forwardto");
     			String forwardto = null;
     			if (forwardtos != null && forwardtos.length > 0) {
     				forwardto = forwardtos[0];
+    			}
     			// if there is a forwardto param on the request, then send the user to the page
     			// referenced in that param, otherwise, just send the xml back.
     			if (forwardto != null) {
     				String qformats[] = params.get("qformat");
     				String qformat = null;
     				if (qformats != null && qformats.length > 0) {
     					qformat = qformats[0];
+    				}
     				ScheduledJobAccess jobAccess = new ScheduledJobAccess();
     				ScheduledJobDAO jobDAO = jobAccess.getJobByName(jobName);
     				// we need to include the workflow id in the forward url
     				ScheduledJobParamDAO workflowIdJobParamDAO = jobDAO.getJobParam("workflowid");
     				if (workflowIdJobParamDAO == null) {
     					throw new MetacatSchedulerException("WorkflowScheduler.unScheduleJob - could not find workflow "
     							+ "id when unscheduling job: " + jobName);
+    				}
     				// we need to include the workflow id in the forward url
     				ScheduledJobParamDAO karJobParamDAO = jobDAO.getJobParam("karid");
     				if (karJobParamDAO == null) {
     					throw new MetacatSchedulerException("WorkflowScheduler.unScheduleJob - could not find kar "
     							+ "id when unscheduling job: " + jobName);
+    				}
     				// we need to include the workflow id in the url
     				ScheduledJobParamDAO workflowNameJobParamDAO = jobDAO.getJobParam("workflowname");
     				if (workflowNameJobParamDAO == null) {
     					throw new MetacatSchedulerException("WorkflowScheduler.unScheduleJob - could not find workflow "
     							+ "name when unscheduling job: " + jobName);
+    				}
     				String destination = "/style/skins/" + qformat + "/" + forwardto
     					+ "?workflowid=" + workflowIdJobParamDAO.getValue()
     					+ "&karid=" + karJobParamDAO.getValue()
     					+ "&workflowname=" + workflowNameJobParamDAO.getValue();
     				RequestUtil.forwardRequest(request, response, destination.toString());
     			} else {
     				ResponseUtil.sendSuccessXML(response, xmlResult);
+    			}
     			ResponseUtil.sendSuccessXML(response, xmlResult);
     		} catch (ServiceException se) {
     			throw new MetacatSchedulerException(
     					"WorkflowScheduler.unScheduleJob - Service issue unscheduling job",
     					se);
     			throw new MetacatSchedulerException("WorkflowScheduler.unScheduleJob - "
     					+ "Service issue unscheduling job", se);
     		} catch (Exception e) {
     			throw new MetacatSchedulerException(
     					"WorkflowScheduler.unScheduleJob - Generic issue unscheduling job: "
     							+ e.getMessage());
     			throw new MetacatSchedulerException("WorkflowScheduler.unScheduleJob - "
     					+ "Generic issue unscheduling job: " + e.getMessage());
+    		}
+    	}
-...
     			SchedulerService schedulerService = SchedulerService.getInstance();
     			String result = schedulerService.rescheduleJob(jobDAO, username, groups);
     			// if there is a forwardto param on the request, then send the user to the page
     			// referenced in that param, otherwise, just send the xml back.
     			String forwardtos[] = params.get("forwardto");
     			String forwardto = null;
     			if (forwardtos != null && forwardtos.length > 0) {
     				forwardto = forwardtos[0];
+    			}
     			ResponseUtil.sendSuccessXML(response, result);
     			if (forwardto != null) {
     				String qformats[] = params.get("qformat");
     				String qformat = null;
     				if (qformats != null && qformats.length > 0) {
     					qformat = qformats[0];
+    				}
     				// we need to include the workflow id in the url
     				ScheduledJobParamDAO workflowIdJobParamDAO = jobDAO.getAllJobParams().get("workflowid");
     				if (workflowIdJobParamDAO == null) {
     					throw new MetacatSchedulerException("WorkflowScheduler.reScheduleJob - could not find workflow "
     							+ "id when deleting job: " + jobName);
+    				}
     				// we need to include the workflow id in the url
     				ScheduledJobParamDAO karJobParamDAO = jobDAO.getJobParam("karid");
     				if (karJobParamDAO == null) {
     					throw new MetacatSchedulerException("WorkflowScheduler.reScheduleJob - could not find kar "
     							+ "id when deleting job: " + jobName);
+    				}
     				// we need to include the workflow id in the url
     				ScheduledJobParamDAO workflowNameJobParamDAO = jobDAO.getJobParam("workflowname");
     				if (workflowNameJobParamDAO == null) {
     					throw new MetacatSchedulerException("WorkflowScheduler.reScheduleJob - could not find workflow "
     							+ "name when deleting job: " + jobName);
+    				}
     				String destination = "/style/skins/" + qformat + "/" + forwardto
     					+ "?workflowid=" + workflowIdJobParamDAO.getValue()
     					+ "&karid=" + karJobParamDAO.getValue()
     					+ "&workflowname=" + workflowNameJobParamDAO.getValue();
     				RequestUtil.forwardRequest(request, response, destination);
     			} else {
     				ResponseUtil.sendSuccessXML(response, result);
+    			}
     		} catch (AccessException ae) {
     			throw new MetacatSchedulerException("WorkflowScheduler.scheduleJob - DB access issue when scheduling job  : ", ae);
     			throw new MetacatSchedulerException("WorkflowScheduler.reScheduleJob - "
     					+ "DB access issue when scheduling job  : ", ae);
     		} catch (ServiceException se) {
     			throw new MetacatSchedulerException("WorkflowScheduler.scheduleJob - Service issue scheduling job", se);
     		} catch (IOException ioe) {
     			throw new MetacatSchedulerException("WorkflowScheduler.scheduleJob - I/O issue scheduling job: " + ioe.getMessage());
     		} catch (ServletException se) {
     			throw new MetacatSchedulerException("WorkflowScheduler.scheduleJob - Servlet issue scheduling job: " + se.getMessage());
     			throw new MetacatSchedulerException("WorkflowScheduler.reScheduleJob - "
     					+ "Service issue scheduling job", se);
     		} catch (ErrorSendingErrorException esee) {
     			throw new MetacatSchedulerException("WorkflowScheduler.scheduleJob - Issue sending erro when scheduling job: " + esee.getMessage());
     			throw new MetacatSchedulerException("WorkflowScheduler.reScheduleJob - "
     					+ "Issue sending erro when scheduling job: " + esee.getMessage());
+    		}
+    	}
-...
     	public void deleteJob(HttpServletRequest request, HttpServletResponse response,
     			Hashtable<String, String[]> params, String username, String[] groups) throws MetacatSchedulerException {
     		 try {
     		// workflow job id must exist
     		String jobNames[] = params.get("workflowjobid");
     		if (jobNames == null || jobNames.length == 0) {
     			throw new MetacatSchedulerException("WorkflowScheduler.deleteJob - workflowjobid field must be populated "
     					+ "in scheduler parameters when deleting job.");
+    		}
     		String jobName = jobNames[0];
     			// workflow job id must exist
     			String jobNames[] = params.get("workflowjobid");
     			if (jobNames == null || jobNames.length == 0) {
     				throw new MetacatSchedulerException(
     						"WorkflowScheduler.deleteJob - workflowname field must be populated "
     								+ "in scheduler parameters when deleting job.");
+    			}
     			String jobName = jobNames[0];
     		ScheduledJobAccess jobAccess = new ScheduledJobAccess();
     		ScheduledJobDAO jobDAO = jobAccess.getJobByName(jobName);
     		// delete the job
     		SchedulerService schedulerService = SchedulerService.getInstance();
     		String result = schedulerService.deleteJob(jobDAO, username, groups);
     		// if there is a forwardto param on the request, then send the user to the page
     		// referenced in that param, otherwise, just send the xml back.
     		String forwardtos[] = params.get("forwardto");
     		String forwardto = null;
     		if (forwardtos != null && forwardtos.length > 0) {
     			forwardto = forwardtos[0];
+    		}
     		if (forwardto != null) {
     			String qformats[] = params.get("qformat");
     			String qformat = null;
     			if (qformats != null && qformats.length > 0) {
     				qformat = qformats[0];
+    			}
     			// we need to include the workflow id in the url
     			ScheduledJobParamDAO workflowIdJobParamDAO = jobDAO.getAllJobParams().get("workflowid");
     			if (workflowIdJobParamDAO == null) {
     				throw new MetacatSchedulerException("WorkflowScheduler.deleteJob - could not find workflow "
     						+ "id when deleting job: " + jobName);
+    			}
     			// we need to include the workflow id in the url
     			ScheduledJobParamDAO karJobParamDAO = jobDAO.getJobParam("karid");
     			if (karJobParamDAO == null) {
     				throw new MetacatSchedulerException("WorkflowScheduler.deleteJob - could not find kar "
     						+ "id when deleting job: " + jobName);
+    			}
     			// we need to include the workflow id in the url
     			ScheduledJobParamDAO workflowNameJobParamDAO = jobDAO.getJobParam("workflowname");
     			if (workflowNameJobParamDAO == null) {
     				throw new MetacatSchedulerException("WorkflowScheduler.deleteJob - could not find workflow "
     						+ "name when deleting job: " + jobName);
+    			}
     			String destination = "/style/skins/" + qformat + "/" + forwardto
     				+ "?workflowid=" + workflowIdJobParamDAO.getValue()
     				+ "&karid=" + karJobParamDAO.getValue()
     				+ "&workflowname=" + workflowNameJobParamDAO.getValue();
     			RequestUtil.forwardRequest(request, response, destination);
     		} else {
     			ScheduledJobAccess jobAccess = new ScheduledJobAccess();
     			ScheduledJobDAO jobDAO = jobAccess.getJobByName(jobName);
     			// delete the job
     			SchedulerService schedulerService = SchedulerService.getInstance();
     			String result = schedulerService.deleteJob(jobDAO, username, groups);
     			ResponseUtil.sendSuccessXML(response, result);
+    		}
     		} catch (AccessException ae) {
     				throw new MetacatSchedulerException("WorkflowScheduler.deleteJob - DB access issue when deleting job  : ", ae);
     			throw new MetacatSchedulerException("WorkflowScheduler.deleteJob - "
     					+ "DB access issue when deleting job  : ", ae);
     		} catch (ServiceException se) {
     			throw new MetacatSchedulerException("WorkflowScheduler.deleteJob - Service issue deleting job", se);
     		} catch (IOException ioe) {
     			throw new MetacatSchedulerException("WorkflowScheduler.deleteJob - I/O issue deleting job: " + ioe.getMessage());
     		} catch (ServletException se) {
     			throw new MetacatSchedulerException("WorkflowScheduler.deleteJob - Servlet issue deleting job: " + se.getMessage());
     			throw new MetacatSchedulerException("WorkflowScheduler.deleteJob - "
     					+ "Service issue deleting job", se);
     		} catch (ErrorSendingErrorException esee) {
     			throw new MetacatSchedulerException("WorkflowScheduler.deleteJob - Issue sending erro when deleting job: " + esee.getMessage());
     			throw new MetacatSchedulerException("WorkflowScheduler.deleteJob - "
     					+ "Issue sending erro when deleting job: " + esee.getMessage());
+    		}
+    	}
-...
     	public void getJobs(HttpServletRequest request, HttpServletResponse response,
     			Hashtable<String, String[]> params, String username, String[] groups) throws MetacatSchedulerException {
     		String workFlowId = null;
     		String qformat = "";
     		String workflowId = null;
     		String workFlowIds[] = params.get("workflowid");
     		if (workFlowIds != null && workFlowIds.length != 0) {
     			workFlowId = workFlowIds[0];
     		String workflowIds[] = params.get("workflowid");
     		if (workflowIds != null && workflowIds.length != 0) {
     			workflowId = workflowIds[0];
+    		}
             if (params.containsKey("qformat")) {
                 qformat = params.get("qformat")[0];
+            }
             PrintWriter out = null;
     		try {
     			// get the job info in xml format
     			String xmlResult = SchedulerService.getInstance().getJobsInfoXML(WORKFLOW_JOB_GROUP, "workflowid", workFlowId);
     			logMetacat.debug("WorkflowScheduler.getJobs - xmlResult: " + xmlResult);
     			if (qformat == null || qformat.equals(MetaCatServlet.XMLFORMAT)) {
     				ResponseUtil.send(response, xmlResult);
     			} else {
     				ResponseUtil.transformAndSendXML(response, xmlResult, "-//NCEAS//scheduledWorkflowResultset//EN",
     					"-//W3C//HTML//EN", qformat, params);
     			out = response.getWriter();
     			SchedulerService.getInstance().getJobsInfoXML(WORKFLOW_JOB_GROUP,
     					"workflowid", workflowId, out);
     		} catch (ServiceException se) {
     			throw new MetacatSchedulerException("WorkflowScheduler.getJobs - "
     					+ "Service error when transforming XML for workflow id: "
     					+ workflowId + " : " + se.getMessage());
     		} catch (IOException ioe) {
     			throw new MetacatSchedulerException("WorkflowScheduler.getJobs - "
     					+ "I/O error when transforming XML for workflow id: "
     					+ workflowId + " : " + ioe.getMessage());
     		} finally {
     			if (out != null) {
     				out.close();
+    			}
     		} catch (ServiceException se) {
     			throw new MetacatSchedulerException("WorkflowScheduler.getJobs - Service issue getting jobs", se);
     		} catch (Exception e) {
     			throw new MetacatSchedulerException("WorkflowScheduler.getJobs - Generic issue getting jobs: "
     					+ e.getMessage());
+    		}
+    	}
+    		}
+    	}
+    }

     import org.apache.log4j.Logger;
     import edu.ucsb.nceas.metacat.MetaCatVersion;
     import edu.ucsb.nceas.metacat.MetacatVersion;
     import edu.ucsb.nceas.metacat.service.PropertyService;
     import edu.ucsb.nceas.metacat.service.ServiceService;
     import edu.ucsb.nceas.metacat.shared.MetacatUtilException;
-...
     	private static Logger logMetacat = Logger.getLogger(SystemUtil.class);
     	private static String METACAT_SERVLET = "metacat";
     	private static String METACAT_WEB_SERVLET = "metacatweb";
     	private static int OS_CLASS = 0;
     	// Class of OS.  If we need more granularity, we should create a version
-...
     	public static String getServletURL() throws PropertyNotFoundException {
     		return getContextURL() + "/" + METACAT_SERVLET;
+    	}
     	/**
     	 * Get the web front end servlet URL. This is made up of the server URL with
     	 * context + file separator + the metacat web servlet name
+    	 *
     	 * @return string holding the web servlet URL
     	 */
     	public static String getWebServletURL() throws PropertyNotFoundException {
     		return getContextURL() + "/" + METACAT_WEB_SERVLET;
+    	}
     	/**
     	 * Get the style skins URL. This is made up of the server URL with context +
-...
+    	 *
     	 * @return a MetaCatVersion object holding metacat version information
     	 */
     	public static MetaCatVersion getMetacatVersion() throws PropertyNotFoundException {
     	public static MetacatVersion getMetacatVersion() throws PropertyNotFoundException {
     		String metacatVersionString =
     			PropertyService.getProperty("application.metacatVersion");
     		return new MetaCatVersion(metacatVersionString);
     		return new MetacatVersion(metacatVersionString);
+    	}
     	/**

     package edu.ucsb.nceas.metacat.util;
     import java.io.InputStreamReader;
     import java.io.IOException;
     import java.io.BufferedReader;
     import java.io.PrintWriter;
     import java.io.StringReader;
     import java.net.MalformedURLException;
     import java.net.URL;
     import java.net.URLConnection;
     import java.util.Enumeration;
     import java.util.HashMap;
     import java.util.Hashtable;
-...
     import org.apache.log4j.Logger;
     import edu.ucsb.nceas.metacat.service.SessionService;
     import edu.ucsb.nceas.metacat.shared.MetacatUtilException;
     public class RequestUtil {
-...
     	 *            the context-relative URL to which the request is forwarded
     	 */
     	public static void forwardRequest(HttpServletRequest request,
     			HttpServletResponse response, String destination)
     			HttpServletResponse response, String destinationUrl, Hashtable<String, String[]> params)
     			throws IOException, ServletException {
     		logMetacat.debug("Forwarding request to " + destination);
     		destinationUrl += "?" + paramsToQuery(params);
     		logMetacat.debug("Forwarding request to " + destinationUrl);
     		ServletContext servletContext = request.getSession()
     				.getServletContext();
     		servletContext.getRequestDispatcher(destination).forward(request,
     		servletContext.getRequestDispatcher(destinationUrl).forward(request,
     				response);
+    	}
-...
     		return null;
+    	}
     	public static String get(String urlString, Hashtable<String, String[]> params)  throws MetacatUtilException {
     		try {

Project

General

Profile

Metacat

Revision 5027

Added by daigle over 14 years ago