[Treebase-guts] SF.net SVN: treebase:[248] trunk/treebase-web/src/main/java/org/cipres/ treebase/we

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 248
          http://treebase.svn.sourceforge.net/treebase/?rev=248&view=rev
Author:   rvos
Date:     2009-11-04 16:54:08 +0000 (Wed, 04 Nov 2009)

Log Message:
-----------
Removed outdated CIPRES/SDSC disclaimers

Modified Paths:
--------------
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/Constants.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AbstractUserController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AddAuthorController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AddPersonController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminAndUserGenericController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminDeletingUserStepOneController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminDeletingUserStepTwoController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminMergingPersonsController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminMergingUsersController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminOverridingUserFormController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminSelectPersonsController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminSelectUsersController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminUpdatingUserInfoController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AjaxMultipartResolver.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AjaxProgressListener.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalysisFormController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalysisStepFormController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalyzedDataFormController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnyObjectAsRDFController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AppletInteractionController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AuthorFormController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/BaseFormController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ChangeStudyStatusController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/CitationFormController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DeleteAMatrixController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DeleteARowSegmentController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DeleteATreeBlockController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DeleteATreeController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DeleteStudyController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DirectMapToPhyloWidgetController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DirectToPhyloWidgetController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DisplayAnalysisController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DisplaySubmissionController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DisplaySubmissionMenuController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadAMatrixController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadANexusFileController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadANexusRCTFileController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadAStudyController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadATreeBlockController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadATreeController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadAnAnalysisStepController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/EditSetTaxonLabelController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/EditTaxonLabelController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/EditorFormController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ExportRowSegmentDataController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ExportRowSegmentTemplateController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/HelpController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListAnalysisController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListAnalysisStepController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListAnalyzedDataController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListMatrixController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListMatrixRowController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListMatrixRowSegmentController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListSearchStudyController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListSubmissionController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListTaxaController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListTaxaSearchController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListTreeBlockController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListTreeController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MatrixRowSegmentFormController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MatrixSearchController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/NexusFilesController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PasswordFormController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PeopleFormController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PeopleFormSearchController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ReadOnlyListTreeController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ReadyStateController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ReadyStateStudiesController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/RegisterUserController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/RowSegmentDataTableController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchBySubmissionIDController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchFormController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchResultsAsRDFController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchStudyController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchSummaryController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SelectStudiesController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ShortPathUrlFilenameViewController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SingleRowSegmentController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudyFormController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudySearchController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SubmissionToJsonController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SummaryController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TestParserController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TreeParserController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TreeParserResultController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TreeSearchController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TreeTopSearchController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/UpdateAnalyzedDataListController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/UpdateStudyQueryController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/UploadFileController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/UploadFileSummaryController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/UploadRowSegmentDataController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/UserFormController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/UserManagementController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ViewAllRowSegmentDataController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/exceptions/DeprecatedFeatureError.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/exceptions/EmptyStudyException.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/exceptions/EmptySubmissionException.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/listeners/EventListener.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/listeners/StartupListener.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/AGenericList.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/AnalysisCommand.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/AnalysisStepCommand.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/AnalyzedDataCommand.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/CitationCommand.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/EditFieldCommand.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/FileBean.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/HelpControllerAction.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/LabelValue.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/MatrixRowCommand.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/MatrixTreeData.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/MultiFileBean.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/MyProgressionListener.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/RowSegmentCommand.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/SearchCommand.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/SearchCriteriaCommand.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/StudyCommand.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/TaxonSearchCommand.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/User.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/ControllerUtil.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/SearchMessageSetter.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/StringUtil.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/WebUtil.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/validators/UserFormValidator.java

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/Constants.java
===================================================================

