Java client libraries moved to src/client and included into makefiles
authorVictor Kirhenshtein <victor@netxms.org>
Fri, 15 Sep 2017 08:26:34 +0000 (11:26 +0300)
committerVictor Kirhenshtein <victor@netxms.org>
Fri, 15 Sep 2017 08:26:34 +0000 (11:26 +0300)
358 files changed:
.gitignore
configure.ac
src/client/Makefile.w32
src/client/java/.classpath [moved from src/java/client/.classpath with 100% similarity]
src/client/java/.project [moved from src/java/client/.project with 100% similarity]
src/client/java/.settings/org.eclipse.jdt.core.prefs [moved from src/java/client/.settings/org.eclipse.jdt.core.prefs with 100% similarity]
src/client/java/META-INF/MANIFEST.MF [moved from src/java/client/META-INF/MANIFEST.MF with 100% similarity]
src/client/java/Makefile.am [new file with mode: 0644]
src/client/java/Makefile.w32 [new file with mode: 0644]
src/client/java/build.properties [moved from src/java/client/build.properties with 100% similarity]
src/client/java/lib/Makefile.am [new file with mode: 0644]
src/client/java/netxms-base/Makefile.am [new file with mode: 0644]
src/client/java/netxms-base/Makefile.w32 [new file with mode: 0644]
src/client/java/netxms-base/jzlib-license.txt [moved from src/java/client/netxms-base/jzlib-license.txt with 100% similarity]
src/client/java/netxms-base/pom.xml [moved from src/java/client/netxms-base/pom.xml with 83% similarity]
src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/Adler32.java [moved from src/java/client/netxms-base/src/main/java/com/jcraft/jzlib/Adler32.java with 100% similarity]
src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/CRC32.java [moved from src/java/client/netxms-base/src/main/java/com/jcraft/jzlib/CRC32.java with 100% similarity]
src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/Checksum.java [moved from src/java/client/netxms-base/src/main/java/com/jcraft/jzlib/Checksum.java with 100% similarity]
src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/Deflate.java [moved from src/java/client/netxms-base/src/main/java/com/jcraft/jzlib/Deflate.java with 100% similarity]
src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/Deflater.java [moved from src/java/client/netxms-base/src/main/java/com/jcraft/jzlib/Deflater.java with 100% similarity]
src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/DeflaterOutputStream.java [moved from src/java/client/netxms-base/src/main/java/com/jcraft/jzlib/DeflaterOutputStream.java with 100% similarity]
src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/GZIPException.java [moved from src/java/client/netxms-base/src/main/java/com/jcraft/jzlib/GZIPException.java with 100% similarity]
src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/GZIPHeader.java [moved from src/java/client/netxms-base/src/main/java/com/jcraft/jzlib/GZIPHeader.java with 100% similarity]
src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/GZIPInputStream.java [moved from src/java/client/netxms-base/src/main/java/com/jcraft/jzlib/GZIPInputStream.java with 100% similarity]
src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/GZIPOutputStream.java [moved from src/java/client/netxms-base/src/main/java/com/jcraft/jzlib/GZIPOutputStream.java with 100% similarity]
src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/InfBlocks.java [moved from src/java/client/netxms-base/src/main/java/com/jcraft/jzlib/InfBlocks.java with 100% similarity]
src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/InfCodes.java [moved from src/java/client/netxms-base/src/main/java/com/jcraft/jzlib/InfCodes.java with 100% similarity]
src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/InfTree.java [moved from src/java/client/netxms-base/src/main/java/com/jcraft/jzlib/InfTree.java with 100% similarity]
src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/Inflate.java [moved from src/java/client/netxms-base/src/main/java/com/jcraft/jzlib/Inflate.java with 100% similarity]
src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/Inflater.java [moved from src/java/client/netxms-base/src/main/java/com/jcraft/jzlib/Inflater.java with 100% similarity]
src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/InflaterInputStream.java [moved from src/java/client/netxms-base/src/main/java/com/jcraft/jzlib/InflaterInputStream.java with 100% similarity]
src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/JZlib.java [moved from src/java/client/netxms-base/src/main/java/com/jcraft/jzlib/JZlib.java with 100% similarity]
src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/StaticTree.java [moved from src/java/client/netxms-base/src/main/java/com/jcraft/jzlib/StaticTree.java with 100% similarity]
src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/Tree.java [moved from src/java/client/netxms-base/src/main/java/com/jcraft/jzlib/Tree.java with 100% similarity]
src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/ZInputStream.java [moved from src/java/client/netxms-base/src/main/java/com/jcraft/jzlib/ZInputStream.java with 100% similarity]
src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/ZOutputStream.java [moved from src/java/client/netxms-base/src/main/java/com/jcraft/jzlib/ZOutputStream.java with 100% similarity]
src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/ZStream.java [moved from src/java/client/netxms-base/src/main/java/com/jcraft/jzlib/ZStream.java with 100% similarity]
src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/ZStreamException.java [moved from src/java/client/netxms-base/src/main/java/com/jcraft/jzlib/ZStreamException.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/base/BuildNumber.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/base/BuildNumber.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/base/CommonRCC.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/base/CommonRCC.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/base/EncryptedPassword.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/base/EncryptedPassword.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/base/EncryptionContext.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/base/EncryptionContext.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/base/GeoLocation.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/base/GeoLocation.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/base/GeoLocationFormatException.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/base/GeoLocationFormatException.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/base/Glob.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/base/Glob.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/base/IceCrypto.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/base/IceCrypto.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/base/InetAddressEx.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/base/InetAddressEx.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/base/Logger.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/base/Logger.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/base/LoggingFacility.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/base/LoggingFacility.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/base/MacAddress.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/base/MacAddress.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/base/MacAddressFormatException.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/base/MacAddressFormatException.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/base/NXCPCodes.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/base/NXCPCodes.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/base/NXCPDataInputStream.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/base/NXCPDataInputStream.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/base/NXCPException.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/base/NXCPException.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/base/NXCPMessage.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/base/NXCPMessage.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/base/NXCPMessageField.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/base/NXCPMessageField.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/base/NXCPMessageReceiver.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/base/NXCPMessageReceiver.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/base/NXCPMsgWaitQueue.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/base/NXCPMsgWaitQueue.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/base/NXCommon.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/base/NXCommon.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/base/PostalAddress.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/base/PostalAddress.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/base/annotations/Internal.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/base/annotations/Internal.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/certificate/loader/KeyStoreLoader.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/certificate/loader/KeyStoreLoader.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/certificate/loader/KeyStoreRequestListener.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/certificate/loader/KeyStoreRequestListener.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/certificate/loader/MSCKeyStoreLoader.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/certificate/loader/MSCKeyStoreLoader.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/certificate/loader/PKCS12KeyStoreLoader.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/certificate/loader/PKCS12KeyStoreLoader.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/certificate/loader/exception/KeyStoreLoaderException.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/certificate/loader/exception/KeyStoreLoaderException.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/certificate/manager/CertificateManager.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/certificate/manager/CertificateManager.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/certificate/manager/CertificateManagerProvider.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/certificate/manager/CertificateManagerProvider.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/certificate/manager/CertificateManagerRequestListener.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/certificate/manager/CertificateManagerRequestListener.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/certificate/manager/exception/CertificateHasNoPrivateKeyException.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/certificate/manager/exception/CertificateHasNoPrivateKeyException.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/certificate/manager/exception/CertificateNotInKeyStoreException.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/certificate/manager/exception/CertificateNotInKeyStoreException.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/certificate/manager/exception/SignatureImpossibleException.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/certificate/manager/exception/SignatureImpossibleException.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/certificate/manager/exception/SignatureVerificationImpossibleException.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/certificate/manager/exception/SignatureVerificationImpossibleException.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/certificate/request/KeyStoreEntryPasswordRequestListener.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/certificate/request/KeyStoreEntryPasswordRequestListener.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/certificate/request/KeyStoreLocationRequestListener.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/certificate/request/KeyStoreLocationRequestListener.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/certificate/request/KeyStorePasswordRequestListener.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/certificate/request/KeyStorePasswordRequestListener.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/certificate/subject/Subject.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/certificate/subject/Subject.java with 100% similarity]
src/client/java/netxms-base/src/main/java/org/netxms/certificate/subject/SubjectParser.java [moved from src/java/client/netxms-base/src/main/java/org/netxms/certificate/subject/SubjectParser.java with 100% similarity]
src/client/java/netxms-base/src/test/java/org/netxms/base/GlobTest.java [moved from src/java/client/netxms-base/src/test/java/org/netxms/base/GlobTest.java with 100% similarity]
src/client/java/netxms-base/src/test/java/org/netxms/base/IceTest.java [moved from src/java/client/netxms-base/src/test/java/org/netxms/base/IceTest.java with 100% similarity]
src/client/java/netxms-base/src/test/java/org/netxms/base/NXCPMessageFieldTest.java [moved from src/java/client/netxms-base/src/test/java/org/netxms/base/NXCPMessageFieldTest.java with 100% similarity]
src/client/java/netxms-base/src/test/java/org/netxms/base/NXCPMessageTest.java [moved from src/java/client/netxms-base/src/test/java/org/netxms/base/NXCPMessageTest.java with 100% similarity]
src/client/java/netxms-base/src/test/java/org/netxms/base/NXCPMsgWaitQueueTest.java [moved from src/java/client/netxms-base/src/test/java/org/netxms/base/NXCPMsgWaitQueueTest.java with 100% similarity]
src/client/java/netxms-base/src/test/java/org/netxms/base/ZlibTest.java [moved from src/java/client/netxms-base/src/test/java/org/netxms/base/ZlibTest.java with 100% similarity]
src/client/java/netxms-base/src/test/java/org/netxms/certificate/KeyStoreTest.java [moved from src/java/client/netxms-base/src/test/java/org/netxms/certificate/KeyStoreTest.java with 100% similarity]
src/client/java/netxms-base/src/test/java/org/netxms/certificate/TestListener.java [moved from src/java/client/netxms-base/src/test/java/org/netxms/certificate/TestListener.java with 100% similarity]
src/client/java/netxms-base/src/test/java/org/netxms/certificate/manager/CertificateManagerProviderTest.java [moved from src/java/client/netxms-base/src/test/java/org/netxms/certificate/manager/CertificateManagerProviderTest.java with 100% similarity]
src/client/java/netxms-base/src/test/java/org/netxms/certificate/manager/CertificateManagerTest.java [moved from src/java/client/netxms-base/src/test/java/org/netxms/certificate/manager/CertificateManagerTest.java with 100% similarity]
src/client/java/netxms-base/src/test/java/org/netxms/certificate/subject/SubjectParserTest.java [moved from src/java/client/netxms-base/src/test/java/org/netxms/certificate/subject/SubjectParserTest.java with 100% similarity]
src/client/java/netxms-base/src/test/resource/keystore.p12 [moved from src/java/client/netxms-base/src/test/resource/keystore.p12 with 100% similarity]
src/client/java/netxms-client/Makefile.am [new file with mode: 0644]
src/client/java/netxms-client/Makefile.w32 [new file with mode: 0644]
src/client/java/netxms-client/pom.xml [moved from src/java/client/netxms-client/pom.xml with 85% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/AccessListElement.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/AccessListElement.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/AgentFileData.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/AgentFileData.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/AgentFileInfo.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/AgentFileInfo.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/AgentParameter.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/AgentParameter.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/AgentTable.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/AgentTable.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/AgentTunnel.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/AgentTunnel.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/InetAddressListElement.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/InetAddressListElement.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/LibraryImage.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/LibraryImage.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/MessageHandler.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/MessageHandler.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/ModuleDataProvider.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/ModuleDataProvider.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/NXCException.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/NXCException.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/NXCObjectCreationData.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/NXCObjectCreationData.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/NXCObjectModificationData.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/NXCObjectModificationData.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/NXCReceivedFile.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/NXCReceivedFile.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/NXCSession.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/NXCSession.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/ObjectFilter.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/ObjectFilter.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/ObjectMenuFilter.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/ObjectMenuFilter.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/ObjectUrl.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/ObjectUrl.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/PhysicalComponent.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/PhysicalComponent.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/ProgressListener.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/ProgressListener.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/ProtocolVersion.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/ProtocolVersion.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/ScheduledTask.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/ScheduledTask.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/Script.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/Script.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/ScriptCompilationResult.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/ScriptCompilationResult.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/ServerAction.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/ServerAction.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/SessionListener.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/SessionListener.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/SessionNotification.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/SessionNotification.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/SoftwarePackage.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/SoftwarePackage.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/Table.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/Table.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/TableCell.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/TableCell.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/TableColumnDefinition.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/TableColumnDefinition.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/TableRow.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/TableRow.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/TextOutputListener.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/TextOutputListener.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/TimePeriod.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/TimePeriod.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/agent/config/ConfigContent.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/agent/config/ConfigContent.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/agent/config/ConfigListElement.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/agent/config/ConfigListElement.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/constants/ASN.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/constants/ASN.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/constants/AccessPointState.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/constants/AccessPointState.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/constants/AgentCacheMode.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/constants/AgentCacheMode.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/constants/AgentCompressionMode.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/constants/AgentCompressionMode.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/constants/AggregationFunction.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/constants/AggregationFunction.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/constants/AuthenticationType.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/constants/AuthenticationType.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/constants/ColumnFilterSetOperation.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/constants/ColumnFilterSetOperation.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/constants/ColumnFilterType.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/constants/ColumnFilterType.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/constants/ConnectionPointType.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/constants/ConnectionPointType.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/constants/LinkLayerDiscoveryProtocol.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/constants/LinkLayerDiscoveryProtocol.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/constants/NetworkDiscovery.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/constants/NetworkDiscovery.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/constants/NodePollType.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/constants/NodePollType.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/constants/NodeType.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/constants/NodeType.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/constants/ObjectStatus.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/constants/ObjectStatus.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/constants/RCC.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/constants/RCC.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/constants/ServerVariableDataType.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/constants/ServerVariableDataType.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/constants/Severity.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/constants/Severity.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/constants/UserAccessRights.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/constants/UserAccessRights.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/dashboards/DashboardElement.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/dashboards/DashboardElement.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/ChartConfig.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/ChartConfig.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/ChartDciConfig.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/ChartDciConfig.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/ColumnDefinition.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/ColumnDefinition.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/ConditionDciInfo.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/ConditionDciInfo.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/DataCollectionConfiguration.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/DataCollectionConfiguration.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/DataCollectionItem.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/DataCollectionItem.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/DataCollectionObject.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/DataCollectionObject.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/DataCollectionTable.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/DataCollectionTable.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/DataFormatter.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/DataFormatter.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/DciData.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/DciData.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/DciDataRow.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/DciDataRow.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/DciPushData.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/DciPushData.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/DciSummaryTable.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/DciSummaryTable.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/DciSummaryTableColumn.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/DciSummaryTableColumn.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/DciSummaryTableDescriptor.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/DciSummaryTableDescriptor.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/DciValue.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/DciValue.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/GraphItem.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/GraphItem.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/GraphItemStyle.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/GraphItemStyle.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/GraphSettings.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/GraphSettings.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/GraphSettingsChangeListener.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/GraphSettingsChangeListener.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/PerfTabDci.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/PerfTabDci.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/PredictionEngine.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/PredictionEngine.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/SimpleDciValue.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/SimpleDciValue.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/TableCondition.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/TableCondition.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/TableDciValue.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/TableDciValue.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/TableThreshold.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/TableThreshold.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/Threshold.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/Threshold.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/ThresholdViolationSummary.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/ThresholdViolationSummary.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/TransformationTestResult.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/TransformationTestResult.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/WinPerfCounter.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/WinPerfCounter.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/datacollection/WinPerfObject.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/WinPerfObject.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/events/Alarm.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/events/Alarm.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/events/AlarmCategory.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/events/AlarmCategory.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/events/AlarmComment.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/events/AlarmComment.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/events/BulkAlarmStateChangeData.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/events/BulkAlarmStateChangeData.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/events/Event.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/events/Event.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/events/EventGroup.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/events/EventGroup.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/events/EventInfo.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/events/EventInfo.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/events/EventObject.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/events/EventObject.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/events/EventProcessingPolicy.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/events/EventProcessingPolicy.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/events/EventProcessingPolicyRule.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/events/EventProcessingPolicyRule.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/events/EventTemplate.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/events/EventTemplate.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/events/SyslogRecord.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/events/SyslogRecord.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/log/ColumnFilter.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/log/ColumnFilter.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/log/Log.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/log/Log.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/log/LogColumn.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/log/LogColumn.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/log/LogFilter.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/log/LogFilter.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/log/OrderingColumn.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/log/OrderingColumn.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/maps/MapDCIInstance.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/maps/MapDCIInstance.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/maps/MapLayoutAlgorithm.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/maps/MapLayoutAlgorithm.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/maps/MapObjectDisplayMode.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/maps/MapObjectDisplayMode.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/maps/NetworkMapLink.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/maps/NetworkMapLink.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/maps/NetworkMapPage.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/maps/NetworkMapPage.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/maps/configs/DCIImageConfiguration.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/maps/configs/DCIImageConfiguration.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/maps/configs/DCIImageRule.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/maps/configs/DCIImageRule.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/maps/configs/DciContainerConfiguration.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/maps/configs/DciContainerConfiguration.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/maps/configs/LinkConfig.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/maps/configs/LinkConfig.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/maps/configs/SingleDciConfig.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/maps/configs/SingleDciConfig.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/maps/elements/NetworkMapDCIContainer.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/maps/elements/NetworkMapDCIContainer.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/maps/elements/NetworkMapDCIImage.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/maps/elements/NetworkMapDCIImage.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/maps/elements/NetworkMapDecoration.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/maps/elements/NetworkMapDecoration.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/maps/elements/NetworkMapElement.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/maps/elements/NetworkMapElement.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/maps/elements/NetworkMapObject.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/maps/elements/NetworkMapObject.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/maps/elements/NetworkMapResource.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/maps/elements/NetworkMapResource.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/market/Repository.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/market/Repository.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/mt/MappingTable.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/mt/MappingTable.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/mt/MappingTableDescriptor.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/mt/MappingTableDescriptor.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/mt/MappingTableEntry.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/mt/MappingTableEntry.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/AbstractNode.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/AbstractNode.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/AbstractObject.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/AbstractObject.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/AccessPoint.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/AccessPoint.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/AgentPolicy.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/AgentPolicy.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/AgentPolicyConfig.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/AgentPolicyConfig.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/AgentPolicyLogParser.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/AgentPolicyLogParser.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/BusinessService.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/BusinessService.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/BusinessServiceRoot.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/BusinessServiceRoot.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/Chassis.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/Chassis.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/Cluster.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/Cluster.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/ClusterResource.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/ClusterResource.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/Condition.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/Condition.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/Container.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/Container.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/Dashboard.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/Dashboard.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/DashboardGroup.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/DashboardGroup.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/DashboardRoot.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/DashboardRoot.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/DataCollectionTarget.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/DataCollectionTarget.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/EntireNetwork.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/EntireNetwork.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/GenericObject.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/GenericObject.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/Interface.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/Interface.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/MobileDevice.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/MobileDevice.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/NetworkMap.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/NetworkMap.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/NetworkMapGroup.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/NetworkMapGroup.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/NetworkMapRoot.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/NetworkMapRoot.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/NetworkService.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/NetworkService.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/Node.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/Node.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/NodeLink.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/NodeLink.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/PolicyGroup.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/PolicyGroup.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/PolicyRoot.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/PolicyRoot.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/Rack.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/Rack.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/RackElement.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/RackElement.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/Sensor.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/Sensor.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/ServiceCheck.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/ServiceCheck.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/ServiceContainer.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/ServiceContainer.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/ServiceRoot.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/ServiceRoot.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/Subnet.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/Subnet.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/Template.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/Template.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/TemplateGroup.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/TemplateGroup.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/TemplateRoot.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/TemplateRoot.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/UnknownObject.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/UnknownObject.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/VPNConnector.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/VPNConnector.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/Zone.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/Zone.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objects/ZoneMember.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objects/ZoneMember.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objecttools/InputField.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objecttools/InputField.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objecttools/InputFieldOptions.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objecttools/InputFieldOptions.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objecttools/InputFieldType.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objecttools/InputFieldType.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objecttools/ObjectAction.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objecttools/ObjectAction.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objecttools/ObjectTool.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objecttools/ObjectTool.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objecttools/ObjectToolDetails.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objecttools/ObjectToolDetails.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/objecttools/ObjectToolTableColumn.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/objecttools/ObjectToolTableColumn.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/packages/PackageDeploymentListener.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/packages/PackageDeploymentListener.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/packages/PackageInfo.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/packages/PackageInfo.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/reporting/ReportDefinition.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/reporting/ReportDefinition.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/reporting/ReportParameter.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/reporting/ReportParameter.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/reporting/ReportRenderFormat.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/reporting/ReportRenderFormat.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/reporting/ReportResult.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/reporting/ReportResult.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/reporting/ReportingJob.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/reporting/ReportingJob.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/sensor/configs/DlmsConfig.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/sensor/configs/DlmsConfig.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/sensor/configs/DlmsConverterCredentials.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/sensor/configs/DlmsConverterCredentials.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/sensor/configs/LoraWanConfig.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/sensor/configs/LoraWanConfig.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/sensor/configs/LoraWanRegConfig.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/sensor/configs/LoraWanRegConfig.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/sensor/configs/SensorConfig.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/sensor/configs/SensorConfig.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/sensor/configs/SensorRegistrationConfig.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/sensor/configs/SensorRegistrationConfig.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/server/AgentFile.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/server/AgentFile.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/server/ServerConsoleListener.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/server/ServerConsoleListener.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/server/ServerFile.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/server/ServerFile.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/server/ServerJob.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/server/ServerJob.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/server/ServerVariable.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/server/ServerVariable.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/services/ServiceHandler.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/services/ServiceHandler.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/services/ServiceManager.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/services/ServiceManager.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/snmp/MibObject.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/snmp/MibObject.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/snmp/MibTree.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/snmp/MibTree.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/snmp/SnmpObjectId.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/snmp/SnmpObjectId.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/snmp/SnmpObjectIdFormatException.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/snmp/SnmpObjectIdFormatException.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/snmp/SnmpTrap.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/snmp/SnmpTrap.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/snmp/SnmpTrapLogRecord.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/snmp/SnmpTrapLogRecord.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/snmp/SnmpTrapParameterMapping.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/snmp/SnmpTrapParameterMapping.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/snmp/SnmpUsmCredential.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/snmp/SnmpUsmCredential.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/snmp/SnmpValue.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/snmp/SnmpValue.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/snmp/SnmpWalkListener.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/snmp/SnmpWalkListener.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/topology/ConnectionPoint.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/topology/ConnectionPoint.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/topology/FdbEntry.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/topology/FdbEntry.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/topology/HopInfo.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/topology/HopInfo.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/topology/NetworkPath.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/topology/NetworkPath.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/topology/Port.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/topology/Port.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/topology/RadioInterface.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/topology/RadioInterface.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/topology/Route.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/topology/Route.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/topology/VlanInfo.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/topology/VlanInfo.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/topology/WirelessStation.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/topology/WirelessStation.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/users/AbstractAccessListElement.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/users/AbstractAccessListElement.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/users/AbstractUserObject.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/users/AbstractUserObject.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/users/AuthCertificate.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/users/AuthCertificate.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/users/User.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/users/User.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/users/UserGroup.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/users/UserGroup.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/xml/UUIDConverter.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/xml/UUIDConverter.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/xml/XMLTools.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/xml/XMLTools.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/xml/XmlDateConverter.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/xml/XmlDateConverter.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/zeromq/ZmqSubscription.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/zeromq/ZmqSubscription.java with 100% similarity]
src/client/java/netxms-client/src/main/java/org/netxms/client/zeromq/ZmqSubscriptionType.java [moved from src/java/client/netxms-client/src/main/java/org/netxms/client/zeromq/ZmqSubscriptionType.java with 100% similarity]
src/client/java/netxms-client/src/main/resources/messages.properties [moved from src/java/client/netxms-client/src/main/resources/messages.properties with 100% similarity]
src/client/java/netxms-client/src/main/resources/messages_ar.properties [moved from src/java/client/netxms-client/src/main/resources/messages_ar.properties with 100% similarity]
src/client/java/netxms-client/src/main/resources/messages_cs.properties [moved from src/java/client/netxms-client/src/main/resources/messages_cs.properties with 100% similarity]
src/client/java/netxms-client/src/main/resources/messages_de.properties [moved from src/java/client/netxms-client/src/main/resources/messages_de.properties with 100% similarity]
src/client/java/netxms-client/src/main/resources/messages_es.properties [moved from src/java/client/netxms-client/src/main/resources/messages_es.properties with 100% similarity]
src/client/java/netxms-client/src/main/resources/messages_fr.properties [moved from src/java/client/netxms-client/src/main/resources/messages_fr.properties with 100% similarity]
src/client/java/netxms-client/src/main/resources/messages_pt.properties [moved from src/java/client/netxms-client/src/main/resources/messages_pt.properties with 100% similarity]
src/client/java/netxms-client/src/main/resources/messages_ru.properties [moved from src/java/client/netxms-client/src/main/resources/messages_ru.properties with 100% similarity]
src/client/java/netxms-client/src/main/resources/messages_zh_CN.properties [moved from src/java/client/netxms-client/src/main/resources/messages_zh_CN.properties with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/IntegrationTest.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/IntegrationTest.java with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/client/AbstractSessionTest.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/client/AbstractSessionTest.java with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/client/AgentTest.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/client/AgentTest.java with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/client/AlarmTest.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/client/AlarmTest.java with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/client/ConnectionTest.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/client/ConnectionTest.java with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/client/DataCollectionTest.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/client/DataCollectionTest.java with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/client/EventDatabaseSyncTest.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/client/EventDatabaseSyncTest.java with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/client/EventProcessingPolicyTest.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/client/EventProcessingPolicyTest.java with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/client/ExceptionTest.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/client/ExceptionTest.java with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/client/GeoLocationTest.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/client/GeoLocationTest.java with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/client/GlobTest.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/client/GlobTest.java with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/client/GraphTest.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/client/GraphTest.java with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/client/ImageLibraryTest.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/client/ImageLibraryTest.java with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/client/JobTest.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/client/JobTest.java with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/client/LogTest.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/client/LogTest.java with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/client/MacAddressTest.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/client/MacAddressTest.java with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/client/ObjectTest.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/client/ObjectTest.java with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/client/ObjectToolsTest.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/client/ObjectToolsTest.java with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/client/PStorageTest.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/client/PStorageTest.java with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/client/ScriptTest.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/client/ScriptTest.java with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/client/SendEventTest.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/client/SendEventTest.java with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/client/ServerConfigTest.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/client/ServerConfigTest.java with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/client/ServerFilesTest.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/client/ServerFilesTest.java with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/client/SnmpTest.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/client/SnmpTest.java with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/client/TestConstants.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/client/TestConstants.java with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/client/TopologyTest.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/client/TopologyTest.java with 100% similarity]
src/client/java/netxms-client/src/test/java/org/netxms/client/UserTest.java [moved from src/java/client/netxms-client/src/test/java/org/netxms/client/UserTest.java with 100% similarity]
src/client/java/plugin.xml [moved from src/java/client/plugin.xml with 100% similarity]
src/client/java/plugin/src/org/netxms/client/plugin/Activator.java [moved from src/java/client/plugin/src/org/netxms/client/plugin/Activator.java with 100% similarity]
src/client/java/plugin/src/org/netxms/client/plugin/ClientStartupHandler.java [moved from src/java/client/plugin/src/org/netxms/client/plugin/ClientStartupHandler.java with 100% similarity]
src/client/java/pom.xml [moved from src/java/client/pom.xml with 100% similarity]
src/client/java/schema/org.netxms.client.startup.exsd [moved from src/java/client/schema/org.netxms.client.startup.exsd with 100% similarity]
src/client/nxshell/java/pom.xml
src/java/client/lib/simple-xml-2.6.4.jar [deleted file]

