7 лет назад · f5ec810235
--- a/collectserver/.classpath
+++ b/collectserver/.classpath
@@ -1,14 +0,0 @@
 
				-<?xml version="1.0" encoding="UTF-8"?>
			
 
				-<classpath>
			
 
				-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
			
 
				-	<classpathentry kind="src" path="o2_base_core_project/src/main/java"/>
			
 
				-	<classpathentry kind="src" path="o2_base_core_project/src/test/java"/>
			
 
				-	<classpathentry excluding="o2/collect/assemble/jaxrs/collect/" kind="src" path="o2_collect_assemble/describe/sources"/>
			
 
				-	<classpathentry kind="src" path="o2_collect_assemble/describe/sources/o2/collect/assemble/jaxrs/collect"/>
			
 
				-	<classpathentry excluding="o2/collect/assemble/jaxrs/collect/" kind="src" path="o2_collect_assemble/src/main/java"/>
			
 
				-	<classpathentry kind="src" path="o2_collect_assemble/src/main/java/o2/collect/assemble/jaxrs/collect"/>
			
 
				-	<classpathentry kind="src" path="o2_collect_assemble/src/test/java"/>
			
 
				-	<classpathentry kind="src" path="o2_collect_console/src/main/java"/>
			
 
				-	<classpathentry kind="src" path="o2_collect_core_entity/src/main/java"/>
			
 
				-	<classpathentry kind="output" path="bin"/>
			
 
				-</classpath>
			
--- a/collectserver/.project
+++ b/collectserver/.project
@@ -1,29 +0,0 @@
 
				-<?xml version="1.0" encoding="UTF-8"?>
			
 
				-<projectDescription>
			
 
				-	<name>collectserver</name>
			
 
				-	<comment></comment>
			
 
				-	<projects>
			
 
				-	</projects>
			
 
				-	<buildSpec>
			
 
				-		<buildCommand>
			
 
				-			<name>org.eclipse.jdt.core.javabuilder</name>
			
 
				-			<arguments>
			
 
				-			</arguments>
			
 
				-		</buildCommand>
			
 
				-		<buildCommand>
			
 
				-			<name>org.eclipse.wst.validation.validationbuilder</name>
			
 
				-			<arguments>
			
 
				-			</arguments>
			
 
				-		</buildCommand>
			
 
				-		<buildCommand>
			
 
				-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
			
 
				-			<arguments>
			
 
				-			</arguments>
			
 
				-		</buildCommand>
			
 
				-	</buildSpec>
			
 
				-	<natures>
			
 
				-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
			
 
				-		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
			
 
				-		<nature>org.eclipse.jdt.core.javanature</nature>
			
 
				-	</natures>
			
 
				-</projectDescription>
			
--- a/collectserver/.settings/.jsdtscope
+++ b/collectserver/.settings/.jsdtscope
@@ -1,7 +0,0 @@
 
				-<?xml version="1.0" encoding="UTF-8"?>
			
 
				-<classpath>
			
 
				-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
			
 
				-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
			
 
				-	<classpathentry kind="src" path=""/>
			
 
				-	<classpathentry kind="output" path=""/>
			
 
				-</classpath>
			
--- a/collectserver/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ b/collectserver/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -1 +0,0 @@
 
				-org.eclipse.wst.jsdt.launching.JRE_CONTAINER
			
--- a/collectserver/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ b/collectserver/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -1 +0,0 @@
 
				-Global
			