--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/Constants.java	2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/Constants.java	2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2006 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- * 
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- * 
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
 
 package org.cipres.treebase.web;
 

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AbstractUserController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AbstractUserController.java	2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AbstractUserController.java	2009-11-04 16:54:08 UTC (rev 248)
@@ -1,24 +1,3 @@
-/*
- * CIPRES Copyright (c) 2005- 2008, The Regents of the University of California All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met: * Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following disclaimer. * Redistributions
- * in binary form must reproduce the above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other materials provided with the distribution. *
- * Neither the name of the University of California or the San Diego Supercomputer Center nor the
- * names of its contributors may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
 package org.cipres.treebase.web.controllers;
 
 import javax.servlet.http.HttpServletRequest;

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AddAuthorController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AddAuthorController.java	2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AddAuthorController.java	2009-11-04 16:54:08 UTC (rev 248)
@@ -1,24 +1,3 @@
-/*
- * CIPRES Copyright (c) 2005- 2008, The Regents of the University of California All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met: * Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following disclaimer. * Redistributions
- * in binary form must reproduce the above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other materials provided with the distribution. *
- * Neither the name of the University of California or the San Diego Supercomputer Center nor the
- * names of its contributors may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
 package org.cipres.treebase.web.controllers;
 
 import java.util.List;

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AddPersonController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AddPersonController.java	2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AddPersonController.java	2009-11-04 16:54:08 UTC (rev 248)
@@ -1,24 +1,3 @@
-/*
- * CIPRES Copyright (c) 2005- 2008, The Regents of the University of California All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met: * Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following disclaimer. * Redistributions
- * in binary form must reproduce the above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other materials provided with the distribution. *
- * Neither the name of the University of California or the San Diego Supercomputer Center nor the
- * names of its contributors may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
 package org.cipres.treebase.web.controllers;
 
 import java.util.Collection;

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminAndUserGenericController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminAndUserGenericController.java	2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminAndUserGenericController.java	2009-11-04 16:54:08 UTC (rev 248)
@@ -1,24 +1,3 @@
-/*
- * CIPRES Copyright (c) 2005- 2008, The Regents of the University of California All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met: * Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following disclaimer. * Redistributions
- * in binary form must reproduce the above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other materials provided with the distribution. *
- * Neither the name of the University of California or the San Diego Supercomputer Center nor the
- * names of its contributors may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
 package org.cipres.treebase.web.controllers;
 
 import javax.servlet.ServletException;

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminDeletingUserStepOneController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminDeletingUserStepOneController.java	2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminDeletingUserStepOneController.java	2009-11-04 16:54:08 UTC (rev 248)
@@ -1,24 +1,3 @@
-/*
- * CIPRES Copyright (c) 2005- 2008, The Regents of the University of California All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met: * Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following disclaimer. * Redistributions
- * in binary form must reproduce the above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other materials provided with the distribution. *
- * Neither the name of the University of California or the San Diego Supercomputer Center nor the
- * names of its contributors may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
 package org.cipres.treebase.web.controllers;
 
 import javax.servlet.http.HttpServletRequest;

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminDeletingUserStepTwoController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminDeletingUserStepTwoController.java	2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminDeletingUserStepTwoController.java	2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- * 
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- * 
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
 
 package org.cipres.treebase.web.controllers;
 

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminMergingPersonsController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminMergingPersonsController.java	2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminMergingPersonsController.java	2009-11-04 16:54:08 UTC (rev 248)
@@ -1,24 +1,3 @@
-/*
- * CIPRES Copyright (c) 2005- 2008, The Regents of the University of California All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met: * Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following disclaimer. * Redistributions
- * in binary form must reproduce the above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other materials provided with the distribution. *
- * Neither the name of the University of California or the San Diego Supercomputer Center nor the
- * names of its contributors may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
 package org.cipres.treebase.web.controllers;
 
 import java.util.ArrayList;

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminMergingUsersController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminMergingUsersController.java	2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminMergingUsersController.java	2009-11-04 16:54:08 UTC (rev 248)
@@ -1,24 +1,3 @@
-/*
- * CIPRES Copyright (c) 2005- 2008, The Regents of the University of California All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met: * Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following disclaimer. * Redistributions
- * in binary form must reproduce the above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other materials provided with the distribution. *
- * Neither the name of the University of California or the San Diego Supercomputer Center nor the
- * names of its contributors may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
 package org.cipres.treebase.web.controllers;
 
 import java.util.ArrayList;

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminOverridingUserFormController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminOverridingUserFormController.java	2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminOverridingUserFormController.java	2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- * 
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- * 
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
 
 package org.cipres.treebase.web.controllers;
 

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminSelectPersonsController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminSelectPersonsController.java	2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminSelectPersonsController.java	2009-11-04 16:54:08 UTC (rev 248)
@@ -1,24 +1,3 @@
-/*
- * CIPRES Copyright (c) 2005- 20078, The Regents of the University of California All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met: * Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following disclaimer. * Redistributions
- * in binary form must reproduce the above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other materials provided with the distribution. *
- * Neither the name of the University of California or the San Diego Supercomputer Center nor the
- * names of its contributors may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
 package org.cipres.treebase.web.controllers;
 
 import java.util.ArrayList;

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminSelectUsersController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminSelectUsersController.java	2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminSelectUsersController.java	2009-11-04 16:54:08 UTC (rev 248)
@@ -1,24 +1,3 @@
-/*
- * CIPRES Copyright (c) 2005- 20078, The Regents of the University of California All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met: * Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following disclaimer. * Redistributions
- * in binary form must reproduce the above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other materials provided with the distribution. *
- * Neither the name of the University of California or the San Diego Supercomputer Center nor the
- * names of its contributors may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
 package org.cipres.treebase.web.controllers;
 
 import java.util.ArrayList;

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminUpdatingUserInfoController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminUpdatingUserInfoController.java	2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminUpdatingUserInfoController.java	2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- * 
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- * 
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
 
 
 

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AjaxMultipartResolver.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AjaxMultipartResolver.java	2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AjaxMultipartResolver.java	2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- * 
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- * 
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
 
 
 

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AjaxProgressListener.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AjaxProgressListener.java	2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AjaxProgressListener.java	2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- * 
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- * 
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
 
 
 

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalysisFormController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalysisFormController.java	2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalysisFormController.java	2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2006 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- * 
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- * 
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
 
 package org.cipres.treebase.web.controllers;
 

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalysisStepFormController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalysisStepFormController.java	2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalysisStepFormController.java	2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2006 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- * 
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- * 
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
 
 package org.cipres.treebase.web.controllers;
 

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalyzedDataFormController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalyzedDataFormController.java	2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalyzedDataFormController.java	2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2006 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- * 
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- * 
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
 
 package org.cipres.treebase.web.controllers;
 

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnyObjectAsRDFController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnyObjectAsRDFController.java	2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnyObjectAsRDFController.java	2009-11-04 16:54:08 UTC (rev 248)
@@ -1,6 +1,3 @@
-/**
- * 
- */
 package org.cipres.treebase.web.controllers;
 
 import javax.servlet.http.HttpServletRequest;

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AppletInteractionController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AppletInteractionController.java	2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AppletInteractionController.java	2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- * 
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- * 
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
 
 
 

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AuthorFormController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AuthorFormController.java	2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AuthorFormController.java	2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2006 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- * 
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- * 
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
 
 package org.cipres.treebase.web.controllers;
 

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/BaseFormController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/BaseFormController.java	2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/BaseFormController.java	2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2005 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- * 
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- * 
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
 
 package org.cipres.treebase.web.controllers;
 

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ChangeStudyStatusController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ChangeStudyStatusController.java	2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ChangeStudyStatusController.java	2009-11-04 16:54:08 UTC (rev 248)
@@ -1,24 +1,3 @@
-/*
- * CIPRES Copyright (c) 2005- 2007, The Regents of the University of California All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met: * Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following disclaimer. * Redistributions
- * in binary form must reproduce the above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other materials provided with the distribution. *
- * Neither the name of the University of California or the San Diego Supercomputer Center nor the
- * names of its contributors may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
 package org.cipres.treebase.web.controllers;
 
 import java.util.ArrayList;

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/CitationFormController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/CitationFormController.java	2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/CitationFormController.java	2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2006 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- * 
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- * 
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
 
 package org.cipres.treebase.web.controllers;
 

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DeleteAMatrixController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DeleteAMatrixController.java	2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DeleteAMatrixController.java	2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- * 
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- * 
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
 
 
 

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DeleteARowSegmentController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DeleteARowSegmentController.java	2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DeleteARowSegmentController.java	2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
...
 
[truncated message content]

[Treebase-guts] SF.net SVN: treebase:[248] trunk/treebase-web/src/main/java/org/cipres/ treebase/we

[Treebase-guts] SF.net SVN: treebase:[248] trunk/treebase-web/src/main/java/org/cipres/ treebase/web