index bb425ef..f0b6132 100644 (file)
@@ -145,6 +145,12 @@ target
 /src/agent/tools/nxappget/nxappget
 /src/agent/tools/nxapush/nxapush
 /src/client/install/Output
+/src/client/java/netxms-base/.classpath
+/src/client/java/netxms-base/.project
+/src/client/java/netxms-base/.settings
+/src/client/java/netxms-client/.classpath
+/src/client/java/netxms-client/.project
+/src/client/java/netxms-client/.settings
 /src/client/nxalarm/nxalarm
 /src/client/nxevent/nxevent
 /src/client/nxpush/nxpush
@@ -165,15 +171,6 @@ target
 /src/java/client/mobile-agent/.classpath
 /src/java/client/mobile-agent/.project
 /src/java/client/mobile-agent/.settings
-/src/java/client/netxms-base/.classpath
-/src/java/client/netxms-base/.project
-/src/java/client/netxms-base/.settings
-/src/java/client/netxms-client-api/.classpath
-/src/java/client/netxms-client-api/.project
-/src/java/client/netxms-client-api/.settings
-/src/java/client/netxms-client/.classpath
-/src/java/client/netxms-client/.project
-/src/java/client/netxms-client/.settings
 /src/java/nebula/org.netxms.nebula.widgets.gallery.tests/.settings
 /src/java/nebula/org.netxms.nebula.widgets.gallery.tests/bin
 /src/java/nebula/org.netxms.nebula.widgets.gallery/.settings
