summaryrefslogtreecommitdiff
path: root/java/src
Commit message (Collapse)AuthorAge
...
* | Merge remote-tracking branch 'origin/3.6'Jose2016-10-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md android/build.gradle android/gradle.properties android/gradle/wrapper/gradle-wrapper.properties config/Make.common.rules config/PropertyNames.xml cpp/BuildInstructionsLinux.md cpp/BuildInstructionsOSX.md cpp/BuildInstructionsWinRT.md cpp/BuildInstructionsWindows.md cpp/config/Make.rules cpp/config/Make.rules.mak cpp/include/IceUtil/Config.h cpp/include/Slice/PythonUtil.h cpp/include/Slice/RubyUtil.h cpp/include/Slice/Util.h cpp/src/Ice/DynamicLibrary.cpp cpp/src/Ice/PropertyNames.cpp cpp/src/Ice/PropertyNames.h cpp/src/Ice/winrt/StreamEndpointI.cpp cpp/src/IceGrid/IceGridDB.cpp cpp/src/IceGrid/Util.cpp cpp/src/IceUtil/FileUtil.cpp cpp/src/IceUtil/FileUtil.h cpp/src/Makefile cpp/src/Slice/Util.cpp cpp/src/slice2cs/Gen.cpp cpp/src/slice2freeze/Main.cpp cpp/src/slice2freezej/Main.cpp cpp/src/slice2html/Makefile cpp/src/slice2html/Makefile.mak cpp/src/slice2java/Main.cpp cpp/test/Ice/exceptions/AllTests.cpp cpp/test/Ice/facets/AllTests.cpp cpp/test/Ice/info/AllTests.cpp cpp/test/Ice/location/AllTests.cpp cpp/test/Ice/properties/run.py cpp/test/Ice/timeout/AllTests.cpp cpp/test/IceGrid/noRestartUpdate/AllTests.cpp cpp/test/IceStorm/stress/run.py cpp/test/TestSuite/10.0/Package.appxmanifest cpp/test/TestSuite/10.0/TestSuite.vcxproj cpp/test/TestSuite/10.0/TestSuite.vcxproj.filters cpp/test/TestSuite/10.0/TestSuite_TemporaryKey.pfx cpp/test/TestSuite/8.0/TestSuite.vcxproj cpp/test/TestSuite/8.0/TestSuite_TemporaryKey.pfx csharp/BuildInstructions.md csharp/src/Ice/PropertyNames.cs csharp/src/IceLocatorDiscovery/PluginI.cs java/BuildInstructions.md java/Makefile java/Makefile.mak java/src/Glacier2/src/main/java/Glacier2/Application.java java/src/Glacier2/src/main/java/Glacier2/SessionFactoryHelper.java java/src/Glacier2/src/main/java/Glacier2/SessionHelper.java java/src/Ice/src/main/java/Ice/Object.java java/src/Ice/src/main/java/Ice/ObjectImpl.java java/src/Ice/src/main/java/IceInternal/PropertyNames.java java/src/Ice/src/main/java/IceSSL/Plugin.java java/src/Ice/src/main/java/IceSSL/PluginFactory.java java/src/Ice/src/main/java/IceUtil/Cache.java java/src/IceGridGUI/build.gradle java/src/IceGridGUI/src/main/java/IceGridGUI/SimpleInternalFrame.java java/src/IceGridGUI/src/main/java/IceGridGUI/Utils.java java/test/build.gradle java/test/ejb/README.md js/src/Ice/PropertyNames.js js/src/Ice/browser/TimerUtil.js js/src/Ice/browser/WSTransceiver.js js/test/Common/TestCases.json js/test/Common/Worker.js objective-c/include/objc/Ice/Config.h objective-c/src/Ice/CommunicatorI.mm php/BuildInstructionsLinuxOSX.md php/BuildInstructionsWindows.md php/config/Make.rules.mak.php php/src/php7/IcePHP.rc python/BuildInstructionsLinuxOSX.md python/BuildInstructionsWindows.md python/Makefile python/modules/IcePy/Slice.cpp python/test/Slice/import/run.py ruby/BuildInstructionsLinuxOSX.md ruby/BuildInstructionsWindows.md ruby/config/Make.rules ruby/src/IceRuby/Slice.cpp scripts/TestController.py scripts/TestUtil.py slice/Ice/Communicator.ice slice/Ice/Instrumentation.ice slice/IceLocatorDiscovery/IceLocatorDiscovery.ice
| * More javadoc fixesMark Spruiell2016-09-26
| |
| * Fixed restore of saved maximized windowBernard Normier2016-09-26
| |
| * Update IceGridGUI/javafx.gradleJoe George2016-09-26
| | | | | | | | Replace long time deprecated "installApp" with "installDist"
| * Few additional javadoc fixesBenoit Foucher2016-09-26
| |
| * Minor javadoc fixesBenoit Foucher2016-09-26
| |
| * JAR install fixesJose2016-09-23
| |
| * Fix for ICE-7167 - fixed some warnings/errors when generating java docsBenoit Foucher2016-09-23
| |
| * Fix ICE-7192 - Review deprecatedBy usageJose2016-09-20
| |
| * Fixes to IceGridGUI buildJose2016-09-19
| | | | | | | | | | | | | | Separate the proguard and plain jar builds to fix the buildscript dependencies on proguard. Only proguard-jar.gradle depends on the proguard tasks.
| * Fixed ICE-6363 (Java & C#) - hang when trying to contact the locatorBenoit Foucher2016-09-19
| |
| * Fix for ICE-7357 - catch exceptions raised by connection getInfoBenoit Foucher2016-09-16
| |
* | more javadoc fixesMark Spruiell2016-09-26
| |
* | Fixed ICE-7357 - Java hang in nested demoBenoit Foucher2016-09-16
| |
* | cleaning up javadocs in Java 8 core, generated codeMark Spruiell2016-09-14
| |
* | Merge remote-tracking branch 'origin/3.6'Bernard Normier2016-09-13
|\| | | | | | | Fixed IceGridGUI app launching on macOS
| * Removed double About on OS XBernard Normier2016-09-13
| | | | | | | | Updated version in Contents link
| * Fixed IceGridGUI bug introduced in previous commitBernard Normier2016-09-08
| |
* | Additional IceGridGUI fix from 3.6Bernard Normier2016-09-08
| |
* | Merged IceGridGUI updates from 3.6 branchBernard Normier2016-09-08
|\ \
| * | Moved IceGridGUI to com.zerocBernard Normier2016-09-08
| |/
| * ICE-7113: remove destroyed serversBernard Normier2016-09-07
| |
| * Fixed typo in IceGridGUI jar signingBenoit Foucher2016-09-07
| |
| * Save location and size of LogFile and IceLog dialogsBernard Normier2016-09-06
| |
| * Fixed ICE-7311 - handling of Java errors with AMDBenoit Foucher2016-09-05
| |
| * IceGrid Admin Cmd+Q support on macOSBernard Normier2016-09-02
| |
* | ICE-7321 - Java cross-test failure in Ice/objectsMark Spruiell2016-09-07
| |
* | Fixed ICE-7311 - handling of Java errors with AMDBenoit Foucher2016-09-05
| |
* | minor clean up in java8 IncomingMark Spruiell2016-08-31
| |
* | Fixed logging messageBernard Normier2016-08-30
| |
* | ICE-7300 - C++/Java cross-test failure with unknown user exceptionMark Spruiell2016-08-29
| |
* | C++ dispatching code fixesBenoit Foucher2016-08-25
| | | | | | | | | | | | - removed user exception check on the server side (ICE-6980) - C++11 dipatch interceptor async callback (ICE-7263) - Fixed slicing/objects test in various mapping (removed Forward.ice)
* | Major changes in Java:Mark Spruiell2016-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Moved existing Java mapping sources to java-compat subdirectory - Added new "Java 8" mapping in java subdirectory - Significant features of Java 8 mapping: - All classes in com.zeroc package (e.g., com.zeroc.Ice.Communicator) - New AMI mapping that uses java.util.concurrent.CompletableFuture - New AMD mapping that uses java.util.concurrent.CompletionStage - New mapping for out parameters - "holder" types have been eliminated - New mapping for optional types that uses JDK classes from java.util (e.g., java.util.Optional) - "TIE" classes are no longer supported or necessary; servant classes now only need to implement a generated interface - Moved IceGrid GUI to new mapping - The "Java Compat" mapping is provided only for backward compatibility to ease migration to Ice 3.7. The Slice compiler supports a new --compat option to generate code for this mapping. However, users are encouraged to migrate to the new mapping as soon as possible.
* | ES6 mapping updatesJose2016-08-19
| |
* | C# mapping changesBenoit Foucher2016-08-16
| | | | | | | | | | | | | | | | - user exceptions are no longer checked on the server side (ICE-6980) - support for ["marshaled-result"] metadata - AMD operations now return a Task - improved dispatch interceptors - PropertiesAdminI::setProperties impl. now invokes callbacks synchronously
* | Fixed ICE-7270 - ice_getConnection now returns a non-null connection even if ↵Benoit Foucher2016-08-09
| | | | | | | | connection caching is disabled
* | Fixed ICE-7208 - C++98 sync code now depends on async codeBenoit Foucher2016-08-08
| |
* | Deprecate Communicator::stringToIdentity and identityToStringBernard Normier2016-07-27
| |
* | Remove cshar IceSSL deprecated featuresJose2016-07-15
| |
* | Update version to 3.7a3Joe George2016-07-12
| |
* | Fixed ICE-6971 - Ice/acm test failureBenoit Foucher2016-07-06
| |
* | Merge remote-tracking branch 'origin/3.6'Jose2016-07-06
|\| | | | | | | | | | | | | | | | | | | Conflicts: cpp/src/Ice/PropertyNames.cpp cpp/src/Ice/PropertyNames.h cpp/test/IceSSL/configuration/Makefile csharp/src/Ice/PropertyNames.cs java/src/Ice/src/main/java/IceInternal/PropertyNames.java js/src/Ice/PropertyNames.js
| * Remove IceSSL.SecurityLevel reintroduced with 3.6-stretch mergeJose2016-07-06
| |
| * Merge remote-tracking branch 'origin/3.6-stretch' into 3.6Jose2016-07-06
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cpp/src/Ice/PropertyNames.cpp cpp/src/Ice/PropertyNames.h cpp/test/IceSSL/configuration/AllTests.cpp csharp/src/Ice/PropertyNames.cs java/src/Ice/src/main/java/IceInternal/PropertyNames.java js/src/Ice/PropertyNames.js
| | * Remove IceSSL.SecurityLevel propertyJose2016-07-06
| | | | | | | | | | | | | | | The security level can be set without this property by adding @SECLEVEL=n in the cipher string
| | * OpenSSL-1.1.0-pre5 supportJose2016-07-01
| | |
* | | Merge remote-tracking branch 'origin/3.6'Jose2016-07-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config/Make.common.rules cpp/Makefile cpp/config/Make.rules cpp/config/Make.rules.Linux cpp/src/Ice/InstrumentationI.cpp cpp/src/Ice/PropertyNames.cpp cpp/src/Ice/PropertyNames.h cpp/src/IceSSL/Makefile cpp/src/IceUtil/Makefile cpp/test/Glacier2/attack/Makefile cpp/test/Glacier2/attack/Makefile.mak cpp/test/Glacier2/router/Makefile cpp/test/Glacier2/sessionHelper/Makefile cpp/test/Glacier2/staticFiltering/Makefile cpp/test/Ice/objects/Makefile cpp/test/IceSSL/configuration/AllTests.cpp cpp/test/IceUtil/stacktrace/StackTrace.debug.Linux cpp/test/IceUtil/stacktrace/StackTrace.release.Linux csharp/src/Ice/PropertyNames.cs java/Makefile java/gradle.properties java/gradle/ice.gradle java/src/Ice/src/main/java/IceInternal/PropertyNames.java java/test/build.gradle js/src/Ice/PropertyNames.js man/man1/icegridadmin.1 man/man1/transformdb.1 php/BuildInstructionsWindows.md php/Makefile php/config/Make.rules.Darwin php/config/Make.rules.mak.php php/config/Make.rules.php php/src/IcePHP/Makefile php/src/Makefile php/src/Makefile.mak php/src/php5/.depend.mak php/src/php5/Communicator.cpp php/src/php5/Config.h php/src/php5/Connection.cpp php/src/php5/Endpoint.cpp php/src/php5/IcePHP.rc php/src/php5/Makefile php/src/php5/Makefile.mak php/src/php5/Operation.cpp php/src/php5/Types.cpp php/src/php5/Types.h php/src/php5/Util.cpp php/src/php7/Communicator.cpp php/src/php7/Communicator.h php/src/php7/Config.h php/src/php7/Connection.cpp php/src/php7/Endpoint.cpp php/src/php7/IcePHP.rc php/src/php7/Makefile php/src/php7/Operation.cpp php/src/php7/Types.cpp php/src/php7/Types.h php/src/php7/Util.cpp scripts/TestUtil.py
| * | OpenSSL-1.1.0-pre5 supportJose2016-07-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cpp/src/Ice/PropertyNames.cpp cpp/src/Ice/PropertyNames.h csharp/src/Ice/PropertyNames.cs java/src/Ice/src/main/java/IceInternal/PropertyNames.java js/src/Ice/PropertyNames.js
| * | Merge branch '3.6-stretch' into 3.6Jose2016-06-15
| |\|
| | * Fixed bug where connection to SOCKs/HTTP proxies could hang under certain ↵Benoit Foucher2016-06-10
| | | | | | | | | | | | conditions
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 15:09:03 +0000