Merge pull request #1 from dvbu-test/master

Move to Main Github
Merge pull request #2 from dvbu-test/master

Synchronize with master
Updated license to EPL
fix file headers
Merge remote-tracking branch 'dvbu-test/master'
Merge remote-tracking branch 'dvbu-test/master'
Merge pull request #6 from dvbu-test/master

update for release 06/13/2014
Merge pull request #7 from dvbu-test/master

updating PDTool for release 2014-06-30
Initial checkin of GIT support and classes cleanup

Merge with 2014-08-24 release
Adding /classes to prevent checkin of class files
Merge branch 'master' of https://github.com/dvbu-test/PDTool

Conflicts:
	classes/com/cisco/dvbu/ps/common/LogOutputStream.class
	classes/com/cisco/dvbu/ps/common/util/wsapi/CisApiFactory$1.class
	classes/com/cisco/dvbu/ps/common/util/wsapi/CisApiFactory.class
	classes/com/cisco/dvbu/ps/deploytool/dao/wsapi/ArchiveWSDAOImpl.class

classes/com/cisco/dvbu/ps/deploytool/dao/wsapi/DataSourceWSDAOImpl.class
	classes/com/cisco/dvbu/ps/deploytool/dao/wsapi/GroupWSDAOImpl.class
	classes/com/cisco/dvbu/ps/deploytool/dao/wsapi/PrivilegeWSDAOImpl.class
	classes/com/cisco/dvbu/ps/deploytool/dao/wsapi/RebindWSDAOImpl.class

classes/com/cisco/dvbu/ps/deploytool/dao/wsapi/ResourceCacheWSDAOImpl.cl
ass
	classes/com/cisco/dvbu/ps/deploytool/dao/wsapi/ResourceWSDAOImpl.class

classes/com/cisco/dvbu/ps/deploytool/dao/wsapi/ServerAttributeWSDAOImpl.
class
	classes/com/cisco/dvbu/ps/deploytool/dao/wsapi/ServerWSDAOImpl.class
	classes/com/cisco/dvbu/ps/deploytool/dao/wsapi/TriggerWSDAOImpl.class
	classes/com/cisco/dvbu/ps/deploytool/dao/wsapi/UserWSDAOImpl.class
	classes/com/cisco/dvbu/ps/deploytool/dao/wsapi/VCSWSDAOImpl.class

classes/com/cisco/dvbu/ps/deploytool/services/PrivilegeManagerImpl.class

classes/com/cisco/dvbu/ps/deploytool/services/RegressionManagerUtils$1.c
lass

classes/com/cisco/dvbu/ps/deploytool/services/RegressionManagerUtils.cla
ss
Removing classes
Merge pull request #8 from dvbu-test/master

Release 08-24-2014
updated license and support info in README.md
Merge pull request #9 from cisco/cisco_master

updated license and support info in README.md
Merge branch 'master' into cisco_master