index f5379aa..79dcc51 100644 (file)
@@ -704,7 +704,7 @@ AC_ARG_WITH(dist,
        TOP_LEVEL_MODULES="include sql images tests"
        SERVER_INCLUDE="include"
        CONTRIB_MODULES="mibs backgrounds music templates"
-       CLIENT_COMPONENTS="nxalarm nxevent nxpush nxshell nxsms"
+       CLIENT_COMPONENTS="java nxalarm nxevent nxpush nxshell nxsms"
        SERVER_TOOLS="nxconfig"
 )
 
@@ -921,7 +921,7 @@ if test $? = 0; then
        CLIENT_COMPONENTS="$CLIENT_COMPONENTS nxalarm nxevent nxpush nxsms"
        check_substr "$COMPONENTS" "java"
        if test $? = 0; then
-               CLIENT_COMPONENTS="$CLIENT_COMPONENTS nxshell"
+               CLIENT_COMPONENTS="$CLIENT_COMPONENTS java nxshell"
        fi
 fi
 
@@ -3634,6 +3634,10 @@ AC_CONFIG_FILES([
        src/appagent/Makefile
        src/client/Makefile
        src/client/install/Makefile
+       src/client/java/Makefile
+       src/client/java/lib/Makefile
+       src/client/java/netxms-base/Makefile
+       src/client/java/netxms-client/Makefile
        src/client/libnxclient/Makefile
        src/client/nxalarm/Makefile
        src/client/nxevent/Makefile
index 9b11c22..86b150f 100644 (file)
@@ -1,3 +1,3 @@
-SUBDIRS = libnxclient nxalarm nxevent nxpush nxshell nxsms
+SUBDIRS = java libnxclient nxalarm nxevent nxpush nxshell nxsms
 
 include ..\..\Makefile.inc.w32
diff --git a/src/client/java/Makefile.am b/src/client/java/Makefile.am
new file mode 100644 (file)
index 0000000..dd75cda
--- /dev/null
@@ -0,0 +1,12 @@
+# Copyright (C) 2004 NetXMS Team <bugs@netxms.org>
+#  
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without 
+# modifications, as long as this notice is preserved.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+SUBDIRS = lib netxms-base netxms-client
+EXTRA_DIST = Makefile.w32
diff --git a/src/client/java/Makefile.w32 b/src/client/java/Makefile.w32
new file mode 100644 (file)
index 0000000..3ea2ad7
--- /dev/null
@@ -0,0 +1,3 @@
+SUBDIRS = netxms-base netxms-client
+
+include ..\..\..\Makefile.inc.w32
diff --git a/src/client/java/lib/Makefile.am b/src/client/java/lib/Makefile.am
new file mode 100644 (file)
index 0000000..75f654e
--- /dev/null
@@ -0,0 +1,3 @@
+javalibdir = $(pkglibdir)
+javalib_DATA = simple-xml-2.7.1.jar
+EXTRA_DIST = simple-xml-2.7.1.jar
diff --git a/src/client/java/netxms-base/Makefile.am b/src/client/java/netxms-base/Makefile.am
new file mode 100644 (file)
index 0000000..0740e30
--- /dev/null
@@ -0,0 +1,13 @@
+JAR = netxms-base.jar
+javalibdir = $(pkglibdir)
+javalib_DATA = $(JAR)
+
+$(JAR): pom.xml
+       mvn clean
+       MAVEN_OPTS=-Xmx512m mvn -Dmaven.test.skip=true install -Ppkg-build
+       mv target/$(JAR) .
+
+EXTRA_DIST = $(JAR) pom.xml Makefile.w32
+
+clean-local:
+       rm -f $(JAR)
diff --git a/src/client/java/netxms-base/Makefile.w32 b/src/client/java/netxms-base/Makefile.w32
new file mode 100644 (file)
index 0000000..86cd3b4
--- /dev/null
@@ -0,0 +1,6 @@
+TARGET = netxms-base.jar
+TYPE = jar
+
+MVNFLAGS = -Dmaven.test.skip=true -Ppkg-build
+
+include ..\..\..\..\Makefile.inc.w32
similarity index 83%
rename from src/java/client/netxms-base/pom.xml
rename to src/client/java/netxms-base/pom.xml
index 3061cbf..a669fa5 100644 (file)
@@ -4,12 +4,17 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.netxms</groupId>
   <artifactId>netxms-base</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <version>3.0-SNAPSHOT</version>
   <name>netxms-base</name>
   <description>NetXMS base classes and commonly used utility code</description>
   <url>http://www.netxms.org</url>
 
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <build.finalName>${project.artifactId}-${project.version}</build.finalName>
+  </properties>
+
   <licenses>
     <license>
       <name>GNU General Public License (GPL) v2</name>
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>pkg-build</id>
+      <properties>
+        <build.finalName>${project.artifactId}</build.finalName>
+      </properties>
+    </profile>
   </profiles>
 
   <build>
+    <finalName>${build.finalName}</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.7</version>
-        <extensions>true</extensions>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.5.5</version>
         <configuration>
-          <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-            <Import-Package>org.netxms.*;version="$(@)",*</Import-Package>
-          </instructions>
+           <descriptorRefs>
+              <descriptorRef>jar-with-dependencies</descriptorRef>
+           </descriptorRefs>
+           <appendAssemblyId>false</appendAssemblyId>
+           <attach>false</attach>
         </configuration>
+        <executions>
+           <execution>
+              <id>make-assembly</id>
+              <phase>package</phase>
+              <goals>
+                 <goal>single</goal>
+              </goals>
+           </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
 </project>
diff --git a/src/client/java/netxms-client/Makefile.am b/src/client/java/netxms-client/Makefile.am
new file mode 100644 (file)
index 0000000..641060e
--- /dev/null
@@ -0,0 +1,13 @@
+JAR = netxms-client.jar
+javalibdir = $(pkglibdir)
+javalib_DATA = $(JAR)
+
+$(JAR): pom.xml
+       mvn clean
+       MAVEN_OPTS=-Xmx512m mvn -Dmaven.test.skip=true install -Ppkg-build
+       mv target/$(JAR) .
+
+EXTRA_DIST = $(JAR) pom.xml Makefile.w32
+
+clean-local:
+       rm -f $(JAR)
diff --git a/src/client/java/netxms-client/Makefile.w32 b/src/client/java/netxms-client/Makefile.w32
new file mode 100644 (file)
index 0000000..9fc5f9a
--- /dev/null
@@ -0,0 +1,6 @@
+TARGET = netxms-client.jar
+TYPE = jar
+
+MVNFLAGS = -Dmaven.test.skip=true -Ppkg-build
+
+include ..\..\..\..\Makefile.inc.w32
similarity index 85%
rename from src/java/client/netxms-client/pom.xml
rename to src/client/java/netxms-client/pom.xml
index f33b3f1..a4e558c 100644 (file)
@@ -4,12 +4,17 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.netxms</groupId>
   <artifactId>netxms-client</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <version>3.0-SNAPSHOT</version>
   <name>netxms-client</name>
   <description>NetXMS client library - complete JAVA API</description>
   <url>http://www.netxms.org</url>
 
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <build.finalName>${project.artifactId}-${project.version}</build.finalName>
+  </properties>
+
   <licenses>
     <license>
       <name>GNU General Public License (GPL) v2</name>
@@ -47,6 +52,7 @@
   </distributionManagement>
 
   <build>
+    <finalName>${build.finalName}</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.7</version>
-        <extensions>true</extensions>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.5.5</version>
         <configuration>
-          <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-            <Import-Package>org.netxms.*;version="$(@)",*</Import-Package>
-          </instructions>
+           <descriptorRefs>
+              <descriptorRef>jar-with-dependencies</descriptorRef>
+           </descriptorRefs>
+           <appendAssemblyId>false</appendAssemblyId>
+           <attach>false</attach>
         </configuration>
+        <executions>
+           <execution>
+              <id>make-assembly</id>
+              <phase>package</phase>
+              <goals>
+                 <goal>single</goal>
+              </goals>
+           </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
       <groupId>org.netxms</groupId>
       <artifactId>netxms-base</artifactId>
       <version>${project.version}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.simpleframework</groupId>
       <artifactId>simple-xml</artifactId>
-      <version>2.6.4</version>
+      <version>2.7.1</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
     </plugins>
   </reporting>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
   <profiles>
     <profile>
       <id>default</id>
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>pkg-build</id>
+      <properties>
+        <build.finalName>${project.artifactId}</build.finalName>
+      </properties>
+    </profile>
   </profiles>
 </project>
index 59b61e4..3a5362b 100644 (file)
@@ -43,6 +43,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <build.finalName>${project.artifactId}-${project.version}</build.finalName>
+        <lib.scope>compile</lib.scope>
     </properties>
 
     <dependencies>
@@ -61,6 +62,7 @@
             <groupId>org.netxms</groupId>
             <artifactId>netxms-client</artifactId>
             <version>${project.version}</version>
+            <scope>${lib.scope}</scope>
         </dependency>
     </dependencies>
 
@@ -69,6 +71,7 @@
             <id>nxshell-launcher</id>
             <properties>
                 <build.finalName>${project.artifactId}</build.finalName>
+                <lib.scope>provided</lib.scope>
             </properties>
         </profile>
     </profiles>
diff --git a/src/java/client/lib/simple-xml-2.6.4.jar b/src/java/client/lib/simple-xml-2.6.4.jar
deleted file mode 100644 (file)
index be60eae..0000000
Binary files a/src/java/client/lib/simple-xml-2.6.4.jar and /dev/null differ