netxms-base jar moved to common sources from client
authorVictor Kirhenshtein <victor@netxms.org>
Fri, 15 Sep 2017 09:45:12 +0000 (12:45 +0300)
committerVictor Kirhenshtein <victor@netxms.org>
Fri, 15 Sep 2017 09:45:12 +0000 (12:45 +0300)
96 files changed:
build/next_build_number.pl
configure.ac
src/client/java/Makefile.am
src/client/java/Makefile.w32
src/client/nxshell/java/pom.xml
src/libnxjava/java/Makefile.am
src/libnxjava/java/base/Makefile.am [copied from src/client/java/Makefile.am with 92% similarity]
src/libnxjava/java/base/Makefile.w32 [new file with mode: 0644]
src/libnxjava/java/base/lib/Makefile.am [moved from src/client/java/lib/Makefile.am with 100% similarity]
src/libnxjava/java/base/netxms-base/Makefile.am [moved from src/client/java/netxms-base/Makefile.am with 100% similarity]
src/libnxjava/java/base/netxms-base/Makefile.w32 [moved from src/client/java/netxms-base/Makefile.w32 with 67% similarity]
src/libnxjava/java/base/netxms-base/jzlib-license.txt [moved from src/client/java/netxms-base/jzlib-license.txt with 100% similarity]
src/libnxjava/java/base/netxms-base/pom.xml [moved from src/client/java/netxms-base/pom.xml with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/com/jcraft/jzlib/Adler32.java [moved from src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/Adler32.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/com/jcraft/jzlib/CRC32.java [moved from src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/CRC32.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/com/jcraft/jzlib/Checksum.java [moved from src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/Checksum.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/com/jcraft/jzlib/Deflate.java [moved from src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/Deflate.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/com/jcraft/jzlib/Deflater.java [moved from src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/Deflater.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/com/jcraft/jzlib/DeflaterOutputStream.java [moved from src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/DeflaterOutputStream.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/com/jcraft/jzlib/GZIPException.java [moved from src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/GZIPException.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/com/jcraft/jzlib/GZIPHeader.java [moved from src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/GZIPHeader.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/com/jcraft/jzlib/GZIPInputStream.java [moved from src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/GZIPInputStream.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/com/jcraft/jzlib/GZIPOutputStream.java [moved from src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/GZIPOutputStream.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/com/jcraft/jzlib/InfBlocks.java [moved from src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/InfBlocks.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/com/jcraft/jzlib/InfCodes.java [moved from src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/InfCodes.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/com/jcraft/jzlib/InfTree.java [moved from src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/InfTree.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/com/jcraft/jzlib/Inflate.java [moved from src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/Inflate.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/com/jcraft/jzlib/Inflater.java [moved from src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/Inflater.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/com/jcraft/jzlib/InflaterInputStream.java [moved from src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/InflaterInputStream.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/com/jcraft/jzlib/JZlib.java [moved from src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/JZlib.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/com/jcraft/jzlib/StaticTree.java [moved from src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/StaticTree.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/com/jcraft/jzlib/Tree.java [moved from src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/Tree.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/com/jcraft/jzlib/ZInputStream.java [moved from src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/ZInputStream.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/com/jcraft/jzlib/ZOutputStream.java [moved from src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/ZOutputStream.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/com/jcraft/jzlib/ZStream.java [moved from src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/ZStream.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/com/jcraft/jzlib/ZStreamException.java [moved from src/client/java/netxms-base/src/main/java/com/jcraft/jzlib/ZStreamException.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/base/BuildNumber.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/base/BuildNumber.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/base/CommonRCC.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/base/CommonRCC.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/base/EncryptedPassword.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/base/EncryptedPassword.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/base/EncryptionContext.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/base/EncryptionContext.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/base/GeoLocation.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/base/GeoLocation.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/base/GeoLocationFormatException.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/base/GeoLocationFormatException.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/base/Glob.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/base/Glob.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/base/IceCrypto.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/base/IceCrypto.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/base/InetAddressEx.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/base/InetAddressEx.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/base/Logger.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/base/Logger.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/base/LoggingFacility.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/base/LoggingFacility.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/base/MacAddress.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/base/MacAddress.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/base/MacAddressFormatException.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/base/MacAddressFormatException.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/base/NXCPCodes.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/base/NXCPCodes.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/base/NXCPDataInputStream.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/base/NXCPDataInputStream.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/base/NXCPException.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/base/NXCPException.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/base/NXCPMessage.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/base/NXCPMessage.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/base/NXCPMessageField.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/base/NXCPMessageField.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/base/NXCPMessageReceiver.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/base/NXCPMessageReceiver.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/base/NXCPMsgWaitQueue.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/base/NXCPMsgWaitQueue.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/base/NXCommon.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/base/NXCommon.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/base/PostalAddress.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/base/PostalAddress.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/base/annotations/Internal.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/base/annotations/Internal.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/certificate/loader/KeyStoreLoader.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/certificate/loader/KeyStoreLoader.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/certificate/loader/KeyStoreRequestListener.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/certificate/loader/KeyStoreRequestListener.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/certificate/loader/MSCKeyStoreLoader.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/certificate/loader/MSCKeyStoreLoader.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/certificate/loader/PKCS12KeyStoreLoader.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/certificate/loader/PKCS12KeyStoreLoader.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/certificate/loader/exception/KeyStoreLoaderException.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/certificate/loader/exception/KeyStoreLoaderException.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/certificate/manager/CertificateManager.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/certificate/manager/CertificateManager.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/certificate/manager/CertificateManagerProvider.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/certificate/manager/CertificateManagerProvider.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/certificate/manager/CertificateManagerRequestListener.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/certificate/manager/CertificateManagerRequestListener.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/certificate/manager/exception/CertificateHasNoPrivateKeyException.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/certificate/manager/exception/CertificateHasNoPrivateKeyException.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/certificate/manager/exception/CertificateNotInKeyStoreException.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/certificate/manager/exception/CertificateNotInKeyStoreException.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/certificate/manager/exception/SignatureImpossibleException.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/certificate/manager/exception/SignatureImpossibleException.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/certificate/manager/exception/SignatureVerificationImpossibleException.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/certificate/manager/exception/SignatureVerificationImpossibleException.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/certificate/request/KeyStoreEntryPasswordRequestListener.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/certificate/request/KeyStoreEntryPasswordRequestListener.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/certificate/request/KeyStoreLocationRequestListener.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/certificate/request/KeyStoreLocationRequestListener.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/certificate/request/KeyStorePasswordRequestListener.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/certificate/request/KeyStorePasswordRequestListener.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/certificate/subject/Subject.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/certificate/subject/Subject.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/certificate/subject/SubjectParser.java [moved from src/client/java/netxms-base/src/main/java/org/netxms/certificate/subject/SubjectParser.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/test/java/org/netxms/base/GlobTest.java [moved from src/client/java/netxms-base/src/test/java/org/netxms/base/GlobTest.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/test/java/org/netxms/base/IceTest.java [moved from src/client/java/netxms-base/src/test/java/org/netxms/base/IceTest.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/test/java/org/netxms/base/NXCPMessageFieldTest.java [moved from src/client/java/netxms-base/src/test/java/org/netxms/base/NXCPMessageFieldTest.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/test/java/org/netxms/base/NXCPMessageTest.java [moved from src/client/java/netxms-base/src/test/java/org/netxms/base/NXCPMessageTest.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/test/java/org/netxms/base/NXCPMsgWaitQueueTest.java [moved from src/client/java/netxms-base/src/test/java/org/netxms/base/NXCPMsgWaitQueueTest.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/test/java/org/netxms/base/ZlibTest.java [moved from src/client/java/netxms-base/src/test/java/org/netxms/base/ZlibTest.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/test/java/org/netxms/certificate/KeyStoreTest.java [moved from src/client/java/netxms-base/src/test/java/org/netxms/certificate/KeyStoreTest.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/test/java/org/netxms/certificate/TestListener.java [moved from src/client/java/netxms-base/src/test/java/org/netxms/certificate/TestListener.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/test/java/org/netxms/certificate/manager/CertificateManagerProviderTest.java [moved from src/client/java/netxms-base/src/test/java/org/netxms/certificate/manager/CertificateManagerProviderTest.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/test/java/org/netxms/certificate/manager/CertificateManagerTest.java [moved from src/client/java/netxms-base/src/test/java/org/netxms/certificate/manager/CertificateManagerTest.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/test/java/org/netxms/certificate/subject/SubjectParserTest.java [moved from src/client/java/netxms-base/src/test/java/org/netxms/certificate/subject/SubjectParserTest.java with 100% similarity]
src/libnxjava/java/base/netxms-base/src/test/resource/keystore.p12 [moved from src/client/java/netxms-base/src/test/resource/keystore.p12 with 100% similarity]
src/libnxjava/java/bridge/Makefile.am [copied from src/libnxjava/java/Makefile.am with 100% similarity]
src/libnxjava/java/bridge/Makefile.w32 [moved from src/libnxjava/java/Makefile.w32 with 65% similarity]
src/libnxjava/java/bridge/pom.xml [moved from src/libnxjava/java/pom.xml with 100% similarity]
src/libnxjava/java/bridge/src/main/java/org/netxms/bridge/Config.java [moved from src/libnxjava/java/src/main/java/org/netxms/bridge/Config.java with 100% similarity]
src/libnxjava/java/bridge/src/main/java/org/netxms/bridge/ConfigEntry.java [moved from src/libnxjava/java/src/main/java/org/netxms/bridge/ConfigEntry.java with 100% similarity]
src/libnxjava/java/bridge/src/main/java/org/netxms/bridge/DirectoryType.java [moved from src/libnxjava/java/src/main/java/org/netxms/bridge/DirectoryType.java with 100% similarity]
src/libnxjava/java/bridge/src/main/java/org/netxms/bridge/LogLevel.java [moved from src/libnxjava/java/src/main/java/org/netxms/bridge/LogLevel.java with 100% similarity]
src/libnxjava/java/bridge/src/main/java/org/netxms/bridge/Platform.java [moved from src/libnxjava/java/src/main/java/org/netxms/bridge/Platform.java with 100% similarity]

index 7512499..1424f4d 100755 (executable)
@@ -38,7 +38,7 @@ open my $outsh, '>', "../src/java/build/set_build_number.sh" or die "cannot open
 print $outsh "build_number=$build\n";
 close $outsh;
 
-open my $outjava, '>', "../src/java/client/netxms-base/src/main/java/org/netxms/base/BuildNumber.java" or die "cannot open BuildNumber.java";
+open my $outjava, '>', "../src/libnxjava/java/base/netxms-base/src/main/java/org/netxms/base/BuildNumber.java" or die "cannot open BuildNumber.java";
 print $outjava "package org.netxms.base;\n";
 print $outjava "public final class BuildNumber {\n";
 print $outjava "   public static final String TEXT = \"$build\";\n";
index 79dcc51..7fdf2d6 100644 (file)
@@ -3635,8 +3635,6 @@ AC_CONFIG_FILES([
        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
@@ -3666,6 +3664,10 @@ AC_CONFIG_FILES([
        src/libnxcc/Makefile
        src/libnxjava/Makefile
        src/libnxjava/java/Makefile
+       src/libnxjava/java/base/Makefile
+       src/libnxjava/java/base/lib/Makefile
+       src/libnxjava/java/base/netxms-base/Makefile
+       src/libnxjava/java/bridge/Makefile
        src/libnxlp/Makefile
        src/libnxmb/Makefile
        src/libnxsl/Makefile
index dd75cda..45f9346 100644 (file)
@@ -8,5 +8,5 @@
 # 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
+SUBDIRS = netxms-client
 EXTRA_DIST = Makefile.w32
index 3ea2ad7..59930b6 100644 (file)
@@ -1,3 +1,3 @@
-SUBDIRS = netxms-base netxms-client
+SUBDIRS = netxms-client
 
 include ..\..\..\Makefile.inc.w32
index 3a5362b..100382a 100644 (file)
             <artifactId>jython-standalone</artifactId>
             <version>2.7.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.netxms</groupId>
+            <artifactId>netxms-base</artifactId>
+            <version>${project.version}</version>
+            <scope>${lib.scope}</scope>
+        </dependency>
         <dependency>
             <groupId>org.netxms</groupId>
             <artifactId>netxms-client</artifactId>
index 2fe981e..6614ce8 100644 (file)
@@ -1,12 +1,3 @@
-javalibdir = $(pkglibdir)
-javalib_DATA = netxms-java-bridge.jar
+EXTRA_DIST = Makefile.w32
 
-netxms-java-bridge.jar: pom.xml
-       mvn clean
-       mvn install
-       mv target/netxms-java-bridge.jar .
-
-clean-local:
-       rm -rf netxms-java-bridge.jar
-
-EXTRA_DIST = Makefile.w32 pom.xml netxms-java-bridge.jar
+SUBDIRS = base bridge
similarity index 92%
copy from src/client/java/Makefile.am
copy to src/libnxjava/java/base/Makefile.am
index dd75cda..6f1e26b 100644 (file)
@@ -8,5 +8,5 @@
 # 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
+SUBDIRS = lib netxms-base
 EXTRA_DIST = Makefile.w32
diff --git a/src/libnxjava/java/base/Makefile.w32 b/src/libnxjava/java/base/Makefile.w32
new file mode 100644 (file)
index 0000000..01d2229
--- /dev/null
@@ -0,0 +1,3 @@
+SUBDIRS = netxms-base
+
+include ..\..\..\..\Makefile.inc.w32
similarity index 67%
rename from src/client/java/netxms-base/Makefile.w32
rename to src/libnxjava/java/base/netxms-base/Makefile.w32
index 86cd3b4..cb5eac2 100644 (file)
@@ -3,4 +3,4 @@ TYPE = jar
 
 MVNFLAGS = -Dmaven.test.skip=true -Ppkg-build
 
-include ..\..\..\..\Makefile.inc.w32
+include ..\..\..\..\..\Makefile.inc.w32
similarity index 65%
rename from src/libnxjava/java/Makefile.w32
rename to src/libnxjava/java/bridge/Makefile.w32
index 7c5731d..1a3bd4d 100644 (file)
@@ -2,4 +2,4 @@ TARGET = netxms-java-bridge.jar
 TYPE = jar
 JAR_BUILD_MODE = install
 
-include ..\..\..\Makefile.inc.w32
+include ..\..\..\..\Makefile.inc.w32