Menu
▾
▴
[Treebase-guts] SF.net SVN: treebase:[247] trunk/treebase-core/src/test/java/org/cipres/ treebase
|
From: <rv...@us...> - 2009-11-04 16:51:54
|
Revision: 247
http://treebase.svn.sourceforge.net/treebase/?rev=247&view=rev
Author: rvos
Date: 2009-11-04 16:51:46 +0000 (Wed, 04 Nov 2009)
Log Message:
-----------
Removed outdated CIPRES/SDSC disclaimers
Modified Paths:
--------------
trunk/treebase-core/src/test/java/org/cipres/treebase/MockDatabase.java
trunk/treebase-core/src/test/java/org/cipres/treebase/RangeExpressionTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/TBMockObject.java
trunk/treebase-core/src/test/java/org/cipres/treebase/TestUtil.java
trunk/treebase-core/src/test/java/org/cipres/treebase/TreebaseIDStringTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/TreebaseUtilTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/XMLTestCase.java
trunk/treebase-core/src/test/java/org/cipres/treebase/auxdata/AuxDataTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/dao/AbstractDAOTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/dao/EnvironmentTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/dao/matrix/RowSegmentDAOTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/dao/study/AlgorithmDAOTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/dao/taxon/TaxonLabelDAOTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/dao/tree/PhyloTreeDAOTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/domain/matrix/MatrixTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/AbstractPhyloDataSet.java
trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/MesquiteConverterTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/NexusMesquiteDataSetTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/PhyloDataSetM12c11.java
trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/PhyloDataSetM1389.java
trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/PhyloDataSetProvider.java
trunk/treebase-core/src/test/java/org/cipres/treebase/domain/tree/PhyloTreeTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/framework/TSVFileParserTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/migration/TBDataMigrationController.java
trunk/treebase-core/src/test/java/org/cipres/treebase/service/AbstractServiceTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/service/admin/DummyUserDAO.java
trunk/treebase-core/src/test/java/org/cipres/treebase/service/matrix/MockMatrixService.java
trunk/treebase-core/src/test/java/org/cipres/treebase/service/matrix/RowSegmentServiceImplTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/service/nexus/NexusParserTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/AnalysisServiceImplTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/MockStudyService.java
trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/StudyServiceImplTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/SubmissionServiceImplTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/service/taxon/TaxonLabelServiceImplTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/service/tree/MockPhyloTreeService.java
trunk/treebase-core/src/test/java/org/cipres/treebase/service/tree/PhyloTreeServiceImplTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/util/HashFieldReaderTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/util/MockDeleter.java
trunk/treebase-core/src/test/java/org/cipres/treebase/util/MockDeleterFactory.java
trunk/treebase-core/src/test/java/org/cipres/treebase/util/ObjectGroupMergerTest.java
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/MockDatabase.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/MockDatabase.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/MockDatabase.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2009 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;
import java.util.HashSet;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/RangeExpressionTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/RangeExpressionTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/RangeExpressionTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -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;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/TBMockObject.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/TBMockObject.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/TBMockObject.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2009 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;
import org.cipres.treebase.domain.TBPersistable;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/TestUtil.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/TestUtil.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/TestUtil.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -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;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/TreebaseIDStringTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/TreebaseIDStringTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/TreebaseIDStringTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2009 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;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/TreebaseUtilTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/TreebaseUtilTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/TreebaseUtilTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -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;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/XMLTestCase.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/XMLTestCase.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/XMLTestCase.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,27 +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;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/auxdata/AuxDataTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/auxdata/AuxDataTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/auxdata/AuxDataTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -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.auxdata;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/dao/AbstractDAOTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/dao/AbstractDAOTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/dao/AbstractDAOTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -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.dao;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/dao/EnvironmentTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/dao/EnvironmentTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/dao/EnvironmentTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2007 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.dao;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/dao/matrix/RowSegmentDAOTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/dao/matrix/RowSegmentDAOTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/dao/matrix/RowSegmentDAOTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,27 +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.dao.matrix;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/dao/study/AlgorithmDAOTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/dao/study/AlgorithmDAOTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/dao/study/AlgorithmDAOTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -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.dao.study;
import org.apache.log4j.Logger;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/dao/taxon/TaxonLabelDAOTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/dao/taxon/TaxonLabelDAOTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/dao/taxon/TaxonLabelDAOTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2009 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.dao.taxon;
import java.util.Set;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/dao/tree/PhyloTreeDAOTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/dao/tree/PhyloTreeDAOTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/dao/tree/PhyloTreeDAOTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2007 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.dao.tree;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/domain/matrix/MatrixTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/domain/matrix/MatrixTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/domain/matrix/MatrixTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,27 +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.domain.matrix;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/AbstractPhyloDataSet.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/AbstractPhyloDataSet.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/AbstractPhyloDataSet.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -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.domain.nexus;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/MesquiteConverterTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/MesquiteConverterTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/MesquiteConverterTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -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.domain.nexus;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/NexusMesquiteDataSetTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/NexusMesquiteDataSetTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/NexusMesquiteDataSetTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2007 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.domain.nexus;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/PhyloDataSetM12c11.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/PhyloDataSetM12c11.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/PhyloDataSetM12c11.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -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.domain.nexus;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/PhyloDataSetM1389.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/PhyloDataSetM1389.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/PhyloDataSetM1389.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -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.domain.nexus;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/PhyloDataSetProvider.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/PhyloDataSetProvider.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/PhyloDataSetProvider.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -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.domain.nexus;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/domain/tree/PhyloTreeTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/domain/tree/PhyloTreeTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/domain/tree/PhyloTreeTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,27 +1,3 @@
-/*
- * Copyright 2007 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.domain.tree;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/framework/TSVFileParserTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/framework/TSVFileParserTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/framework/TSVFileParserTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,27 +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.framework;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/migration/TBDataMigrationController.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/migration/TBDataMigrationController.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/migration/TBDataMigrationController.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -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.migration;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/service/AbstractServiceTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/service/AbstractServiceTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/service/AbstractServiceTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -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.service;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/service/admin/DummyUserDAO.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/service/admin/DummyUserDAO.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/service/admin/DummyUserDAO.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -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.service.admin;
@@ -63,7 +44,7 @@
mNewUser.setFirstName("New");
mNewUser.setLastName("User");
mNewUser.setPassword("dummyPasswd");
- mNewUser.setEmailAddressString("du...@sd...");
+ mNewUser.setEmailAddressString("du...@tr...");
}
return mNewUser;
}
@@ -81,7 +62,7 @@
mStoredUser.setFirstName("Dummy");
mStoredUser.setLastName("User");
mStoredUser.setPassword("dummyPasswd");
- mStoredUser.setEmailAddressString("du...@sd...");
+ mStoredUser.setEmailAddressString("du...@tr...");
}
return mStoredUser;
}
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/service/matrix/MockMatrixService.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/service/matrix/MockMatrixService.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/service/matrix/MockMatrixService.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -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.service.matrix;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/service/matrix/RowSegmentServiceImplTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/service/matrix/RowSegmentServiceImplTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/service/matrix/RowSegmentServiceImplTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -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.service.matrix;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/service/nexus/NexusParserTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/service/nexus/NexusParserTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/service/nexus/NexusParserTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,24 +1,3 @@
-/*
- * CIPRES Copyright (c) 2005- 2006, 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.service.nexus;
import java.io.File;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/AnalysisServiceImplTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/AnalysisServiceImplTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/AnalysisServiceImplTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2007 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.service.study;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/MockStudyService.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/MockStudyService.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/MockStudyService.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -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.service.study;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/StudyServiceImplTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/StudyServiceImplTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/StudyServiceImplTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -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.service.study;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/SubmissionServiceImplTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/SubmissionServiceImplTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/SubmissionServiceImplTest.java 2...
[truncated message content] |