Conflicts:
	README.md
	classes/com/cisco/dvbu/cmdline/vcs/DiffMerger$DeletionFilter.class
	classes/com/cisco/dvbu/cmdline/vcs/DiffMerger$DiffNode$Kind.class
	classes/com/cisco/dvbu/cmdline/vcs/DiffMerger$DiffNode.class
	classes/com/cisco/dvbu/cmdline/vcs/DiffMerger$Pair.class
	classes/com/cisco/dvbu/cmdline/vcs/DiffMerger$Quartet.class
	classes/com/cisco/dvbu/cmdline/vcs/DiffMerger$ResourceNode$Id.class
	classes/com/cisco/dvbu/cmdline/vcs/DiffMerger$ResourceNode$PhysicalId.class
	classes/com/cisco/dvbu/cmdline/vcs/DiffMerger$ResourceNode.class
	classes/com/cisco/dvbu/cmdline/vcs/DiffMerger$Triplet.class
	classes/com/cisco/dvbu/cmdline/vcs/DiffMerger.class
	classes/com/cisco/dvbu/cmdline/vcs/DiffMergerOptions.class
	classes/com/cisco/dvbu/cmdline/vcs/RollbackCARBuilder$DeletionFragmentBuilder.class
	classes/com/cisco/dvbu/cmdline/vcs/RollbackCARBuilder$FileDepthComparator.class
	classes/com/cisco/dvbu/cmdline/vcs/RollbackCARBuilder.class
	classes/com/cisco/dvbu/cmdline/vcs/_README_CODE_DIFF.txt
	classes/com/cisco/dvbu/cmdline/vcs/client/ExportCommand.class
	classes/com/cisco/dvbu/cmdline/vcs/client/ExportOptions.class
	classes/com/cisco/dvbu/cmdline/vcs/primitives/AbstractOptions.class
	classes/com/cisco/dvbu/cmdline/vcs/spi/AbstractLifecycleListener.class
	classes/com/cisco/dvbu/cmdline/vcs/spi/LifecycleListener$Event.class
	classes/com/cisco/dvbu/cmdline/vcs/spi/LifecycleListener$Mode.class
	classes/com/cisco/dvbu/cmdline/vcs/spi/LifecycleListener$VCSException.class
	classes/com/cisco/dvbu/cmdline/vcs/spi/LifecycleListener.class
	classes/com/cisco/dvbu/cmdline/vcs/spi/cvs/CVSLifecycleListener.class
	classes/com/cisco/dvbu/cmdline/vcs/spi/git/GITLifecycleListener.class
	classes/com/cisco/dvbu/cmdline/vcs/spi/p4/P4LifecycleListener.class
	classes/com/cisco/dvbu/cmdline/vcs/spi/tfs/TFSLifecycleListener.class
	classes/com/cisco/dvbu/cmdline/vcs/util/NameCodecCommand$Options.class
	classes/com/cisco/dvbu/cmdline/vcs/util/NameCodecCommand.class
	classes/com/cisco/dvbu/ps/common/BasicAuthenticator.class
	classes/com/cisco/dvbu/ps/common/CommonConstants.class
	classes/com/cisco/dvbu/ps/common/LogOutputStream.class
	classes/com/cisco/dvbu/ps/common/NoExitSecurityManager.class
	classes/com/cisco/dvbu/ps/common/exception/ApplicationException.class
	classes/com/cisco/dvbu/ps/common/exception/CompositeException.class
	classes/com/cisco/dvbu/ps/common/exception/ValidationException.class
	classes/com/cisco/dvbu/ps/common/scriptutil/ScriptUtil.class
	classes/com/cisco/dvbu/ps/common/util/Base64EncodeDecode.class
	classes/com/cisco/dvbu/ps/common/util/BindingModelNamespaceContext.class
	classes/com/cisco/dvbu/ps/common/util/CisPathQuoter.class
	classes/com/cisco/dvbu/ps/common/util/CommonUtils.class
	classes/com/cisco/dvbu/ps/common/util/CompositeLogger.class
	classes/com/cisco/dvbu/ps/common/util/PropertyManager.class
	classes/com/cisco/dvbu/ps/common/util/PropertyUtil.class
	classes/com/cisco/dvbu/ps/common/util/ScriptExecutor.class
	classes/com/cisco/dvbu/ps/common/util/ScriptStreamHandler.class
	classes/com/cisco/dvbu/ps/common/util/Sleep.class
	classes/com/cisco/dvbu/ps/common/util/XMLUtils.class
	classes/com/cisco/dvbu/ps/common/util/XMLXPath.class
	classes/com/cisco/dvbu/ps/common/util/jdbcapi/JdbcApp.class
	classes/com/cisco/dvbu/ps/common/util/jdbcapi/JdbcConnector.class
	classes/com/cisco/dvbu/ps/common/util/wsapi/CisApiFactory$1.class
	classes/com/cisco/dvbu/ps/common/util/wsapi/CisApiFactory.class
	classes/com/cisco/dvbu/ps/common/util/wsapi/CompositeServer.class
	classes/com/cisco/dvbu/ps/common/util/wsapi/WsApiHelperObjects.class
	classes/com/cisco/dvbu/ps/deploytool/CisDeployTool.class
	classes/com/cisco/dvbu/ps/deploytool/DeployManager.class
	classes/com/cisco/dvbu/ps/deploytool/DeployManagerImpl.class
	classes/com/cisco/dvbu/ps/deploytool/DeployManagerUtil.class
	classes/com/cisco/dvbu/ps/deploytool/HowToDebug.txt
	classes/com/cisco/dvbu/ps/deploytool/ant/CompositeAntTask.class
	classes/com/cisco/dvbu/ps/deploytool/dao/ArchiveDAO$action.class
	classes/com/cisco/dvbu/ps/deploytool/dao/DataSourceDAO$action.class
	classes/com/cisco/dvbu/ps/deploytool/dao/GroupDAO$action.class
	classes/com/cisco/dvbu/ps/deploytool/dao/PrivilegeDAO$action.class
	classes/com/cisco/dvbu/ps/deploytool/dao/RebindDAO$action.class
	classes/com/cisco/dvbu/ps/deploytool/dao/RebindDAO$resourceType.class
	classes/com/cisco/dvbu/ps/deploytool/dao/ResourceCacheDAO$action.class
	classes/com/cisco/dvbu/ps/deploytool/dao/ResourceDAO.class
	classes/com/cisco/dvbu/ps/deploytool/dao/ServerAttributeDAO$action.class
	classes/com/cisco/dvbu/ps/deploytool/dao/ServerDAO$action.class
	classes/com/cisco/dvbu/ps/deploytool/dao/TriggerDAO$action.class
	classes/com/cisco/dvbu/ps/deploytool/dao/UserDAO$action.class
	classes/com/cisco/dvbu/ps/deploytool/dao/jdbcapi/ProcParams.class
	classes/com/cisco/dvbu/ps/deploytool/dao/jdbcapi/RegressionInputFileJdbcDAOImpl.class
	classes/com/cisco/dvbu/ps/deploytool/dao/jdbcapi/RegressionPerfTestDAOImpl$Worker.class
	classes/com/cisco/dvbu/ps/deploytool/dao/jdbcapi/RegressionPerfTestDAOImpl.class
	classes/com/cisco/dvbu/ps/deploytool/dao/jdbcapi/RegressionPubTestJdbcDAOImpl.class
	classes/com/cisco/dvbu/ps/deploytool/dao/jdbcapi/RegressionSecurityTestDAOImpl.class
	classes/com/cisco/dvbu/ps/deploytool/dao/wsapi/ArchiveWSDAOImpl.class
	classes/com/cisco/dvbu/ps/deploytool/dao/wsapi/DataSourceWSDAOImpl.class
	classes/com/cisco/dvbu/ps/deploytool/dao/wsapi/GroupWSDAOImpl.class
	classes/com/cisco/dvbu/ps/deploytool/dao/wsapi/PrivilegeWSDAOImpl.class
	classes/com/cisco/dvbu/ps/deploytool/dao/wsapi/RebindWSDAOImpl.class
	classes/com/cisco/dvbu/ps/deploytool/dao/wsapi/ResourceCacheWSDAOImpl.class
	classes/com/cisco/dvbu/ps/deploytool/dao/wsapi/ResourceWSDAOImpl.class
	classes/com/cisco/dvbu/ps/deploytool/dao/wsapi/ServerAttributeWSDAOImpl.class
	classes/com/cisco/dvbu/ps/deploytool/dao/wsapi/ServerWSDAOImpl.class
	classes/com/cisco/dvbu/ps/deploytool/dao/wsapi/TriggerWSDAOImpl.class
	classes/com/cisco/dvbu/ps/deploytool/dao/wsapi/UserWSDAOImpl.class
	classes/com/cisco/dvbu/ps/deploytool/dao/wsapi/VCSWSDAOImpl$ResourceTypeFilterType.class
	classes/com/cisco/dvbu/ps/deploytool/dao/wsapi/VCSWSDAOImpl.class
	classes/com/cisco/dvbu/ps/deploytool/services/ArchiveManagerImpl.class
	classes/com/cisco/dvbu/ps/deploytool/services/DataSourceManagerImpl.class
	classes/com/cisco/dvbu/ps/deploytool/services/GroupManagerImpl.class
	classes/com/cisco/dvbu/ps/deploytool/services/PrivilegeManagerImpl.class
	classes/com/cisco/dvbu/ps/deploytool/services/RebindManagerImpl$PathType.class
	classes/com/cisco/dvbu/ps/deploytool/services/RebindManagerImpl.class
	classes/com/cisco/dvbu/ps/deploytool/services/RegressionItem.class
	classes/com/cisco/dvbu/ps/deploytool/services/RegressionManagerImpl$QueryExecLog.class
	classes/com/cisco/dvbu/ps/deploytool/services/RegressionManagerImpl.class
	classes/com/cisco/dvbu/ps/deploytool/services/RegressionManagerUtils$1.class
	classes/com/cisco/dvbu/ps/deploytool/services/RegressionManagerUtils.class
	classes/com/cisco/dvbu/ps/deploytool/services/RegressionQuery.class
	classes/com/cisco/dvbu/ps/deploytool/services/ResourceCacheManagerImpl$Period.class
	classes/com/cisco/dvbu/ps/deploytool/services/ResourceCacheManagerImpl.class
	classes/com/cisco/dvbu/ps/deploytool/services/ResourceManager.class
	classes/com/cisco/dvbu/ps/deploytool/services/ResourceManagerImpl.class
	classes/com/cisco/dvbu/ps/deploytool/services/ServerAttributeManagerImpl.class
	classes/com/cisco/dvbu/ps/deploytool/services/ServerManagerImpl.class
	classes/com/cisco/dvbu/ps/deploytool/services/TriggerManagerImpl.class
	classes/com/cisco/dvbu/ps/deploytool/services/UserManagerImpl$UserDomain.class
	classes/com/cisco/dvbu/ps/deploytool/services/UserManagerImpl.class
	classes/com/cisco/dvbu/ps/deploytool/services/VCSManager$action.class
	classes/com/cisco/dvbu/ps/deploytool/services/VCSManagerImpl$VcsStruct.class
	classes/com/cisco/dvbu/ps/deploytool/services/VCSManagerImpl.class
	classes/com/cisco/dvbu/ps/deploytool/util/DeployUtil$MessageType.class
	classes/com/cisco/dvbu/ps/deploytool/util/DeployUtil.class
	classes/com/cisco/dvbu/ps/deploytool/wsapi/CompositeWsApiCall.class