--- a/collectserver/bin/ActionAppLogReceive$Wi.class
+++ b/collectserver/bin/ActionAppLogReceive$Wi.class
--- a/collectserver/bin/ActionAppLogReceive$Wo.class
+++ b/collectserver/bin/ActionAppLogReceive$Wo.class
--- a/collectserver/bin/ActionAppLogReceive.class
+++ b/collectserver/bin/ActionAppLogReceive.class
--- a/collectserver/bin/ActionPromptErrorLogReceive$Wi.class
+++ b/collectserver/bin/ActionPromptErrorLogReceive$Wi.class
--- a/collectserver/bin/ActionPromptErrorLogReceive.class
+++ b/collectserver/bin/ActionPromptErrorLogReceive.class
--- a/collectserver/bin/ActionPushMessageTransfer$Wi.class
+++ b/collectserver/bin/ActionPushMessageTransfer$Wi.class
--- a/collectserver/bin/ActionPushMessageTransfer$Wo.class
+++ b/collectserver/bin/ActionPushMessageTransfer$Wo.class
--- a/collectserver/bin/ActionPushMessageTransfer.class
+++ b/collectserver/bin/ActionPushMessageTransfer.class
--- a/collectserver/bin/ActionTransmitReceive$Wi.class
+++ b/collectserver/bin/ActionTransmitReceive$Wi.class
--- a/collectserver/bin/ActionTransmitReceive$Wo.class
+++ b/collectserver/bin/ActionTransmitReceive$Wo.class
--- a/collectserver/bin/ActionTransmitReceive.class
+++ b/collectserver/bin/ActionTransmitReceive.class
--- a/collectserver/bin/ActionUnexpectedErrorLogReceive$Wi.class
+++ b/collectserver/bin/ActionUnexpectedErrorLogReceive$Wi.class
--- a/collectserver/bin/ActionUnexpectedErrorLogReceive$Wo.class
+++ b/collectserver/bin/ActionUnexpectedErrorLogReceive$Wo.class
--- a/collectserver/bin/ActionUnexpectedErrorLogReceive.class
+++ b/collectserver/bin/ActionUnexpectedErrorLogReceive.class
--- a/collectserver/bin/ActionValidate$Wi.class
+++ b/collectserver/bin/ActionValidate$Wi.class
--- a/collectserver/bin/ActionValidate$Wo.class
+++ b/collectserver/bin/ActionValidate$Wo.class
--- a/collectserver/bin/ActionValidate.class
+++ b/collectserver/bin/ActionValidate.class
--- a/collectserver/bin/ActionWarnLogReceive$Wi.class
+++ b/collectserver/bin/ActionWarnLogReceive$Wi.class
--- a/collectserver/bin/ActionWarnLogReceive$Wo.class
+++ b/collectserver/bin/ActionWarnLogReceive$Wo.class
--- a/collectserver/bin/ActionWarnLogReceive.class
+++ b/collectserver/bin/ActionWarnLogReceive.class
--- a/collectserver/bin/BaseAction.class
+++ b/collectserver/bin/BaseAction.class
--- a/collectserver/bin/CollectAction.class
+++ b/collectserver/bin/CollectAction.class
--- a/collectserver/bin/ExceptionAccountNotExist.class
+++ b/collectserver/bin/ExceptionAccountNotExist.class
--- a/collectserver/bin/ExceptionEmptyAppLog.class
+++ b/collectserver/bin/ExceptionEmptyAppLog.class
--- a/collectserver/bin/ExceptionEmptyReturn.class
+++ b/collectserver/bin/ExceptionEmptyReturn.class
--- a/collectserver/bin/ExceptionValidateUnitError.class
+++ b/collectserver/bin/ExceptionValidateUnitError.class
--- a/collectserver/bin/QueueAppLogReceive$WiAppLogReceive.class
+++ b/collectserver/bin/QueueAppLogReceive$WiAppLogReceive.class
--- a/collectserver/bin/QueueAppLogReceive.class
+++ b/collectserver/bin/QueueAppLogReceive.class
--- a/collectserver/bin/QueuePromptErrorLogReceive$WiPromptErrorLogReceive.class
+++ b/collectserver/bin/QueuePromptErrorLogReceive$WiPromptErrorLogReceive.class
--- a/collectserver/bin/QueuePromptErrorLogReceive.class
+++ b/collectserver/bin/QueuePromptErrorLogReceive.class
--- a/collectserver/bin/QueuePushMessageTransfer$ExecuteThread.class
+++ b/collectserver/bin/QueuePushMessageTransfer$ExecuteThread.class
--- a/collectserver/bin/QueuePushMessageTransfer$StopSignal.class
+++ b/collectserver/bin/QueuePushMessageTransfer$StopSignal.class
--- a/collectserver/bin/QueuePushMessageTransfer$WiPushMessage.class
+++ b/collectserver/bin/QueuePushMessageTransfer$WiPushMessage.class
--- a/collectserver/bin/QueuePushMessageTransfer.class
+++ b/collectserver/bin/QueuePushMessageTransfer.class
--- a/collectserver/bin/QueueTransmitReceive$ExecuteThread.class
+++ b/collectserver/bin/QueueTransmitReceive$ExecuteThread.class
--- a/collectserver/bin/QueueTransmitReceive$StopExecuteThreadSignal.class
+++ b/collectserver/bin/QueueTransmitReceive$StopExecuteThreadSignal.class
--- a/collectserver/bin/QueueTransmitReceive$WiTransmitReceive.class
+++ b/collectserver/bin/QueueTransmitReceive$WiTransmitReceive.class
--- a/collectserver/bin/QueueTransmitReceive.class
+++ b/collectserver/bin/QueueTransmitReceive.class
--- a/collectserver/bin/QueueUnexpectedErrorLogReceive$WiUnexpectedErrorLogReceive.class
+++ b/collectserver/bin/QueueUnexpectedErrorLogReceive$WiUnexpectedErrorLogReceive.class
--- a/collectserver/bin/QueueUnexpectedErrorLogReceive.class
+++ b/collectserver/bin/QueueUnexpectedErrorLogReceive.class
--- a/collectserver/bin/QueueWarnLogReceive$WiWarnLogReceive.class
+++ b/collectserver/bin/QueueWarnLogReceive$WiWarnLogReceive.class
--- a/collectserver/bin/QueueWarnLogReceive.class
+++ b/collectserver/bin/QueueWarnLogReceive.class
--- a/collectserver/bin/o2/base/core/project/BaseTools.class
+++ b/collectserver/bin/o2/base/core/project/BaseTools.class
--- a/collectserver/bin/o2/base/core/project/DefaultCharset.class
+++ b/collectserver/bin/o2/base/core/project/DefaultCharset.class
--- a/collectserver/bin/o2/base/core/project/Packages.class
+++ b/collectserver/bin/o2/base/core/project/Packages.class
--- a/collectserver/bin/o2/base/core/project/config/ApplicationServer$NameWeightPair.class
+++ b/collectserver/bin/o2/base/core/project/config/ApplicationServer$NameWeightPair.class
--- a/collectserver/bin/o2/base/core/project/config/ApplicationServer.class
+++ b/collectserver/bin/o2/base/core/project/config/ApplicationServer.class
--- a/collectserver/bin/o2/base/core/project/config/Config.class
+++ b/collectserver/bin/o2/base/core/project/config/Config.class
--- a/collectserver/bin/o2/base/core/project/config/DataMapping.class
+++ b/collectserver/bin/o2/base/core/project/config/DataMapping.class
--- a/collectserver/bin/o2/base/core/project/config/DataServer.class
+++ b/collectserver/bin/o2/base/core/project/config/DataServer.class
--- a/collectserver/bin/o2/base/core/project/config/DemoSite.class
+++ b/collectserver/bin/o2/base/core/project/config/DemoSite.class
--- a/collectserver/bin/o2/base/core/project/config/ExternalDataSource.class
+++ b/collectserver/bin/o2/base/core/project/config/ExternalDataSource.class
--- a/collectserver/bin/o2/base/core/project/config/ExternalDataSources.class
+++ b/collectserver/bin/o2/base/core/project/config/ExternalDataSources.class
--- a/collectserver/bin/o2/base/core/project/config/Token$InitialManager.class
+++ b/collectserver/bin/o2/base/core/project/config/Token$InitialManager.class
--- a/collectserver/bin/o2/base/core/project/config/Token.class
+++ b/collectserver/bin/o2/base/core/project/config/Token.class
--- a/collectserver/bin/o2/base/core/project/config/Update.class
+++ b/collectserver/bin/o2/base/core/project/config/Update.class
--- a/collectserver/bin/o2/base/core/project/config/WebServer.class
+++ b/collectserver/bin/o2/base/core/project/config/WebServer.class
--- a/collectserver/bin/o2/base/core/project/config/WorkTime.class
+++ b/collectserver/bin/o2/base/core/project/config/WorkTime.class
--- a/collectserver/bin/o2/base/core/project/jaxrs/AnonymousCipherManagerUserJaxrsFilter.class
+++ b/collectserver/bin/o2/base/core/project/jaxrs/AnonymousCipherManagerUserJaxrsFilter.class
--- a/collectserver/bin/o2/base/core/project/jaxrs/AnonymousJaxrsFilter.class
+++ b/collectserver/bin/o2/base/core/project/jaxrs/AnonymousJaxrsFilter.class
--- a/collectserver/bin/o2/base/core/project/jaxrs/CacheJaxrsFilter.class
+++ b/collectserver/bin/o2/base/core/project/jaxrs/CacheJaxrsFilter.class
--- a/collectserver/bin/o2/base/core/project/jaxrs/CipherJaxrsFilter.class
+++ b/collectserver/bin/o2/base/core/project/jaxrs/CipherJaxrsFilter.class
--- a/collectserver/bin/o2/base/core/project/jaxrs/CipherManagerJaxrsFilter.class
+++ b/collectserver/bin/o2/base/core/project/jaxrs/CipherManagerJaxrsFilter.class
--- a/collectserver/bin/o2/base/core/project/jaxrs/CipherManagerUserJaxrsFilter.class
+++ b/collectserver/bin/o2/base/core/project/jaxrs/CipherManagerUserJaxrsFilter.class
--- a/collectserver/bin/o2/base/core/project/jaxrs/ClockScheduleJaxrsFilter.class
+++ b/collectserver/bin/o2/base/core/project/jaxrs/ClockScheduleJaxrsFilter.class
--- a/collectserver/bin/o2/base/core/project/jaxrs/DruidFilter.class
+++ b/collectserver/bin/o2/base/core/project/jaxrs/DruidFilter.class
--- a/collectserver/bin/o2/base/core/project/jaxrs/EchoJaxrsFilter.class
+++ b/collectserver/bin/o2/base/core/project/jaxrs/EchoJaxrsFilter.class
--- a/collectserver/bin/o2/base/core/project/jaxrs/LoggerJaxrsFilter.class
+++ b/collectserver/bin/o2/base/core/project/jaxrs/LoggerJaxrsFilter.class
--- a/collectserver/bin/o2/base/core/project/jaxrs/ManagerUserJaxrsFilter.class
+++ b/collectserver/bin/o2/base/core/project/jaxrs/ManagerUserJaxrsFilter.class
--- a/collectserver/bin/o2/base/core/project/jaxrs/TokenFilter.class
+++ b/collectserver/bin/o2/base/core/project/jaxrs/TokenFilter.class
--- a/collectserver/bin/o2/base/core/project/jaxrs/UserJaxrsFilter.class
+++ b/collectserver/bin/o2/base/core/project/jaxrs/UserJaxrsFilter.class
--- a/collectserver/bin/o2/base/core/project/o2_base_core_project.class
+++ b/collectserver/bin/o2/base/core/project/o2_base_core_project.class
--- a/collectserver/bin/o2/base/core/project/o2_collect_assemble.class
+++ b/collectserver/bin/o2/base/core/project/o2_collect_assemble.class
--- a/collectserver/bin/o2/base/core/project/o2_collect_core_entity.class
+++ b/collectserver/bin/o2/base/core/project/o2_collect_core_entity.class
--- a/collectserver/bin/o2/base/core/project/test/TestClient.class
+++ b/collectserver/bin/o2/base/core/project/test/TestClient.class
--- a/collectserver/bin/o2/collect/assemble/AbstractFactory.class
+++ b/collectserver/bin/o2/collect/assemble/AbstractFactory.class
--- a/collectserver/bin/o2/collect/assemble/Business.class
+++ b/collectserver/bin/o2/collect/assemble/Business.class
--- a/collectserver/bin/o2/collect/assemble/ThisServletContextListener.class
+++ b/collectserver/bin/o2/collect/assemble/ThisServletContextListener.class
--- a/collectserver/bin/o2/collect/assemble/factory/AccountFactory.class
+++ b/collectserver/bin/o2/collect/assemble/factory/AccountFactory.class
--- a/collectserver/bin/o2/collect/assemble/factory/CodeFactory.class
+++ b/collectserver/bin/o2/collect/assemble/factory/CodeFactory.class
--- a/collectserver/bin/o2/collect/assemble/factory/DeviceFactory.class
+++ b/collectserver/bin/o2/collect/assemble/factory/DeviceFactory.class
--- a/collectserver/bin/o2/collect/assemble/factory/UnitFactory.class
+++ b/collectserver/bin/o2/collect/assemble/factory/UnitFactory.class
--- a/collectserver/bin/o2/collect/assemble/jaxrs/AccountJaxrsFilter.class
+++ b/collectserver/bin/o2/collect/assemble/jaxrs/AccountJaxrsFilter.class
--- a/collectserver/bin/o2/collect/assemble/jaxrs/ActionApplication.class
+++ b/collectserver/bin/o2/collect/assemble/jaxrs/ActionApplication.class
--- a/collectserver/bin/o2/collect/assemble/jaxrs/AppLogJaxrsFilter.class
+++ b/collectserver/bin/o2/collect/assemble/jaxrs/AppLogJaxrsFilter.class
--- a/collectserver/bin/o2/collect/assemble/jaxrs/AuthenticationJaxrsFilter.class
+++ b/collectserver/bin/o2/collect/assemble/jaxrs/AuthenticationJaxrsFilter.class
--- a/collectserver/bin/o2/collect/assemble/jaxrs/CaptchaJaxrsFilter.class
+++ b/collectserver/bin/o2/collect/assemble/jaxrs/CaptchaJaxrsFilter.class
--- a/collectserver/bin/o2/collect/assemble/jaxrs/CodeJaxrsFilter.class
+++ b/collectserver/bin/o2/collect/assemble/jaxrs/CodeJaxrsFilter.class
--- a/collectserver/bin/o2/collect/assemble/jaxrs/CollectJaxrsFilter.class
+++ b/collectserver/bin/o2/collect/assemble/jaxrs/CollectJaxrsFilter.class
--- a/collectserver/bin/o2/collect/assemble/jaxrs/DeviceJaxrsFilter.class
+++ b/collectserver/bin/o2/collect/assemble/jaxrs/DeviceJaxrsFilter.class
--- a/collectserver/bin/o2/collect/assemble/jaxrs/ModuleJaxrsFilter.class
+++ b/collectserver/bin/o2/collect/assemble/jaxrs/ModuleJaxrsFilter.class
--- a/collectserver/bin/o2/collect/assemble/jaxrs/PromptErrorLogJaxrsFilter.class
+++ b/collectserver/bin/o2/collect/assemble/jaxrs/PromptErrorLogJaxrsFilter.class
--- a/collectserver/bin/o2/collect/assemble/jaxrs/TransmitJaxrsFilter.class
+++ b/collectserver/bin/o2/collect/assemble/jaxrs/TransmitJaxrsFilter.class
--- a/collectserver/bin/o2/collect/assemble/jaxrs/UnexpectedErrorLogJaxrsFilter.class
+++ b/collectserver/bin/o2/collect/assemble/jaxrs/UnexpectedErrorLogJaxrsFilter.class
--- a/collectserver/bin/o2/collect/assemble/jaxrs/UnitJaxrsFilter.class
+++ b/collectserver/bin/o2/collect/assemble/jaxrs/UnitJaxrsFilter.class
		`@@ -1 +0,0 @@`
		`-org.eclipse.wst.jsdt.launching.JRE_CONTAINER`