From 999d216d7c76f1e3b50a6326ba5c48a9e6e36f8c Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 20 Jan 2010 15:44:30 +0100 Subject: [PATCH] purge out p2pproxy --- .gitmodules | 4 +- linphone/ABOUT-NLS => ABOUT-NLS | 0 linphone/AUTHORS => AUTHORS | 0 linphone/BUGS => BUGS | 0 linphone/COPYING => COPYING | 0 linphone/ChangeLog => ChangeLog | 0 linphone/Makefile.am => Makefile.am | 0 linphone/NEWS => NEWS | 0 linphone/README => README | 0 linphone/README.M68k.txt => README.M68k.txt | 0 linphone/README.arm => README.arm | 0 linphone/README.macos => README.macos | 0 linphone/README.mingw => README.mingw | 0 linphone/TODO => TODO | 0 linphone/autogen.sh => autogen.sh | 0 .../build => build}/wince/liblinphone.sln | 0 .../build => build}/wince/liblinphone.vcproj | 0 .../wince/linphonec/linphonec.vcproj | 0 linphone/config.rpath => config.rpath | 0 linphone/configure.in => configure.in | 0 {linphone/console => console}/.gitignore | 0 {linphone/console => console}/Makefile.am | 0 {linphone/console => console}/TODO | 0 {linphone/console => console}/commands.c | 0 .../console => console}/example/linphonec | 0 {linphone/console => console}/linphonec.c | 0 {linphone/console => console}/linphonec.h | 0 {linphone/console => console}/shell.c | 0 {linphone/console => console}/sipomatic.c | 0 {linphone/console => console}/sipomatic.h | 0 {linphone/console => console}/wav2raw.c | 0 {linphone/coreapi => coreapi}/.gitignore | 0 {linphone/coreapi => coreapi}/Makefile.am | 0 {linphone/coreapi => coreapi}/address.c | 0 .../coreapi => coreapi}/authentication.c | 0 {linphone/coreapi => coreapi}/chat.c | 0 {linphone/coreapi => coreapi}/enum.c | 0 {linphone/coreapi => coreapi}/enum.h | 0 {linphone/coreapi => coreapi}/exevents.c | 0 {linphone/coreapi => coreapi}/exevents.h | 0 {linphone/coreapi => coreapi}/fonis.c | 0 {linphone/coreapi => coreapi}/friend.c | 0 {linphone/coreapi => coreapi}/general_state.c | 0 .../coreapi => coreapi}/help/Doxyfile.in | 0 .../coreapi => coreapi}/help/Makefile.am | 0 .../coreapi => coreapi}/help/doxygen.dox.in | 0 {linphone/coreapi => coreapi}/linphonecore.c | 0 {linphone/coreapi => coreapi}/linphonecore.h | 0 {linphone/coreapi => coreapi}/lpconfig.c | 0 {linphone/coreapi => coreapi}/lpconfig.h | 0 {linphone/coreapi => coreapi}/misc.c | 0 .../plugins/buddylookup/AUTHORS | 0 .../plugins/buddylookup/COPYING | 0 .../plugins/buddylookup/ChangeLog | 0 .../plugins/buddylookup/INSTALL | 0 .../plugins/buddylookup/Makefile.am | 0 .../plugins/buddylookup/NEWS | 0 .../plugins/buddylookup/README | 0 .../plugins/buddylookup/autogen.sh | 0 .../plugins/buddylookup/configure.ac | 0 .../plugins/buddylookup/src/Makefile.am | 0 .../plugins/buddylookup/src/lookup.c | 0 {linphone/coreapi => coreapi}/presence.c | 0 {linphone/coreapi => coreapi}/private.h | 0 {linphone/coreapi => coreapi}/proxy.c | 0 {linphone/coreapi => coreapi}/sdphandler.c | 0 {linphone/coreapi => coreapi}/sdphandler.h | 0 {linphone/coreapi => coreapi}/siplogin.c | 0 {linphone/coreapi => coreapi}/sipsetup.c | 0 {linphone/coreapi => coreapi}/sipsetup.h | 0 .../gen-gtkfilelist.sh => gen-gtkfilelist.sh | 0 ...k+-2.16.2.filelist => gtk+-2.16.2.filelist | 0 ...k+-2.16.6.filelist => gtk+-2.16.6.filelist | 0 ...k+-2.18.5.filelist => gtk+-2.18.5.filelist | 0 {linphone/gtk-glade => gtk-glade}/.gitignore | 0 {linphone/gtk-glade => gtk-glade}/Makefile.am | 0 {linphone/gtk-glade => gtk-glade}/about.glade | 0 .../gtk-glade => gtk-glade}/buddylookup.c | 0 .../gtk-glade => gtk-glade}/buddylookup.glade | 0 .../gtk-glade => gtk-glade}/call_logs.glade | 0 {linphone/gtk-glade => gtk-glade}/calllogs.c | 0 {linphone/gtk-glade => gtk-glade}/chat.c | 0 .../gtk-glade => gtk-glade}/chatroom.glade | 0 .../gtk-glade => gtk-glade}/contact.glade | 0 {linphone/gtk-glade => gtk-glade}/fonis.c | 0 .../gtk-glade => gtk-glade}/friendlist.c | 0 {linphone/gtk-glade => gtk-glade}/gtkrc | 0 .../gtk-glade => gtk-glade}/incall_view.c | 0 .../incoming_call.glade | 0 {linphone/gtk-glade => gtk-glade}/linphone.h | 0 .../gtk-glade => gtk-glade}/linphone.ico | Bin .../gtk-glade => gtk-glade}/linphone.iss | 0 .../gtk-glade => gtk-glade}/linphone.png | Bin {linphone/gtk-glade => gtk-glade}/linphone.rc | 0 .../gtk-glade => gtk-glade}/linphone2.png | Bin {linphone/gtk-glade => gtk-glade}/log.glade | 0 {linphone/gtk-glade => gtk-glade}/logging.c | 0 .../gtk-glade => gtk-glade}/loginframe.c | 0 {linphone/gtk-glade => gtk-glade}/main.c | 0 {linphone/gtk-glade => gtk-glade}/main.glade | 0 .../gtk-glade => gtk-glade}/p2pwizard.glade | 0 .../gtk-glade => gtk-glade}/parameters.glade | 0 .../gtk-glade => gtk-glade}/password.glade | 0 .../gtk-glade => gtk-glade}/propertybox.c | 0 .../gtk-glade => gtk-glade}/setupwizard.c | 0 .../gtk-glade => gtk-glade}/sip_account.glade | 0 .../gtk-glade => gtk-glade}/stock_people.png | Bin {linphone/gtk-glade => gtk-glade}/support.c | 0 {linphone/gtk-glade => gtk-glade}/update.c | 0 {linphone/gtk-glade => gtk-glade}/utils.c | 0 .../gtk-glade => gtk-glade}/waiting.glade | 0 {linphone/intl => intl}/ChangeLog | 0 {linphone/intl => intl}/Makefile.in | 0 {linphone/intl => intl}/VERSION | 0 {linphone/intl => intl}/bindtextdom.c | 0 {linphone/intl => intl}/cat-compat.c | 0 {linphone/intl => intl}/dcgettext.c | 0 {linphone/intl => intl}/dgettext.c | 0 {linphone/intl => intl}/explodename.c | 0 {linphone/intl => intl}/finddomain.c | 0 {linphone/intl => intl}/gettext.c | 0 {linphone/intl => intl}/gettext.h | 0 {linphone/intl => intl}/gettextP.h | 0 {linphone/intl => intl}/hash-string.h | 0 {linphone/intl => intl}/intl-compat.c | 0 {linphone/intl => intl}/l10nflist.c | 0 {linphone/intl => intl}/libgettext.h | 0 {linphone/intl => intl}/linux-msg.sed | 0 {linphone/intl => intl}/loadinfo.h | 0 {linphone/intl => intl}/loadmsgcat.c | 0 {linphone/intl => intl}/localealias.c | 0 {linphone/intl => intl}/po2tbl.sed.in | 0 {linphone/intl => intl}/textdomain.c | 0 {linphone/intl => intl}/xopen-msg.sed | 0 ...intltool-extract.in => intltool-extract.in | 0 .../intltool-merge.in => intltool-merge.in | 0 .../intltool-update.in => intltool-update.in | 0 ...ne-deps.filelist => linphone-deps.filelist | 0 linphone/linphone.iss.in => linphone.iss.in | 0 .../linphone.kdevelop => linphone.kdevelop | 0 linphone/linphone.spec.in => linphone.spec.in | 0 linphone/mingw-envsetup.sh | 5 - {linphone/m4 => m4}/.gitignore | 0 {linphone/m4 => m4}/Makefile.am | 0 {linphone/m4 => m4}/codeset.m4 | 0 {linphone/m4 => m4}/exosip.m4 | 0 {linphone/m4 => m4}/gettext.m4 | 0 {linphone/m4 => m4}/glibc2.m4 | 0 {linphone/m4 => m4}/glibc21.m4 | 0 {linphone/m4 => m4}/iconv.m4 | 0 {linphone/m4 => m4}/ilbc.m4 | 0 {linphone/m4 => m4}/intdiv0.m4 | 0 {linphone/m4 => m4}/intl.m4 | 0 {linphone/m4 => m4}/intldir.m4 | 0 {linphone/m4 => m4}/intmax.m4 | 0 {linphone/m4 => m4}/inttypes-pri.m4 | 0 {linphone/m4 => m4}/inttypes.m4 | 0 {linphone/m4 => m4}/inttypes_h.m4 | 0 {linphone/m4 => m4}/isc-posix.m4 | 0 {linphone/m4 => m4}/lcmessage.m4 | 0 {linphone/m4 => m4}/lib-ld.m4 | 0 {linphone/m4 => m4}/lib-link.m4 | 0 {linphone/m4 => m4}/lib-prefix.m4 | 0 {linphone/m4 => m4}/lock.m4 | 0 {linphone/m4 => m4}/longdouble.m4 | 0 {linphone/m4 => m4}/longlong.m4 | 0 {linphone/m4 => m4}/nls.m4 | 0 {linphone/m4 => m4}/ortp.m4 | 0 {linphone/m4 => m4}/osip.m4 | 0 {linphone/m4 => m4}/po.m4 | 0 {linphone/m4 => m4}/printf-posix.m4 | 0 {linphone/m4 => m4}/progtest.m4 | 0 {linphone/m4 => m4}/readline.m4 | 0 {linphone/m4 => m4}/signed.m4 | 0 {linphone/m4 => m4}/size_max.m4 | 0 {linphone/m4 => m4}/stdint_h.m4 | 0 {linphone/m4 => m4}/uintmax_t.m4 | 0 {linphone/m4 => m4}/ulonglong.m4 | 0 {linphone/m4 => m4}/video.m4 | 0 {linphone/m4 => m4}/visibility.m4 | 0 {linphone/m4 => m4}/wchar_t.m4 | 0 {linphone/m4 => m4}/wint_t.m4 | 0 {linphone/m4 => m4}/xsize.m4 | 0 {linphone/media_api => media_api}/.gitignore | 0 {linphone/media_api => media_api}/DESIGN.txt | 0 {linphone/media_api => media_api}/Makefile.am | 0 {linphone/media_api => media_api}/apitest.c | 0 {linphone/media_api => media_api}/apitest.h | 0 {linphone/media_api => media_api}/basiccall.c | 0 {linphone/media_api => media_api}/basiccall.h | 0 .../media_api => media_api}/callmember.c | 0 .../media_api => media_api}/callmember.h | 0 {linphone/media_api => media_api}/ccl | 0 {linphone/media_api => media_api}/common.h | 0 {linphone/media_api => media_api}/media_api.c | 0 {linphone/media_api => media_api}/media_api.h | 0 {linphone/media_api => media_api}/mediaflow.c | 0 {linphone/media_api => media_api}/mediaflow.h | 0 p2pproxy/.classpath | 18 - p2pproxy/.cvsignore | 5 - p2pproxy/.gcjbuilder | 21 - p2pproxy/.project | 24 - p2pproxy/AUTHORS | 0 p2pproxy/COPYING | 674 ---- p2pproxy/ChangeLog | 0 p2pproxy/INSTALL | 291 -- p2pproxy/Makefile.am | 19 - p2pproxy/NEWS | 0 p2pproxy/README | 0 p2pproxy/autogen.sh | 20 - p2pproxy/bin/p2pproxy-cmd.bat | 2 - p2pproxy/bin/p2pproxy-cmd.sh | 2 - p2pproxy/bin/p2pproxy.bat | 2 - p2pproxy/bin/p2pproxy.sh | 9 - p2pproxy/build.xml | 195 -- p2pproxy/configure.ac | 134 - .../javawi/jstun/attribute/ChangeRequest.java | 81 - .../jstun/attribute/ChangedAddress.java | 30 - .../de/javawi/jstun/attribute/Data.java | 20 - .../de/javawi/jstun/attribute/Dummy.java | 42 - .../de/javawi/jstun/attribute/ErrorCode.java | 104 - .../javawi/jstun/attribute/MappedAddress.java | 29 - ...onseChangedSourceAddressReflectedFrom.java | 107 - .../jstun/attribute/MessageAttribute.java | 135 - .../attribute/MessageAttributeException.java | 20 - .../attribute/MessageAttributeInterface.java | 68 - .../MessageAttributeParsingException.java | 20 - .../jstun/attribute/MessageIntegrity.java | 27 - .../de/javawi/jstun/attribute/Password.java | 64 - .../javawi/jstun/attribute/ReflectedFrom.java | 31 - .../jstun/attribute/ResponseAddress.java | 29 - .../javawi/jstun/attribute/SourceAddress.java | 29 - .../jstun/attribute/UnknownAttribute.java | 82 - .../UnknownMessageAttributeException.java | 18 - .../de/javawi/jstun/attribute/Username.java | 64 - .../de/javawi/jstun/header/MessageHeader.java | 202 -- .../jstun/header/MessageHeaderException.java | 20 - .../jstun/header/MessageHeaderInterface.java | 61 - .../header/MessageHeaderParsingException.java | 20 - .../jstun/test/BindingLifetimeTest.java | 192 -- .../de/javawi/jstun/test/DiscoveryInfo.java | 153 - .../de/javawi/jstun/test/DiscoveryTest.java | 351 --- .../test/demo/BindingLifetimeTestDemo.java | 47 - .../jstun/test/demo/DiscoveryTestDemo.java | 75 - .../de/javawi/jstun/test/demo/StunServer.java | 263 -- .../javawi/jstun/test/demo/ice/Candidate.java | 115 - .../jstun/test/demo/ice/ICENegociator.java | 146 - .../de/javawi/jstun/util/Address.java | 102 - .../de/javawi/jstun/util/Utility.java | 68 - .../javawi/jstun/util/UtilityException.java | 21 - .../dependencies-src/jxse-src-2.5/api/pom.xml | 15 - .../api/src/net/jxta/Version.java | 149 - .../src/net/jxta/access/AccessService.java | 146 - .../api/src/net/jxta/access/package.html | 23 - .../api/src/net/jxta/codat/Codat.java | 168 - .../api/src/net/jxta/codat/CodatID.java | 128 - .../api/src/net/jxta/codat/Metadata.java | 105 - .../api/src/net/jxta/codat/package.html | 15 - .../credential/AuthenticationCredential.java | 386 --- .../src/net/jxta/credential/Credential.java | 166 - .../jxta/credential/CredentialPCLSupport.java | 112 - .../jxta/credential/CredentialValidator.java | 71 - .../jxta/credential/PrivilegedOperation.java | 81 - .../api/src/net/jxta/credential/package.html | 13 - .../net/jxta/discovery/DiscoveryEvent.java | 123 - .../net/jxta/discovery/DiscoveryListener.java | 112 - .../net/jxta/discovery/DiscoveryService.java | 506 --- .../api/src/net/jxta/discovery/package.html | 15 - .../src/net/jxta/document/Advertisement.java | 231 -- .../jxta/document/AdvertisementFactory.java | 401 --- .../src/net/jxta/document/Attributable.java | 118 - .../api/src/net/jxta/document/Attribute.java | 189 -- .../src/net/jxta/document/BinaryDocument.java | 153 - .../api/src/net/jxta/document/Document.java | 96 - .../jxta/document/DocumentByteArrayIO.java | 75 - .../jxta/document/DocumentByteBufferIO.java | 76 - .../net/jxta/document/DocumentStreamIO.java | 91 - .../api/src/net/jxta/document/Element.java | 142 - .../document/ExtendableAdvertisement.java | 197 -- .../src/net/jxta/document/FileDocument.java | 166 - .../src/net/jxta/document/MimeMediaType.java | 835 ----- .../net/jxta/document/StructuredDocument.java | 93 - .../document/StructuredDocumentFactory.java | 582 ---- .../document/StructuredDocumentUtils.java | 228 -- .../jxta/document/StructuredTextDocument.java | 89 - .../src/net/jxta/document/TextDocument.java | 71 - .../document/TextDocumentCharArrayIO.java | 80 - .../document/TextDocumentCharBufferIO.java | 80 - .../document/TextDocumentCharSequenceIO.java | 77 - .../jxta/document/TextDocumentReaderIO.java | 91 - .../src/net/jxta/document/TextElement.java | 111 - .../src/net/jxta/document/XMLDocument.java | 76 - .../api/src/net/jxta/document/XMLElement.java | 73 - .../api/src/net/jxta/document/package.html | 13 - .../net/jxta/endpoint/AbstractMessenger.java | 324 -- .../jxta/endpoint/AsyncChannelMessenger.java | 665 ---- .../endpoint/ByteArrayMessageElement.java | 383 --- .../net/jxta/endpoint/ChannelMessenger.java | 214 -- .../net/jxta/endpoint/EndpointAddress.java | 637 ---- .../net/jxta/endpoint/EndpointListener.java | 79 - .../net/jxta/endpoint/EndpointService.java | 552 ---- .../endpoint/InputStreamMessageElement.java | 325 -- .../net/jxta/endpoint/ListenerAdaptor.java | 481 --- .../api/src/net/jxta/endpoint/Message.java | 1444 --------- .../src/net/jxta/endpoint/MessageElement.java | 567 ---- .../jxta/endpoint/MessageFilterListener.java | 86 - .../net/jxta/endpoint/MessagePropagater.java | 100 - .../net/jxta/endpoint/MessageReceiver.java | 85 - .../src/net/jxta/endpoint/MessageSender.java | 150 - .../net/jxta/endpoint/MessageTransport.java | 105 - .../api/src/net/jxta/endpoint/Messenger.java | 696 ----- .../src/net/jxta/endpoint/MessengerEvent.java | 110 - .../jxta/endpoint/MessengerEventListener.java | 73 - .../src/net/jxta/endpoint/MessengerState.java | 443 --- .../jxta/endpoint/OutgoingMessageEvent.java | 110 - .../OutgoingMessageEventListener.java | 95 - .../jxta/endpoint/StringMessageElement.java | 546 ---- .../endpoint/TextDocumentMessageElement.java | 358 --- .../net/jxta/endpoint/TextMessageElement.java | 316 -- .../net/jxta/endpoint/ThreadedMessenger.java | 800 ----- .../net/jxta/endpoint/WireFormatMessage.java | 87 - .../endpoint/WireFormatMessageFactory.java | 361 --- .../api/src/net/jxta/endpoint/package.html | 12 - .../jxta/exception/ConfiguratorException.java | 237 -- .../api/src/net/jxta/exception/JxtaError.java | 84 - .../src/net/jxta/exception/JxtaException.java | 108 - .../jxta/exception/PeerGroupException.java | 108 - .../ProtocolNotSupportedException.java | 108 - .../exception/ServiceNotFoundException.java | 106 - .../exception/UnknownServiceException.java | 108 - .../api/src/net/jxta/exception/package.html | 9 - .../jxse-src-2.5/api/src/net/jxta/id/ID.java | 325 -- .../api/src/net/jxta/id/IDFactory.java | 1210 -------- .../api/src/net/jxta/id/jxta/IDFormat.java | 107 - .../src/net/jxta/id/jxta/Instantiator.java | 320 -- .../api/src/net/jxta/id/jxta/package.html | 29 - .../api/src/net/jxta/id/package.html | 12 - .../api/src/net/jxta/logging/Logging.java | 210 -- .../api/src/net/jxta/logging/package.html | 39 - .../net/jxta/membership/Authenticator.java | 125 - .../membership/InteractiveAuthenticator.java | 81 - .../jxta/membership/MembershipService.java | 238 -- .../membership/doc-files/memberAndAccess.png | Bin 22731 -> 0 bytes .../api/src/net/jxta/membership/package.html | 30 - .../api/src/net/jxta/meter/MonitorEvent.java | 203 -- .../src/net/jxta/meter/MonitorException.java | 108 - .../api/src/net/jxta/meter/MonitorFilter.java | 242 -- .../jxta/meter/MonitorFilterException.java | 113 - .../src/net/jxta/meter/MonitorListener.java | 85 - .../api/src/net/jxta/meter/MonitorReport.java | 241 -- .../src/net/jxta/meter/MonitorResources.java | 548 ---- .../src/net/jxta/meter/PeerMonitorInfo.java | 212 -- .../net/jxta/meter/PeerMonitorInfoEvent.java | 100 - .../jxta/meter/PeerMonitorInfoListener.java | 78 - .../api/src/net/jxta/meter/ServiceMetric.java | 96 - .../src/net/jxta/meter/ServiceMonitor.java | 155 - .../net/jxta/meter/ServiceMonitorFilter.java | 81 - .../api/src/net/jxta/meter/package.html | 10 - .../api/src/net/jxta/overview.html | 26 - .../api/src/net/jxta/peer/PeerID.java | 112 - .../api/src/net/jxta/peer/PeerInfoEvent.java | 112 - .../src/net/jxta/peer/PeerInfoListener.java | 93 - .../src/net/jxta/peer/PeerInfoService.java | 303 -- .../api/src/net/jxta/peer/package.html | 18 - .../src/net/jxta/peergroup/Configurator.java | 127 - .../jxta/peergroup/LightWeightPeerGroup.java | 584 ---- .../jxta/peergroup/NetPeerGroupFactory.java | 581 ---- .../api/src/net/jxta/peergroup/PeerGroup.java | 1003 ------ .../net/jxta/peergroup/PeerGroupFactory.java | 577 ---- .../src/net/jxta/peergroup/PeerGroupID.java | 241 -- .../jxta/peergroup/WorldPeerGroupFactory.java | 339 -- .../api/src/net/jxta/peergroup/package.html | 79 - .../api/src/net/jxta/pipe/InputPipe.java | 138 - .../api/src/net/jxta/pipe/OutputPipe.java | 142 - .../src/net/jxta/pipe/OutputPipeEvent.java | 117 - .../src/net/jxta/pipe/OutputPipeListener.java | 94 - .../api/src/net/jxta/pipe/PipeID.java | 114 - .../api/src/net/jxta/pipe/PipeMsgEvent.java | 111 - .../src/net/jxta/pipe/PipeMsgListener.java | 93 - .../api/src/net/jxta/pipe/PipeService.java | 206 -- .../api/src/net/jxta/pipe/package.html | 15 - .../src/net/jxta/platform/Application.java | 68 - .../api/src/net/jxta/platform/JxtaLoader.java | 151 - .../api/src/net/jxta/platform/Module.java | 212 -- .../src/net/jxta/platform/ModuleClassID.java | 191 -- .../src/net/jxta/platform/ModuleSpecID.java | 185 -- .../jxta/platform/NetworkConfigurator.java | 1947 ------------ .../src/net/jxta/platform/NetworkManager.java | 617 ---- .../api/src/net/jxta/platform/package.html | 14 - .../protocol/AccessPointAdvertisement.java | 387 --- .../src/net/jxta/protocol/ConfigParams.java | 587 ---- .../net/jxta/protocol/DiscoveryQueryMsg.java | 220 -- .../jxta/protocol/DiscoveryResponseMsg.java | 379 --- .../protocol/ModuleClassAdvertisement.java | 231 -- .../protocol/ModuleImplAdvertisement.java | 374 --- .../protocol/ModuleSpecAdvertisement.java | 404 --- .../net/jxta/protocol/PeerAdvertisement.java | 456 --- .../jxta/protocol/PeerGroupAdvertisement.java | 397 --- .../jxta/protocol/PeerInfoQueryMessage.java | 171 -- .../protocol/PeerInfoResponseMessage.java | 224 -- .../net/jxta/protocol/PipeAdvertisement.java | 324 -- .../jxta/protocol/PipeResolverMessage.java | 269 -- .../net/jxta/protocol/RdvAdvertisement.java | 256 -- .../net/jxta/protocol/ResolverQueryMsg.java | 312 -- .../jxta/protocol/ResolverResponseMsg.java | 199 -- .../net/jxta/protocol/ResolverSrdiMsg.java | 163 - .../net/jxta/protocol/RouteAdvertisement.java | 859 ------ .../src/net/jxta/protocol/RouteQueryMsg.java | 184 -- .../net/jxta/protocol/RouteResponseMsg.java | 147 - .../jxta/protocol/SignedAdvertisement.java | 127 - .../src/net/jxta/protocol/SrdiMessage.java | 323 -- .../jxta/protocol/TransportAdvertisement.java | 142 - .../api/src/net/jxta/protocol/package.html | 17 - .../jxta/rendezvous/RendezVousService.java | 455 --- .../net/jxta/rendezvous/RendezVousStatus.java | 100 - .../net/jxta/rendezvous/RendezvousEvent.java | 185 -- .../jxta/rendezvous/RendezvousListener.java | 95 - .../api/src/net/jxta/rendezvous/package.html | 14 - .../net/jxta/resolver/GenericResolver.java | 64 - .../src/net/jxta/resolver/QueryHandler.java | 102 - .../net/jxta/resolver/ResolverService.java | 172 -- .../src/net/jxta/resolver/SrdiHandler.java | 93 - .../api/src/net/jxta/resolver/package.html | 12 - .../api/src/net/jxta/service/Service.java | 106 - .../api/src/net/jxta/service/package.html | 14 - .../net/jxta/socket/JxtaMulticastSocket.java | 478 --- .../src/net/jxta/socket/JxtaServerSocket.java | 700 ----- .../api/src/net/jxta/socket/JxtaSocket.java | 1804 ----------- .../net/jxta/socket/JxtaSocketAddress.java | 283 -- .../jxta/socket/JxtaSocketInputStream.java | 317 -- .../jxta/socket/JxtaSocketOutputStream.java | 190 -- .../api/src/net/jxta/socket/package.html | 63 - .../api/src/net/jxta/user.properties | 22 - .../jxta/util/AbstractSimpleSelectable.java | 219 -- .../net/jxta/util/AdvertisementUtilities.java | 608 ---- .../api/src/net/jxta/util/AwtUtils.java | 93 - .../api/src/net/jxta/util/ClassFactory.java | 367 --- .../net/jxta/util/CountingInputStream.java | 153 - .../net/jxta/util/CountingOutputStream.java | 148 - .../api/src/net/jxta/util/CountingWriter.java | 149 - .../net/jxta/util/DevNullOutputStream.java | 113 - .../api/src/net/jxta/util/DevNullWriter.java | 117 - .../src/net/jxta/util/DocumentUtilities.java | 121 - .../util/IgnoreFlushFilterOutputStream.java | 78 - .../api/src/net/jxta/util/JxtaBiDiPipe.java | 1284 -------- .../api/src/net/jxta/util/JxtaServerPipe.java | 549 ---- .../src/net/jxta/util/LimitInputStream.java | 381 --- .../jxta/util/MarkProhibitedFilterStream.java | 110 - .../src/net/jxta/util/MessageUtilities.java | 160 - .../src/net/jxta/util/PipeEventListener.java | 92 - .../src/net/jxta/util/PipeStateListener.java | 108 - .../api/src/net/jxta/util/PipeUtilities.java | 116 - .../src/net/jxta/util/SimpleSelectable.java | 163 - .../api/src/net/jxta/util/SimpleSelector.java | 159 - .../src/net/jxta/util/WatchedInputStream.java | 247 -- .../net/jxta/util/WatchedOutputStream.java | 239 -- .../api/src/net/jxta/util/WatchedStream.java | 99 - .../DocumentSerializable.java | 68 - .../DocumentSerializableUtilities.java | 570 ---- .../DocumentSerializationException.java | 73 - .../api/src/net/jxta/util/package.html | 10 - .../src/sun/net/www/protocol/urn/Handler.java | 220 -- .../services/net.jxta.document.Advertisement | 23 - .../net.jxta.document.StructuredDocument | 4 - .../net.jxta.endpoint.WireFormatMessage | 3 - .../impl/src/META-INF/services/net.jxta.id.ID | 4 - .../services/net.jxta.platform.Module | 31 - .../impl/src/net/jxta/impl/Version.java | 149 - .../src/net/jxta/impl/access/AccessList.java | 563 ---- .../access/always/AlwaysAccessService.java | 415 --- .../net/jxta/impl/access/always/package.html | 14 - .../impl/access/pse/PSEAccessService.java | 495 --- .../src/net/jxta/impl/access/pse/package.html | 19 - .../simpleACL/SimpleACLAccessService.java | 525 ---- .../jxta/impl/access/simpleACL/package.html | 13 - .../impl/src/net/jxta/impl/cm/Cm.java | 1209 -------- .../impl/src/net/jxta/impl/cm/Indexer.java | 617 ---- .../impl/src/net/jxta/impl/cm/Srdi.java | 666 ---- .../impl/src/net/jxta/impl/cm/SrdiIndex.java | 987 ------ .../impl/src/net/jxta/impl/config.properties | 19 - .../impl/discovery/DiscoveryServiceImpl.java | 1718 ----------- .../discovery/DiscoveryServiceInterface.java | 258 -- .../src/net/jxta/impl/discovery/package.html | 15 - .../jxta/impl/document/DOMXMLDocument.java | 490 --- .../net/jxta/impl/document/DOMXMLElement.java | 383 --- .../jxta/impl/document/LiteXMLDocument.java | 526 ---- .../jxta/impl/document/LiteXMLElement.java | 1729 ----------- .../jxta/impl/document/PlainTextDocument.java | 293 -- .../jxta/impl/document/PlainTextElement.java | 353 --- .../impl/document/TextDocumentCommon.java | 95 - .../jxta/impl/endpoint/BlockingMessenger.java | 881 ------ .../impl/endpoint/EndpointServiceImpl.java | 1961 ------------ .../endpoint/EndpointServiceInterface.java | 494 --- .../net/jxta/impl/endpoint/EndpointUtils.java | 129 - .../src/net/jxta/impl/endpoint/IPUtils.java | 511 ---- .../endpoint/JxtaMessageMessageElement.java | 260 -- .../jxta/impl/endpoint/LoopbackMessenger.java | 213 -- .../net/jxta/impl/endpoint/SocketFactory.java | 103 - .../endpoint/WireFormatMessageBinary.java | 1280 -------- .../net/jxta/impl/endpoint/cbjx/CbJxDefs.java | 98 - .../impl/endpoint/cbjx/CbJxMessageInfo.java | 389 --- .../impl/endpoint/cbjx/CbJxMessenger.java | 230 -- .../impl/endpoint/cbjx/CbJxTransport.java | 692 ----- .../net/jxta/impl/endpoint/cbjx/package.html | 12 - ...ConditionalEndpointMeterBuildSettings.java | 80 - .../endpoint/endpointMeter/EndpointMeter.java | 188 -- .../EndpointMeterBuildSettings.java | 67 - .../endpointMeter/EndpointMetric.java | 282 -- .../endpointMeter/EndpointServiceMetric.java | 359 --- .../endpointMeter/EndpointServiceMonitor.java | 219 -- .../EndpointServiceMonitorFilter.java | 158 - .../endpoint/endpointMeter/InboundMeter.java | 154 - .../endpoint/endpointMeter/InboundMetric.java | 279 -- .../IncomingMessageListenerMeter.java | 68 - .../endpointMeter/MessengerMeter.java | 69 - .../endpoint/endpointMeter/OutboundMeter.java | 145 - .../endpointMeter/OutboundMetric.java | 289 -- .../endpointMeter/PropagationMeter.java | 124 - .../endpointMeter/PropagationMetric.java | 244 -- .../impl/endpoint/mcast/McastTransport.java | 887 ------ .../net/jxta/impl/endpoint/mcast/package.html | 17 - .../msgframing/MessagePackageHeader.java | 605 ---- .../endpoint/msgframing/WelcomeMessage.java | 529 ---- .../src/net/jxta/impl/endpoint/package.html | 13 - .../jxta/impl/endpoint/relay/RelayClient.java | 1351 -------- .../relay/RelayReferralSeedingManager.java | 203 -- .../jxta/impl/endpoint/relay/RelayServer.java | 1498 --------- .../endpoint/relay/RelayServerClient.java | 669 ---- .../impl/endpoint/relay/RelayTransport.java | 464 --- .../net/jxta/impl/endpoint/relay/package.html | 20 - .../jxta/impl/endpoint/router/BadRoute.java | 190 -- .../impl/endpoint/router/Destinations.java | 602 ---- .../impl/endpoint/router/EndpointRouter.java | 2715 ----------------- .../router/EndpointRouterMessage.java | 512 ---- .../jxta/impl/endpoint/router/RouteCM.java | 595 ---- .../impl/endpoint/router/RouteControl.java | 502 --- .../impl/endpoint/router/RouteResolver.java | 1432 --------- .../impl/endpoint/router/RouterMessenger.java | 258 -- .../jxta/impl/endpoint/router/package.html | 19 - .../servlethttp/HttpClientMessenger.java | 917 ------ .../servlethttp/HttpMessageReceiver.java | 404 --- .../servlethttp/HttpMessageSender.java | 261 -- .../servlethttp/HttpMessageServlet.java | 908 ------ .../servlethttp/HttpServletMessenger.java | 470 --- .../servlethttp/ServletHttpTransport.java | 473 --- .../impl/endpoint/servlethttp/package.html | 19 - .../endpoint/tcp/IncomingUnicastServer.java | 468 --- .../jxta/impl/endpoint/tcp/TcpMessenger.java | 1128 ------- .../jxta/impl/endpoint/tcp/TcpTransport.java | 1236 -------- .../net/jxta/impl/endpoint/tcp/package.html | 17 - .../net/jxta/impl/endpoint/tls/JTlsDefs.java | 80 - .../impl/endpoint/tls/JTlsInputStream.java | 590 ---- .../impl/endpoint/tls/JTlsOutputStream.java | 964 ------ .../net/jxta/impl/endpoint/tls/TlsConn.java | 741 ----- .../jxta/impl/endpoint/tls/TlsManager.java | 612 ---- .../jxta/impl/endpoint/tls/TlsMessenger.java | 207 -- .../net/jxta/impl/endpoint/tls/TlsSocket.java | 170 -- .../jxta/impl/endpoint/tls/TlsTransport.java | 772 ----- .../net/jxta/impl/endpoint/tls/package.html | 15 - ...onditionalTransportMeterBuildSettings.java | 80 - .../transportMeter/TransportBindingMeter.java | 242 -- .../TransportBindingMetric.java | 1135 ------- .../transportMeter/TransportMeter.java | 167 - .../TransportMeterBuildSettings.java | 67 - .../transportMeter/TransportMetric.java | 183 -- .../TransportServiceMetric.java | 260 -- .../TransportServiceMonitor.java | 178 -- .../TransportServiceMonitorFilter.java | 155 - .../src/net/jxta/impl/id/CBID/CodatID.java | 200 -- .../src/net/jxta/impl/id/CBID/IDFormat.java | 151 - .../net/jxta/impl/id/CBID/Instantiator.java | 445 --- .../net/jxta/impl/id/CBID/ModuleClassID.java | 146 - .../net/jxta/impl/id/CBID/ModuleSpecID.java | 128 - .../net/jxta/impl/id/CBID/PeerGroupID.java | 191 -- .../src/net/jxta/impl/id/CBID/PeerID.java | 183 -- .../src/net/jxta/impl/id/CBID/PipeID.java | 181 -- .../src/net/jxta/impl/id/CBID/package.html | 17 - .../src/net/jxta/impl/id/UUID/CodatID.java | 293 -- .../src/net/jxta/impl/id/UUID/IDBytes.java | 249 -- .../src/net/jxta/impl/id/UUID/IDFormat.java | 218 -- .../net/jxta/impl/id/UUID/Instantiator.java | 451 --- .../net/jxta/impl/id/UUID/ModuleClassID.java | 237 -- .../net/jxta/impl/id/UUID/ModuleSpecID.java | 216 -- .../net/jxta/impl/id/UUID/PeerGroupID.java | 242 -- .../src/net/jxta/impl/id/UUID/PeerID.java | 195 -- .../src/net/jxta/impl/id/UUID/PipeID.java | 201 -- .../impl/src/net/jxta/impl/id/UUID/UUID.java | 300 -- .../net/jxta/impl/id/UUID/UUIDFactory.java | 292 -- .../src/net/jxta/impl/id/UUID/package.html | 16 - .../net/jxta/impl/id/binaryID/BinaryID.java | 319 -- .../impl/id/binaryID/BinaryIDFactory.java | 79 - .../jxta/impl/id/binaryID/CodatBinaryID.java | 274 -- .../net/jxta/impl/id/binaryID/DigestTool.java | 417 --- .../net/jxta/impl/id/binaryID/IDFormat.java | 162 - .../jxta/impl/id/binaryID/Instantiator.java | 395 --- .../impl/id/binaryID/ModuleClassBinaryID.java | 326 -- .../impl/id/binaryID/ModuleSpecBinaryID.java | 283 -- .../jxta/impl/id/binaryID/PeerBinaryID.java | 212 -- .../impl/id/binaryID/PeerGroupBinaryID.java | 244 -- .../jxta/impl/id/binaryID/PipeBinaryID.java | 210 -- .../net/jxta/impl/id/binaryID/package.html | 49 - .../impl/src/net/jxta/impl/id/unknown/ID.java | 178 -- .../net/jxta/impl/id/unknown/IDFormat.java | 81 - .../jxta/impl/id/unknown/Instantiator.java | 272 -- .../src/net/jxta/impl/id/unknown/package.html | 13 - .../net/jxta/impl/loader/RefJxtaLoader.java | 386 --- .../src/net/jxta/impl/loader/package.html | 10 - .../membership/PasswdMembershipService.java | 180 -- .../none/NoneMembershipService.java | 700 ----- .../none/NoneMembershipServiceBeanInfo.java | 121 - .../jxta/impl/membership/none/package.html | 17 - .../src/net/jxta/impl/membership/package.html | 14 - .../passwd/PasswdMembershipService.java | 909 ------ .../PasswdMembershipServiceBeanInfo.java | 121 - .../jxta/impl/membership/passwd/package.html | 17 - .../membership/pse/CMKeyStoreManager.java | 315 -- .../membership/pse/DialogAuthenticator.java | 492 --- .../membership/pse/EngineAuthenticator.java | 365 --- .../membership/pse/FileKeyStoreManager.java | 293 -- .../impl/membership/pse/KeyStoreManager.java | 139 - .../pse/PSEAuthenticatorEngine.java | 89 - .../pse/PSEAuthenticatorEngineFactory.java | 114 - .../jxta/impl/membership/pse/PSEConfig.java | 648 ---- .../impl/membership/pse/PSECredential.java | 861 ------ .../pse/PSECrendentialBeanInfo.java | 134 - .../pse/PSEKeyStoreManagerFactory.java | 163 - .../membership/pse/PSEMembershipService.java | 797 ----- .../pse/PSEMembershipServiceBeanInfo.java | 125 - .../membership/pse/PSEPeerSecurityEngine.java | 114 - .../pse/PSESecurityEngineFactory.java | 209 -- .../jxta/impl/membership/pse/PSEUtils.java | 874 ------ .../membership/pse/StringAuthenticator.java | 356 --- .../membership/pse/URIKeyStoreManager.java | 313 -- .../net/jxta/impl/membership/pse/package.html | 11 - .../meter/ConditionalMeterBuildSettings.java | 80 - .../impl/meter/GenericServiceMonitor.java | 223 -- .../jxta/impl/meter/MeterBuildSettings.java | 67 - .../net/jxta/impl/meter/MetricUtilities.java | 100 - .../net/jxta/impl/meter/MonitorManager.java | 834 ----- .../jxta/impl/meter/ServiceMonitorImpl.java | 71 - .../impl/meter/ServiceMonitorPulseInfo.java | 195 -- .../impl/meter/ServiceMonitorResource.java | 68 - .../impl/src/net/jxta/impl/monitor.properties | 64 - .../impl/src/net/jxta/impl/overview.html | 26 - .../net/jxta/impl/peer/PeerInfoHandler.java | 70 - .../net/jxta/impl/peer/PeerInfoMessenger.java | 68 - .../jxta/impl/peer/PeerInfoServiceImpl.java | 560 ---- .../impl/peer/PeerInfoServiceInterface.java | 203 -- .../peer/RemoteMonitorPeerInfoHandler.java | 638 ---- .../jxta/impl/peer/RemoteMonitorQuery.java | 227 -- .../jxta/impl/peer/RemoteMonitorResponse.java | 334 -- .../impl/src/net/jxta/impl/peer/package.html | 11 - .../impl/peergroup/AutomaticConfigurator.java | 511 ---- .../src/net/jxta/impl/peergroup/Boot.java | 169 - .../impl/peergroup/CompatibilityEquater.java | 70 - .../net/jxta/impl/peergroup/ConfigDialog.java | 2022 ------------ .../impl/peergroup/DefaultConfigurator.java | 270 -- .../jxta/impl/peergroup/GenericPeerGroup.java | 1720 ----------- .../IncompleteConfigurationException.java | 66 - .../jxta/impl/peergroup/NullConfigurator.java | 304 -- .../impl/peergroup/PeerGroupInterface.java | 447 --- .../src/net/jxta/impl/peergroup/Platform.java | 257 -- .../impl/peergroup/PlatformConfigurator.java | 108 - .../peergroup/RefCountPeerGroupInterface.java | 267 -- .../jxta/impl/peergroup/ShadowPeerGroup.java | 186 -- .../net/jxta/impl/peergroup/StdPeerGroup.java | 986 ------ .../impl/peergroup/StdPeerGroupParamAdv.java | 517 ---- .../src/net/jxta/impl/peergroup/package.html | 13 - .../impl/pipe/BlockingWireOutputPipe.java | 260 -- .../src/net/jxta/impl/pipe/InputPipeImpl.java | 280 -- .../jxta/impl/pipe/NonBlockingOutputPipe.java | 768 ----- .../impl/pipe/NonBlockingWireOutputPipe.java | 221 -- .../src/net/jxta/impl/pipe/PipeRegistrar.java | 81 - .../src/net/jxta/impl/pipe/PipeResolver.java | 1218 -------- .../net/jxta/impl/pipe/PipeServiceImpl.java | 748 ----- .../jxta/impl/pipe/PipeServiceInterface.java | 197 -- .../jxta/impl/pipe/SecureInputPipeImpl.java | 117 - .../net/jxta/impl/pipe/SecureOutputPipe.java | 124 - .../src/net/jxta/impl/pipe/WireHeader.java | 271 -- .../impl/src/net/jxta/impl/pipe/WirePipe.java | 557 ---- .../src/net/jxta/impl/pipe/WirePipeImpl.java | 345 --- .../impl/src/net/jxta/impl/pipe/package.html | 18 - .../jxta/impl/protocol/AccessPointAdv.java | 319 -- .../net/jxta/impl/protocol/Certificate.java | 268 -- .../protocol/CertificateSigningRequest.java | 201 -- .../impl/protocol/DiscoveryConfigAdv.java | 347 --- .../jxta/impl/protocol/DiscoveryQuery.java | 327 -- .../jxta/impl/protocol/DiscoveryResponse.java | 347 --- .../net/jxta/impl/protocol/GroupConfig.java | 214 -- .../src/net/jxta/impl/protocol/HTTPAdv.java | 561 ---- .../jxta/impl/protocol/LeaseRequestMsg.java | 463 --- .../jxta/impl/protocol/LeaseResponseMsg.java | 626 ---- .../impl/protocol/LimitedRangeRdvMsg.java | 473 --- .../jxta/impl/protocol/ModuleClassAdv.java | 263 -- .../net/jxta/impl/protocol/ModuleImplAdv.java | 344 --- .../net/jxta/impl/protocol/ModuleSpecAdv.java | 376 --- .../net/jxta/impl/protocol/PSEConfigAdv.java | 766 ----- .../src/net/jxta/impl/protocol/PeerAdv.java | 364 --- .../net/jxta/impl/protocol/PeerGroupAdv.java | 334 -- .../impl/protocol/PeerGroupConfigAdv.java | 443 --- .../jxta/impl/protocol/PeerInfoQueryMsg.java | 179 -- .../impl/protocol/PeerInfoResponseMsg.java | 219 -- .../src/net/jxta/impl/protocol/PipeAdv.java | 303 -- .../jxta/impl/protocol/PipeResolverMsg.java | 341 --- .../jxta/impl/protocol/PlatformConfig.java | 441 --- .../src/net/jxta/impl/protocol/RdvAdv.java | 325 -- .../net/jxta/impl/protocol/RdvConfigAdv.java | 948 ------ .../jxta/impl/protocol/RelayConfigAdv.java | 997 ------ .../net/jxta/impl/protocol/ResolverQuery.java | 401 --- .../jxta/impl/protocol/ResolverResponse.java | 248 -- .../impl/protocol/ResolverSrdiMsgImpl.java | 219 -- .../src/net/jxta/impl/protocol/RouteAdv.java | 332 -- .../net/jxta/impl/protocol/RouteQuery.java | 227 -- .../net/jxta/impl/protocol/RouteResponse.java | 234 -- .../src/net/jxta/impl/protocol/SignedAdv.java | 384 --- .../jxta/impl/protocol/SrdiMessageImpl.java | 355 --- .../src/net/jxta/impl/protocol/TCPAdv.java | 827 ----- .../src/net/jxta/impl/protocol/package.html | 19 - .../src/net/jxta/impl/proxy/ProxyService.java | 1191 -------- .../src/net/jxta/impl/proxy/Requestor.java | 325 -- .../jxta/impl/rendezvous/PeerConnection.java | 370 --- .../net/jxta/impl/rendezvous/RdvGreeter.java | 84 - .../src/net/jxta/impl/rendezvous/RdvWalk.java | 168 - .../net/jxta/impl/rendezvous/RdvWalker.java | 93 - .../RendezVousPropagateMessage.java | 332 -- .../rendezvous/RendezVousServiceImpl.java | 945 ------ .../RendezVousServiceInterface.java | 377 --- .../rendezvous/RendezVousServiceProvider.java | 788 ----- .../impl/rendezvous/StdRendezVousService.java | 520 ---- .../rendezvous/adhoc/AdhocPeerRdvService.java | 401 --- .../rendezvous/edge/EdgePeerRdvService.java | 866 ------ .../impl/rendezvous/edge/RdvConnection.java | 157 - .../limited/LimitedRangeGreeter.java | 191 -- .../rendezvous/limited/LimitedRangeWalk.java | 219 -- .../limited/LimitedRangeWalker.java | 255 -- .../src/net/jxta/impl/rendezvous/package.html | 14 - .../impl/rendezvous/rdv/ClientConnection.java | 104 - .../rendezvous/rdv/RdvPeerRdvService.java | 869 ------ .../ClientConnectionMeter.java | 162 - .../ClientConnectionMetric.java | 399 --- ...nditionalRendezvousMeterBuildSettings.java | 80 - .../RendezvousConnectionMeter.java | 165 - .../RendezvousConnectionMetric.java | 422 --- .../rendezvousMeter/RendezvousMeter.java | 279 -- .../RendezvousMeterBuildSettings.java | 67 - .../rendezvousMeter/RendezvousMetric.java | 666 ---- .../RendezvousServiceMetric.java | 358 --- .../RendezvousServiceMonitor.java | 272 -- .../RendezvousServiceMonitorFilter.java | 130 - .../jxta/impl/rendezvous/rpv/PeerView.java | 2067 ------------- .../rendezvous/rpv/PeerViewDestination.java | 126 - .../impl/rendezvous/rpv/PeerViewElement.java | 391 --- .../impl/rendezvous/rpv/PeerViewEvent.java | 123 - .../impl/rendezvous/rpv/PeerViewListener.java | 71 - .../rpv/PeerViewRandomStrategy.java | 107 - .../PeerViewRandomWithReplaceStrategy.java | 102 - .../rpv/PeerViewSequentialStrategy.java | 132 - .../impl/rendezvous/rpv/PeerViewStrategy.java | 77 - .../rpv/PeerviewSeedingManager.java | 380 --- .../impl/resolver/InternalQueryHandler.java | 109 - .../impl/resolver/ResolverServiceImpl.java | 1293 -------- .../resolver/ResolverServiceInterface.java | 185 -- .../src/net/jxta/impl/resolver/package.html | 13 - ...ConditionalResolverMeterBuildSettings.java | 80 - .../resolverMeter/QueryDestinationMeter.java | 164 - .../resolverMeter/QueryDestinationMetric.java | 256 -- .../resolverMeter/QueryHandlerMeter.java | 522 ---- .../resolverMeter/QueryHandlerMetric.java | 582 ---- .../resolver/resolverMeter/ResolverMeter.java | 222 -- .../ResolverMeterBuildSettings.java | 67 - .../resolverMeter/ResolverMetric.java | 194 -- .../resolverMeter/ResolverServiceMetric.java | 327 -- .../resolverMeter/ResolverServiceMonitor.java | 249 -- .../ResolverServiceMonitorFilter.java | 132 - .../resolverMeter/SrdiDestinationMeter.java | 140 - .../resolverMeter/SrdiDestinationMetric.java | 191 -- .../resolverMeter/SrdiHandlerMeter.java | 239 -- .../resolverMeter/SrdiHandlerMetric.java | 299 -- .../net/jxta/impl/util/ACLSeedingManager.java | 193 -- .../src/net/jxta/impl/util/AdvCooker.java | 513 ---- .../net/jxta/impl/util/BASE64InputStream.java | 252 -- .../jxta/impl/util/BASE64OutputStream.java | 241 -- .../impl/src/net/jxta/impl/util/Base64.java | 284 -- .../impl/src/net/jxta/impl/util/Cache.java | 351 --- .../src/net/jxta/impl/util/CacheEntry.java | 71 - .../jxta/impl/util/CacheEntryListener.java | 71 - .../jxta/impl/util/ConsumerBiasedQueue.java | 248 -- .../impl/src/net/jxta/impl/util/Dlink.java | 130 - .../impl/src/net/jxta/impl/util/Dlist.java | 130 - .../jxta/impl/util/DynamicEnumeration.java | 171 -- .../impl/util/EndpointServiceStatsFilter.java | 193 -- .../src/net/jxta/impl/util/GenerateID.java | 115 - .../impl/src/net/jxta/impl/util/JxtaHash.java | 219 -- .../impl/src/net/jxta/impl/util/LRUCache.java | 216 -- .../src/net/jxta/impl/util/ModuleManager.java | 655 ---- .../jxta/impl/util/ProducerBiasedQueue.java | 244 -- .../jxta/impl/util/RdvAdvSeedingManager.java | 230 -- .../net/jxta/impl/util/ResourceAccount.java | 198 -- .../jxta/impl/util/ResourceDispatcher.java | 722 ----- .../net/jxta/impl/util/SeedingManager.java | 186 -- .../net/jxta/impl/util/SequenceIterator.java | 141 - .../src/net/jxta/impl/util/TimeUtils.java | 439 --- .../net/jxta/impl/util/TimerThreadNamer.java | 117 - .../net/jxta/impl/util/URISeedingManager.java | 554 ---- .../src/net/jxta/impl/util/UnbiasedQueue.java | 875 ------ .../src/net/jxta/impl/util/cm/DumpCm.java | 272 -- .../impl/src/net/jxta/impl/util/package.html | 11 - .../pipe/reliable/AdaptiveFlowControl.java | 360 --- .../jxta/impl/util/pipe/reliable/Defs.java | 84 - .../util/pipe/reliable/FixedFlowControl.java | 100 - .../impl/util/pipe/reliable/FlowControl.java | 110 - .../impl/util/pipe/reliable/Incoming.java | 78 - .../pipe/reliable/IncomingPipeAdaptor.java | 113 - .../impl/util/pipe/reliable/Outgoing.java | 125 - .../pipe/reliable/OutgoingMsgrAdaptor.java | 192 -- .../pipe/reliable/OutgoingPipeAdaptor.java | 164 - .../reliable/OutgoingPipeAdaptorSync.java | 205 -- .../pipe/reliable/ReliableInputStream.java | 779 ----- .../pipe/reliable/ReliableOutputStream.java | 1277 -------- .../impl/src/net/jxta/impl/xindice/Debug.java | 125 - .../jxta/impl/xindice/core/DBException.java | 86 - .../net/jxta/impl/xindice/core/DBObject.java | 127 - .../jxta/impl/xindice/core/FaultCodes.java | 555 ---- .../net/jxta/impl/xindice/core/data/Key.java | 125 - .../jxta/impl/xindice/core/data/Record.java | 151 - .../impl/xindice/core/data/RecordSet.java | 103 - .../jxta/impl/xindice/core/data/Value.java | 278 -- .../jxta/impl/xindice/core/filer/BTree.java | 1194 -------- .../xindice/core/filer/BTreeCallback.java | 76 - .../core/filer/BTreeCorruptException.java | 74 - .../xindice/core/filer/BTreeException.java | 75 - .../impl/xindice/core/filer/BTreeFiler.java | 491 --- .../core/filer/BTreeNotFoundException.java | 73 - .../jxta/impl/xindice/core/filer/Filer.java | 137 - .../xindice/core/filer/FilerException.java | 77 - .../impl/xindice/core/filer/MemFiler.java | 226 -- .../jxta/impl/xindice/core/filer/Paged.java | 1501 --------- .../impl/xindice/core/filer/Streamable.java | 84 - .../impl/xindice/core/indexer/IndexQuery.java | 275 -- .../impl/xindice/core/indexer/Indexer.java | 99 - .../xindice/core/indexer/NameIndexer.java | 113 - .../src/net/jxta/impl/xindice/util/Named.java | 75 - .../impl/xindice/util/XindiceException.java | 86 - .../xindice/util/XindiceRuntimeException.java | 78 - p2pproxy/dependencies/MJSIP.COPYRIGHT.txt | 22 - p2pproxy/dependencies/bcprov-jdk14.jar | Bin 1601132 -> 0 bytes .../dependencies/bouncycastle-LICENSE.txt | 22 - p2pproxy/dependencies/javax.servlet.jar | Bin 73373 -> 0 bytes p2pproxy/dependencies/jstun-0.7.0.jar | Bin 69133 -> 0 bytes p2pproxy/dependencies/junit-4.3.1.jar | Bin 106547 -> 0 bytes p2pproxy/dependencies/jxta_license.html | 248 -- p2pproxy/dependencies/log4j.LICENSE | 202 -- p2pproxy/dependencies/log4j.jar | Bin 358180 -> 0 bytes p2pproxy/dependencies/org.mortbay.jetty.jar | Bin 576379 -> 0 bytes p2pproxy/dependencies/sip.jar | Bin 201058 -> 0 bytes p2pproxy/launcher/.cdtproject | 12 - p2pproxy/launcher/.cproject | 848 ----- p2pproxy/launcher/.project | 81 - .../.settings/org.eclipse.cdt.core.prefs | 3 - p2pproxy/launcher/Debug/makefile | 44 - p2pproxy/launcher/Debug/objects.mk | 7 - p2pproxy/launcher/Debug/sources.mk | 17 - p2pproxy/launcher/Debug/src/launcher-tester.d | 4 - p2pproxy/launcher/Debug/src/p2pproxy.d | 9 - p2pproxy/launcher/Debug/src/p2pproxy_wrap.d | 7 - p2pproxy/launcher/Debug/src/subdir.mk | 37 - p2pproxy/launcher/Makefile.am | 1 - p2pproxy/launcher/src/Makefile.am | 24 - p2pproxy/launcher/src/launcher-tester.c | 98 - p2pproxy/launcher/src/p2pproxy.c | 268 -- p2pproxy/launcher/src/p2pproxy.h | 154 - p2pproxy/log4j.properties | 82 - p2pproxy/plugin-src/Makefile.am | 19 - p2pproxy/plugin-src/fonis.c | 178 -- .../p2pproxy/api/P2pProxyException.java | 45 - .../p2pproxy/api/P2pProxyInstance.java | 76 - .../p2pproxy/api/P2pProxyManagement.java | 33 - .../p2pproxy/api/P2pProxyNetworkProbe.java | 48 - .../api/P2pProxyNotReadyException.java | 55 - .../api/P2pProxyResourceManagement.java | 42 - .../api/P2pProxyRtpRelayManagement.java | 15 - .../P2pProxyUserAlreadyExistException.java | 58 - .../api/P2pProxyUserNotFoundException.java | 55 - .../linphone/p2pproxy/core/Configurator.java | 68 - .../p2pproxy/core/EdgePeerServiceManager.java | 61 - .../p2pproxy/core/GenericService.java | 157 - .../p2pproxy/core/GenericServiceClient.java | 121 - .../p2pproxy/core/GenericUdpSession.java | 89 - .../p2pproxy/core/JxtaNetworkManager.java | 411 --- .../p2pproxy/core/MessageDispatcher.java | 53 - .../core/P2pProxyAccountManagement.java | 120 - .../core/P2pProxyAccountManagementMBean.java | 49 - ...2pProxyAdvertisementNotFoundException.java | 57 - .../p2pproxy/core/P2pProxyInstanceImpl.java | 274 -- .../linphone/p2pproxy/core/P2pProxyMain.java | 520 ---- .../p2pproxy/core/P2pProxyMainMBean.java | 32 - .../p2pproxy/core/P2pProxyManagementImpl.java | 69 - .../core/P2pProxyResourceManagementImpl.java | 71 - .../core/P2pUserProfileAdvertisement.java | 251 -- .../core/SeedingPeerServiceManager.java | 51 - .../p2pproxy/core/ServiceProvider.java | 16 - .../core/SuperPeerServiceManager.java | 44 - .../core/jxtaext/EndpointRegistry.java | 63 - .../core/jxtaext/NatedEndPointAddress.java | 52 - .../core/media/MediaResourceService.java | 108 - .../MediaResoureUnreachableException.java | 34 - .../core/media/jxtaudpproxy/RtpSession.java | 9 - .../media/jxtaudpproxy/RtpSessionImpl.java | 81 - .../media/jxtaudpproxy/SdpProcessorImpl.java | 190 -- .../core/media/jxtaudpproxy/UdpSession.java | 90 - .../core/media/rtprelay/AddressRequest.java | 32 - .../core/media/rtprelay/AddressResponse.java | 47 - .../media/rtprelay/IceSdpProcessorImpl.java | 222 -- .../core/media/rtprelay/MediaType.java | 38 - .../core/media/rtprelay/RouteAddRequest.java | 57 - .../core/media/rtprelay/RouteAddResponse.java | 50 - .../core/media/rtprelay/RoutingTable.java | 60 - .../core/media/rtprelay/RtpRelayServer.java | 334 -- .../media/rtprelay/RtpRelayServerConfig.java | 28 - .../core/media/rtprelay/RtpRoutingRules.java | 48 - .../core/media/rtprelay/SdpProcessorImpl.java | 90 - .../media/rtprelay/SingleAddressResponse.java | 43 - .../core/rdvautoconfig/AutoConfigService.java | 147 - .../rdvautoconfig/P2pproxyRdvListener.java | 33 - .../core/rdvautoconfig/PeerInfoProvider.java | 33 - .../PeerInfoProviderService.java | 239 -- .../rdvautoconfig/PeerInfoServiceClient.java | 150 - .../rdvautoconfig/PublicIpAddressRequest.java | 41 - .../PublicIpAddressResponse.java | 58 - .../rdvautoconfig/SocketProbeRequest.java | 55 - .../NetworkResourceAdvertisement.java | 267 -- .../core/sipproxy/RegistrationHandler.java | 29 - .../p2pproxy/core/sipproxy/SdpProcessor.java | 39 - .../p2pproxy/core/sipproxy/SipProxy.java | 29 - .../core/sipproxy/SipProxyRegistrar.java | 404 --- .../core/sipproxy/SipProxyRegistrarMBean.java | 34 - .../p2pproxy/core/sipproxy/SipUtils.java | 52 - .../core/sipproxy/peers/JxtaSipProxy.java | 203 -- .../core/sipproxy/peers/NetworkResources.java | 93 - .../superpeers/JxtaNetworkResources.java | 64 - .../P2pUserRegistrationAdvertisement.java | 271 -- .../sipproxy/superpeers/SuperPeerProxy.java | 133 - .../p2pproxy/core/stun/AddressInfo.java | 67 - .../p2pproxy/core/stun/DiscoveryInfo.java | 110 - .../p2pproxy/core/stun/StunClient.java | 200 -- .../p2pproxy/core/stun/StunServer.java | 148 - .../core/utils/AccountManagerCli.java | 129 - .../p2pproxy/core/utils/DumpLocalCache.java | 45 - .../p2pproxy/core/utils/Excecutor.java | 8 - .../core/utils/PeerGroupIdGenerator.java | 74 - .../p2pproxy/test/P2pAutoConfigTester.java | 110 - .../test/P2pProxyAccountManagementTester.java | 86 - .../test/P2pProxyNatedNetworkTester.java | 48 - .../test/P2pProxyNetworkingTester.java | 148 - .../p2pproxy/test/P2pProxyTester.java | 487 --- .../p2pproxy/test/RtpRelayServerTester.java | 202 -- .../p2pproxy/test/StunServerTester.java | 425 --- .../p2pproxy/test/UdpRelayTester.java | 125 - .../test/utils/DefaultCallListener.java | 75 - .../p2pproxy/test/utils/P2pNetwork.java | 224 -- .../p2pproxy/test/utils/SipClient.java | 283 -- .../p2pproxy/test/utils/UserInstance.java | 224 -- {linphone/pixmaps => pixmaps}/.gitignore | 0 {linphone/pixmaps => pixmaps}/Makefile.am | 0 {linphone/pixmaps => pixmaps}/green.png | Bin {linphone/pixmaps => pixmaps}/linphone.png | Bin {linphone/pixmaps => pixmaps}/linphone2.png | Bin {linphone/pixmaps => pixmaps}/linphone2.xpm | 0 {linphone/pixmaps => pixmaps}/mic_active.png | Bin {linphone/pixmaps => pixmaps}/mic_muted.png | Bin {linphone/pixmaps => pixmaps}/red.png | Bin {linphone/pixmaps => pixmaps}/sip-away.png | Bin {linphone/pixmaps => pixmaps}/sip-bifm.png | Bin {linphone/pixmaps => pixmaps}/sip-busy.png | Bin {linphone/pixmaps => pixmaps}/sip-closed.png | Bin {linphone/pixmaps => pixmaps}/sip-online.png | Bin {linphone/pixmaps => pixmaps}/sip-otl.png | Bin {linphone/pixmaps => pixmaps}/sip-otp.png | Bin {linphone/pixmaps => pixmaps}/sip-wfa.png | Bin {linphone/po => po}/.gitignore | 0 {linphone/po => po}/ChangeLog | 0 {linphone/po => po}/Makefile.in.in | 0 {linphone/po => po}/Makevars | 0 {linphone/po => po}/Makevars.template | 0 {linphone/po => po}/POTFILES.in | 0 {linphone/po => po}/POTFILES.skip | 0 {linphone/po => po}/Rules-quot | 0 {linphone/po => po}/boldquot.sed | 0 {linphone/po => po}/cat-id-tbl.c | 0 {linphone/po => po}/cs.po | 0 {linphone/po => po}/de.po | 0 {linphone/po => po}/en@boldquot.header | 0 {linphone/po => po}/en@quot.header | 0 {linphone/po => po}/es.po | 0 {linphone/po => po}/fr.po | 0 {linphone/po => po}/hu.po | 0 {linphone/po => po}/insert-header.sin | 0 {linphone/po => po}/it.po | 0 {linphone/po => po}/ja.po | 0 {linphone/po => po}/nl.po | 0 {linphone/po => po}/pl.po | 0 {linphone/po => po}/pt_BR.po | 0 {linphone/po => po}/quot.sed | 0 {linphone/po => po}/remove-potcdate.sin | 0 {linphone/po => po}/ru.po | 0 {linphone/po => po}/sv.po | 0 {linphone/po => po}/zh_CN.po | 0 {linphone/scripts => scripts}/Makefile.am | 0 .../scripts => scripts}/Portfile-devel.tmpl | 0 {linphone/scripts => scripts}/Portfile.tmpl | 0 .../scripts => scripts}/builder-mingw.mk | 0 {linphone/share => share}/.gitignore | 0 {linphone/share => share}/C/.gitignore | 0 {linphone/share => share}/C/Makefile.am | 0 {linphone/share => share}/C/linphone.1 | 0 {linphone/share => share}/C/linphonec.1 | 0 {linphone/share => share}/C/linphonecsh.1 | 0 {linphone/share => share}/C/manual.lyx | 0 {linphone/share => share}/C/manual.sgml | 0 {linphone/share => share}/C/sipomatic.1 | 0 {linphone/share => share}/Makefile.am | 0 {linphone/share => share}/Makefile.inc | 0 {linphone/share => share}/cs/.gitignore | 0 {linphone/share => share}/cs/Makefile.am | 0 {linphone/share => share}/cs/linphone.1 | 0 {linphone/share => share}/cs/linphonec.1 | 0 {linphone/share => share}/cs/sipomatic.1 | 0 {linphone/share => share}/fr/.gitignore | 0 {linphone/share => share}/fr/Makefile.am | 0 {linphone/share => share}/fr/manual.lyx | 0 {linphone/share => share}/fr/manual.sgml | 0 {linphone/share => share}/hello16000.wav | Bin {linphone/share => share}/hello8000.wav | Bin {linphone/share => share}/it/.gitignore | 0 {linphone/share => share}/it/Makefile.am | 0 {linphone/share => share}/it/manual.lyx | 0 {linphone/share => share}/it/manual.sgml | 0 {linphone/share => share}/ja/.gitignore | 0 {linphone/share => share}/ja/Makefile.am | 0 {linphone/share => share}/ja/manual.lyx | 0 {linphone/share => share}/ja/manual.sgml | 0 {linphone/share => share}/linphone.desktop | 0 {linphone/share => share}/linphone.gnorba | 0 {linphone/share => share}/linphone.pc.in | 0 .../share => share}/linphone_applet.desktop | 0 {linphone/share => share}/ringback.wav | Bin {linphone/share => share}/rings/bigben.wav | Bin {linphone/share => share}/rings/oldphone.wav | Bin {linphone/share => share}/rings/orig.wav | Bin {linphone/share => share}/rings/rock.wav | Bin {linphone/share => share}/rings/sweet.wav | Bin {linphone/share => share}/rings/synth.wav | Bin {linphone/share => share}/rings/tapping.wav | Bin {linphone/share => share}/rings/toy.wav | Bin linphone/stamp-h.in => stamp-h.in | 0 1055 files changed, 2 insertions(+), 201099 deletions(-) rename linphone/ABOUT-NLS => ABOUT-NLS (100%) rename linphone/AUTHORS => AUTHORS (100%) rename linphone/BUGS => BUGS (100%) rename linphone/COPYING => COPYING (100%) rename linphone/ChangeLog => ChangeLog (100%) rename linphone/Makefile.am => Makefile.am (100%) rename linphone/NEWS => NEWS (100%) rename linphone/README => README (100%) rename linphone/README.M68k.txt => README.M68k.txt (100%) rename linphone/README.arm => README.arm (100%) rename linphone/README.macos => README.macos (100%) rename linphone/README.mingw => README.mingw (100%) rename linphone/TODO => TODO (100%) rename linphone/autogen.sh => autogen.sh (100%) rename {linphone/build => build}/wince/liblinphone.sln (100%) rename {linphone/build => build}/wince/liblinphone.vcproj (100%) rename {linphone/build => build}/wince/linphonec/linphonec.vcproj (100%) rename linphone/config.rpath => config.rpath (100%) rename linphone/configure.in => configure.in (100%) rename {linphone/console => console}/.gitignore (100%) rename {linphone/console => console}/Makefile.am (100%) rename {linphone/console => console}/TODO (100%) rename {linphone/console => console}/commands.c (100%) rename {linphone/console => console}/example/linphonec (100%) rename {linphone/console => console}/linphonec.c (100%) rename {linphone/console => console}/linphonec.h (100%) rename {linphone/console => console}/shell.c (100%) rename {linphone/console => console}/sipomatic.c (100%) rename {linphone/console => console}/sipomatic.h (100%) rename {linphone/console => console}/wav2raw.c (100%) rename {linphone/coreapi => coreapi}/.gitignore (100%) rename {linphone/coreapi => coreapi}/Makefile.am (100%) rename {linphone/coreapi => coreapi}/address.c (100%) rename {linphone/coreapi => coreapi}/authentication.c (100%) rename {linphone/coreapi => coreapi}/chat.c (100%) rename {linphone/coreapi => coreapi}/enum.c (100%) rename {linphone/coreapi => coreapi}/enum.h (100%) rename {linphone/coreapi => coreapi}/exevents.c (100%) rename {linphone/coreapi => coreapi}/exevents.h (100%) rename {linphone/coreapi => coreapi}/fonis.c (100%) rename {linphone/coreapi => coreapi}/friend.c (100%) rename {linphone/coreapi => coreapi}/general_state.c (100%) rename {linphone/coreapi => coreapi}/help/Doxyfile.in (100%) rename {linphone/coreapi => coreapi}/help/Makefile.am (100%) rename {linphone/coreapi => coreapi}/help/doxygen.dox.in (100%) rename {linphone/coreapi => coreapi}/linphonecore.c (100%) rename {linphone/coreapi => coreapi}/linphonecore.h (100%) rename {linphone/coreapi => coreapi}/lpconfig.c (100%) rename {linphone/coreapi => coreapi}/lpconfig.h (100%) rename {linphone/coreapi => coreapi}/misc.c (100%) rename {linphone/coreapi => coreapi}/plugins/buddylookup/AUTHORS (100%) rename {linphone/coreapi => coreapi}/plugins/buddylookup/COPYING (100%) rename {linphone/coreapi => coreapi}/plugins/buddylookup/ChangeLog (100%) rename {linphone/coreapi => coreapi}/plugins/buddylookup/INSTALL (100%) rename {linphone/coreapi => coreapi}/plugins/buddylookup/Makefile.am (100%) rename {linphone/coreapi => coreapi}/plugins/buddylookup/NEWS (100%) rename {linphone/coreapi => coreapi}/plugins/buddylookup/README (100%) rename {linphone/coreapi => coreapi}/plugins/buddylookup/autogen.sh (100%) rename {linphone/coreapi => coreapi}/plugins/buddylookup/configure.ac (100%) rename {linphone/coreapi => coreapi}/plugins/buddylookup/src/Makefile.am (100%) rename {linphone/coreapi => coreapi}/plugins/buddylookup/src/lookup.c (100%) rename {linphone/coreapi => coreapi}/presence.c (100%) rename {linphone/coreapi => coreapi}/private.h (100%) rename {linphone/coreapi => coreapi}/proxy.c (100%) rename {linphone/coreapi => coreapi}/sdphandler.c (100%) rename {linphone/coreapi => coreapi}/sdphandler.h (100%) rename {linphone/coreapi => coreapi}/siplogin.c (100%) rename {linphone/coreapi => coreapi}/sipsetup.c (100%) rename {linphone/coreapi => coreapi}/sipsetup.h (100%) rename linphone/gen-gtkfilelist.sh => gen-gtkfilelist.sh (100%) rename linphone/gtk+-2.16.2.filelist => gtk+-2.16.2.filelist (100%) rename linphone/gtk+-2.16.6.filelist => gtk+-2.16.6.filelist (100%) rename linphone/gtk+-2.18.5.filelist => gtk+-2.18.5.filelist (100%) rename {linphone/gtk-glade => gtk-glade}/.gitignore (100%) rename {linphone/gtk-glade => gtk-glade}/Makefile.am (100%) rename {linphone/gtk-glade => gtk-glade}/about.glade (100%) rename {linphone/gtk-glade => gtk-glade}/buddylookup.c (100%) rename {linphone/gtk-glade => gtk-glade}/buddylookup.glade (100%) rename {linphone/gtk-glade => gtk-glade}/call_logs.glade (100%) rename {linphone/gtk-glade => gtk-glade}/calllogs.c (100%) rename {linphone/gtk-glade => gtk-glade}/chat.c (100%) rename {linphone/gtk-glade => gtk-glade}/chatroom.glade (100%) rename {linphone/gtk-glade => gtk-glade}/contact.glade (100%) rename {linphone/gtk-glade => gtk-glade}/fonis.c (100%) rename {linphone/gtk-glade => gtk-glade}/friendlist.c (100%) rename {linphone/gtk-glade => gtk-glade}/gtkrc (100%) rename {linphone/gtk-glade => gtk-glade}/incall_view.c (100%) rename {linphone/gtk-glade => gtk-glade}/incoming_call.glade (100%) rename {linphone/gtk-glade => gtk-glade}/linphone.h (100%) rename {linphone/gtk-glade => gtk-glade}/linphone.ico (100%) rename {linphone/gtk-glade => gtk-glade}/linphone.iss (100%) rename {linphone/gtk-glade => gtk-glade}/linphone.png (100%) rename {linphone/gtk-glade => gtk-glade}/linphone.rc (100%) rename {linphone/gtk-glade => gtk-glade}/linphone2.png (100%) rename {linphone/gtk-glade => gtk-glade}/log.glade (100%) rename {linphone/gtk-glade => gtk-glade}/logging.c (100%) rename {linphone/gtk-glade => gtk-glade}/loginframe.c (100%) rename {linphone/gtk-glade => gtk-glade}/main.c (100%) rename {linphone/gtk-glade => gtk-glade}/main.glade (100%) rename {linphone/gtk-glade => gtk-glade}/p2pwizard.glade (100%) rename {linphone/gtk-glade => gtk-glade}/parameters.glade (100%) rename {linphone/gtk-glade => gtk-glade}/password.glade (100%) rename {linphone/gtk-glade => gtk-glade}/propertybox.c (100%) rename {linphone/gtk-glade => gtk-glade}/setupwizard.c (100%) rename {linphone/gtk-glade => gtk-glade}/sip_account.glade (100%) rename {linphone/gtk-glade => gtk-glade}/stock_people.png (100%) rename {linphone/gtk-glade => gtk-glade}/support.c (100%) rename {linphone/gtk-glade => gtk-glade}/update.c (100%) rename {linphone/gtk-glade => gtk-glade}/utils.c (100%) rename {linphone/gtk-glade => gtk-glade}/waiting.glade (100%) rename {linphone/intl => intl}/ChangeLog (100%) rename {linphone/intl => intl}/Makefile.in (100%) rename {linphone/intl => intl}/VERSION (100%) rename {linphone/intl => intl}/bindtextdom.c (100%) rename {linphone/intl => intl}/cat-compat.c (100%) rename {linphone/intl => intl}/dcgettext.c (100%) rename {linphone/intl => intl}/dgettext.c (100%) rename {linphone/intl => intl}/explodename.c (100%) rename {linphone/intl => intl}/finddomain.c (100%) rename {linphone/intl => intl}/gettext.c (100%) rename {linphone/intl => intl}/gettext.h (100%) rename {linphone/intl => intl}/gettextP.h (100%) rename {linphone/intl => intl}/hash-string.h (100%) rename {linphone/intl => intl}/intl-compat.c (100%) rename {linphone/intl => intl}/l10nflist.c (100%) rename {linphone/intl => intl}/libgettext.h (100%) rename {linphone/intl => intl}/linux-msg.sed (100%) rename {linphone/intl => intl}/loadinfo.h (100%) rename {linphone/intl => intl}/loadmsgcat.c (100%) rename {linphone/intl => intl}/localealias.c (100%) rename {linphone/intl => intl}/po2tbl.sed.in (100%) rename {linphone/intl => intl}/textdomain.c (100%) rename {linphone/intl => intl}/xopen-msg.sed (100%) rename linphone/intltool-extract.in => intltool-extract.in (100%) rename linphone/intltool-merge.in => intltool-merge.in (100%) rename linphone/intltool-update.in => intltool-update.in (100%) rename linphone/linphone-deps.filelist => linphone-deps.filelist (100%) rename linphone/linphone.iss.in => linphone.iss.in (100%) rename linphone/linphone.kdevelop => linphone.kdevelop (100%) rename linphone/linphone.spec.in => linphone.spec.in (100%) delete mode 100644 linphone/mingw-envsetup.sh rename {linphone/m4 => m4}/.gitignore (100%) rename {linphone/m4 => m4}/Makefile.am (100%) rename {linphone/m4 => m4}/codeset.m4 (100%) rename {linphone/m4 => m4}/exosip.m4 (100%) rename {linphone/m4 => m4}/gettext.m4 (100%) rename {linphone/m4 => m4}/glibc2.m4 (100%) rename {linphone/m4 => m4}/glibc21.m4 (100%) rename {linphone/m4 => m4}/iconv.m4 (100%) rename {linphone/m4 => m4}/ilbc.m4 (100%) rename {linphone/m4 => m4}/intdiv0.m4 (100%) rename {linphone/m4 => m4}/intl.m4 (100%) rename {linphone/m4 => m4}/intldir.m4 (100%) rename {linphone/m4 => m4}/intmax.m4 (100%) rename {linphone/m4 => m4}/inttypes-pri.m4 (100%) rename {linphone/m4 => m4}/inttypes.m4 (100%) rename {linphone/m4 => m4}/inttypes_h.m4 (100%) rename {linphone/m4 => m4}/isc-posix.m4 (100%) rename {linphone/m4 => m4}/lcmessage.m4 (100%) rename {linphone/m4 => m4}/lib-ld.m4 (100%) rename {linphone/m4 => m4}/lib-link.m4 (100%) rename {linphone/m4 => m4}/lib-prefix.m4 (100%) rename {linphone/m4 => m4}/lock.m4 (100%) rename {linphone/m4 => m4}/longdouble.m4 (100%) rename {linphone/m4 => m4}/longlong.m4 (100%) rename {linphone/m4 => m4}/nls.m4 (100%) rename {linphone/m4 => m4}/ortp.m4 (100%) rename {linphone/m4 => m4}/osip.m4 (100%) rename {linphone/m4 => m4}/po.m4 (100%) rename {linphone/m4 => m4}/printf-posix.m4 (100%) rename {linphone/m4 => m4}/progtest.m4 (100%) rename {linphone/m4 => m4}/readline.m4 (100%) rename {linphone/m4 => m4}/signed.m4 (100%) rename {linphone/m4 => m4}/size_max.m4 (100%) rename {linphone/m4 => m4}/stdint_h.m4 (100%) rename {linphone/m4 => m4}/uintmax_t.m4 (100%) rename {linphone/m4 => m4}/ulonglong.m4 (100%) rename {linphone/m4 => m4}/video.m4 (100%) rename {linphone/m4 => m4}/visibility.m4 (100%) rename {linphone/m4 => m4}/wchar_t.m4 (100%) rename {linphone/m4 => m4}/wint_t.m4 (100%) rename {linphone/m4 => m4}/xsize.m4 (100%) rename {linphone/media_api => media_api}/.gitignore (100%) rename {linphone/media_api => media_api}/DESIGN.txt (100%) rename {linphone/media_api => media_api}/Makefile.am (100%) rename {linphone/media_api => media_api}/apitest.c (100%) rename {linphone/media_api => media_api}/apitest.h (100%) rename {linphone/media_api => media_api}/basiccall.c (100%) rename {linphone/media_api => media_api}/basiccall.h (100%) rename {linphone/media_api => media_api}/callmember.c (100%) rename {linphone/media_api => media_api}/callmember.h (100%) rename {linphone/media_api => media_api}/ccl (100%) rename {linphone/media_api => media_api}/common.h (100%) rename {linphone/media_api => media_api}/media_api.c (100%) rename {linphone/media_api => media_api}/media_api.h (100%) rename {linphone/media_api => media_api}/mediaflow.c (100%) rename {linphone/media_api => media_api}/mediaflow.h (100%) delete mode 100644 p2pproxy/.classpath delete mode 100644 p2pproxy/.cvsignore delete mode 100644 p2pproxy/.gcjbuilder delete mode 100644 p2pproxy/.project delete mode 100644 p2pproxy/AUTHORS delete mode 100644 p2pproxy/COPYING delete mode 100644 p2pproxy/ChangeLog delete mode 100644 p2pproxy/INSTALL delete mode 100644 p2pproxy/Makefile.am delete mode 100644 p2pproxy/NEWS delete mode 100644 p2pproxy/README delete mode 100755 p2pproxy/autogen.sh delete mode 100644 p2pproxy/bin/p2pproxy-cmd.bat delete mode 100644 p2pproxy/bin/p2pproxy-cmd.sh delete mode 100644 p2pproxy/bin/p2pproxy.bat delete mode 100644 p2pproxy/bin/p2pproxy.sh delete mode 100644 p2pproxy/build.xml delete mode 100644 p2pproxy/configure.ac delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/ChangeRequest.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/ChangedAddress.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/Data.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/Dummy.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/ErrorCode.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MappedAddress.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MappedResponseChangedSourceAddressReflectedFrom.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MessageAttribute.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MessageAttributeException.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MessageAttributeInterface.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MessageAttributeParsingException.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MessageIntegrity.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/Password.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/ReflectedFrom.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/ResponseAddress.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/SourceAddress.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/UnknownAttribute.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/UnknownMessageAttributeException.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/Username.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/header/MessageHeader.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/header/MessageHeaderException.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/header/MessageHeaderInterface.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/header/MessageHeaderParsingException.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/BindingLifetimeTest.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/DiscoveryInfo.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/DiscoveryTest.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/demo/BindingLifetimeTestDemo.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/demo/DiscoveryTestDemo.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/demo/StunServer.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/demo/ice/Candidate.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/demo/ice/ICENegociator.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/util/Address.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/util/Utility.java delete mode 100644 p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/util/UtilityException.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/pom.xml delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/Version.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/access/AccessService.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/access/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/codat/Codat.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/codat/CodatID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/codat/Metadata.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/codat/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/credential/AuthenticationCredential.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/credential/Credential.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/credential/CredentialPCLSupport.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/credential/CredentialValidator.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/credential/PrivilegedOperation.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/credential/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/discovery/DiscoveryEvent.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/discovery/DiscoveryListener.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/discovery/DiscoveryService.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/discovery/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/document/Advertisement.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/document/AdvertisementFactory.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/document/Attributable.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/document/Attribute.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/document/BinaryDocument.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/document/Document.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/document/DocumentByteArrayIO.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/document/DocumentByteBufferIO.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/document/DocumentStreamIO.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/document/Element.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/document/ExtendableAdvertisement.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/document/FileDocument.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/document/MimeMediaType.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/document/StructuredDocument.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/document/StructuredDocumentFactory.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/document/StructuredDocumentUtils.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/document/StructuredTextDocument.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/document/TextDocument.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/document/TextDocumentCharArrayIO.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/document/TextDocumentCharBufferIO.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/document/TextDocumentCharSequenceIO.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/document/TextDocumentReaderIO.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/document/TextElement.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/document/XMLDocument.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/document/XMLElement.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/document/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/AbstractMessenger.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/AsyncChannelMessenger.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/ByteArrayMessageElement.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/ChannelMessenger.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/EndpointAddress.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/EndpointListener.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/EndpointService.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/InputStreamMessageElement.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/ListenerAdaptor.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/Message.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/MessageElement.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/MessageFilterListener.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/MessagePropagater.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/MessageReceiver.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/MessageSender.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/MessageTransport.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/Messenger.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/MessengerEvent.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/MessengerEventListener.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/MessengerState.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/OutgoingMessageEvent.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/OutgoingMessageEventListener.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/StringMessageElement.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/TextDocumentMessageElement.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/TextMessageElement.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/ThreadedMessenger.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/WireFormatMessage.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/WireFormatMessageFactory.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/endpoint/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/exception/ConfiguratorException.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/exception/JxtaError.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/exception/JxtaException.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/exception/PeerGroupException.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/exception/ProtocolNotSupportedException.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/exception/ServiceNotFoundException.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/exception/UnknownServiceException.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/exception/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/id/ID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/id/IDFactory.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/id/jxta/IDFormat.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/id/jxta/Instantiator.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/id/jxta/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/id/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/logging/Logging.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/logging/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/membership/Authenticator.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/membership/InteractiveAuthenticator.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/membership/MembershipService.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/membership/doc-files/memberAndAccess.png delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/membership/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/meter/MonitorEvent.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/meter/MonitorException.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/meter/MonitorFilter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/meter/MonitorFilterException.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/meter/MonitorListener.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/meter/MonitorReport.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/meter/MonitorResources.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/meter/PeerMonitorInfo.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/meter/PeerMonitorInfoEvent.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/meter/PeerMonitorInfoListener.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/meter/ServiceMetric.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/meter/ServiceMonitor.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/meter/ServiceMonitorFilter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/meter/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/overview.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/peer/PeerID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/peer/PeerInfoEvent.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/peer/PeerInfoListener.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/peer/PeerInfoService.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/peer/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/peergroup/Configurator.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/peergroup/LightWeightPeerGroup.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/peergroup/NetPeerGroupFactory.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/peergroup/PeerGroup.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/peergroup/PeerGroupFactory.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/peergroup/PeerGroupID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/peergroup/WorldPeerGroupFactory.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/peergroup/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/pipe/InputPipe.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/pipe/OutputPipe.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/pipe/OutputPipeEvent.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/pipe/OutputPipeListener.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/pipe/PipeID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/pipe/PipeMsgEvent.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/pipe/PipeMsgListener.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/pipe/PipeService.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/pipe/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/platform/Application.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/platform/JxtaLoader.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/platform/Module.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/platform/ModuleClassID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/platform/ModuleSpecID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/platform/NetworkConfigurator.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/platform/NetworkManager.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/platform/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/protocol/AccessPointAdvertisement.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/protocol/ConfigParams.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/protocol/DiscoveryQueryMsg.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/protocol/DiscoveryResponseMsg.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/protocol/ModuleClassAdvertisement.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/protocol/ModuleImplAdvertisement.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/protocol/ModuleSpecAdvertisement.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/protocol/PeerAdvertisement.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/protocol/PeerGroupAdvertisement.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/protocol/PeerInfoQueryMessage.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/protocol/PeerInfoResponseMessage.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/protocol/PipeAdvertisement.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/protocol/PipeResolverMessage.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/protocol/RdvAdvertisement.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/protocol/ResolverQueryMsg.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/protocol/ResolverResponseMsg.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/protocol/ResolverSrdiMsg.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/protocol/RouteAdvertisement.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/protocol/RouteQueryMsg.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/protocol/RouteResponseMsg.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/protocol/SignedAdvertisement.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/protocol/SrdiMessage.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/protocol/TransportAdvertisement.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/protocol/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/rendezvous/RendezVousService.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/rendezvous/RendezVousStatus.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/rendezvous/RendezvousEvent.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/rendezvous/RendezvousListener.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/rendezvous/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/resolver/GenericResolver.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/resolver/QueryHandler.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/resolver/ResolverService.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/resolver/SrdiHandler.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/resolver/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/service/Service.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/service/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/socket/JxtaMulticastSocket.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/socket/JxtaServerSocket.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/socket/JxtaSocket.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/socket/JxtaSocketAddress.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/socket/JxtaSocketInputStream.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/socket/JxtaSocketOutputStream.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/socket/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/user.properties delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/AbstractSimpleSelectable.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/AdvertisementUtilities.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/AwtUtils.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/ClassFactory.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/CountingInputStream.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/CountingOutputStream.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/CountingWriter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/DevNullOutputStream.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/DevNullWriter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/DocumentUtilities.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/IgnoreFlushFilterOutputStream.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/JxtaBiDiPipe.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/JxtaServerPipe.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/LimitInputStream.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/MarkProhibitedFilterStream.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/MessageUtilities.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/PipeEventListener.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/PipeStateListener.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/PipeUtilities.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/SimpleSelectable.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/SimpleSelector.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/WatchedInputStream.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/WatchedOutputStream.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/WatchedStream.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/documentSerializable/DocumentSerializable.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/documentSerializable/DocumentSerializableUtilities.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/documentSerializable/DocumentSerializationException.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/util/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/api/src/sun/net/www/protocol/urn/Handler.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/META-INF/services/net.jxta.document.Advertisement delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/META-INF/services/net.jxta.document.StructuredDocument delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/META-INF/services/net.jxta.endpoint.WireFormatMessage delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/META-INF/services/net.jxta.id.ID delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/META-INF/services/net.jxta.platform.Module delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/Version.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/access/AccessList.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/access/always/AlwaysAccessService.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/access/always/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/access/pse/PSEAccessService.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/access/pse/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/access/simpleACL/SimpleACLAccessService.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/access/simpleACL/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/cm/Cm.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/cm/Indexer.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/cm/Srdi.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/cm/SrdiIndex.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/config.properties delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/discovery/DiscoveryServiceImpl.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/discovery/DiscoveryServiceInterface.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/discovery/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/document/DOMXMLDocument.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/document/DOMXMLElement.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/document/LiteXMLDocument.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/document/LiteXMLElement.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/document/PlainTextDocument.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/document/PlainTextElement.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/document/TextDocumentCommon.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/BlockingMessenger.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/EndpointServiceImpl.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/EndpointServiceInterface.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/EndpointUtils.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/IPUtils.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/JxtaMessageMessageElement.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/LoopbackMessenger.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/SocketFactory.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/WireFormatMessageBinary.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/cbjx/CbJxDefs.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/cbjx/CbJxMessageInfo.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/cbjx/CbJxMessenger.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/cbjx/CbJxTransport.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/cbjx/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/endpointMeter/ConditionalEndpointMeterBuildSettings.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/endpointMeter/EndpointMeter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/endpointMeter/EndpointMeterBuildSettings.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/endpointMeter/EndpointMetric.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/endpointMeter/EndpointServiceMetric.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/endpointMeter/EndpointServiceMonitor.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/endpointMeter/EndpointServiceMonitorFilter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/endpointMeter/InboundMeter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/endpointMeter/InboundMetric.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/endpointMeter/IncomingMessageListenerMeter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/endpointMeter/MessengerMeter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/endpointMeter/OutboundMeter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/endpointMeter/OutboundMetric.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/endpointMeter/PropagationMeter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/endpointMeter/PropagationMetric.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/mcast/McastTransport.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/mcast/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/msgframing/MessagePackageHeader.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/msgframing/WelcomeMessage.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/relay/RelayClient.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/relay/RelayReferralSeedingManager.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/relay/RelayServer.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/relay/RelayServerClient.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/relay/RelayTransport.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/relay/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/router/BadRoute.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/router/Destinations.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/router/EndpointRouter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/router/EndpointRouterMessage.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/router/RouteCM.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/router/RouteControl.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/router/RouteResolver.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/router/RouterMessenger.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/router/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/servlethttp/HttpClientMessenger.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/servlethttp/HttpMessageReceiver.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/servlethttp/HttpMessageSender.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/servlethttp/HttpMessageServlet.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/servlethttp/HttpServletMessenger.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/servlethttp/ServletHttpTransport.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/servlethttp/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/tcp/IncomingUnicastServer.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/tcp/TcpMessenger.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/tcp/TcpTransport.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/tcp/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/tls/JTlsDefs.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/tls/JTlsInputStream.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/tls/JTlsOutputStream.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/tls/TlsConn.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/tls/TlsManager.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/tls/TlsMessenger.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/tls/TlsSocket.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/tls/TlsTransport.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/tls/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/transportMeter/ConditionalTransportMeterBuildSettings.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/transportMeter/TransportBindingMeter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/transportMeter/TransportBindingMetric.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/transportMeter/TransportMeter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/transportMeter/TransportMeterBuildSettings.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/transportMeter/TransportMetric.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/transportMeter/TransportServiceMetric.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/transportMeter/TransportServiceMonitor.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/endpoint/transportMeter/TransportServiceMonitorFilter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/CBID/CodatID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/CBID/IDFormat.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/CBID/Instantiator.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/CBID/ModuleClassID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/CBID/ModuleSpecID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/CBID/PeerGroupID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/CBID/PeerID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/CBID/PipeID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/CBID/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/UUID/CodatID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/UUID/IDBytes.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/UUID/IDFormat.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/UUID/Instantiator.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/UUID/ModuleClassID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/UUID/ModuleSpecID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/UUID/PeerGroupID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/UUID/PeerID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/UUID/PipeID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/UUID/UUID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/UUID/UUIDFactory.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/UUID/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/binaryID/BinaryID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/binaryID/BinaryIDFactory.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/binaryID/CodatBinaryID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/binaryID/DigestTool.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/binaryID/IDFormat.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/binaryID/Instantiator.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/binaryID/ModuleClassBinaryID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/binaryID/ModuleSpecBinaryID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/binaryID/PeerBinaryID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/binaryID/PeerGroupBinaryID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/binaryID/PipeBinaryID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/binaryID/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/unknown/ID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/unknown/IDFormat.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/unknown/Instantiator.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/id/unknown/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/loader/RefJxtaLoader.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/loader/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/PasswdMembershipService.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/none/NoneMembershipService.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/none/NoneMembershipServiceBeanInfo.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/none/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/passwd/PasswdMembershipService.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/passwd/PasswdMembershipServiceBeanInfo.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/passwd/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/pse/CMKeyStoreManager.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/pse/DialogAuthenticator.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/pse/EngineAuthenticator.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/pse/FileKeyStoreManager.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/pse/KeyStoreManager.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/pse/PSEAuthenticatorEngine.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/pse/PSEAuthenticatorEngineFactory.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/pse/PSEConfig.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/pse/PSECredential.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/pse/PSECrendentialBeanInfo.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/pse/PSEKeyStoreManagerFactory.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/pse/PSEMembershipService.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/pse/PSEMembershipServiceBeanInfo.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/pse/PSEPeerSecurityEngine.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/pse/PSESecurityEngineFactory.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/pse/PSEUtils.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/pse/StringAuthenticator.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/pse/URIKeyStoreManager.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/membership/pse/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/meter/ConditionalMeterBuildSettings.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/meter/GenericServiceMonitor.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/meter/MeterBuildSettings.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/meter/MetricUtilities.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/meter/MonitorManager.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/meter/ServiceMonitorImpl.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/meter/ServiceMonitorPulseInfo.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/meter/ServiceMonitorResource.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/monitor.properties delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/overview.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/peer/PeerInfoHandler.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/peer/PeerInfoMessenger.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/peer/PeerInfoServiceImpl.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/peer/PeerInfoServiceInterface.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/peer/RemoteMonitorPeerInfoHandler.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/peer/RemoteMonitorQuery.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/peer/RemoteMonitorResponse.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/peer/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/peergroup/AutomaticConfigurator.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/peergroup/Boot.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/peergroup/CompatibilityEquater.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/peergroup/ConfigDialog.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/peergroup/DefaultConfigurator.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/peergroup/GenericPeerGroup.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/peergroup/IncompleteConfigurationException.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/peergroup/NullConfigurator.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/peergroup/PeerGroupInterface.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/peergroup/Platform.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/peergroup/PlatformConfigurator.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/peergroup/RefCountPeerGroupInterface.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/peergroup/ShadowPeerGroup.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/peergroup/StdPeerGroup.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/peergroup/StdPeerGroupParamAdv.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/peergroup/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/pipe/BlockingWireOutputPipe.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/pipe/InputPipeImpl.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/pipe/NonBlockingOutputPipe.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/pipe/NonBlockingWireOutputPipe.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/pipe/PipeRegistrar.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/pipe/PipeResolver.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/pipe/PipeServiceImpl.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/pipe/PipeServiceInterface.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/pipe/SecureInputPipeImpl.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/pipe/SecureOutputPipe.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/pipe/WireHeader.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/pipe/WirePipe.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/pipe/WirePipeImpl.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/pipe/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/AccessPointAdv.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/Certificate.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/CertificateSigningRequest.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/DiscoveryConfigAdv.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/DiscoveryQuery.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/DiscoveryResponse.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/GroupConfig.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/HTTPAdv.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/LeaseRequestMsg.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/LeaseResponseMsg.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/LimitedRangeRdvMsg.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/ModuleClassAdv.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/ModuleImplAdv.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/ModuleSpecAdv.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/PSEConfigAdv.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/PeerAdv.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/PeerGroupAdv.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/PeerGroupConfigAdv.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/PeerInfoQueryMsg.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/PeerInfoResponseMsg.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/PipeAdv.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/PipeResolverMsg.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/PlatformConfig.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/RdvAdv.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/RdvConfigAdv.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/RelayConfigAdv.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/ResolverQuery.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/ResolverResponse.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/ResolverSrdiMsgImpl.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/RouteAdv.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/RouteQuery.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/RouteResponse.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/SignedAdv.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/SrdiMessageImpl.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/TCPAdv.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/protocol/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/proxy/ProxyService.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/proxy/Requestor.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/PeerConnection.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/RdvGreeter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/RdvWalk.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/RdvWalker.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/RendezVousPropagateMessage.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/RendezVousServiceImpl.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/RendezVousServiceInterface.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/RendezVousServiceProvider.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/StdRendezVousService.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/adhoc/AdhocPeerRdvService.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/edge/EdgePeerRdvService.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/edge/RdvConnection.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/limited/LimitedRangeGreeter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/limited/LimitedRangeWalk.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/limited/LimitedRangeWalker.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/rdv/ClientConnection.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/rdv/RdvPeerRdvService.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/rendezvousMeter/ClientConnectionMeter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/rendezvousMeter/ClientConnectionMetric.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/rendezvousMeter/ConditionalRendezvousMeterBuildSettings.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/rendezvousMeter/RendezvousConnectionMeter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/rendezvousMeter/RendezvousConnectionMetric.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/rendezvousMeter/RendezvousMeter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/rendezvousMeter/RendezvousMeterBuildSettings.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/rendezvousMeter/RendezvousMetric.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/rendezvousMeter/RendezvousServiceMetric.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/rendezvousMeter/RendezvousServiceMonitor.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/rendezvousMeter/RendezvousServiceMonitorFilter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/rpv/PeerView.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/rpv/PeerViewDestination.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/rpv/PeerViewElement.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/rpv/PeerViewEvent.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/rpv/PeerViewListener.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/rpv/PeerViewRandomStrategy.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/rpv/PeerViewRandomWithReplaceStrategy.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/rpv/PeerViewSequentialStrategy.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/rpv/PeerViewStrategy.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/rendezvous/rpv/PeerviewSeedingManager.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/resolver/InternalQueryHandler.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/resolver/ResolverServiceImpl.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/resolver/ResolverServiceInterface.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/resolver/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/resolver/resolverMeter/ConditionalResolverMeterBuildSettings.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/resolver/resolverMeter/QueryDestinationMeter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/resolver/resolverMeter/QueryDestinationMetric.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/resolver/resolverMeter/QueryHandlerMeter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/resolver/resolverMeter/QueryHandlerMetric.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/resolver/resolverMeter/ResolverMeter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/resolver/resolverMeter/ResolverMeterBuildSettings.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/resolver/resolverMeter/ResolverMetric.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/resolver/resolverMeter/ResolverServiceMetric.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/resolver/resolverMeter/ResolverServiceMonitor.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/resolver/resolverMeter/ResolverServiceMonitorFilter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/resolver/resolverMeter/SrdiDestinationMeter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/resolver/resolverMeter/SrdiDestinationMetric.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/resolver/resolverMeter/SrdiHandlerMeter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/resolver/resolverMeter/SrdiHandlerMetric.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/ACLSeedingManager.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/AdvCooker.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/BASE64InputStream.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/BASE64OutputStream.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/Base64.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/Cache.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/CacheEntry.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/CacheEntryListener.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/ConsumerBiasedQueue.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/Dlink.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/Dlist.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/DynamicEnumeration.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/EndpointServiceStatsFilter.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/GenerateID.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/JxtaHash.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/LRUCache.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/ModuleManager.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/ProducerBiasedQueue.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/RdvAdvSeedingManager.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/ResourceAccount.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/ResourceDispatcher.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/SeedingManager.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/SequenceIterator.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/TimeUtils.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/TimerThreadNamer.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/URISeedingManager.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/UnbiasedQueue.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/cm/DumpCm.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/package.html delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/pipe/reliable/AdaptiveFlowControl.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/pipe/reliable/Defs.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/pipe/reliable/FixedFlowControl.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/pipe/reliable/FlowControl.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/pipe/reliable/Incoming.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/pipe/reliable/IncomingPipeAdaptor.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/pipe/reliable/Outgoing.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/pipe/reliable/OutgoingMsgrAdaptor.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/pipe/reliable/OutgoingPipeAdaptor.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/pipe/reliable/OutgoingPipeAdaptorSync.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/pipe/reliable/ReliableInputStream.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/util/pipe/reliable/ReliableOutputStream.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/xindice/Debug.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/xindice/core/DBException.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/xindice/core/DBObject.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/xindice/core/FaultCodes.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/xindice/core/data/Key.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/xindice/core/data/Record.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/xindice/core/data/RecordSet.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/xindice/core/data/Value.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/xindice/core/filer/BTree.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/xindice/core/filer/BTreeCallback.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/xindice/core/filer/BTreeCorruptException.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/xindice/core/filer/BTreeException.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/xindice/core/filer/BTreeFiler.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/xindice/core/filer/BTreeNotFoundException.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/xindice/core/filer/Filer.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/xindice/core/filer/FilerException.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/xindice/core/filer/MemFiler.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/xindice/core/filer/Paged.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/xindice/core/filer/Streamable.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/xindice/core/indexer/IndexQuery.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/xindice/core/indexer/Indexer.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/xindice/core/indexer/NameIndexer.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/xindice/util/Named.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/xindice/util/XindiceException.java delete mode 100644 p2pproxy/dependencies-src/jxse-src-2.5/impl/src/net/jxta/impl/xindice/util/XindiceRuntimeException.java delete mode 100644 p2pproxy/dependencies/MJSIP.COPYRIGHT.txt delete mode 100644 p2pproxy/dependencies/bcprov-jdk14.jar delete mode 100644 p2pproxy/dependencies/bouncycastle-LICENSE.txt delete mode 100644 p2pproxy/dependencies/javax.servlet.jar delete mode 100644 p2pproxy/dependencies/jstun-0.7.0.jar delete mode 100644 p2pproxy/dependencies/junit-4.3.1.jar delete mode 100644 p2pproxy/dependencies/jxta_license.html delete mode 100644 p2pproxy/dependencies/log4j.LICENSE delete mode 100644 p2pproxy/dependencies/log4j.jar delete mode 100644 p2pproxy/dependencies/org.mortbay.jetty.jar delete mode 100644 p2pproxy/dependencies/sip.jar delete mode 100644 p2pproxy/launcher/.cdtproject delete mode 100644 p2pproxy/launcher/.cproject delete mode 100644 p2pproxy/launcher/.project delete mode 100644 p2pproxy/launcher/.settings/org.eclipse.cdt.core.prefs delete mode 100644 p2pproxy/launcher/Debug/makefile delete mode 100644 p2pproxy/launcher/Debug/objects.mk delete mode 100644 p2pproxy/launcher/Debug/sources.mk delete mode 100644 p2pproxy/launcher/Debug/src/launcher-tester.d delete mode 100644 p2pproxy/launcher/Debug/src/p2pproxy.d delete mode 100644 p2pproxy/launcher/Debug/src/p2pproxy_wrap.d delete mode 100644 p2pproxy/launcher/Debug/src/subdir.mk delete mode 100644 p2pproxy/launcher/Makefile.am delete mode 100644 p2pproxy/launcher/src/Makefile.am delete mode 100644 p2pproxy/launcher/src/launcher-tester.c delete mode 100644 p2pproxy/launcher/src/p2pproxy.c delete mode 100644 p2pproxy/launcher/src/p2pproxy.h delete mode 100644 p2pproxy/log4j.properties delete mode 100644 p2pproxy/plugin-src/Makefile.am delete mode 100644 p2pproxy/plugin-src/fonis.c delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/api/P2pProxyException.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/api/P2pProxyInstance.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/api/P2pProxyManagement.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/api/P2pProxyNetworkProbe.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/api/P2pProxyNotReadyException.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/api/P2pProxyResourceManagement.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/api/P2pProxyRtpRelayManagement.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/api/P2pProxyUserAlreadyExistException.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/api/P2pProxyUserNotFoundException.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/Configurator.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/EdgePeerServiceManager.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/GenericService.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/GenericServiceClient.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/GenericUdpSession.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/JxtaNetworkManager.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/MessageDispatcher.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/P2pProxyAccountManagement.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/P2pProxyAccountManagementMBean.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/P2pProxyAdvertisementNotFoundException.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/P2pProxyInstanceImpl.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/P2pProxyMain.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/P2pProxyMainMBean.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/P2pProxyManagementImpl.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/P2pProxyResourceManagementImpl.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/P2pUserProfileAdvertisement.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/SeedingPeerServiceManager.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/ServiceProvider.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/SuperPeerServiceManager.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/jxtaext/EndpointRegistry.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/jxtaext/NatedEndPointAddress.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/media/MediaResourceService.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/media/MediaResoureUnreachableException.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/media/jxtaudpproxy/RtpSession.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/media/jxtaudpproxy/RtpSessionImpl.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/media/jxtaudpproxy/SdpProcessorImpl.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/media/jxtaudpproxy/UdpSession.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/media/rtprelay/AddressRequest.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/media/rtprelay/AddressResponse.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/media/rtprelay/IceSdpProcessorImpl.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/media/rtprelay/MediaType.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/media/rtprelay/RouteAddRequest.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/media/rtprelay/RouteAddResponse.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/media/rtprelay/RoutingTable.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/media/rtprelay/RtpRelayServer.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/media/rtprelay/RtpRelayServerConfig.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/media/rtprelay/RtpRoutingRules.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/media/rtprelay/SdpProcessorImpl.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/media/rtprelay/SingleAddressResponse.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/rdvautoconfig/AutoConfigService.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/rdvautoconfig/P2pproxyRdvListener.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/rdvautoconfig/PeerInfoProvider.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/rdvautoconfig/PeerInfoProviderService.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/rdvautoconfig/PeerInfoServiceClient.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/rdvautoconfig/PublicIpAddressRequest.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/rdvautoconfig/PublicIpAddressResponse.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/rdvautoconfig/SocketProbeRequest.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/sipproxy/NetworkResourceAdvertisement.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/sipproxy/RegistrationHandler.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/sipproxy/SdpProcessor.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/sipproxy/SipProxy.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/sipproxy/SipProxyRegistrar.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/sipproxy/SipProxyRegistrarMBean.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/sipproxy/SipUtils.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/sipproxy/peers/JxtaSipProxy.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/sipproxy/peers/NetworkResources.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/sipproxy/superpeers/JxtaNetworkResources.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/sipproxy/superpeers/P2pUserRegistrationAdvertisement.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/sipproxy/superpeers/SuperPeerProxy.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/stun/AddressInfo.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/stun/DiscoveryInfo.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/stun/StunClient.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/stun/StunServer.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/utils/AccountManagerCli.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/utils/DumpLocalCache.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/utils/Excecutor.java delete mode 100644 p2pproxy/src/org/linphone/p2pproxy/core/utils/PeerGroupIdGenerator.java delete mode 100644 p2pproxy/test-src/org/linphone/p2pproxy/test/P2pAutoConfigTester.java delete mode 100644 p2pproxy/test-src/org/linphone/p2pproxy/test/P2pProxyAccountManagementTester.java delete mode 100644 p2pproxy/test-src/org/linphone/p2pproxy/test/P2pProxyNatedNetworkTester.java delete mode 100644 p2pproxy/test-src/org/linphone/p2pproxy/test/P2pProxyNetworkingTester.java delete mode 100644 p2pproxy/test-src/org/linphone/p2pproxy/test/P2pProxyTester.java delete mode 100644 p2pproxy/test-src/org/linphone/p2pproxy/test/RtpRelayServerTester.java delete mode 100644 p2pproxy/test-src/org/linphone/p2pproxy/test/StunServerTester.java delete mode 100644 p2pproxy/test-src/org/linphone/p2pproxy/test/UdpRelayTester.java delete mode 100644 p2pproxy/test-src/org/linphone/p2pproxy/test/utils/DefaultCallListener.java delete mode 100644 p2pproxy/test-src/org/linphone/p2pproxy/test/utils/P2pNetwork.java delete mode 100644 p2pproxy/test-src/org/linphone/p2pproxy/test/utils/SipClient.java delete mode 100644 p2pproxy/test-src/org/linphone/p2pproxy/test/utils/UserInstance.java rename {linphone/pixmaps => pixmaps}/.gitignore (100%) rename {linphone/pixmaps => pixmaps}/Makefile.am (100%) rename {linphone/pixmaps => pixmaps}/green.png (100%) rename {linphone/pixmaps => pixmaps}/linphone.png (100%) rename {linphone/pixmaps => pixmaps}/linphone2.png (100%) rename {linphone/pixmaps => pixmaps}/linphone2.xpm (100%) rename {linphone/pixmaps => pixmaps}/mic_active.png (100%) rename {linphone/pixmaps => pixmaps}/mic_muted.png (100%) rename {linphone/pixmaps => pixmaps}/red.png (100%) rename {linphone/pixmaps => pixmaps}/sip-away.png (100%) rename {linphone/pixmaps => pixmaps}/sip-bifm.png (100%) rename {linphone/pixmaps => pixmaps}/sip-busy.png (100%) rename {linphone/pixmaps => pixmaps}/sip-closed.png (100%) rename {linphone/pixmaps => pixmaps}/sip-online.png (100%) rename {linphone/pixmaps => pixmaps}/sip-otl.png (100%) rename {linphone/pixmaps => pixmaps}/sip-otp.png (100%) rename {linphone/pixmaps => pixmaps}/sip-wfa.png (100%) rename {linphone/po => po}/.gitignore (100%) rename {linphone/po => po}/ChangeLog (100%) rename {linphone/po => po}/Makefile.in.in (100%) rename {linphone/po => po}/Makevars (100%) rename {linphone/po => po}/Makevars.template (100%) rename {linphone/po => po}/POTFILES.in (100%) rename {linphone/po => po}/POTFILES.skip (100%) rename {linphone/po => po}/Rules-quot (100%) rename {linphone/po => po}/boldquot.sed (100%) rename {linphone/po => po}/cat-id-tbl.c (100%) rename {linphone/po => po}/cs.po (100%) rename {linphone/po => po}/de.po (100%) rename {linphone/po => po}/en@boldquot.header (100%) rename {linphone/po => po}/en@quot.header (100%) rename {linphone/po => po}/es.po (100%) rename {linphone/po => po}/fr.po (100%) rename {linphone/po => po}/hu.po (100%) rename {linphone/po => po}/insert-header.sin (100%) rename {linphone/po => po}/it.po (100%) rename {linphone/po => po}/ja.po (100%) rename {linphone/po => po}/nl.po (100%) rename {linphone/po => po}/pl.po (100%) rename {linphone/po => po}/pt_BR.po (100%) rename {linphone/po => po}/quot.sed (100%) rename {linphone/po => po}/remove-potcdate.sin (100%) rename {linphone/po => po}/ru.po (100%) rename {linphone/po => po}/sv.po (100%) rename {linphone/po => po}/zh_CN.po (100%) rename {linphone/scripts => scripts}/Makefile.am (100%) rename {linphone/scripts => scripts}/Portfile-devel.tmpl (100%) rename {linphone/scripts => scripts}/Portfile.tmpl (100%) rename {linphone/scripts => scripts}/builder-mingw.mk (100%) rename {linphone/share => share}/.gitignore (100%) rename {linphone/share => share}/C/.gitignore (100%) rename {linphone/share => share}/C/Makefile.am (100%) rename {linphone/share => share}/C/linphone.1 (100%) rename {linphone/share => share}/C/linphonec.1 (100%) rename {linphone/share => share}/C/linphonecsh.1 (100%) rename {linphone/share => share}/C/manual.lyx (100%) rename {linphone/share => share}/C/manual.sgml (100%) rename {linphone/share => share}/C/sipomatic.1 (100%) rename {linphone/share => share}/Makefile.am (100%) rename {linphone/share => share}/Makefile.inc (100%) rename {linphone/share => share}/cs/.gitignore (100%) rename {linphone/share => share}/cs/Makefile.am (100%) rename {linphone/share => share}/cs/linphone.1 (100%) rename {linphone/share => share}/cs/linphonec.1 (100%) rename {linphone/share => share}/cs/sipomatic.1 (100%) rename {linphone/share => share}/fr/.gitignore (100%) rename {linphone/share => share}/fr/Makefile.am (100%) rename {linphone/share => share}/fr/manual.lyx (100%) rename {linphone/share => share}/fr/manual.sgml (100%) rename {linphone/share => share}/hello16000.wav (100%) rename {linphone/share => share}/hello8000.wav (100%) rename {linphone/share => share}/it/.gitignore (100%) rename {linphone/share => share}/it/Makefile.am (100%) rename {linphone/share => share}/it/manual.lyx (100%) rename {linphone/share => share}/it/manual.sgml (100%) rename {linphone/share => share}/ja/.gitignore (100%) rename {linphone/share => share}/ja/Makefile.am (100%) rename {linphone/share => share}/ja/manual.lyx (100%) rename {linphone/share => share}/ja/manual.sgml (100%) rename {linphone/share => share}/linphone.desktop (100%) rename {linphone/share => share}/linphone.gnorba (100%) rename {linphone/share => share}/linphone.pc.in (100%) rename {linphone/share => share}/linphone_applet.desktop (100%) rename {linphone/share => share}/ringback.wav (100%) rename {linphone/share => share}/rings/bigben.wav (100%) rename {linphone/share => share}/rings/oldphone.wav (100%) rename {linphone/share => share}/rings/orig.wav (100%) rename {linphone/share => share}/rings/rock.wav (100%) rename {linphone/share => share}/rings/sweet.wav (100%) rename {linphone/share => share}/rings/synth.wav (100%) rename {linphone/share => share}/rings/tapping.wav (100%) rename {linphone/share => share}/rings/toy.wav (100%) rename linphone/stamp-h.in => stamp-h.in (100%) diff --git a/.gitmodules b/.gitmodules index 98a34651..4e701d07 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "linphone/oRTP"] - path = linphone/oRTP + path = oRTP url = git://git.linphone.org/ortp.git [submodule "linphone/mediastreamer2"] - path = linphone/mediastreamer2 + path = mediastreamer2 url = git://git.linphone.org/mediastreamer2.git diff --git a/linphone/ABOUT-NLS b/ABOUT-NLS similarity index 100% rename from linphone/ABOUT-NLS rename to ABOUT-NLS diff --git a/linphone/AUTHORS b/AUTHORS similarity index 100% rename from linphone/AUTHORS rename to AUTHORS diff --git a/linphone/BUGS b/BUGS similarity index 100% rename from linphone/BUGS rename to BUGS diff --git a/linphone/COPYING b/COPYING similarity index 100% rename from linphone/COPYING rename to COPYING diff --git a/linphone/ChangeLog b/ChangeLog similarity index 100% rename from linphone/ChangeLog rename to ChangeLog diff --git a/linphone/Makefile.am b/Makefile.am similarity index 100% rename from linphone/Makefile.am rename to Makefile.am diff --git a/linphone/NEWS b/NEWS similarity index 100% rename from linphone/NEWS rename to NEWS diff --git a/linphone/README b/README similarity index 100% rename from linphone/README rename to README diff --git a/linphone/README.M68k.txt b/README.M68k.txt similarity index 100% rename from linphone/README.M68k.txt rename to README.M68k.txt diff --git a/linphone/README.arm b/README.arm similarity index 100% rename from linphone/README.arm rename to README.arm diff --git a/linphone/README.macos b/README.macos similarity index 100% rename from linphone/README.macos rename to README.macos diff --git a/linphone/README.mingw b/README.mingw similarity index 100% rename from linphone/README.mingw rename to README.mingw diff --git a/linphone/TODO b/TODO similarity index 100% rename from linphone/TODO rename to TODO diff --git a/linphone/autogen.sh b/autogen.sh similarity index 100% rename from linphone/autogen.sh rename to autogen.sh diff --git a/linphone/build/wince/liblinphone.sln b/build/wince/liblinphone.sln similarity index 100% rename from linphone/build/wince/liblinphone.sln rename to build/wince/liblinphone.sln diff --git a/linphone/build/wince/liblinphone.vcproj b/build/wince/liblinphone.vcproj similarity index 100% rename from linphone/build/wince/liblinphone.vcproj rename to build/wince/liblinphone.vcproj diff --git a/linphone/build/wince/linphonec/linphonec.vcproj b/build/wince/linphonec/linphonec.vcproj similarity index 100% rename from linphone/build/wince/linphonec/linphonec.vcproj rename to build/wince/linphonec/linphonec.vcproj diff --git a/linphone/config.rpath b/config.rpath similarity index 100% rename from linphone/config.rpath rename to config.rpath diff --git a/linphone/configure.in b/configure.in similarity index 100% rename from linphone/configure.in rename to configure.in diff --git a/linphone/console/.gitignore b/console/.gitignore similarity index 100% rename from linphone/console/.gitignore rename to console/.gitignore diff --git a/linphone/console/Makefile.am b/console/Makefile.am similarity index 100% rename from linphone/console/Makefile.am rename to console/Makefile.am diff --git a/linphone/console/TODO b/console/TODO similarity index 100% rename from linphone/console/TODO rename to console/TODO diff --git a/linphone/console/commands.c b/console/commands.c similarity index 100% rename from linphone/console/commands.c rename to console/commands.c diff --git a/linphone/console/example/linphonec b/console/example/linphonec similarity index 100% rename from linphone/console/example/linphonec rename to console/example/linphonec diff --git a/linphone/console/linphonec.c b/console/linphonec.c similarity index 100% rename from linphone/console/linphonec.c rename to console/linphonec.c diff --git a/linphone/console/linphonec.h b/console/linphonec.h similarity index 100% rename from linphone/console/linphonec.h rename to console/linphonec.h diff --git a/linphone/console/shell.c b/console/shell.c similarity index 100% rename from linphone/console/shell.c rename to console/shell.c diff --git a/linphone/console/sipomatic.c b/console/sipomatic.c similarity index 100% rename from linphone/console/sipomatic.c rename to console/sipomatic.c diff --git a/linphone/console/sipomatic.h b/console/sipomatic.h similarity index 100% rename from linphone/console/sipomatic.h rename to console/sipomatic.h diff --git a/linphone/console/wav2raw.c b/console/wav2raw.c similarity index 100% rename from linphone/console/wav2raw.c rename to console/wav2raw.c diff --git a/linphone/coreapi/.gitignore b/coreapi/.gitignore similarity index 100% rename from linphone/coreapi/.gitignore rename to coreapi/.gitignore diff --git a/linphone/coreapi/Makefile.am b/coreapi/Makefile.am similarity index 100% rename from linphone/coreapi/Makefile.am rename to coreapi/Makefile.am diff --git a/linphone/coreapi/address.c b/coreapi/address.c similarity index 100% rename from linphone/coreapi/address.c rename to coreapi/address.c diff --git a/linphone/coreapi/authentication.c b/coreapi/authentication.c similarity index 100% rename from linphone/coreapi/authentication.c rename to coreapi/authentication.c diff --git a/linphone/coreapi/chat.c b/coreapi/chat.c similarity index 100% rename from linphone/coreapi/chat.c rename to coreapi/chat.c diff --git a/linphone/coreapi/enum.c b/coreapi/enum.c similarity index 100% rename from linphone/coreapi/enum.c rename to coreapi/enum.c diff --git a/linphone/coreapi/enum.h b/coreapi/enum.h similarity index 100% rename from linphone/coreapi/enum.h rename to coreapi/enum.h diff --git a/linphone/coreapi/exevents.c b/coreapi/exevents.c similarity index 100% rename from linphone/coreapi/exevents.c rename to coreapi/exevents.c diff --git a/linphone/coreapi/exevents.h b/coreapi/exevents.h similarity index 100% rename from linphone/coreapi/exevents.h rename to coreapi/exevents.h diff --git a/linphone/coreapi/fonis.c b/coreapi/fonis.c similarity index 100% rename from linphone/coreapi/fonis.c rename to coreapi/fonis.c diff --git a/linphone/coreapi/friend.c b/coreapi/friend.c similarity index 100% rename from linphone/coreapi/friend.c rename to coreapi/friend.c diff --git a/linphone/coreapi/general_state.c b/coreapi/general_state.c similarity index 100% rename from linphone/coreapi/general_state.c rename to coreapi/general_state.c diff --git a/linphone/coreapi/help/Doxyfile.in b/coreapi/help/Doxyfile.in similarity index 100% rename from linphone/coreapi/help/Doxyfile.in rename to coreapi/help/Doxyfile.in diff --git a/linphone/coreapi/help/Makefile.am b/coreapi/help/Makefile.am similarity index 100% rename from linphone/coreapi/help/Makefile.am rename to coreapi/help/Makefile.am diff --git a/linphone/coreapi/help/doxygen.dox.in b/coreapi/help/doxygen.dox.in similarity index 100% rename from linphone/coreapi/help/doxygen.dox.in rename to coreapi/help/doxygen.dox.in diff --git a/linphone/coreapi/linphonecore.c b/coreapi/linphonecore.c similarity index 100% rename from linphone/coreapi/linphonecore.c rename to coreapi/linphonecore.c diff --git a/linphone/coreapi/linphonecore.h b/coreapi/linphonecore.h similarity index 100% rename from linphone/coreapi/linphonecore.h rename to coreapi/linphonecore.h diff --git a/linphone/coreapi/lpconfig.c b/coreapi/lpconfig.c similarity index 100% rename from linphone/coreapi/lpconfig.c rename to coreapi/lpconfig.c diff --git a/linphone/coreapi/lpconfig.h b/coreapi/lpconfig.h similarity index 100% rename from linphone/coreapi/lpconfig.h rename to coreapi/lpconfig.h diff --git a/linphone/coreapi/misc.c b/coreapi/misc.c similarity index 100% rename from linphone/coreapi/misc.c rename to coreapi/misc.c diff --git a/linphone/coreapi/plugins/buddylookup/AUTHORS b/coreapi/plugins/buddylookup/AUTHORS similarity index 100% rename from linphone/coreapi/plugins/buddylookup/AUTHORS rename to coreapi/plugins/buddylookup/AUTHORS diff --git a/linphone/coreapi/plugins/buddylookup/COPYING b/coreapi/plugins/buddylookup/COPYING similarity index 100% rename from linphone/coreapi/plugins/buddylookup/COPYING rename to coreapi/plugins/buddylookup/COPYING diff --git a/linphone/coreapi/plugins/buddylookup/ChangeLog b/coreapi/plugins/buddylookup/ChangeLog similarity index 100% rename from linphone/coreapi/plugins/buddylookup/ChangeLog rename to coreapi/plugins/buddylookup/ChangeLog diff --git a/linphone/coreapi/plugins/buddylookup/INSTALL b/coreapi/plugins/buddylookup/INSTALL similarity index 100% rename from linphone/coreapi/plugins/buddylookup/INSTALL rename to coreapi/plugins/buddylookup/INSTALL diff --git a/linphone/coreapi/plugins/buddylookup/Makefile.am b/coreapi/plugins/buddylookup/Makefile.am similarity index 100% rename from linphone/coreapi/plugins/buddylookup/Makefile.am rename to coreapi/plugins/buddylookup/Makefile.am diff --git a/linphone/coreapi/plugins/buddylookup/NEWS b/coreapi/plugins/buddylookup/NEWS similarity index 100% rename from linphone/coreapi/plugins/buddylookup/NEWS rename to coreapi/plugins/buddylookup/NEWS diff --git a/linphone/coreapi/plugins/buddylookup/README b/coreapi/plugins/buddylookup/README similarity index 100% rename from linphone/coreapi/plugins/buddylookup/README rename to coreapi/plugins/buddylookup/README diff --git a/linphone/coreapi/plugins/buddylookup/autogen.sh b/coreapi/plugins/buddylookup/autogen.sh similarity index 100% rename from linphone/coreapi/plugins/buddylookup/autogen.sh rename to coreapi/plugins/buddylookup/autogen.sh diff --git a/linphone/coreapi/plugins/buddylookup/configure.ac b/coreapi/plugins/buddylookup/configure.ac similarity index 100% rename from linphone/coreapi/plugins/buddylookup/configure.ac rename to coreapi/plugins/buddylookup/configure.ac diff --git a/linphone/coreapi/plugins/buddylookup/src/Makefile.am b/coreapi/plugins/buddylookup/src/Makefile.am similarity index 100% rename from linphone/coreapi/plugins/buddylookup/src/Makefile.am rename to coreapi/plugins/buddylookup/src/Makefile.am diff --git a/linphone/coreapi/plugins/buddylookup/src/lookup.c b/coreapi/plugins/buddylookup/src/lookup.c similarity index 100% rename from linphone/coreapi/plugins/buddylookup/src/lookup.c rename to coreapi/plugins/buddylookup/src/lookup.c diff --git a/linphone/coreapi/presence.c b/coreapi/presence.c similarity index 100% rename from linphone/coreapi/presence.c rename to coreapi/presence.c diff --git a/linphone/coreapi/private.h b/coreapi/private.h similarity index 100% rename from linphone/coreapi/private.h rename to coreapi/private.h diff --git a/linphone/coreapi/proxy.c b/coreapi/proxy.c similarity index 100% rename from linphone/coreapi/proxy.c rename to coreapi/proxy.c diff --git a/linphone/coreapi/sdphandler.c b/coreapi/sdphandler.c similarity index 100% rename from linphone/coreapi/sdphandler.c rename to coreapi/sdphandler.c diff --git a/linphone/coreapi/sdphandler.h b/coreapi/sdphandler.h similarity index 100% rename from linphone/coreapi/sdphandler.h rename to coreapi/sdphandler.h diff --git a/linphone/coreapi/siplogin.c b/coreapi/siplogin.c similarity index 100% rename from linphone/coreapi/siplogin.c rename to coreapi/siplogin.c diff --git a/linphone/coreapi/sipsetup.c b/coreapi/sipsetup.c similarity index 100% rename from linphone/coreapi/sipsetup.c rename to coreapi/sipsetup.c diff --git a/linphone/coreapi/sipsetup.h b/coreapi/sipsetup.h similarity index 100% rename from linphone/coreapi/sipsetup.h rename to coreapi/sipsetup.h diff --git a/linphone/gen-gtkfilelist.sh b/gen-gtkfilelist.sh similarity index 100% rename from linphone/gen-gtkfilelist.sh rename to gen-gtkfilelist.sh diff --git a/linphone/gtk+-2.16.2.filelist b/gtk+-2.16.2.filelist similarity index 100% rename from linphone/gtk+-2.16.2.filelist rename to gtk+-2.16.2.filelist diff --git a/linphone/gtk+-2.16.6.filelist b/gtk+-2.16.6.filelist similarity index 100% rename from linphone/gtk+-2.16.6.filelist rename to gtk+-2.16.6.filelist diff --git a/linphone/gtk+-2.18.5.filelist b/gtk+-2.18.5.filelist similarity index 100% rename from linphone/gtk+-2.18.5.filelist rename to gtk+-2.18.5.filelist diff --git a/linphone/gtk-glade/.gitignore b/gtk-glade/.gitignore similarity index 100% rename from linphone/gtk-glade/.gitignore rename to gtk-glade/.gitignore diff --git a/linphone/gtk-glade/Makefile.am b/gtk-glade/Makefile.am similarity index 100% rename from linphone/gtk-glade/Makefile.am rename to gtk-glade/Makefile.am diff --git a/linphone/gtk-glade/about.glade b/gtk-glade/about.glade similarity index 100% rename from linphone/gtk-glade/about.glade rename to gtk-glade/about.glade diff --git a/linphone/gtk-glade/buddylookup.c b/gtk-glade/buddylookup.c similarity index 100% rename from linphone/gtk-glade/buddylookup.c rename to gtk-glade/buddylookup.c diff --git a/linphone/gtk-glade/buddylookup.glade b/gtk-glade/buddylookup.glade similarity index 100% rename from linphone/gtk-glade/buddylookup.glade rename to gtk-glade/buddylookup.glade diff --git a/linphone/gtk-glade/call_logs.glade b/gtk-glade/call_logs.glade similarity index 100% rename from linphone/gtk-glade/call_logs.glade rename to gtk-glade/call_logs.glade diff --git a/linphone/gtk-glade/calllogs.c b/gtk-glade/calllogs.c similarity index 100% rename from linphone/gtk-glade/calllogs.c rename to gtk-glade/calllogs.c diff --git a/linphone/gtk-glade/chat.c b/gtk-glade/chat.c similarity index 100% rename from linphone/gtk-glade/chat.c rename to gtk-glade/chat.c diff --git a/linphone/gtk-glade/chatroom.glade b/gtk-glade/chatroom.glade similarity index 100% rename from linphone/gtk-glade/chatroom.glade rename to gtk-glade/chatroom.glade diff --git a/linphone/gtk-glade/contact.glade b/gtk-glade/contact.glade similarity index 100% rename from linphone/gtk-glade/contact.glade rename to gtk-glade/contact.glade diff --git a/linphone/gtk-glade/fonis.c b/gtk-glade/fonis.c similarity index 100% rename from linphone/gtk-glade/fonis.c rename to gtk-glade/fonis.c diff --git a/linphone/gtk-glade/friendlist.c b/gtk-glade/friendlist.c similarity index 100% rename from linphone/gtk-glade/friendlist.c rename to gtk-glade/friendlist.c diff --git a/linphone/gtk-glade/gtkrc b/gtk-glade/gtkrc similarity index 100% rename from linphone/gtk-glade/gtkrc rename to gtk-glade/gtkrc diff --git a/linphone/gtk-glade/incall_view.c b/gtk-glade/incall_view.c similarity index 100% rename from linphone/gtk-glade/incall_view.c rename to gtk-glade/incall_view.c diff --git a/linphone/gtk-glade/incoming_call.glade b/gtk-glade/incoming_call.glade similarity index 100% rename from linphone/gtk-glade/incoming_call.glade rename to gtk-glade/incoming_call.glade diff --git a/linphone/gtk-glade/linphone.h b/gtk-glade/linphone.h similarity index 100% rename from linphone/gtk-glade/linphone.h rename to gtk-glade/linphone.h diff --git a/linphone/gtk-glade/linphone.ico b/gtk-glade/linphone.ico similarity index 100% rename from linphone/gtk-glade/linphone.ico rename to gtk-glade/linphone.ico diff --git a/linphone/gtk-glade/linphone.iss b/gtk-glade/linphone.iss similarity index 100% rename from linphone/gtk-glade/linphone.iss rename to gtk-glade/linphone.iss diff --git a/linphone/gtk-glade/linphone.png b/gtk-glade/linphone.png similarity index 100% rename from linphone/gtk-glade/linphone.png rename to gtk-glade/linphone.png diff --git a/linphone/gtk-glade/linphone.rc b/gtk-glade/linphone.rc similarity index 100% rename from linphone/gtk-glade/linphone.rc rename to gtk-glade/linphone.rc diff --git a/linphone/gtk-glade/linphone2.png b/gtk-glade/linphone2.png similarity index 100% rename from linphone/gtk-glade/linphone2.png rename to gtk-glade/linphone2.png diff --git a/linphone/gtk-glade/log.glade b/gtk-glade/log.glade similarity index 100% rename from linphone/gtk-glade/log.glade rename to gtk-glade/log.glade diff --git a/linphone/gtk-glade/logging.c b/gtk-glade/logging.c similarity index 100% rename from linphone/gtk-glade/logging.c rename to gtk-glade/logging.c diff --git a/linphone/gtk-glade/loginframe.c b/gtk-glade/loginframe.c similarity index 100% rename from linphone/gtk-glade/loginframe.c rename to gtk-glade/loginframe.c diff --git a/linphone/gtk-glade/main.c b/gtk-glade/main.c similarity index 100% rename from linphone/gtk-glade/main.c rename to gtk-glade/main.c diff --git a/linphone/gtk-glade/main.glade b/gtk-glade/main.glade similarity index 100% rename from linphone/gtk-glade/main.glade rename to gtk-glade/main.glade diff --git a/linphone/gtk-glade/p2pwizard.glade b/gtk-glade/p2pwizard.glade similarity index 100% rename from linphone/gtk-glade/p2pwizard.glade rename to gtk-glade/p2pwizard.glade diff --git a/linphone/gtk-glade/parameters.glade b/gtk-glade/parameters.glade similarity index 100% rename from linphone/gtk-glade/parameters.glade rename to gtk-glade/parameters.glade diff --git a/linphone/gtk-glade/password.glade b/gtk-glade/password.glade similarity index 100% rename from linphone/gtk-glade/password.glade rename to gtk-glade/password.glade diff --git a/linphone/gtk-glade/propertybox.c b/gtk-glade/propertybox.c similarity index 100% rename from linphone/gtk-glade/propertybox.c rename to gtk-glade/propertybox.c diff --git a/linphone/gtk-glade/setupwizard.c b/gtk-glade/setupwizard.c similarity index 100% rename from linphone/gtk-glade/setupwizard.c rename to gtk-glade/setupwizard.c diff --git a/linphone/gtk-glade/sip_account.glade b/gtk-glade/sip_account.glade similarity index 100% rename from linphone/gtk-glade/sip_account.glade rename to gtk-glade/sip_account.glade diff --git a/linphone/gtk-glade/stock_people.png b/gtk-glade/stock_people.png similarity index 100% rename from linphone/gtk-glade/stock_people.png rename to gtk-glade/stock_people.png diff --git a/linphone/gtk-glade/support.c b/gtk-glade/support.c similarity index 100% rename from linphone/gtk-glade/support.c rename to gtk-glade/support.c diff --git a/linphone/gtk-glade/update.c b/gtk-glade/update.c similarity index 100% rename from linphone/gtk-glade/update.c rename to gtk-glade/update.c diff --git a/linphone/gtk-glade/utils.c b/gtk-glade/utils.c similarity index 100% rename from linphone/gtk-glade/utils.c rename to gtk-glade/utils.c diff --git a/linphone/gtk-glade/waiting.glade b/gtk-glade/waiting.glade similarity index 100% rename from linphone/gtk-glade/waiting.glade rename to gtk-glade/waiting.glade diff --git a/linphone/intl/ChangeLog b/intl/ChangeLog similarity index 100% rename from linphone/intl/ChangeLog rename to intl/ChangeLog diff --git a/linphone/intl/Makefile.in b/intl/Makefile.in similarity index 100% rename from linphone/intl/Makefile.in rename to intl/Makefile.in diff --git a/linphone/intl/VERSION b/intl/VERSION similarity index 100% rename from linphone/intl/VERSION rename to intl/VERSION diff --git a/linphone/intl/bindtextdom.c b/intl/bindtextdom.c similarity index 100% rename from linphone/intl/bindtextdom.c rename to intl/bindtextdom.c diff --git a/linphone/intl/cat-compat.c b/intl/cat-compat.c similarity index 100% rename from linphone/intl/cat-compat.c rename to intl/cat-compat.c diff --git a/linphone/intl/dcgettext.c b/intl/dcgettext.c similarity index 100% rename from linphone/intl/dcgettext.c rename to intl/dcgettext.c diff --git a/linphone/intl/dgettext.c b/intl/dgettext.c similarity index 100% rename from linphone/intl/dgettext.c rename to intl/dgettext.c diff --git a/linphone/intl/explodename.c b/intl/explodename.c similarity index 100% rename from linphone/intl/explodename.c rename to intl/explodename.c diff --git a/linphone/intl/finddomain.c b/intl/finddomain.c similarity index 100% rename from linphone/intl/finddomain.c rename to intl/finddomain.c diff --git a/linphone/intl/gettext.c b/intl/gettext.c similarity index 100% rename from linphone/intl/gettext.c rename to intl/gettext.c diff --git a/linphone/intl/gettext.h b/intl/gettext.h similarity index 100% rename from linphone/intl/gettext.h rename to intl/gettext.h diff --git a/linphone/intl/gettextP.h b/intl/gettextP.h similarity index 100% rename from linphone/intl/gettextP.h rename to intl/gettextP.h diff --git a/linphone/intl/hash-string.h b/intl/hash-string.h similarity index 100% rename from linphone/intl/hash-string.h rename to intl/hash-string.h diff --git a/linphone/intl/intl-compat.c b/intl/intl-compat.c similarity index 100% rename from linphone/intl/intl-compat.c rename to intl/intl-compat.c diff --git a/linphone/intl/l10nflist.c b/intl/l10nflist.c similarity index 100% rename from linphone/intl/l10nflist.c rename to intl/l10nflist.c diff --git a/linphone/intl/libgettext.h b/intl/libgettext.h similarity index 100% rename from linphone/intl/libgettext.h rename to intl/libgettext.h diff --git a/linphone/intl/linux-msg.sed b/intl/linux-msg.sed similarity index 100% rename from linphone/intl/linux-msg.sed rename to intl/linux-msg.sed diff --git a/linphone/intl/loadinfo.h b/intl/loadinfo.h similarity index 100% rename from linphone/intl/loadinfo.h rename to intl/loadinfo.h diff --git a/linphone/intl/loadmsgcat.c b/intl/loadmsgcat.c similarity index 100% rename from linphone/intl/loadmsgcat.c rename to intl/loadmsgcat.c diff --git a/linphone/intl/localealias.c b/intl/localealias.c similarity index 100% rename from linphone/intl/localealias.c rename to intl/localealias.c diff --git a/linphone/intl/po2tbl.sed.in b/intl/po2tbl.sed.in similarity index 100% rename from linphone/intl/po2tbl.sed.in rename to intl/po2tbl.sed.in diff --git a/linphone/intl/textdomain.c b/intl/textdomain.c similarity index 100% rename from linphone/intl/textdomain.c rename to intl/textdomain.c diff --git a/linphone/intl/xopen-msg.sed b/intl/xopen-msg.sed similarity index 100% rename from linphone/intl/xopen-msg.sed rename to intl/xopen-msg.sed diff --git a/linphone/intltool-extract.in b/intltool-extract.in similarity index 100% rename from linphone/intltool-extract.in rename to intltool-extract.in diff --git a/linphone/intltool-merge.in b/intltool-merge.in similarity index 100% rename from linphone/intltool-merge.in rename to intltool-merge.in diff --git a/linphone/intltool-update.in b/intltool-update.in similarity index 100% rename from linphone/intltool-update.in rename to intltool-update.in diff --git a/linphone/linphone-deps.filelist b/linphone-deps.filelist similarity index 100% rename from linphone/linphone-deps.filelist rename to linphone-deps.filelist diff --git a/linphone/linphone.iss.in b/linphone.iss.in similarity index 100% rename from linphone/linphone.iss.in rename to linphone.iss.in diff --git a/linphone/linphone.kdevelop b/linphone.kdevelop similarity index 100% rename from linphone/linphone.kdevelop rename to linphone.kdevelop diff --git a/linphone/linphone.spec.in b/linphone.spec.in similarity index 100% rename from linphone/linphone.spec.in rename to linphone.spec.in diff --git a/linphone/mingw-envsetup.sh b/linphone/mingw-envsetup.sh deleted file mode 100644 index 9f79d897..00000000 --- a/linphone/mingw-envsetup.sh +++ /dev/null @@ -1,5 +0,0 @@ -export PATH=$PATH:"${PROGRAMFILES}\GnuWin32\bin":"${PROGRAMFILES}\Inno Setup 5" -export PERL=/c/Perl/bin/perl.exe -export INTLTOOL_PERL=/c/Perl/bin/perl.exe - - diff --git a/linphone/m4/.gitignore b/m4/.gitignore similarity index 100% rename from linphone/m4/.gitignore rename to m4/.gitignore diff --git a/linphone/m4/Makefile.am b/m4/Makefile.am similarity index 100% rename from linphone/m4/Makefile.am rename to m4/Makefile.am diff --git a/linphone/m4/codeset.m4 b/m4/codeset.m4 similarity index 100% rename from linphone/m4/codeset.m4 rename to m4/codeset.m4 diff --git a/linphone/m4/exosip.m4 b/m4/exosip.m4 similarity index 100% rename from linphone/m4/exosip.m4 rename to m4/exosip.m4 diff --git a/linphone/m4/gettext.m4 b/m4/gettext.m4 similarity index 100% rename from linphone/m4/gettext.m4 rename to m4/gettext.m4 diff --git a/linphone/m4/glibc2.m4 b/m4/glibc2.m4 similarity index 100% rename from linphone/m4/glibc2.m4 rename to m4/glibc2.m4 diff --git a/linphone/m4/glibc21.m4 b/m4/glibc21.m4 similarity index 100% rename from linphone/m4/glibc21.m4 rename to m4/glibc21.m4 diff --git a/linphone/m4/iconv.m4 b/m4/iconv.m4 similarity index 100% rename from linphone/m4/iconv.m4 rename to m4/iconv.m4 diff --git a/linphone/m4/ilbc.m4 b/m4/ilbc.m4 similarity index 100% rename from linphone/m4/ilbc.m4 rename to m4/ilbc.m4 diff --git a/linphone/m4/intdiv0.m4 b/m4/intdiv0.m4 similarity index 100% rename from linphone/m4/intdiv0.m4 rename to m4/intdiv0.m4 diff --git a/linphone/m4/intl.m4 b/m4/intl.m4 similarity index 100% rename from linphone/m4/intl.m4 rename to m4/intl.m4 diff --git a/linphone/m4/intldir.m4 b/m4/intldir.m4 similarity index 100% rename from linphone/m4/intldir.m4 rename to m4/intldir.m4 diff --git a/linphone/m4/intmax.m4 b/m4/intmax.m4 similarity index 100% rename from linphone/m4/intmax.m4 rename to m4/intmax.m4 diff --git a/linphone/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4 similarity index 100% rename from linphone/m4/inttypes-pri.m4 rename to m4/inttypes-pri.m4 diff --git a/linphone/m4/inttypes.m4 b/m4/inttypes.m4 similarity index 100% rename from linphone/m4/inttypes.m4 rename to m4/inttypes.m4 diff --git a/linphone/m4/inttypes_h.m4 b/m4/inttypes_h.m4 similarity index 100% rename from linphone/m4/inttypes_h.m4 rename to m4/inttypes_h.m4 diff --git a/linphone/m4/isc-posix.m4 b/m4/isc-posix.m4 similarity index 100% rename from linphone/m4/isc-posix.m4 rename to m4/isc-posix.m4 diff --git a/linphone/m4/lcmessage.m4 b/m4/lcmessage.m4 similarity index 100% rename from linphone/m4/lcmessage.m4 rename to m4/lcmessage.m4 diff --git a/linphone/m4/lib-ld.m4 b/m4/lib-ld.m4 similarity index 100% rename from linphone/m4/lib-ld.m4 rename to m4/lib-ld.m4 diff --git a/linphone/m4/lib-link.m4 b/m4/lib-link.m4 similarity index 100% rename from linphone/m4/lib-link.m4 rename to m4/lib-link.m4 diff --git a/linphone/m4/lib-prefix.m4 b/m4/lib-prefix.m4 similarity index 100% rename from linphone/m4/lib-prefix.m4 rename to m4/lib-prefix.m4 diff --git a/linphone/m4/lock.m4 b/m4/lock.m4 similarity index 100% rename from linphone/m4/lock.m4 rename to m4/lock.m4 diff --git a/linphone/m4/longdouble.m4 b/m4/longdouble.m4 similarity index 100% rename from linphone/m4/longdouble.m4 rename to m4/longdouble.m4 diff --git a/linphone/m4/longlong.m4 b/m4/longlong.m4 similarity index 100% rename from linphone/m4/longlong.m4 rename to m4/longlong.m4 diff --git a/linphone/m4/nls.m4 b/m4/nls.m4 similarity index 100% rename from linphone/m4/nls.m4 rename to m4/nls.m4 diff --git a/linphone/m4/ortp.m4 b/m4/ortp.m4 similarity index 100% rename from linphone/m4/ortp.m4 rename to m4/ortp.m4 diff --git a/linphone/m4/osip.m4 b/m4/osip.m4 similarity index 100% rename from linphone/m4/osip.m4 rename to m4/osip.m4 diff --git a/linphone/m4/po.m4 b/m4/po.m4 similarity index 100% rename from linphone/m4/po.m4 rename to m4/po.m4 diff --git a/linphone/m4/printf-posix.m4 b/m4/printf-posix.m4 similarity index 100% rename from linphone/m4/printf-posix.m4 rename to m4/printf-posix.m4 diff --git a/linphone/m4/progtest.m4 b/m4/progtest.m4 similarity index 100% rename from linphone/m4/progtest.m4 rename to m4/progtest.m4 diff --git a/linphone/m4/readline.m4 b/m4/readline.m4 similarity index 100% rename from linphone/m4/readline.m4 rename to m4/readline.m4 diff --git a/linphone/m4/signed.m4 b/m4/signed.m4 similarity index 100% rename from linphone/m4/signed.m4 rename to m4/signed.m4 diff --git a/linphone/m4/size_max.m4 b/m4/size_max.m4 similarity index 100% rename from linphone/m4/size_max.m4 rename to m4/size_max.m4 diff --git a/linphone/m4/stdint_h.m4 b/m4/stdint_h.m4 similarity index 100% rename from linphone/m4/stdint_h.m4 rename to m4/stdint_h.m4 diff --git a/linphone/m4/uintmax_t.m4 b/m4/uintmax_t.m4 similarity index 100% rename from linphone/m4/uintmax_t.m4 rename to m4/uintmax_t.m4 diff --git a/linphone/m4/ulonglong.m4 b/m4/ulonglong.m4 similarity index 100% rename from linphone/m4/ulonglong.m4 rename to m4/ulonglong.m4 diff --git a/linphone/m4/video.m4 b/m4/video.m4 similarity index 100% rename from linphone/m4/video.m4 rename to m4/video.m4 diff --git a/linphone/m4/visibility.m4 b/m4/visibility.m4 similarity index 100% rename from linphone/m4/visibility.m4 rename to m4/visibility.m4 diff --git a/linphone/m4/wchar_t.m4 b/m4/wchar_t.m4 similarity index 100% rename from linphone/m4/wchar_t.m4 rename to m4/wchar_t.m4 diff --git a/linphone/m4/wint_t.m4 b/m4/wint_t.m4 similarity index 100% rename from linphone/m4/wint_t.m4 rename to m4/wint_t.m4 diff --git a/linphone/m4/xsize.m4 b/m4/xsize.m4 similarity index 100% rename from linphone/m4/xsize.m4 rename to m4/xsize.m4 diff --git a/linphone/media_api/.gitignore b/media_api/.gitignore similarity index 100% rename from linphone/media_api/.gitignore rename to media_api/.gitignore diff --git a/linphone/media_api/DESIGN.txt b/media_api/DESIGN.txt similarity index 100% rename from linphone/media_api/DESIGN.txt rename to media_api/DESIGN.txt diff --git a/linphone/media_api/Makefile.am b/media_api/Makefile.am similarity index 100% rename from linphone/media_api/Makefile.am rename to media_api/Makefile.am diff --git a/linphone/media_api/apitest.c b/media_api/apitest.c similarity index 100% rename from linphone/media_api/apitest.c rename to media_api/apitest.c diff --git a/linphone/media_api/apitest.h b/media_api/apitest.h similarity index 100% rename from linphone/media_api/apitest.h rename to media_api/apitest.h diff --git a/linphone/media_api/basiccall.c b/media_api/basiccall.c similarity index 100% rename from linphone/media_api/basiccall.c rename to media_api/basiccall.c diff --git a/linphone/media_api/basiccall.h b/media_api/basiccall.h similarity index 100% rename from linphone/media_api/basiccall.h rename to media_api/basiccall.h diff --git a/linphone/media_api/callmember.c b/media_api/callmember.c similarity index 100% rename from linphone/media_api/callmember.c rename to media_api/callmember.c diff --git a/linphone/media_api/callmember.h b/media_api/callmember.h similarity index 100% rename from linphone/media_api/callmember.h rename to media_api/callmember.h diff --git a/linphone/media_api/ccl b/media_api/ccl similarity index 100% rename from linphone/media_api/ccl rename to media_api/ccl diff --git a/linphone/media_api/common.h b/media_api/common.h similarity index 100% rename from linphone/media_api/common.h rename to media_api/common.h diff --git a/linphone/media_api/media_api.c b/media_api/media_api.c similarity index 100% rename from linphone/media_api/media_api.c rename to media_api/media_api.c diff --git a/linphone/media_api/media_api.h b/media_api/media_api.h similarity index 100% rename from linphone/media_api/media_api.h rename to media_api/media_api.h diff --git a/linphone/media_api/mediaflow.c b/media_api/mediaflow.c similarity index 100% rename from linphone/media_api/mediaflow.c rename to media_api/mediaflow.c diff --git a/linphone/media_api/mediaflow.h b/media_api/mediaflow.h similarity index 100% rename from linphone/media_api/mediaflow.h rename to media_api/mediaflow.h diff --git a/p2pproxy/.classpath b/p2pproxy/.classpath deleted file mode 100644 index d4307def..00000000 --- a/p2pproxy/.classpath +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/p2pproxy/.cvsignore b/p2pproxy/.cvsignore deleted file mode 100644 index da41270a..00000000 --- a/p2pproxy/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -eclipsebuild -.settings -antbuild* -P2pNetwork-* -sipp2 diff --git a/p2pproxy/.gcjbuilder b/p2pproxy/.gcjbuilder deleted file mode 100644 index 1084bf2f..00000000 --- a/p2pproxy/.gcjbuilder +++ /dev/null @@ -1,21 +0,0 @@ - - 0 - 0 - - 0 - - - - 0 - - 2 - - - - - - - debug - p2pproxy - make - \ No newline at end of file diff --git a/p2pproxy/.project b/p2pproxy/.project deleted file mode 100644 index fbea5077..00000000 --- a/p2pproxy/.project +++ /dev/null @@ -1,24 +0,0 @@ - - - p2pproxy - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - - - jni_src - 2 - jni_src - - - diff --git a/p2pproxy/AUTHORS b/p2pproxy/AUTHORS deleted file mode 100644 index e69de29b..00000000 diff --git a/p2pproxy/COPYING b/p2pproxy/COPYING deleted file mode 100644 index 94a9ed02..00000000 --- a/p2pproxy/COPYING +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/p2pproxy/ChangeLog b/p2pproxy/ChangeLog deleted file mode 100644 index e69de29b..00000000 diff --git a/p2pproxy/INSTALL b/p2pproxy/INSTALL deleted file mode 100644 index 8b82ade0..00000000 --- a/p2pproxy/INSTALL +++ /dev/null @@ -1,291 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008 Free Software Foundation, Inc. - - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. - - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - - 6. Often, you can also type `make uninstall' to remove the installed - files again. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c99 CFLAGS=-g LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - With a non-GNU `make', it is safer to compile the package for one -architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before -reconfiguring for another architecture. - - On MacOS X 10.5 and later systems, you can create libraries and -executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like -this: - - ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CPP="gcc -E" CXXCPP="g++ -E" - - This is not guaranteed to produce working output in all cases, you -may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. - -Installation Names -================== - - By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Particular systems -================== - - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in -order to use an ANSI C compiler: - - ./configure CC="cc -Ae" - -and if that doesn't work, install pre-built binaries of GCC for HP-UX. - - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try - - ./configure CC="cc" - -and if that doesn't work, try - - ./configure CC="cc -nodtk" - -Specifying the System Type -========================== - - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - - Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). - -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: - - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash - -`configure' Invocation -====================== - - `configure' recognizes the following options to control how it -operates. - -`--help' -`-h' - Print a summary of all of the options to `configure', and exit. - -`--help=short' -`--help=recursive' - Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`--prefix=DIR' - Use DIR as the installation prefix. *Note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. - -`--no-create' -`-n' - Run the configure checks, but stop before creating any output - files. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - diff --git a/p2pproxy/Makefile.am b/p2pproxy/Makefile.am deleted file mode 100644 index aaa51ae7..00000000 --- a/p2pproxy/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -EXTRA_DIST=dependencies dependencies-src src test-src - -SUBDIRS=launcher plugin-src - -ALL_JARS= \ - $(top_builddir)/antbuild/dist/p2pproxy_0.1/bcprov-jdk14.jar $(top_builddir)/antbuild/dist/p2pproxy_0.1/log4j.jar \ - $(top_builddir)/antbuild/dist/p2pproxy_0.1/javax.servlet.jar $(top_builddir)/antbuild/dist/p2pproxy_0.1/org.mortbay.jetty.jar \ - $(top_builddir)/antbuild/dist/p2pproxy_0.1/jstun-0.7.0.jar $(top_builddir)/antbuild/dist/p2pproxy_0.1/p2pproxy.jar \ - $(top_builddir)/antbuild/dist/p2pproxy_0.1/junit-4.3.1.jar $(top_builddir)/antbuild/dist/p2pproxy_0.1/sip.jar - -$(ALL_JARS): src/org/linphone/p2pproxy/*/*.java - $(ANT) dist - -jarsdir=$(datadir)/java/fonis - -jars_DATA=$(ALL_JARS) - -clean-local: - $(ANT) clean diff --git a/p2pproxy/NEWS b/p2pproxy/NEWS deleted file mode 100644 index e69de29b..00000000 diff --git a/p2pproxy/README b/p2pproxy/README deleted file mode 100644 index e69de29b..00000000 diff --git a/p2pproxy/autogen.sh b/p2pproxy/autogen.sh deleted file mode 100755 index d342f286..00000000 --- a/p2pproxy/autogen.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -#AM_VERSION=1.10 -#1.9 was the recommended version -if test -n "$AM_VERSION" ; then - ACLOCAL=aclocal-${AM_VERSION} - AUTOMAKE=automake-${AM_VERSION} -else - ACLOCAL=aclocal - AUTOMAKE=automake -fi - -echo "Generating build scripts in this mediastreamer plugin" -set -x -libtoolize --copy --force -$ACLOCAL -$AUTOMAKE --force-missing --add-missing --copy -autoconf -rm -rf config.cache - diff --git a/p2pproxy/bin/p2pproxy-cmd.bat b/p2pproxy/bin/p2pproxy-cmd.bat deleted file mode 100644 index f1fc5f0c..00000000 --- a/p2pproxy/bin/p2pproxy-cmd.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -"%JAVA_HOME%\bin\java.exe" -cp p2pproxy.jar org.linphone.p2pproxy.core.utils.AccountManagerCli %1 %2 %3 %4 %5 %6 %7 %8 %9 \ No newline at end of file diff --git a/p2pproxy/bin/p2pproxy-cmd.sh b/p2pproxy/bin/p2pproxy-cmd.sh deleted file mode 100644 index 1598057d..00000000 --- a/p2pproxy/bin/p2pproxy-cmd.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec ${JAVA_HOME}/bin/java -cp p2pproxy.jar org.linphone.p2pproxy.core.utils.AccountManagerCli $* \ No newline at end of file diff --git a/p2pproxy/bin/p2pproxy.bat b/p2pproxy/bin/p2pproxy.bat deleted file mode 100644 index 21eaf933..00000000 --- a/p2pproxy/bin/p2pproxy.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -"%JAVA_HOME%\bin\java.exe" -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=6789 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -jar p2pproxy.jar %1 %2 %3 %4 %5 %6 %7 %8 %9 \ No newline at end of file diff --git a/p2pproxy/bin/p2pproxy.sh b/p2pproxy/bin/p2pproxy.sh deleted file mode 100644 index 91f31916..00000000 --- a/p2pproxy/bin/p2pproxy.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -if [ -z "$P2P_JMX_PORT"] ; then - P2P_JMX_PORT=6789 -fi -exec ${JAVA_HOME}/bin/java -Dcom.sun.management.jmxremote \ - -Dcom.sun.management.jmxremote.port=${P2P_JMX_PORT} \ - -Dcom.sun.management.jmxremote.authenticate=false \ - -Dcom.sun.management.jmxremote.ssl=false \ - -jar p2pproxy.jar $* \ No newline at end of file diff --git a/p2pproxy/build.xml b/p2pproxy/build.xml deleted file mode 100644 index 02d3a759..00000000 --- a/p2pproxy/build.xml +++ /dev/null @@ -1,195 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/p2pproxy/configure.ac b/p2pproxy/configure.ac deleted file mode 100644 index fffaf614..00000000 --- a/p2pproxy/configure.ac +++ /dev/null @@ -1,134 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT([p2pproxy],[0.0.1]) - -AM_INIT_AUTOMAKE([tar-ustar]) - -AC_CANONICAL_SYSTEM - -AC_MSG_CHECKING([warning make an error on compilation]) -AC_ARG_ENABLE(strict, -[ --enable-strict Enable error on compilation warning [default=no]], -[wall_werror=$enableval], -[wall_werror=no] -) - - -dnl Checks for programs. -AC_PROG_CC -AC_PROG_LIBTOOL -AC_DISABLE_STATIC - - -CFLAGS="$CFLAGS -Wall" - - -dnl Checks for header files. -AC_HEADER_STDC - -dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_C_INLINE -AC_HEADER_TIME -AC_WORDS_BIGENDIAN -if test x$ac_cv_c_bigendian = xyes ; then - CFLAGS="$CFLAGS -D_BIGENDIAN" -fi - -if test $GCC = yes && test $wall_werror = yes; then - CFLAGS="$CFLAGS -Werror " -fi - -AC_ARG_WITH(java, - [ --with-java Sets directory of java home, [default=/usr/lib/jvm/java-6-sun] ], - [ javadir=${withval}],[javadir=/usr/lib/jvm/java-6-sun/]) - -AC_SUBST(javadir) - -AC_PATH_PROG(ANT,ant,false) - -AC_PATH_PROG(SWIG,swig,false) - -if test x$ANT = xfalse ; then - AC_MSG_ERROR([ant not found: you must install ant to build this package.]) -fi - -if test x$prefix = xNONE ; then - jarsdir="/usr/local/share/java/fonis" -else - jarsdir="$prefix/share/java/fonis" -fi - -AC_DEFINE_UNQUOTED(P2PPROXY_INSTALLDIR,"$jarsdir",[path of jars]) - -PKG_CHECK_MODULES(LIBLINPHONE, linphone >= 3.0.0) - -LINPHONE_PLUGINS_DIR="\$(libdir)/liblinphone/plugins/" -AC_SUBST(LINPHONE_PLUGINS_DIR) - -dnl ################################################## -dnl # Check for ESP Packager -dnl ################################################## - -AC_PATH_PROG(EPM,epm,false) -AC_PATH_PROG(MKEPMLIST,mkepmlist,false) -AC_PATH_PROG(EPMINSTALL,epminstall,false) -AM_CONDITIONAL(WITH_EPM,test $EPM != false && test $MKEPMLIST != false && test $EPMINSTALL != false) - - -# Preferred packaging system, as per EPM terminology -case $target in -*-*-linux*) - if test -f /etc/debian_version ; then - EPM_PKG_EXT=deb - else - EPM_PKG_EXT=rpm - fi - ;; -*-hp-hpux*) - EPM_PKG_EXT=depot.gz;; -*-dec-osf*) - EPM_PKG_EXT=setld;; -esac -AC_SUBST(EPM_PKG_EXT) - -# System software User & Group names -case $target in -*-*-linux*) - SYS_USER=root - SYS_GROUP=root - ;; -*-*-hpux*|*-dec-osf*) - SYS_USER=bin - SYS_GROUP=bin - ;; -esac -AC_SUBST(SYS_USER) -AC_SUBST(SYS_GROUP) - -# CPU Architecture -case $target_cpu in -i?86) ARCH=i386;; -*) ARCH=$target_cpu;; -esac -AC_SUBST(ARCH) - -# Various other packaging variables, that can be over-ridden ad `make -# package' time -SUMMARY="A SIP P2P proxy and toolkit" -AC_SUBST(SUMMARY) -PACKAGER=anonymous -AC_SUBST(PACKAGER) -LICENSE=GPL -AC_SUBST(LICENSE) -VENDOR=Linphone -AC_SUBST(VENDOR) -RELEASE=1 -AC_SUBST(RELEASE) - - -AC_OUTPUT( -Makefile -launcher/Makefile -launcher/src/Makefile -plugin-src/Makefile -) diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/ChangeRequest.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/ChangeRequest.java deleted file mode 100644 index bf83df66..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/ChangeRequest.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.attribute; - -import de.javawi.jstun.util.*; - -public class ChangeRequest extends MessageAttribute { - /* - * 0 1 2 3 - * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 - * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - * |0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 A B 0| - * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - */ - boolean changeIP = false; - boolean changePort = false; - - public ChangeRequest() { - super(MessageAttribute.MessageAttributeType.ChangeRequest); - } - - public boolean isChangeIP() { - return changeIP; - } - - public boolean isChangePort() { - return changePort; - } - - public void setChangeIP() { - changeIP = true; - } - - public void setChangePort() { - changePort = true; - } - - public byte[] getBytes() throws UtilityException { - byte[] result = new byte[8]; - // message attribute header - // type - System.arraycopy(Utility.integerToTwoBytes(typeToInteger(type)), 0, result, 0, 2); - // length - System.arraycopy(Utility.integerToTwoBytes(4), 0, result, 2, 2); - - // change request header - if (changeIP) result[7] = Utility.integerToOneByte(4); - if (changePort) result[7] = Utility.integerToOneByte(2); - if (changeIP && changePort) result[7] = Utility.integerToOneByte(6); - return result; - } - - public static ChangeRequest parse(byte[] data) throws MessageAttributeParsingException { - try { - if (data.length < 4) { - throw new MessageAttributeParsingException("Data array too short"); - } - ChangeRequest cr = new ChangeRequest(); - int status = Utility.oneByteToInteger(data[3]); - switch (status) { - case 0: break; - case 2: cr.setChangePort(); break; - case 4: cr.setChangeIP(); break; - case 6: cr.setChangeIP(); cr.setChangePort(); break; - default: throw new MessageAttributeParsingException("Status parsing error"); - } - return cr; - } catch (UtilityException ue) { - throw new MessageAttributeParsingException("Parsing error"); - } - } -} diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/ChangedAddress.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/ChangedAddress.java deleted file mode 100644 index ce06b603..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/ChangedAddress.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.attribute; - -import java.util.logging.Logger; - - -public class ChangedAddress extends MappedResponseChangedSourceAddressReflectedFrom { - private static Logger logger = Logger.getLogger("de.javawi.stun.attribute.ChangedAddress"); - - public ChangedAddress() { - super(MessageAttribute.MessageAttributeType.ChangedAddress); - } - - public static MessageAttribute parse(byte[] data) throws MessageAttributeParsingException { - ChangedAddress ca = new ChangedAddress(); - MappedResponseChangedSourceAddressReflectedFrom.parse(ca, data); - logger.finer("Message Attribute: Changed Address parsed: " + ca.toString() + "."); - return ca; - } -} diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/Data.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/Data.java deleted file mode 100644 index 71452ad2..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/Data.java +++ /dev/null @@ -1,20 +0,0 @@ -package de.javawi.jstun.attribute; - -import java.util.logging.Logger; - -import de.javawi.jstun.util.UtilityException; - -public class Data extends MessageAttribute { - private static Logger logger = Logger.getLogger(Data.class.getName()); - @Override - public byte[] getBytes() throws UtilityException { - // TODO Auto-generated method stub - return null; - } - public static MessageAttribute parse(byte[] data) throws MessageAttributeParsingException { - Data ma = new Data(); - - logger.finer("Message Attribute: Data Address parsed: " + ma.toString() + "."); - return ma; - } -} diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/Dummy.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/Dummy.java deleted file mode 100644 index 8e780dcc..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/Dummy.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.attribute; - -import de.javawi.jstun.util.Utility; -import de.javawi.jstun.util.UtilityException; - -public class Dummy extends MessageAttribute { - int lengthValue; - public Dummy() { - super(MessageAttributeType.Dummy); - } - - public void setLengthValue(int length) { - this.lengthValue = length; - } - - public byte[] getBytes() throws UtilityException { - byte[] result = new byte[lengthValue + 4]; - // message attribute header - // type - System.arraycopy(Utility.integerToTwoBytes(typeToInteger(type)), 0, result, 0, 2); - // length - System.arraycopy(Utility.integerToTwoBytes(lengthValue), 0, result, 2, 2); - return result; - } - - public static Dummy parse(byte[] data) { - Dummy dummy = new Dummy(); - dummy.setLengthValue(data.length); - return dummy; - } -} diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/ErrorCode.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/ErrorCode.java deleted file mode 100644 index 04436dd7..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/ErrorCode.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.attribute; - -import de.javawi.jstun.util.Utility; -import de.javawi.jstun.util.UtilityException; - -public class ErrorCode extends MessageAttribute { - /* - * 0 1 2 3 - * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 - * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - * | 0 |Class| Number | - * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - * | Reason Phrase (variable) .. - * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - */ - - int responseCode; - String reason; - - public ErrorCode() { - super(MessageAttribute.MessageAttributeType.ErrorCode); - } - - public void setResponseCode(int responseCode) throws MessageAttributeException { - switch (responseCode) { - case 400: reason = "Bad Request"; break; - case 401: reason = "Unauthorized"; break; - case 420: reason = "Unkown Attribute"; break; - case 430: reason = "Stale Credentials"; break; - case 431: reason = "Integrity Check Failure"; break; - case 432: reason = "Missing Username"; break; - case 433: reason = "Use TLS"; break; - case 500: reason = "Server Error"; break; - case 600: reason = "Global Failure"; break; - default: throw new MessageAttributeException("Response Code is not valid"); - } - this.responseCode = responseCode; - } - - public int getResponseCode() { - return responseCode; - } - - public String getReason() { - return reason; - } - - public byte[] getBytes() throws UtilityException { - int length = reason.length(); - // length adjustment - if ((length % 4) != 0) { - length += 4 - (length % 4); - } - // message attribute header - length += 4; - byte[] result = new byte[length]; - // message attribute header - // type - System.arraycopy(Utility.integerToTwoBytes(typeToInteger(type)), 0, result, 0, 2); - // length - System.arraycopy(Utility.integerToTwoBytes(length-4), 0, result, 2, 2); - - // error code header - int classHeader = (int) Math.floor(((double)responseCode)/100); - result[6] = Utility.integerToOneByte(classHeader); - result[7] = Utility.integerToOneByte(responseCode%100); - byte[] reasonArray = reason.getBytes(); - System.arraycopy(reasonArray, 0, result, 8, reasonArray.length); - return result; - } - - public static ErrorCode parse(byte[] data) throws MessageAttributeParsingException { - try { - if (data.length < 4) { - throw new MessageAttributeParsingException("Data array too short"); - } - byte classHeaderByte = data[3]; - int classHeader = Utility.oneByteToInteger(classHeaderByte); - if ((classHeader < 1) || (classHeader > 6)) throw new MessageAttributeParsingException("Class parsing error"); - byte numberByte = data[4]; - int number = Utility.oneByteToInteger(numberByte); - if ((number < 0) || (number > 99)) throw new MessageAttributeParsingException("Number parsing error"); - int responseCode = (classHeader * 100) + number; - ErrorCode result = new ErrorCode(); - result.setResponseCode(responseCode); - return result; - } catch (UtilityException ue) { - throw new MessageAttributeParsingException("Parsing error"); - } catch (MessageAttributeException mae) { - throw new MessageAttributeParsingException("Parsing error"); - } - } -} diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MappedAddress.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MappedAddress.java deleted file mode 100644 index bdb84acf..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MappedAddress.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.attribute; - -import java.util.logging.Logger; - - -public class MappedAddress extends MappedResponseChangedSourceAddressReflectedFrom { - private static Logger logger = Logger.getLogger("de.javawi.stun.attribute.MappedAddress"); - public MappedAddress() { - super(MessageAttribute.MessageAttributeType.MappedAddress); - } - - public static MessageAttribute parse(byte[] data) throws MessageAttributeParsingException { - MappedAddress ma = new MappedAddress(); - MappedResponseChangedSourceAddressReflectedFrom.parse(ma, data); - logger.finer("Message Attribute: Mapped Address parsed: " + ma.toString() + "."); - return ma; - } -} diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MappedResponseChangedSourceAddressReflectedFrom.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MappedResponseChangedSourceAddressReflectedFrom.java deleted file mode 100644 index 252e9605..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MappedResponseChangedSourceAddressReflectedFrom.java +++ /dev/null @@ -1,107 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.attribute; - -import de.javawi.jstun.util.*; - -public class MappedResponseChangedSourceAddressReflectedFrom extends MessageAttribute { - int port; - Address address; - - /* - * 0 1 2 3 - * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 - * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - * |x x x x x x x x| Family | Port | - * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - * | Address | - * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - */ - public MappedResponseChangedSourceAddressReflectedFrom() { - super(); - try { - port = 0; - address = new Address("0.0.0.0"); - } catch (UtilityException ue) { - ue.getMessage(); - ue.printStackTrace(); - } - } - - public MappedResponseChangedSourceAddressReflectedFrom(MessageAttribute.MessageAttributeType type) { - super(type); - } - - public int getPort() { - return port; - } - - public Address getAddress() { - return address; - } - - public void setPort(int port) throws MessageAttributeException { - if ((port > 65536) || (port < 0)) { - throw new MessageAttributeException("Port value " + port + " out of range."); - } - this.port = port; - } - - public void setAddress(Address address) { - this.address = address; - } - - public byte[] getBytes() throws UtilityException { - byte[] result = new byte[12]; - // message attribute header - // type - System.arraycopy(Utility.integerToTwoBytes(typeToInteger(type)), 0, result, 0, 2); - // length - System.arraycopy(Utility.integerToTwoBytes(8), 0, result, 2, 2); - - // mappedaddress header - // family - result[5] = Utility.integerToOneByte(0x01); - // port - System.arraycopy(Utility.integerToTwoBytes(port), 0, result, 6, 2); - // address - System.arraycopy(address.getBytes(), 0, result, 8, 4); - return result; - } - - protected static MappedResponseChangedSourceAddressReflectedFrom parse(MappedResponseChangedSourceAddressReflectedFrom ma, byte[] data) throws MessageAttributeParsingException { - try { - if (data.length < 8) { - throw new MessageAttributeParsingException("Data array too short"); - } - int family = Utility.oneByteToInteger(data[1]); - if (family != 0x01) throw new MessageAttributeParsingException("Family " + family + " is not supported"); - byte[] portArray = new byte[2]; - System.arraycopy(data, 2, portArray, 0, 2); - ma.setPort(Utility.twoBytesToInteger(portArray)); - int firstOctet = Utility.oneByteToInteger(data[4]); - int secondOctet = Utility.oneByteToInteger(data[5]); - int thirdOctet = Utility.oneByteToInteger(data[6]); - int fourthOctet = Utility.oneByteToInteger(data[7]); - ma.setAddress(new Address(firstOctet, secondOctet, thirdOctet, fourthOctet)); - return ma; - } catch (UtilityException ue) { - throw new MessageAttributeParsingException("Parsing error"); - } catch (MessageAttributeException mae) { - throw new MessageAttributeParsingException("Port parsing error"); - } - } - - public String toString() { - return "Address " +address.toString() + ", Port " + port; - } -} \ No newline at end of file diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MessageAttribute.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MessageAttribute.java deleted file mode 100644 index 2c1f1ef7..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MessageAttribute.java +++ /dev/null @@ -1,135 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.attribute; - -import java.util.logging.*; - -import de.javawi.jstun.util.*; - - -public abstract class MessageAttribute implements MessageAttributeInterface { - private static Logger logger = Logger.getLogger("de.javawi.stun.util.MessageAttribute"); - MessageAttributeType type; - - public MessageAttribute() { - } - - public MessageAttribute(MessageAttributeType type) { - setType(type); - } - - public void setType(MessageAttributeType type) { - this.type = type; - } - - public MessageAttribute.MessageAttributeType getType() { - return type; - } - - public static int typeToInteger(MessageAttributeType type) { - if (type == MessageAttributeType.MappedAddress) return MAPPEDADDRESS; - if (type == MessageAttributeType.ResponseAddress) return RESPONSEADDRESS; - if (type == MessageAttributeType.ChangeRequest) return CHANGEREQUEST; - if (type == MessageAttributeType.SourceAddress) return SOURCEADDRESS; - if (type == MessageAttributeType.ChangedAddress) return CHANGEDADDRESS; - if (type == MessageAttributeType.Username) return USERNAME; - if (type == MessageAttributeType.Password) return PASSWORD; - if (type == MessageAttributeType.MessageIntegrity) return MESSAGEINTEGRITY; - if (type == MessageAttributeType.ErrorCode) return ERRORCODE; - if (type == MessageAttributeType.UnknownAttribute) return UNKNOWNATTRIBUTE; - if (type == MessageAttributeType.ReflectedFrom) return REFLECTEDFROM; - if (type == MessageAttributeType.Dummy) return DUMMY; - //turn - if (type == MessageAttributeType.ChannelNumber) return CHANNELNUMBER; - if (type == MessageAttributeType.LifeTime) return LIFETIME; - if (type == MessageAttributeType.Bandwidth ) return BANDWIDTH; - if (type == MessageAttributeType.PeerAddress ) return PEERADDRESS; - if (type == MessageAttributeType.Data ) return DATA; - if (type == MessageAttributeType.RelayAddress ) return RELAYADDRESS; - if (type == MessageAttributeType.RequestedProps ) return REQUESTEDPROPS; - if (type == MessageAttributeType.RequestedTransport ) return REQUESTEDTRANSPORT; - if (type == MessageAttributeType.ReservationToken ) return RESERVATIONTOKEN; - return -1; - } - - public static MessageAttributeType intToType(long type) { - if (type == MAPPEDADDRESS) return MessageAttributeType.MappedAddress; - if (type == RESPONSEADDRESS) return MessageAttributeType.ResponseAddress; - if (type == CHANGEREQUEST) return MessageAttributeType.ChangeRequest; - if (type == SOURCEADDRESS) return MessageAttributeType.SourceAddress; - if (type == CHANGEDADDRESS) return MessageAttributeType.ChangedAddress; - if (type == USERNAME) return MessageAttributeType.Username; - if (type == PASSWORD) return MessageAttributeType.Password; - if (type == MESSAGEINTEGRITY) return MessageAttributeType.MessageIntegrity; - if (type == ERRORCODE) return MessageAttributeType.ErrorCode; - if (type == UNKNOWNATTRIBUTE) return MessageAttributeType.UnknownAttribute; - if (type == REFLECTEDFROM) return MessageAttributeType.ReflectedFrom; - if (type == DUMMY) return MessageAttributeType.Dummy; - //turn - if (type == CHANNELNUMBER) return MessageAttributeType.ChannelNumber; - if (type == LIFETIME) return MessageAttributeType.LifeTime; - if (type == BANDWIDTH) return MessageAttributeType.Bandwidth; - if (type == PEERADDRESS) return MessageAttributeType.PeerAddress; - if (type == DATA) return MessageAttributeType.Data; - if (type == RELAYADDRESS) return MessageAttributeType.RelayAddress; - if (type == REQUESTEDPROPS) return MessageAttributeType.RequestedProps; - if (type == REQUESTEDTRANSPORT) return MessageAttributeType.RequestedTransport; - if (type == RESERVATIONTOKEN) return MessageAttributeType.ReservationToken; - return null; - } - - abstract public byte[] getBytes() throws UtilityException; - //abstract public MessageAttribute parse(byte[] data) throws MessageAttributeParsingException; - - public int getLength() throws UtilityException { - int length = getBytes().length; - return length; - } - - public static MessageAttribute parseCommonHeader(byte[] data) throws MessageAttributeParsingException { - try { - byte[] typeArray = new byte[2]; - System.arraycopy(data, 0, typeArray, 0, 2); - int type = Utility.twoBytesToInteger(typeArray); - byte[] lengthArray = new byte[2]; - System.arraycopy(data, 2, lengthArray, 0, 2); - int lengthValue = Utility.twoBytesToInteger(lengthArray); - byte[] valueArray = new byte[lengthValue]; - System.arraycopy(data, 4, valueArray, 0, lengthValue); - MessageAttribute ma; - switch (type) { - case MAPPEDADDRESS: ma = MappedAddress.parse(valueArray); break; - case RESPONSEADDRESS: ma = ResponseAddress.parse(valueArray); break; - case CHANGEREQUEST: ma = ChangeRequest.parse(valueArray); break; - case SOURCEADDRESS: ma = SourceAddress.parse(valueArray); break; - case CHANGEDADDRESS: ma = ChangedAddress.parse(valueArray); break; - case USERNAME: ma = Username.parse(valueArray); break; - case PASSWORD: ma = Password.parse(valueArray); break; - case MESSAGEINTEGRITY: ma = MessageIntegrity.parse(valueArray); break; - case ERRORCODE: ma = ErrorCode.parse(valueArray); break; - case UNKNOWNATTRIBUTE: ma = UnknownAttribute.parse(valueArray); break; - case REFLECTEDFROM: ma = ReflectedFrom.parse(valueArray); break; - default: - if (type <= 0x7fff) { - throw new UnknownMessageAttributeException("Unkown mandatory message attribute", intToType(type)); - } else { - logger.finer("MessageAttribute with type " + type + " unkown."); - ma = Dummy.parse(valueArray); - break; - } - } - return ma; - } catch (UtilityException ue) { - throw new MessageAttributeParsingException("Parsing error"); - } - } -} diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MessageAttributeException.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MessageAttributeException.java deleted file mode 100644 index a8109cfd..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MessageAttributeException.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.attribute; - -public class MessageAttributeException extends Exception { - private static final long serialVersionUID = 3258131345099404850L; - - public MessageAttributeException(String mesg) { - super(mesg); - } -} \ No newline at end of file diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MessageAttributeInterface.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MessageAttributeInterface.java deleted file mode 100644 index 8c55d780..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MessageAttributeInterface.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.attribute; - -public interface MessageAttributeInterface { - public enum MessageAttributeType { MappedAddress - , ResponseAddress - , ChangeRequest - , SourceAddress - , ChangedAddress - , Username - , Password - , MessageIntegrity - , ErrorCode - , UnknownAttribute - , ReflectedFrom - , Dummy - , ChannelNumber - , LifeTime - , Bandwidth - , PeerAddress - , Data - , RelayAddress - , RequestedProps - , RequestedTransport - , ReservationToken}; - final static int MAPPEDADDRESS = 0x0001; - final static int RESPONSEADDRESS = 0x0002; - final static int CHANGEREQUEST = 0x0003; - final static int SOURCEADDRESS = 0x0004; - final static int CHANGEDADDRESS = 0x0005; - final static int USERNAME = 0x0006; - final static int PASSWORD = 0x0007; - final static int MESSAGEINTEGRITY = 0x0008; - final static int ERRORCODE = 0x0009; - final static int UNKNOWNATTRIBUTE = 0x000a; - final static int REFLECTEDFROM = 0x000b; - final static int DUMMY = 0x0000; -// turn attributes -// 0x000C: CHANNEL-NUMBER -// 0x000D: LIFETIME -// 0x0010: BANDWIDTH -// 0x0012: PEER-ADDRESS -// 0x0013: DATA -// 0x0016: RELAY-ADDRESS -// 0x0018: REQUESTED-PROPS -// 0x0019: REQUESTED-TRANSPORT -// 0x0022: RESERVATION-TOKEN - final static int CHANNELNUMBER = 0x000C; - final static int LIFETIME = 0x000D; - final static int BANDWIDTH = 0x0010; - final static int PEERADDRESS = 0x0012; - final static int DATA = 0x0013; - final static int RELAYADDRESS = 0x0016; - final static int REQUESTEDPROPS = 0x0018; - final static int REQUESTEDTRANSPORT = 0x0019; - final static int RESERVATIONTOKEN = 0x0022; - -} \ No newline at end of file diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MessageAttributeParsingException.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MessageAttributeParsingException.java deleted file mode 100644 index d2027897..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MessageAttributeParsingException.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.attribute; - -public class MessageAttributeParsingException extends MessageAttributeException { - private static final long serialVersionUID = 3258409534426263605L; - - public MessageAttributeParsingException(String mesg) { - super(mesg); - } -} \ No newline at end of file diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MessageIntegrity.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MessageIntegrity.java deleted file mode 100644 index 7aa7df3d..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/MessageIntegrity.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.attribute; - -public class MessageIntegrity extends MessageAttribute { - // incomplete message integrity implementation - public MessageIntegrity() { - super(MessageAttribute.MessageAttributeType.MessageIntegrity); - } - - public byte[] getBytes() { - return new byte[0]; - } - - public static MessageIntegrity parse(byte[] data) { - return new MessageIntegrity(); - } -} diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/Password.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/Password.java deleted file mode 100644 index 679a193d..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/Password.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.attribute; - -import de.javawi.jstun.util.Utility; -import de.javawi.jstun.util.UtilityException; - -public class Password extends MessageAttribute { - String password; - - public Password() { - super(MessageAttribute.MessageAttributeType.Password); - } - - public Password(String password) { - super(MessageAttribute.MessageAttributeType.Password); - setPassword(password); - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public byte[] getBytes() throws UtilityException { - int length = password.length(); - // password header - if ((length % 4) != 0) { - length += 4 - (length % 4); - } - // message attribute header - length += 4; - byte[] result = new byte[length]; - // message attribute header - // type - System.arraycopy(Utility.integerToTwoBytes(typeToInteger(type)), 0, result, 0, 2); - // length - System.arraycopy(Utility.integerToTwoBytes(length - 4), 0, result, 2, 2); - - // password header - byte[] temp = password.getBytes(); - System.arraycopy(temp, 0, result, 4, temp.length); - return result; - } - - public static Password parse(byte[] data) { - Password result = new Password(); - String password = new String(data); - result.setPassword(password); - return result; - } -} \ No newline at end of file diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/ReflectedFrom.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/ReflectedFrom.java deleted file mode 100644 index e2983143..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/ReflectedFrom.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.attribute; - -import java.util.logging.Logger; - -public class ReflectedFrom extends MappedResponseChangedSourceAddressReflectedFrom { - private static Logger logger = Logger.getLogger("de.javawi.stun.attribute.ReflectedFrom"); - - public ReflectedFrom() { - super(MessageAttribute.MessageAttributeType.ReflectedFrom); - } - - public static ReflectedFrom parse(byte[] data) throws MessageAttributeParsingException { - ReflectedFrom result = new ReflectedFrom(); - MappedResponseChangedSourceAddressReflectedFrom.parse(result, data); - logger.finer("Message Attribute: ReflectedFrom parsed: " + result.toString() + "."); - return result; - } - - -} diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/ResponseAddress.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/ResponseAddress.java deleted file mode 100644 index 40c73bd0..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/ResponseAddress.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.attribute; - -import java.util.logging.Logger; - - -public class ResponseAddress extends MappedResponseChangedSourceAddressReflectedFrom { - private static Logger logger = Logger.getLogger("de.javawi.stun.attribute.ResponseAddress"); - public ResponseAddress() { - super(MessageAttribute.MessageAttributeType.ResponseAddress); - } - - public static MessageAttribute parse(byte[] data) throws MessageAttributeParsingException { - ResponseAddress ra = new ResponseAddress(); - MappedResponseChangedSourceAddressReflectedFrom.parse(ra, data); - logger.finer("Message Attribute: Response Address parsed: " + ra.toString() + "."); - return ra; - } -} diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/SourceAddress.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/SourceAddress.java deleted file mode 100644 index 070d7d8d..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/SourceAddress.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.attribute; - -import java.util.logging.Logger; - - -public class SourceAddress extends MappedResponseChangedSourceAddressReflectedFrom { - private static Logger logger = Logger.getLogger("de.javawi.stun.attribute.SourceAddress"); - public SourceAddress() { - super(MessageAttribute.MessageAttributeType.SourceAddress); - } - - public static MessageAttribute parse(byte[] data) throws MessageAttributeParsingException { - SourceAddress sa = new SourceAddress(); - MappedResponseChangedSourceAddressReflectedFrom.parse(sa, data); - logger.finer("Message Attribute: Source Address parsed: " + sa.toString() + "."); - return sa; - } -} \ No newline at end of file diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/UnknownAttribute.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/UnknownAttribute.java deleted file mode 100644 index 04f1abb8..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/UnknownAttribute.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.attribute; - -import java.util.*; - -import de.javawi.jstun.util.Utility; -import de.javawi.jstun.util.UtilityException; - -public class UnknownAttribute extends MessageAttribute { - /* - * 0 1 2 3 - * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 - * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - * | Attribute 1 Type | Attribute 2 Type | - * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - * | Attribute 3 Type | Attribute 4 Type ... - * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - */ - - Vector unkown = new Vector(); - - public UnknownAttribute() { - super(MessageAttribute.MessageAttributeType.UnknownAttribute); - } - - public void addAttribute(MessageAttributeType attribute) { - unkown.add(attribute); - } - - public byte[] getBytes() throws UtilityException { - int length = 0; - if (unkown.size()%2 == 1) { - length = 2 * (unkown.size() + 1) + 4; - } else { - length = 2 * unkown.size() + 4; - } - byte[] result = new byte[length]; - // message attribute header - // type - System.arraycopy(Utility.integerToTwoBytes(typeToInteger(type)), 0, result, 0, 2); - // length - System.arraycopy(Utility.integerToTwoBytes(length - 4), 0, result, 2, 2); - - // unkown attribute header - Iterator it = unkown.iterator(); - while(it.hasNext()) { - MessageAttributeType attri = it.next(); - System.arraycopy(Utility.integerToTwoBytes(typeToInteger(attri)), 0, result, 4, 2); - } - // padding - if (unkown.size()%2 == 1) { - System.arraycopy(Utility.integerToTwoBytes(typeToInteger(unkown.elementAt(1))), 0, result, 4, 2); - } - return result; - } - - public static UnknownAttribute parse(byte[] data) throws MessageAttributeParsingException { - try { - UnknownAttribute result = new UnknownAttribute(); - if (data.length % 4 != 0) throw new MessageAttributeParsingException("Data array too short"); - for (int i = 0; i < data.length; i += 4) { - byte[] temp = new byte[4]; - System.arraycopy(data, i, temp, 0, 4); - long attri = Utility.fourBytesToLong(temp); - result.addAttribute(MessageAttribute.intToType(attri)); - } - return result; - } catch (UtilityException ue) { - throw new MessageAttributeParsingException("Parsing error"); - } - } -} \ No newline at end of file diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/UnknownMessageAttributeException.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/UnknownMessageAttributeException.java deleted file mode 100644 index 4ddd4922..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/UnknownMessageAttributeException.java +++ /dev/null @@ -1,18 +0,0 @@ -package de.javawi.jstun.attribute; - -import de.javawi.jstun.attribute.MessageAttributeInterface.MessageAttributeType; - -public class UnknownMessageAttributeException extends MessageAttributeParsingException { - private static final long serialVersionUID = 5375193544145543299L; - - private MessageAttributeType type; - - public UnknownMessageAttributeException(String mesg, MessageAttributeType type) { - super(mesg); - this.type = type; - } - - public MessageAttributeType getType() { - return type; - } -} diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/Username.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/Username.java deleted file mode 100644 index 1afaec7b..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/attribute/Username.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.attribute; - -import de.javawi.jstun.util.Utility; -import de.javawi.jstun.util.UtilityException; - -public class Username extends MessageAttribute { - String username; - - public Username() { - super(MessageAttribute.MessageAttributeType.Username); - } - - public Username(String username) { - super(MessageAttribute.MessageAttributeType.Username); - setUsername(username); - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public byte[] getBytes() throws UtilityException { - int length = username.length(); - // username header - if ((length % 4) != 0) { - length += 4 - (length % 4); - } - // message attribute header - length += 4; - byte[] result = new byte[length]; - // message attribute header - // type - System.arraycopy(Utility.integerToTwoBytes(typeToInteger(type)), 0, result, 0, 2); - // length - System.arraycopy(Utility.integerToTwoBytes(length-4), 0, result, 2, 2); - - // username header - byte[] temp = username.getBytes(); - System.arraycopy(temp, 0, result, 4, temp.length); - return result; - } - - public static Username parse(byte[] data) { - Username result = new Username(); - String username = new String(data); - result.setUsername(username); - return result; - } -} diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/header/MessageHeader.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/header/MessageHeader.java deleted file mode 100644 index 1e6dab58..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/header/MessageHeader.java +++ /dev/null @@ -1,202 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.header; - -import de.javawi.jstun.attribute.*; -import de.javawi.jstun.util.*; - -import java.util.*; -import java.util.logging.*; - -public class MessageHeader implements MessageHeaderInterface { - /* - * 0 1 2 3 - * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 - * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - * | STUN Message Type | Message Length | - * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - * | - * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - * - * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - * Transaction ID - * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - * | - * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - */ - private static Logger logger = Logger.getLogger("de.javawi.stun.header.MessageHeader"); - MessageHeaderType type; - byte[] id = new byte[16]; - - TreeMap ma = new TreeMap(); - - public MessageHeader() { - super(); - } - - public MessageHeader(MessageHeaderType type) { - super(); - setType(type); - } - - public void setType(MessageHeaderType type) { - this.type = type; - } - - public MessageHeaderType getType() { - return type; - } - - public static int typeToInteger(MessageHeaderType type) { - if (type == MessageHeaderType.BindingRequest) return BINDINGREQUEST; - if (type == MessageHeaderType.BindingResponse) return BINDINGRESPONSE; - if (type == MessageHeaderType.BindingErrorResponse) return BINDINGERRORRESPONSE; - if (type == MessageHeaderType.SharedSecretRequest) return SHAREDSECRETREQUEST; - if (type == MessageHeaderType.SharedSecretResponse) return SHAREDSECRETRESPONSE; - if (type == MessageHeaderType.SharedSecretErrorResponse) return SHAREDSECRETERRORRESPONSE; - //turn headers - if (type == MessageHeaderType.AllocateRequest) return ALLOCATEREQUEST; - if (type == MessageHeaderType.AllocateResponse) return ALLOCATERESPONSE; - if (type == MessageHeaderType.AllocateErrorResponse) return ALLOCATEERRORRESPONSE; - if (type == MessageHeaderType.RefreshRequest) return REFRESHREQUEST; - if (type == MessageHeaderType.RefreshResponse) return REFRESHRESPONSE; - if (type == MessageHeaderType.RefreshErrorResponse) return REFRESHERRORRESPONSE; - if (type == MessageHeaderType.ChannelBindRequest) return CHANNELBINDREQUEST; - if (type == MessageHeaderType.ChannelBindResponse) return CHANNELBINDRESPONSE; - if (type == MessageHeaderType.ChannelBindErrorResponse) return CHANNELBINDERRORRESPONSE; - - - return -1; - } - - public void setTransactionID(byte[] id) { - System.arraycopy(id, 0, this.id, 0, 16); - } - - public void generateTransactionID() throws UtilityException { - System.arraycopy(Utility.integerToTwoBytes((int)(Math.random() * 65536)), 0, id, 0, 2); - System.arraycopy(Utility.integerToTwoBytes((int)(Math.random() * 65536)), 0, id, 2, 2); - System.arraycopy(Utility.integerToTwoBytes((int)(Math.random() * 65536)), 0, id, 4, 2); - System.arraycopy(Utility.integerToTwoBytes((int)(Math.random() * 65536)), 0, id, 6, 2); - System.arraycopy(Utility.integerToTwoBytes((int)(Math.random() * 65536)), 0, id, 8, 2); - System.arraycopy(Utility.integerToTwoBytes((int)(Math.random() * 65536)), 0, id, 10, 2); - System.arraycopy(Utility.integerToTwoBytes((int)(Math.random() * 65536)), 0, id, 12, 2); - System.arraycopy(Utility.integerToTwoBytes((int)(Math.random() * 65536)), 0, id, 14, 2); - } - - public byte[] getTransactionID() { - byte[] idCopy = new byte[id.length]; - System.arraycopy(id, 0, idCopy, 0, id.length); - return idCopy; - } - - public boolean equalTransactionID(MessageHeader header) { - byte[] idHeader = header.getTransactionID(); - if (idHeader.length != 16) return false; - if ((idHeader[0] == id[0]) && (idHeader[1] == id[1]) && (idHeader[2] == id[2]) && (idHeader[3] == id[3]) && - (idHeader[4] == id[4]) && (idHeader[5] == id[5]) && (idHeader[6] == id[6]) && (idHeader[7] == id[7]) && - (idHeader[8] == id[8]) && (idHeader[9] == id[9]) && (idHeader[10] == id[10]) && (idHeader[11] == id[11]) && - (idHeader[12] == id[12]) && (idHeader[13] == id[13]) && (idHeader[14] == id[14]) && (idHeader[15] == id[15])) { - return true; - } else { - return false; - } - } - - public void addMessageAttribute(MessageAttribute attri) { - ma.put(attri.getType(), attri); - } - - public MessageAttribute getMessageAttribute(MessageAttribute.MessageAttributeType type) { - return ma.get(type); - } - - public byte[] getBytes() throws UtilityException { - int length = 20; - Iterator it = ma.keySet().iterator(); - while (it.hasNext()) { - MessageAttribute attri = ma.get(it.next()); - length += attri.getLength(); - } - // add attribute size + attributes.getSize(); - byte[] result = new byte[length]; - System.arraycopy(Utility.integerToTwoBytes(typeToInteger(type)), 0, result, 0, 2); - System.arraycopy(Utility.integerToTwoBytes(length-20), 0, result, 2, 2); - System.arraycopy(id, 0, result, 4, 16); - - // arraycopy of attributes - int offset = 20; - it = ma.keySet().iterator(); - while (it.hasNext()) { - MessageAttribute attri = ma.get(it.next()); - System.arraycopy(attri.getBytes(), 0, result, offset, attri.getLength()); - offset += attri.getLength(); - } - return result; - } - - public int getLength() throws UtilityException { - return getBytes().length; - } - - public void parseAttributes(byte[] data) throws MessageAttributeParsingException { - try { - byte[] lengthArray = new byte[2]; - System.arraycopy(data, 2, lengthArray, 0, 2); - int length = Utility.twoBytesToInteger(lengthArray); - System.arraycopy(data, 4, id, 0, 16); - byte[] cuttedData; - int offset = 20; - while (length > 0) { - cuttedData = new byte[length]; - System.arraycopy(data, offset, cuttedData, 0, length); - MessageAttribute ma = MessageAttribute.parseCommonHeader(cuttedData); - addMessageAttribute(ma); - length -= ma.getLength(); - offset += ma.getLength(); - } - } catch (UtilityException ue) { - throw new MessageAttributeParsingException("Parsing error"); - } - } - - public static MessageHeader parseHeader(byte[] data) throws MessageHeaderParsingException { - try { - MessageHeader mh = new MessageHeader(); - byte[] typeArray = new byte[2]; - System.arraycopy(data, 0, typeArray, 0, 2); - int type = Utility.twoBytesToInteger(typeArray); - switch (type) { - case BINDINGREQUEST: mh.setType(MessageHeaderType.BindingRequest); logger.finer("Binding Request received."); break; - case BINDINGRESPONSE: mh.setType(MessageHeaderType.BindingResponse); logger.finer("Binding Response received."); break; - case BINDINGERRORRESPONSE: mh.setType(MessageHeaderType.BindingErrorResponse); logger.finer("Binding Error Response received."); break; - case SHAREDSECRETREQUEST: mh.setType(MessageHeaderType.SharedSecretRequest); logger.finer("Shared Secret Request received."); break; - case SHAREDSECRETRESPONSE: mh.setType(MessageHeaderType.SharedSecretResponse); logger.finer("Shared Secret Response received."); break; - case SHAREDSECRETERRORRESPONSE: mh.setType(MessageHeaderType.SharedSecretErrorResponse); logger.finer("Shared Secret Error Response received.");break; - //turn - case ALLOCATEREQUEST: mh.setType(MessageHeaderType.AllocateRequest); logger.finer("Allocate Request received."); break; - case ALLOCATERESPONSE: mh.setType(MessageHeaderType.AllocateResponse); logger.finer("Allocate Response received."); break; - case ALLOCATEERRORRESPONSE: mh.setType(MessageHeaderType.AllocateErrorResponse); logger.finer("Allocate Errro received."); break; - case REFRESHREQUEST: mh.setType(MessageHeaderType.RefreshRequest); logger.finer("Refresh Request received."); break; - case REFRESHRESPONSE: mh.setType(MessageHeaderType.RefreshResponse); logger.finer("Refresh Response received."); break; - case REFRESHERRORRESPONSE: mh.setType(MessageHeaderType.RefreshErrorResponse); logger.finer("Refresh Error received."); break; - case CHANNELBINDREQUEST: mh.setType(MessageHeaderType.ChannelBindRequest); logger.finer("ChannelBind Request received."); break; - case CHANNELBINDRESPONSE: mh.setType(MessageHeaderType.ChannelBindResponse); logger.finer("ChannelBind Response received."); break; - case CHANNELBINDERRORRESPONSE: mh.setType(MessageHeaderType.ChannelBindErrorResponse); logger.finer("ChannelBind Error received."); break; - default: throw new MessageHeaderParsingException("Message type " + type + "is not supported"); - } - return mh; - } catch (UtilityException ue) { - throw new MessageHeaderParsingException("Parsing error"); - } - } -} \ No newline at end of file diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/header/MessageHeaderException.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/header/MessageHeaderException.java deleted file mode 100644 index f4a9fa49..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/header/MessageHeaderException.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.header; - -public class MessageHeaderException extends Exception { - private static final long serialVersionUID = 3689066248944103737L; - - public MessageHeaderException(String mesg) { - super(mesg); - } -} \ No newline at end of file diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/header/MessageHeaderInterface.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/header/MessageHeaderInterface.java deleted file mode 100644 index 1b7a2cfe..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/header/MessageHeaderInterface.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.header; - -public interface MessageHeaderInterface { - public enum MessageHeaderType { BindingRequest - , BindingResponse - , BindingErrorResponse - , SharedSecretRequest - , SharedSecretResponse - , SharedSecretErrorResponse - , AllocateRequest - , AllocateResponse - , AllocateErrorResponse - , RefreshRequest - , RefreshResponse - , RefreshErrorResponse - , ChannelBindRequest - , ChannelBindResponse - , ChannelBindErrorResponse - ,SendIndication - ,DataIndication}; - final static int BINDINGREQUEST = 0x0001; - final static int BINDINGRESPONSE = 0x0101; - final static int BINDINGERRORRESPONSE = 0x0111; - final static int SHAREDSECRETREQUEST = 0x0002; - final static int SHAREDSECRETRESPONSE = 0x0102; - final static int SHAREDSECRETERRORRESPONSE = 0x0112; - -// TURN defines ten new Message Types: -//Request/Response Transactions -//0x003 : Allocate -//0x004 : Refresh -//0x009 : ChannelBind -//0x006 : Send -//0x007 : Data - - - final static int ALLOCATEREQUEST = 0x0003; - final static int ALLOCATERESPONSE = 0x0103; - final static int ALLOCATEERRORRESPONSE = 0x0113; - final static int REFRESHREQUEST = 0x0004; - final static int REFRESHRESPONSE = 0x0104; - final static int REFRESHERRORRESPONSE = 0x0114; - final static int CHANNELBINDREQUEST = 0x0009; - final static int CHANNELBINDRESPONSE = 0x0109; - final static int CHANNELBINDERRORRESPONSE = 0x0119; - final static int SENDINDICATION = 0x0006; - final static int DATAINDICATION = 0x0007; - - -} \ No newline at end of file diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/header/MessageHeaderParsingException.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/header/MessageHeaderParsingException.java deleted file mode 100644 index d5192ef2..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/header/MessageHeaderParsingException.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.header; - -public class MessageHeaderParsingException extends MessageHeaderException { - private static final long serialVersionUID = 3544393617029607478L; - - public MessageHeaderParsingException(String mesg) { - super(mesg); - } -} \ No newline at end of file diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/BindingLifetimeTest.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/BindingLifetimeTest.java deleted file mode 100644 index 1dca91b4..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/BindingLifetimeTest.java +++ /dev/null @@ -1,192 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.test; - -import java.util.logging.*; -import java.util.*; -import java.io.*; -import java.net.*; - -import de.javawi.jstun.attribute.*; -import de.javawi.jstun.header.*; -import de.javawi.jstun.util.UtilityException; - -public class BindingLifetimeTest { - private static Logger logger = Logger.getLogger("de.javawi.stun.test.BindingLifetimeTest"); - String stunServer; - int port; - int timeout = 300; //ms - MappedAddress ma; - Timer timer; - DatagramSocket initialSocket; - - // start value for binary search - should be carefully choosen - int upperBinarySearchLifetime = 345000; // ms - int lowerBinarySearchLifetime = 0; - int binarySearchLifetime = ( upperBinarySearchLifetime + lowerBinarySearchLifetime ) / 2; - - // lifetime value - int lifetime = -1; // -1 means undefined. - boolean completed = false; - - public BindingLifetimeTest(String stunServer, int port) { - super(); - this.stunServer = stunServer; - this.port = port; - timer = new Timer(true); - } - - public void test() throws UtilityException, SocketException, UnknownHostException, IOException, MessageAttributeParsingException, MessageAttributeException, MessageHeaderParsingException { - initialSocket = new DatagramSocket(); - initialSocket.connect(InetAddress.getByName(stunServer), port); - initialSocket.setSoTimeout(timeout); - - if (bindingCommunicationInitialSocket()) { - return; - } - BindingLifetimeTask task = new BindingLifetimeTask(); - timer.schedule(task, binarySearchLifetime); - logger.finer("Timer scheduled initially: " + binarySearchLifetime + "."); - } - - private boolean bindingCommunicationInitialSocket() throws UtilityException, IOException, MessageHeaderParsingException, MessageAttributeParsingException { - MessageHeader sendMH = new MessageHeader(MessageHeader.MessageHeaderType.BindingRequest); - sendMH.generateTransactionID(); - ChangeRequest changeRequest = new ChangeRequest(); - sendMH.addMessageAttribute(changeRequest); - byte[] data = sendMH.getBytes(); - - DatagramPacket send = new DatagramPacket(data, data.length, InetAddress.getByName(stunServer), port); - initialSocket.send(send); - logger.finer("Binding Request sent."); - - MessageHeader receiveMH = new MessageHeader(); - while (!(receiveMH.equalTransactionID(sendMH))) { - DatagramPacket receive = new DatagramPacket(new byte[200], 200); - initialSocket.receive(receive); - receiveMH = MessageHeader.parseHeader(receive.getData()); - receiveMH.parseAttributes(receive.getData()); - } - ma = (MappedAddress) receiveMH.getMessageAttribute(MessageAttribute.MessageAttributeType.MappedAddress); - ErrorCode ec = (ErrorCode) receiveMH.getMessageAttribute(MessageAttribute.MessageAttributeType.ErrorCode); - if (ec != null) { - logger.config("Message header contains an Errorcode message attribute."); - return true; - } - if (ma == null) { - logger.config("Response does not contain a Mapped Address message attribute."); - return true; - } - return false; - } - - public int getLifetime() { - return lifetime; - } - - public boolean isCompleted() { - return completed; - } - - public void setUpperBinarySearchLifetime(int upperBinarySearchLifetime) { - this.upperBinarySearchLifetime = upperBinarySearchLifetime; - binarySearchLifetime = ( upperBinarySearchLifetime + lowerBinarySearchLifetime ) / 2; - } - - class BindingLifetimeTask extends TimerTask { - - public BindingLifetimeTask() { - super(); - } - - public void run() { - try { - lifetimeQuery(); - } catch (Exception e) { - logger.config("Unhandled Exception. BindLifetimeTasks stopped."); - e.printStackTrace(); - } - } - - public void lifetimeQuery() throws UtilityException, MessageAttributeException, MessageHeaderParsingException, MessageAttributeParsingException, IOException { - try { - DatagramSocket socket = new DatagramSocket(); - socket.connect(InetAddress.getByName(stunServer), port); - socket.setSoTimeout(timeout); - - MessageHeader sendMH = new MessageHeader(MessageHeader.MessageHeaderType.BindingRequest); - sendMH.generateTransactionID(); - ChangeRequest changeRequest = new ChangeRequest(); - ResponseAddress responseAddress = new ResponseAddress(); - responseAddress.setAddress(ma.getAddress()); - responseAddress.setPort(ma.getPort()); - sendMH.addMessageAttribute(changeRequest); - sendMH.addMessageAttribute(responseAddress); - byte[] data = sendMH.getBytes(); - - DatagramPacket send = new DatagramPacket(data, data.length, InetAddress.getByName(stunServer), port); - socket.send(send); - logger.finer("Binding Request sent."); - - MessageHeader receiveMH = new MessageHeader(); - while (!(receiveMH.equalTransactionID(sendMH))) { - DatagramPacket receive = new DatagramPacket(new byte[200], 200); - initialSocket.receive(receive); - receiveMH = MessageHeader.parseHeader(receive.getData()); - receiveMH.parseAttributes(receive.getData()); - } - ErrorCode ec = (ErrorCode) receiveMH.getMessageAttribute(MessageAttribute.MessageAttributeType.ErrorCode); - if (ec != null) { - logger.config("Message header contains errorcode message attribute."); - return; - } - logger.finer("Binding Response received."); - if (upperBinarySearchLifetime == (lowerBinarySearchLifetime + 1)) { - logger.config("BindingLifetimeTest completed. UDP binding lifetime: " + binarySearchLifetime + "."); - completed = true; - return; - } - lifetime = binarySearchLifetime; - logger.finer("Lifetime update: " + lifetime + "."); - lowerBinarySearchLifetime = binarySearchLifetime; - binarySearchLifetime = ( upperBinarySearchLifetime + lowerBinarySearchLifetime ) / 2; - if (binarySearchLifetime > 0) { - BindingLifetimeTask task = new BindingLifetimeTask(); - timer.schedule(task, binarySearchLifetime); - logger.finer("Timer scheduled: " + binarySearchLifetime + "."); - } else { - completed = true; - } - } catch (SocketTimeoutException ste) { - logger.finest("Read operation at query socket timeout."); - if (upperBinarySearchLifetime == (lowerBinarySearchLifetime + 1)) { - logger.config("BindingLifetimeTest completed. UDP binding lifetime: " + binarySearchLifetime + "."); - completed = true; - return; - } - upperBinarySearchLifetime = binarySearchLifetime; - binarySearchLifetime = ( upperBinarySearchLifetime + lowerBinarySearchLifetime ) / 2; - if (binarySearchLifetime > 0) { - if (bindingCommunicationInitialSocket()) { - return; - } - BindingLifetimeTask task = new BindingLifetimeTask(); - timer.schedule(task, binarySearchLifetime); - logger.finer("Timer scheduled: " + binarySearchLifetime + "."); - } else { - completed = true; - } - } - } - } -} - diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/DiscoveryInfo.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/DiscoveryInfo.java deleted file mode 100644 index abaab15e..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/DiscoveryInfo.java +++ /dev/null @@ -1,153 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.test; - -import java.net.*; - -public class DiscoveryInfo { - private InetAddress testIP; - private boolean error = false; - private int errorResponseCode = 0; - private String errorReason; - private boolean openAccess = false; - private boolean blockedUDP = false; - private boolean fullCone = false; - private boolean restrictedCone = false; - private boolean portRestrictedCone = false; - private boolean symmetric = false; - private boolean symmetricUDPFirewall = false; - private InetAddress publicIP; - - public DiscoveryInfo(InetAddress testIP) { - this.testIP = testIP; - } - - public boolean isError() { - return error; - } - - public void setError(int responseCode, String reason) { - this.error = true; - this.errorResponseCode = responseCode; - this.errorReason = reason; - } - - public boolean isOpenAccess() { - if (error) return false; - return openAccess; - } - - public void setOpenAccess() { - this.openAccess = true; - } - - public boolean isBlockedUDP() { - if (error) return false; - return blockedUDP; - } - - public void setBlockedUDP() { - this.blockedUDP = true; - } - - public boolean isFullCone() { - if (error) return false; - return fullCone; - } - - public void setFullCone() { - this.fullCone = true; - } - - public boolean isPortRestrictedCone() { - if (error) return false; - return portRestrictedCone; - } - - public void setPortRestrictedCone() { - this.portRestrictedCone = true; - } - - public boolean isRestrictedCone() { - if (error) return false; - return restrictedCone; - } - - public void setRestrictedCone() { - this.restrictedCone = true; - } - - public boolean isSymmetric() { - if (error) return false; - return symmetric; - } - - public void setSymmetric() { - this.symmetric = true; - } - - public boolean isSymmetricUDPFirewall() { - if (error) return false; - return symmetricUDPFirewall; - } - - public void setSymmetricUDPFirewall() { - this.symmetricUDPFirewall = true; - } - - public InetAddress getPublicIP() { - return publicIP; - } - - public InetAddress getLocalIP() { - return testIP; - } - - public void setPublicIP(InetAddress publicIP) { - this.publicIP = publicIP; - } - - public String toString() { - StringBuffer sb = new StringBuffer(); - sb.append("Network interface: "); - try { - sb.append(NetworkInterface.getByInetAddress(testIP).getName()); - } catch (SocketException se) { - sb.append("unknown"); - } - sb.append("\n"); - sb.append("Local IP address: "); - sb.append(testIP.getHostAddress()); - sb.append("\n"); - if (error) { - sb.append(errorReason + " - Responsecode: " + errorResponseCode); - return sb.toString(); - } - sb.append("Result: "); - if (openAccess) sb.append("Open access to the Internet.\n"); - if (blockedUDP) sb.append("Firewall blocks UDP.\n"); - if (fullCone) sb.append("Full Cone NAT handles connections.\n"); - if (restrictedCone) sb.append("Restricted Cone NAT handles connections.\n"); - if (portRestrictedCone) sb.append("Port restricted Cone NAT handles connections.\n"); - if (symmetric) sb.append("Symmetric Cone NAT handles connections.\n"); - if (symmetricUDPFirewall) sb.append ("Symmetric UDP Firewall handles connections.\n"); - if (!openAccess && !blockedUDP && !fullCone && !restrictedCone && !portRestrictedCone && !symmetric && !symmetricUDPFirewall) sb.append("unkown\n"); - sb.append("Public IP address: "); - if (publicIP != null) { - sb.append(publicIP.getHostAddress()); - } else { - sb.append("unknown"); - } - sb.append("\n"); - return sb.toString(); - } -} diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/DiscoveryTest.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/DiscoveryTest.java deleted file mode 100644 index 4f940adf..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/DiscoveryTest.java +++ /dev/null @@ -1,351 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.test; - -import java.io.IOException; -import java.net.DatagramPacket; -import java.net.DatagramSocket; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.net.SocketException; -import java.net.SocketTimeoutException; -import java.net.UnknownHostException; -import java.util.logging.Logger; - - - - - -import de.javawi.jstun.attribute.ChangeRequest; -import de.javawi.jstun.attribute.ChangedAddress; -import de.javawi.jstun.attribute.ErrorCode; -import de.javawi.jstun.attribute.MappedAddress; -import de.javawi.jstun.attribute.MessageAttribute; -import de.javawi.jstun.attribute.MessageAttributeException; -import de.javawi.jstun.attribute.MessageAttributeParsingException; -import de.javawi.jstun.header.MessageHeader; -import de.javawi.jstun.header.MessageHeaderParsingException; -import de.javawi.jstun.util.UtilityException; - -public class DiscoveryTest { - private static Logger logger = Logger.getLogger("de.javawi.stun.test.DiscoveryTest"); - InetAddress iaddress; - String stunServer; - int port; - int timeoutInitValue = 300; //ms - MappedAddress ma = null; - ChangedAddress ca = null; - boolean nodeNatted = true; - DatagramSocket socketTest1 = null; - DiscoveryInfo di = null; - - public DiscoveryTest(InetAddress iaddress , String stunServer, int port) { - super(); - this.iaddress = iaddress; - this.stunServer = stunServer; - this.port = port; - } - - public DiscoveryInfo test() throws UtilityException, SocketException, UnknownHostException, IOException, MessageAttributeParsingException, MessageAttributeException, MessageHeaderParsingException{ - ma = null; - ca = null; - nodeNatted = true; - socketTest1 = null; - di = new DiscoveryInfo(iaddress); - - if (test1()) { - if (test2()) { - if (test1Redo()) { - test3(); - } - } - } - - socketTest1.close(); - - return di; - } - - private boolean test1() throws UtilityException, SocketException, UnknownHostException, IOException, MessageAttributeParsingException, MessageHeaderParsingException { - int timeSinceFirstTransmission = 0; - int timeout = timeoutInitValue; - while (true) { - try { - // Test 1 including response - socketTest1 = new DatagramSocket(new InetSocketAddress(iaddress, 0)); - socketTest1.setReuseAddress(true); - socketTest1.connect(InetAddress.getByName(stunServer), port); - socketTest1.setSoTimeout(timeout); - - MessageHeader sendMH = new MessageHeader(MessageHeader.MessageHeaderType.BindingRequest); - sendMH.generateTransactionID(); - - ChangeRequest changeRequest = new ChangeRequest(); - sendMH.addMessageAttribute(changeRequest); - - byte[] data = sendMH.getBytes(); - DatagramPacket send = new DatagramPacket(data, data.length); - socketTest1.send(send); - logger.finer("Test 1: Binding Request sent."); - - MessageHeader receiveMH = new MessageHeader(); - while (!(receiveMH.equalTransactionID(sendMH))) { - DatagramPacket receive = new DatagramPacket(new byte[200], 200); - socketTest1.receive(receive); - receiveMH = MessageHeader.parseHeader(receive.getData()); - receiveMH.parseAttributes(receive.getData()); - } - - ma = (MappedAddress) receiveMH.getMessageAttribute(MessageAttribute.MessageAttributeType.MappedAddress); - ca = (ChangedAddress) receiveMH.getMessageAttribute(MessageAttribute.MessageAttributeType.ChangedAddress); - ErrorCode ec = (ErrorCode) receiveMH.getMessageAttribute(MessageAttribute.MessageAttributeType.ErrorCode); - if (ec != null) { - di.setError(ec.getResponseCode(), ec.getReason()); - logger.config("Message header contains an Errorcode message attribute."); - return false; - } - if ((ma == null) || (ca == null)) { - di.setError(700, "The server is sending an incomplete response (Mapped Address and Changed Address message attributes are missing). The client should not retry."); - logger.config("Response does not contain a Mapped Address or Changed Address message attribute."); - return false; - } else { - di.setPublicIP(ma.getAddress().getInetAddress()); - if ((ma.getPort() == socketTest1.getLocalPort()) && (ma.getAddress().getInetAddress().equals(socketTest1.getLocalAddress()))) { - logger.fine("Node is not natted."); - nodeNatted = false; - } else { - logger.fine("Node is natted."); - } - return true; - } - } catch (SocketTimeoutException ste) { - if (timeSinceFirstTransmission < 7900) { - logger.finer("Test 1: Socket timeout while receiving the response."); - timeSinceFirstTransmission += timeout; - int timeoutAddValue = (timeSinceFirstTransmission * 2); - if (timeoutAddValue > 1600) timeoutAddValue = 1600; - timeout = timeoutAddValue; - } else { - // node is not capable of udp communication - logger.finer("Test 1: Socket timeout while receiving the response. Maximum retry limit exceed. Give up."); - di.setBlockedUDP(); - logger.fine("Node is not capable of UDP communication."); - return false; - } - } - } - } - - private boolean test2() throws UtilityException, SocketException, UnknownHostException, IOException, MessageAttributeParsingException, MessageAttributeException, MessageHeaderParsingException { - int timeSinceFirstTransmission = 0; - int timeout = timeoutInitValue; - while (true) { - try { - // Test 2 including response - DatagramSocket sendSocket = new DatagramSocket(new InetSocketAddress(iaddress, 0)); - sendSocket.connect(InetAddress.getByName(stunServer), port); - sendSocket.setSoTimeout(timeout); - - MessageHeader sendMH = new MessageHeader(MessageHeader.MessageHeaderType.BindingRequest); - sendMH.generateTransactionID(); - - ChangeRequest changeRequest = new ChangeRequest(); - changeRequest.setChangeIP(); - changeRequest.setChangePort(); - sendMH.addMessageAttribute(changeRequest); - - byte[] data = sendMH.getBytes(); - DatagramPacket send = new DatagramPacket(data, data.length); - sendSocket.send(send); - logger.finer("Test 2: Binding Request sent."); - - int localPort = sendSocket.getLocalPort(); - InetAddress localAddress = sendSocket.getLocalAddress(); - - sendSocket.close(); - - DatagramSocket receiveSocket = new DatagramSocket(localPort, localAddress); - receiveSocket.connect(ca.getAddress().getInetAddress(), ca.getPort()); - receiveSocket.setSoTimeout(timeout); - - MessageHeader receiveMH = new MessageHeader(); - while(!(receiveMH.equalTransactionID(sendMH))) { - DatagramPacket receive = new DatagramPacket(new byte[200], 200); - receiveSocket.receive(receive); - receiveMH = MessageHeader.parseHeader(receive.getData()); - receiveMH.parseAttributes(receive.getData()); - } - ErrorCode ec = (ErrorCode) receiveMH.getMessageAttribute(MessageAttribute.MessageAttributeType.ErrorCode); - if (ec != null) { - di.setError(ec.getResponseCode(), ec.getReason()); - logger.config("Message header contains an Errorcode message attribute."); - return false; - } - if (!nodeNatted) { - di.setOpenAccess(); - logger.fine("Node has open access to the Internet (or, at least the node is behind a full-cone NAT without translation)."); - } else { - di.setFullCone(); - logger.fine("Node is behind a full-cone NAT."); - } - return false; - } catch (SocketTimeoutException ste) { - if (timeSinceFirstTransmission < 7900) { - logger.finer("Test 2: Socket timeout while receiving the response."); - timeSinceFirstTransmission += timeout; - int timeoutAddValue = (timeSinceFirstTransmission * 2); - if (timeoutAddValue > 1600) timeoutAddValue = 1600; - timeout = timeoutAddValue; - } else { - logger.finer("Test 2: Socket timeout while receiving the response. Maximum retry limit exceed. Give up."); - if (!nodeNatted) { - di.setSymmetricUDPFirewall(); - logger.fine("Node is behind a symmetric UDP firewall."); - return false; - } else { - // not is natted - // redo test 1 with address and port as offered in the changed-address message attribute - return true; - } - } - } - } - } - - private boolean test1Redo() throws UtilityException, SocketException, UnknownHostException, IOException, MessageAttributeParsingException, MessageHeaderParsingException{ - int timeSinceFirstTransmission = 0; - int timeout = timeoutInitValue; - while (true) { - // redo test 1 with address and port as offered in the changed-address message attribute - try { - // Test 1 with changed port and address values - socketTest1.connect(ca.getAddress().getInetAddress(), ca.getPort()); - socketTest1.setSoTimeout(timeout); - - MessageHeader sendMH = new MessageHeader(MessageHeader.MessageHeaderType.BindingRequest); - sendMH.generateTransactionID(); - - ChangeRequest changeRequest = new ChangeRequest(); - sendMH.addMessageAttribute(changeRequest); - - byte[] data = sendMH.getBytes(); - DatagramPacket send = new DatagramPacket(data, data.length); - socketTest1.send(send); - logger.finer("Test 1 redo with changed address: Binding Request sent."); - - MessageHeader receiveMH = new MessageHeader(); - while (!(receiveMH.equalTransactionID(sendMH))) { - DatagramPacket receive = new DatagramPacket(new byte[200], 200); - socketTest1.receive(receive); - receiveMH = MessageHeader.parseHeader(receive.getData()); - receiveMH.parseAttributes(receive.getData()); - } - MappedAddress ma2 = (MappedAddress) receiveMH.getMessageAttribute(MessageAttribute.MessageAttributeType.MappedAddress); - ErrorCode ec = (ErrorCode) receiveMH.getMessageAttribute(MessageAttribute.MessageAttributeType.ErrorCode); - if (ec != null) { - di.setError(ec.getResponseCode(), ec.getReason()); - logger.config("Message header contains an Errorcode message attribute."); - return false; - } - if (ma2 == null) { - di.setError(700, "The server is sending an incomplete response (Mapped Address message attribute is missing). The client should not retry."); - logger.config("Response does not contain a Mapped Address message attribute."); - return false; - } else { - if ((ma.getPort() != ma2.getPort()) || (!(ma.getAddress().getInetAddress().equals(ma2.getAddress().getInetAddress())))) { - di.setSymmetric(); - logger.fine("Node is behind a symmetric NAT."); - return false; - } - } - return true; - } catch (SocketTimeoutException ste2) { - if (timeSinceFirstTransmission < 7900) { - logger.config("Test 1 redo with changed address: Socket timeout while receiving the response."); - timeSinceFirstTransmission += timeout; - int timeoutAddValue = (timeSinceFirstTransmission * 2); - if (timeoutAddValue > 1600) timeoutAddValue = 1600; - timeout = timeoutAddValue; - } else { - logger.config("Test 1 redo with changed address: Socket timeout while receiving the response. Maximum retry limit exceed. Give up."); - return false; - } - } - } - } - - private void test3() throws UtilityException, SocketException, UnknownHostException, IOException, MessageAttributeParsingException, MessageAttributeException, MessageHeaderParsingException { - int timeSinceFirstTransmission = 0; - int timeout = timeoutInitValue; - while (true) { - try { - // Test 3 including response - DatagramSocket sendSocket = new DatagramSocket(new InetSocketAddress(iaddress, 0)); - sendSocket.connect(InetAddress.getByName(stunServer), port); - sendSocket.setSoTimeout(timeout); - - MessageHeader sendMH = new MessageHeader(MessageHeader.MessageHeaderType.BindingRequest); - sendMH.generateTransactionID(); - - ChangeRequest changeRequest = new ChangeRequest(); - changeRequest.setChangePort(); - sendMH.addMessageAttribute(changeRequest); - - byte[] data = sendMH.getBytes(); - DatagramPacket send = new DatagramPacket(data, data.length); - sendSocket.send(send); - logger.finer("Test 3: Binding Request sent."); - - int localPort = sendSocket.getLocalPort(); - InetAddress localAddress = sendSocket.getLocalAddress(); - - sendSocket.close(); - - DatagramSocket receiveSocket = new DatagramSocket(localPort, localAddress); - receiveSocket.connect(InetAddress.getByName(stunServer), ca.getPort()); - receiveSocket.setSoTimeout(timeout); - - MessageHeader receiveMH = new MessageHeader(); - while (!(receiveMH.equalTransactionID(sendMH))) { - DatagramPacket receive = new DatagramPacket(new byte[200], 200); - receiveSocket.receive(receive); - receiveMH = MessageHeader.parseHeader(receive.getData()); - receiveMH.parseAttributes(receive.getData()); - } - ErrorCode ec = (ErrorCode) receiveMH.getMessageAttribute(MessageAttribute.MessageAttributeType.ErrorCode); - if (ec != null) { - di.setError(ec.getResponseCode(), ec.getReason()); - logger.config("Message header contains an Errorcode message attribute."); - return; - } - if (nodeNatted) { - di.setRestrictedCone(); - logger.fine("Node is behind a restricted NAT."); - return; - } - } catch (SocketTimeoutException ste) { - if (timeSinceFirstTransmission < 7900) { - logger.finer("Test 3: Socket timeout while receiving the response."); - timeSinceFirstTransmission += timeout; - int timeoutAddValue = (timeSinceFirstTransmission * 2); - if (timeoutAddValue > 1600) timeoutAddValue = 1600; - timeout = timeoutAddValue; - } else { - logger.finer("Test 3: Socket timeout while receiving the response. Maximum retry limit exceed. Give up."); - di.setPortRestrictedCone(); - logger.fine("Node is behind a port restricted NAT."); - return; - } - } - } - } -} diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/demo/BindingLifetimeTestDemo.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/demo/BindingLifetimeTestDemo.java deleted file mode 100644 index 37e20f84..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/demo/BindingLifetimeTestDemo.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.test.demo; - -import java.util.logging.FileHandler; -import java.util.logging.Handler; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.logging.SimpleFormatter; - -import de.javawi.jstun.test.BindingLifetimeTest; - -public class BindingLifetimeTestDemo { - public static void main(String args[]) { - try { - Handler fh = new FileHandler("logging.txt"); - fh.setFormatter(new SimpleFormatter()); - Logger.getLogger("de.javawi.stun").addHandler(fh); - Logger.getLogger("de.javawi.stun").setLevel(Level.ALL); - BindingLifetimeTest test = new BindingLifetimeTest("iphone-stun.freenet.de", 3478); - // iphone-stun.freenet.de:3478 - // larry.gloo.net:3478 - // stun.xten.net:3478 - test.test(); - boolean continueWhile = true; - while(continueWhile) { - Thread.sleep(5000); - if (test.getLifetime() != -1) { - System.out.println("Lifetime: " + test.getLifetime() + " Finished: " + test.isCompleted()); - if (test.isCompleted()) continueWhile = false; - } - } - } catch (Exception e) { - System.out.println(e.getMessage()); - e.printStackTrace(); - } - } -} diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/demo/DiscoveryTestDemo.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/demo/DiscoveryTestDemo.java deleted file mode 100644 index 76a6c17e..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/demo/DiscoveryTestDemo.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.test.demo; - -import java.net.BindException; -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.util.Enumeration; -import java.util.logging.FileHandler; -import java.util.logging.Handler; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.logging.SimpleFormatter; - -import de.javawi.jstun.test.DiscoveryTest; - -public class DiscoveryTestDemo implements Runnable { - InetAddress iaddress; - - public DiscoveryTestDemo(InetAddress iaddress) { - this.iaddress = iaddress; - } - - public void run() { - try { - DiscoveryTest test = new DiscoveryTest(iaddress, "jstun.javawi.de", 3478); - //DiscoveryTest test = new DiscoveryTest(iaddress, "stun.sipgate.net", 10000); - // iphone-stun.freenet.de:3478 - // larry.gloo.net:3478 - // stun.xten.net:3478 - // stun.sipgate.net:10000 - System.out.println(test.test()); - } catch (BindException be) { - System.out.println(iaddress.toString() + ": " + be.getMessage()); - } catch (Exception e) { - System.out.println(e.getMessage()); - e.printStackTrace(); - } - } - - public static void main(String args[]) { - try { - Handler fh = new FileHandler("logging.txt"); - fh.setFormatter(new SimpleFormatter()); - Logger.getLogger("de.javawi.stun").addHandler(fh); - Logger.getLogger("de.javawi.stun").setLevel(Level.ALL); - - Enumeration ifaces = NetworkInterface.getNetworkInterfaces(); - while (ifaces.hasMoreElements()) { - NetworkInterface iface = ifaces.nextElement(); - Enumeration iaddresses = iface.getInetAddresses(); - while (iaddresses.hasMoreElements()) { - InetAddress iaddress = iaddresses.nextElement(); - if (Class.forName("java.net.Inet4Address").isInstance(iaddress)) { - if ((!iaddress.isLoopbackAddress()) && (!iaddress.isLinkLocalAddress())) { - Thread thread = new Thread(new DiscoveryTestDemo(iaddress)); - thread.start(); - } - } - } - } - } catch (Exception e) { - System.out.println(e.getMessage()); - } - } -} diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/demo/StunServer.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/demo/StunServer.java deleted file mode 100644 index b72ffe7c..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/demo/StunServer.java +++ /dev/null @@ -1,263 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.test.demo; - -import java.io.IOException; -import java.net.DatagramPacket; -import java.net.DatagramSocket; -import java.net.InetAddress; -import java.net.SocketException; -import java.net.UnknownHostException; -import java.util.Vector; -import java.util.logging.FileHandler; -import java.util.logging.Handler; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.logging.SimpleFormatter; - -import de.javawi.jstun.attribute.ChangeRequest; -import de.javawi.jstun.attribute.ChangedAddress; -import de.javawi.jstun.attribute.MappedAddress; -import de.javawi.jstun.attribute.MessageAttributeException; -import de.javawi.jstun.attribute.MessageAttributeParsingException; -import de.javawi.jstun.attribute.ResponseAddress; -import de.javawi.jstun.attribute.SourceAddress; -import de.javawi.jstun.attribute.UnknownAttribute; -import de.javawi.jstun.attribute.UnknownMessageAttributeException; -import de.javawi.jstun.attribute.MessageAttributeInterface.MessageAttributeType; -import de.javawi.jstun.header.MessageHeader; -import de.javawi.jstun.header.MessageHeaderParsingException; -import de.javawi.jstun.header.MessageHeaderInterface.MessageHeaderType; -import de.javawi.jstun.util.Address; -import de.javawi.jstun.util.UtilityException; - -/* - * This class implements a STUN server as described in RFC 3489. - * The server requires a machine that is dual-homed to be functional. - */ -public class StunServer { - private static Logger logger = Logger.getLogger("de.javawi.stun.test.StunServer"); - Vector sockets; - - public StunServer(int primaryPort, InetAddress primary, int secondaryPort, InetAddress secondary) throws SocketException { - sockets = new Vector(); - sockets.add(new DatagramSocket(primaryPort, primary)); - sockets.add(new DatagramSocket(secondaryPort, primary)); - sockets.add(new DatagramSocket(primaryPort, secondary)); - sockets.add(new DatagramSocket(secondaryPort, secondary)); - } - - public void start() throws SocketException { - for (DatagramSocket socket : sockets) { - socket.setReceiveBufferSize(2000); - StunServerReceiverThread ssrt = new StunServerReceiverThread(socket); - ssrt.start(); - } - } - - /* - * Inner class to handle incoming packets and react accordingly. - * I decided not to start a thread for every received Binding Request, because the time - * required to receive a Binding Request, parse it, generate a Binding Response and send - * it varies only between 2 and 4 milliseconds. This amount of time is small enough so - * that no extra thread is needed for incoming Binding Request. - */ - class StunServerReceiverThread extends Thread { - private DatagramSocket receiverSocket; - private DatagramSocket changedPort; - private DatagramSocket changedIP; - private DatagramSocket changedPortIP; - - StunServerReceiverThread(DatagramSocket datagramSocket) { - this.receiverSocket = datagramSocket; - for (DatagramSocket socket : sockets) { - if ((socket.getLocalPort() != receiverSocket.getLocalPort()) && - (socket.getLocalAddress().equals(receiverSocket.getLocalAddress()))) - changedPort = socket; - if ((socket.getLocalPort() == receiverSocket.getLocalPort()) && - (!socket.getLocalAddress().equals(receiverSocket.getLocalAddress()))) - changedIP = socket; - if ((socket.getLocalPort() != receiverSocket.getLocalPort()) && - (!socket.getLocalAddress().equals(receiverSocket.getLocalAddress()))) - changedPortIP = socket; - } - } - - public void run() { - while (true) { - try { - DatagramPacket receive = new DatagramPacket(new byte[200], 200); - receiverSocket.receive(receive); - logger.finest(receiverSocket.getLocalAddress().getHostAddress() + ":" + receiverSocket.getLocalPort() + " datagram received from " + receive.getAddress().getHostAddress() + ":" + receive.getPort()); - MessageHeader receiveMH = MessageHeader.parseHeader(receive.getData()); - try { - receiveMH.parseAttributes(receive.getData()); - if (receiveMH.getType() == MessageHeaderType.BindingRequest) { - logger.config(receiverSocket.getLocalAddress().getHostAddress() + ":" + receiverSocket.getLocalPort() + " Binding Request received from " + receive.getAddress().getHostAddress() + ":" + receive.getPort()); - ChangeRequest cr = (ChangeRequest) receiveMH.getMessageAttribute(MessageAttributeType.ChangeRequest); - if (cr == null) throw new MessageAttributeException("Message attribute change request is not set."); - ResponseAddress ra = (ResponseAddress) receiveMH.getMessageAttribute(MessageAttributeType.ResponseAddress); - - MessageHeader sendMH = new MessageHeader(MessageHeaderType.BindingResponse); - sendMH.setTransactionID(receiveMH.getTransactionID()); - - // Mapped address attribute - MappedAddress ma = new MappedAddress(); - ma.setAddress(new Address(receive.getAddress().getAddress())); - ma.setPort(receive.getPort()); - sendMH.addMessageAttribute(ma); - // Changed address attribute - ChangedAddress ca = new ChangedAddress(); - ca.setAddress(new Address(changedPortIP.getLocalAddress().getAddress())); - ca.setPort(changedPortIP.getLocalPort()); - sendMH.addMessageAttribute(ca); - if (cr.isChangePort() && (!cr.isChangeIP())) { - logger.finer("Change port received in Change Request attribute"); - // Source address attribute - SourceAddress sa = new SourceAddress(); - sa.setAddress(new Address(changedPort.getLocalAddress().getAddress())); - sa.setPort(changedPort.getLocalPort()); - sendMH.addMessageAttribute(sa); - byte[] data = sendMH.getBytes(); - DatagramPacket send = new DatagramPacket(data, data.length); - if (ra != null) { - send.setPort(ra.getPort()); - send.setAddress(ra.getAddress().getInetAddress()); - } else { - send.setPort(receive.getPort()); - send.setAddress(receive.getAddress()); - } - changedPort.send(send); - logger.config(changedPort.getLocalAddress().getHostAddress() + ":" + changedPort.getLocalPort() + " send Binding Response to " + send.getAddress().getHostAddress() + ":" + send.getPort()); - } else if ((!cr.isChangePort()) && cr.isChangeIP()) { - logger.finer("Change ip received in Change Request attribute"); - // Source address attribute - SourceAddress sa = new SourceAddress(); - sa.setAddress(new Address(changedIP.getLocalAddress().getAddress())); - sa.setPort(changedIP.getLocalPort()); - sendMH.addMessageAttribute(sa); - byte[] data = sendMH.getBytes(); - DatagramPacket send = new DatagramPacket(data, data.length); - if (ra != null) { - send.setPort(ra.getPort()); - send.setAddress(ra.getAddress().getInetAddress()); - } else { - send.setPort(receive.getPort()); - send.setAddress(receive.getAddress()); - } - changedIP.send(send); - logger.config(changedIP.getLocalAddress().getHostAddress() + ":" + changedIP.getLocalPort() + " send Binding Response to " + send.getAddress().getHostAddress() + ":" + send.getPort()); - } else if ((!cr.isChangePort()) && (!cr.isChangeIP())) { - logger.finer("Nothing received in Change Request attribute"); - // Source address attribute - SourceAddress sa = new SourceAddress(); - sa.setAddress(new Address(receiverSocket.getLocalAddress().getAddress())); - sa.setPort(receiverSocket.getLocalPort()); - sendMH.addMessageAttribute(sa); - byte[] data = sendMH.getBytes(); - DatagramPacket send = new DatagramPacket(data, data.length); - if (ra != null) { - send.setPort(ra.getPort()); - send.setAddress(ra.getAddress().getInetAddress()); - } else { - send.setPort(receive.getPort()); - send.setAddress(receive.getAddress()); - } - receiverSocket.send(send); - logger.config(receiverSocket.getLocalAddress().getHostAddress() + ":" + receiverSocket.getLocalPort() + " send Binding Response to " + send.getAddress().getHostAddress() + ":" + send.getPort()); - } else if (cr.isChangePort() && cr.isChangeIP()) { - logger.finer("Change port and ip received in Change Request attribute"); - // Source address attribute - SourceAddress sa = new SourceAddress(); - sa.setAddress(new Address(changedPortIP.getLocalAddress().getAddress())); - sa.setPort(changedPortIP.getLocalPort()); - sendMH.addMessageAttribute(sa); - byte[] data = sendMH.getBytes(); - DatagramPacket send = new DatagramPacket(data, data.length); - if (ra != null) { - send.setPort(ra.getPort()); - send.setAddress(ra.getAddress().getInetAddress()); - } else { - send.setPort(receive.getPort()); - send.setAddress(receive.getAddress()); - } - changedPortIP.send(send); - logger.config(changedPortIP.getLocalAddress().getHostAddress() + ":" + changedPortIP.getLocalPort() + " send Binding Response to " + send.getAddress().getHostAddress() + ":" + send.getPort()); - } - } - } catch (UnknownMessageAttributeException umae) { - umae.printStackTrace(); - // Generate Binding error response - MessageHeader sendMH = new MessageHeader(MessageHeaderType.BindingErrorResponse); - sendMH.setTransactionID(receiveMH.getTransactionID()); - - // Unknown attributes - UnknownAttribute ua = new UnknownAttribute(); - ua.addAttribute(umae.getType()); - sendMH.addMessageAttribute(ua); - - byte[] data = sendMH.getBytes(); - DatagramPacket send = new DatagramPacket(data, data.length); - send.setPort(receive.getPort()); - send.setAddress(receive.getAddress()); - receiverSocket.send(send); - logger.config(changedPortIP.getLocalAddress().getHostAddress() + ":" + changedPortIP.getLocalPort() + " send Binding Error Response to " + send.getAddress().getHostAddress() + ":" + send.getPort()); - } - } catch (IOException ioe) { - ioe.printStackTrace(); - } catch (MessageAttributeParsingException mape) { - mape.printStackTrace(); - } catch (MessageAttributeException mae) { - mae.printStackTrace(); - } catch (MessageHeaderParsingException mhpe) { - mhpe.printStackTrace(); - } catch (UtilityException ue) { - ue.printStackTrace(); - } catch (ArrayIndexOutOfBoundsException aioobe) { - aioobe.printStackTrace(); - } - } - } - } - - /* - * To invoke the STUN server two IP addresses and two ports are required. - */ - public static void main(String args[]) { - try { - if (args.length != 4) { - System.out.println("usage: java de.javawi.jstun.test.demo.StunServer PORT1 IP1 PORT2 IP2"); - System.out.println(); - System.out.println(" PORT1 - the first port that should be used by the server"); - System.out.println(" IP1 - the first ip address that should be used by the server"); - System.out.println(" PORT2 - the second port that should be used by the server"); - System.out.println(" IP2 - the second ip address that should be used by the server"); - System.exit(0); - } - Handler fh = new FileHandler("logging_server.txt"); - fh.setFormatter(new SimpleFormatter()); - Logger.getLogger("de.javawi.stun").addHandler(fh); - Logger.getLogger("de.javawi.stun").setLevel(Level.ALL); - StunServer ss = new StunServer(Integer.parseInt(args[0]), - InetAddress.getByName(args[1]), - Integer.parseInt(args[2]), - InetAddress.getByName(args[3])); - ss.start(); - } catch (SocketException se) { - se.printStackTrace(); - } catch (UnknownHostException uhe) { - uhe.printStackTrace(); - } catch (IOException ioe) { - ioe.printStackTrace(); - } - } -} \ No newline at end of file diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/demo/ice/Candidate.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/demo/ice/Candidate.java deleted file mode 100644 index 22dd58fb..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/demo/ice/Candidate.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.test.demo.ice; - -import java.net.DatagramSocket; -import java.net.SocketException; -import java.net.UnknownHostException; - -import de.javawi.jstun.util.Address; -import de.javawi.jstun.util.UtilityException; - -public class Candidate implements Comparable { - // The ieft-mmusic-ice-12 draft is not non-ambigious about the number of types. - // Chapter 5.1 defines 3 and 4 types on page 16 and page 17, respectively. - public enum CandidateType { Local, ServerReflexive, PeerReflexive, Relayed }; - - private DatagramSocket socket; - private CandidateType type; - private short componentId; - private int priority; - private int foundationId; - private Candidate base; - private boolean isInUse; - - public Candidate(Address address, short componentId) throws SocketException, UnknownHostException, UtilityException { - this.socket = new DatagramSocket(0, address.getInetAddress()); - this.type = CandidateType.Local; - this.componentId = componentId; - this.priority = 0; - this.base = this; - this.isInUse = false; - } - - public Candidate(Address address, CandidateType type, short componentId, Candidate base) throws SocketException, UnknownHostException, UtilityException { - this.socket = new DatagramSocket(0, address.getInetAddress()); - this.type = type; - setComponentId(componentId); - this.priority = 0; - this.base = base; - this.isInUse = false; - } - - public void setBase(Candidate base) { - this.base = base; - } - - public Candidate getBase() { - return base; - } - - public CandidateType getCandidateType() { - return type; - } - - public void setComponentId(short componentId) { - if ((componentId < 1) || (componentId > 256)) throw new IllegalArgumentException(componentId + " is not between 1 and 256 inclusive."); - this.componentId = componentId; - } - - public short getComponentId() { - return componentId; - } - - public void setFoundationId(int foundationId) { - this.foundationId = foundationId; - } - - public int getFoundationId() { - return foundationId; - } - - public void setPriority(int priority) { - this.priority = priority; - } - - public int getPriority() { - return priority; - } - - public Address getAddress() throws UtilityException { - return new Address(socket.getLocalAddress().getAddress()); - } - - public int getPort() { - return socket.getLocalPort(); - } - - public void setInUse(boolean isInUse) { - this.isInUse = isInUse; - } - - public boolean getInUse() { - return isInUse; - } - - public int compareTo(Object arg0) { - Candidate cand = (Candidate) arg0; - return cand.getPriority() - getPriority(); - } - - public boolean equals(Object o) { - if (o == null) return false; - if ((((Candidate) o).socket.equals(socket)) && (((Candidate) o).base.equals(base))) return true; - return false; - } -} diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/demo/ice/ICENegociator.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/demo/ice/ICENegociator.java deleted file mode 100644 index 502528c5..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/test/demo/ice/ICENegociator.java +++ /dev/null @@ -1,146 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.test.demo.ice; - -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Vector; - -import de.javawi.jstun.test.DiscoveryInfo; -import de.javawi.jstun.test.DiscoveryTest; -import de.javawi.jstun.test.demo.ice.Candidate.CandidateType; -import de.javawi.jstun.util.Address; - -public class ICENegociator { - // type preference must be an integere from 0 (=lowest) to 126 (=highest) (inclusive) - private final static int LOCAL_PREFERENCE = 0; - private final static int SERVER_REFLEXIVE_PREFERENCE = 42; - private final static int PEER_REFLEXIVE_PREFERENCE = 84; - private final static int RELAYED_PREFERENCE = 126; - - // component id - private short componentId; - - // candidates - HashSet candidates; - - public ICENegociator(short componentId) { - this.componentId = componentId; - candidates = new HashSet(); - } - - /* - * This method gathers candidate addresses as described in draft-ietf-mmusic-ice-12.txt Chapter 2.1 - * Unfortunately, only the candidates of the direct attached network interfaces and server reflexive - * addreses are gathered. So far, no support for relayed candidates is available (because I am not - * aware of any STUN relay server). - */ - public void gatherCandidateAddresses() { - candidates = new HashSet(); - try { - Enumeration ifaces = NetworkInterface.getNetworkInterfaces(); - while (ifaces.hasMoreElements()) { - NetworkInterface iface = ifaces.nextElement(); - Enumeration iaddresses = iface.getInetAddresses(); - while (iaddresses.hasMoreElements()) { - InetAddress iaddress = iaddresses.nextElement(); - if (!iaddress.isLoopbackAddress() && !iaddress.isLinkLocalAddress()) { - // add host candidate - Candidate local = new Candidate(new Address(iaddress.getAddress()), componentId); - candidates.add(local); - // add server reflexive address - DiscoveryTest test = new DiscoveryTest(iaddress, "iphone-stun.freenet.de", 3478); - DiscoveryInfo di = test.test(); - if (di.getPublicIP() != null) { - Candidate cand = new Candidate(new Address(di.getPublicIP().getAddress()), CandidateType.ServerReflexive, componentId, local); - cand.setComponentId(componentId); - candidates.add(cand); - } - } - } - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - public void prioritizeCandidates() { - // count number of candidate types - int numberLocal = 0; - int numberServerReflexive = 0; - int numberPeerReflexive = 0; - int numberRelayed = 0; - // count number of candidates of a particular type - Iterator iterCandidates = candidates.iterator(); - while (iterCandidates.hasNext()) { - Candidate cand = iterCandidates.next(); - CandidateType type = cand.getCandidateType(); - if (type == CandidateType.Local) numberLocal++; - else if (type == CandidateType.ServerReflexive) numberServerReflexive++; - else if (type == CandidateType.PeerReflexive) numberPeerReflexive++; - else if (type == CandidateType.Relayed) numberRelayed++; - } - // assign priorities - iterCandidates = candidates.iterator(); - while (iterCandidates.hasNext()) { - int typeValue = 0; - int localValue = 0; - int componentValue = 0; - Candidate cand = iterCandidates.next(); - CandidateType type = cand.getCandidateType(); - if (type == CandidateType.Local) { - typeValue = LOCAL_PREFERENCE; - localValue = numberLocal--; - } - else if (type == CandidateType.ServerReflexive) { - typeValue = SERVER_REFLEXIVE_PREFERENCE; - localValue = numberServerReflexive--; - } - else if (type == CandidateType.PeerReflexive) { - typeValue = PEER_REFLEXIVE_PREFERENCE; - localValue = numberPeerReflexive--; - } - else if (type == CandidateType.Relayed) { - typeValue = RELAYED_PREFERENCE; - localValue = numberRelayed--; - } - componentValue = cand.getComponentId(); - int priority = ((2 ^ 24) * typeValue) + ((2 ^ 8) * localValue) + componentValue; - cand.setPriority(priority); - } - } - - public List getSortedCandidates() { - Vector sortedCandidates = new Vector(candidates); - Collections.sort(sortedCandidates); - return sortedCandidates; - } - - public static void main(String args[]) { - ICENegociator cc = new ICENegociator((short) 1); - // gather candidates - cc.gatherCandidateAddresses(); - // priorize candidates - cc.prioritizeCandidates(); - // get SortedCandidates - List sortedCandidates = cc.getSortedCandidates(); - - // sent sorted candidate addresses to peer over SDP - // received sorted candidate addresses of peer over SDP - - } -} diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/util/Address.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/util/Address.java deleted file mode 100644 index 46ad1a0e..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/util/Address.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.util; - -import java.util.*; -import java.net.*; - -public class Address { - int firstOctet; - int secondOctet; - int thirdOctet; - int fourthOctet; - - public Address(int firstOctet, int secondOctet, int thirdOctet, int fourthOctet) throws UtilityException { - if ((firstOctet < 0) || (firstOctet > 255) || (secondOctet < 0) || (secondOctet > 255) || (thirdOctet < 0) || (thirdOctet > 255) || (fourthOctet < 0) || (fourthOctet > 255)) { - throw new UtilityException("Address is malformed."); - } - this.firstOctet = firstOctet; - this.secondOctet = secondOctet; - this.thirdOctet = thirdOctet; - this.fourthOctet = fourthOctet; - } - - public Address(String address) throws UtilityException { - StringTokenizer st = new StringTokenizer(address, "."); - if (st.countTokens() != 4) { - throw new UtilityException("4 octets in address string are required."); - } - int i = 0; - while (st.hasMoreTokens()) { - int temp = Integer.parseInt(st.nextToken()); - if ((temp < 0) || (temp > 255)) { - throw new UtilityException("Address is in incorrect format."); - } - switch (i) { - case 0: firstOctet = temp; ++i; break; - case 1: secondOctet = temp; ++i; break; - case 2: thirdOctet = temp; ++i; break; - case 3: fourthOctet = temp; ++i; break; - } - } - } - - public Address(byte[] address) throws UtilityException { - if (address.length < 4) { - throw new UtilityException("4 bytes are required."); - } - firstOctet = Utility.oneByteToInteger(address[0]); - secondOctet = Utility.oneByteToInteger(address[1]); - thirdOctet = Utility.oneByteToInteger(address[2]); - fourthOctet = Utility.oneByteToInteger(address[3]); - } - - public String toString() { - return firstOctet + "." + secondOctet + "." + thirdOctet + "." + fourthOctet; - } - - public byte[] getBytes() throws UtilityException { - byte[] result = new byte[4]; - result[0] = Utility.integerToOneByte(firstOctet); - result[1] = Utility.integerToOneByte(secondOctet); - result[2] = Utility.integerToOneByte(thirdOctet); - result[3] = Utility.integerToOneByte(fourthOctet); - return result; - } - - public InetAddress getInetAddress() throws UtilityException, UnknownHostException { - byte[] address = new byte[4]; - address[0] = Utility.integerToOneByte(firstOctet); - address[1] = Utility.integerToOneByte(secondOctet); - address[2] = Utility.integerToOneByte(thirdOctet); - address[3] = Utility.integerToOneByte(fourthOctet); - return InetAddress.getByAddress(address); - } - - public boolean equals(Object obj) { - if (obj == null) return false; - try { - byte[] data1 = this.getBytes(); - byte[] data2 = ((Address) obj).getBytes(); - if ((data1[0] == data2[0]) && (data1[1] == data2[1]) && - (data1[2] == data2[2]) && (data1[3] == data2[3])) return true; - return false; - } catch (UtilityException ue) { - return false; - } - } - - public int hashCode() { - return (firstOctet << 24) + (secondOctet << 16) + (thirdOctet << 8) + fourthOctet; - } - -} diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/util/Utility.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/util/Utility.java deleted file mode 100644 index 91c2d88e..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/util/Utility.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.util; - -public class Utility { - - public static final byte integerToOneByte(int value) throws UtilityException { - if ((value > Math.pow(2,15)) || (value < 0)) { - throw new UtilityException("Integer value " + value + " is larger than 2^15"); - } - return (byte)(value & 0xFF); - } - - public static final byte[] integerToTwoBytes(int value) throws UtilityException { - byte[] result = new byte[2]; - if ((value > Math.pow(2,31)) || (value < 0)) { - throw new UtilityException("Integer value " + value + " is larger than 2^31"); - } - result[0] = (byte)((value >>> 8) & 0xFF); - result[1] = (byte)(value & 0xFF); - return result; - } - - public static final byte[] integerToFourBytes(int value) throws UtilityException { - byte[] result = new byte[4]; - if ((value > Math.pow(2,63)) || (value < 0)) { - throw new UtilityException("Integer value " + value + " is larger than 2^63"); - } - result[0] = (byte)((value >>> 24) & 0xFF); - result[1] = (byte)((value >>> 16) & 0xFF); - result[2] = (byte)((value >>> 8) & 0xFF); - result[3] = (byte)(value & 0xFF); - return result; - } - - public static final int oneByteToInteger(byte value) throws UtilityException { - return (int)value & 0xFF; - } - - public static final int twoBytesToInteger(byte[] value) throws UtilityException { - if (value.length < 2) { - throw new UtilityException("Byte array too short!"); - } - int temp0 = value[0] & 0xFF; - int temp1 = value[1] & 0xFF; - return ((temp0 << 8) + temp1); - } - - public static final long fourBytesToLong(byte[] value) throws UtilityException { - if (value.length < 4) { - throw new UtilityException("Byte array too short!"); - } - int temp0 = value[0] & 0xFF; - int temp1 = value[1] & 0xFF; - int temp2 = value[2] & 0xFF; - int temp3 = value[3] & 0xFF; - return (((long)temp0 << 24) + (temp1 << 16) + (temp2 << 8) + temp3); - } -} diff --git a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/util/UtilityException.java b/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/util/UtilityException.java deleted file mode 100644 index d6f65fa7..00000000 --- a/p2pproxy/dependencies-src/jstun-src-0.7.1/de/javawi/jstun/util/UtilityException.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * This file is part of JSTUN. - * - * Copyright (c) 2005 Thomas King - All rights - * reserved. - * - * This software is licensed under either the GNU Public License (GPL), - * or the Apache 2.0 license. Copies of both license agreements are - * included in this distribution. - */ - -package de.javawi.jstun.util; - -public class UtilityException extends Exception { - private static final long serialVersionUID = 3545800974716581680L; - - UtilityException(String mesg) { - super(mesg); - } - -} diff --git a/p2pproxy/dependencies-src/jxse-src-2.5/api/pom.xml b/p2pproxy/dependencies-src/jxse-src-2.5/api/pom.xml deleted file mode 100644 index 4f467d1c..00000000 --- a/p2pproxy/dependencies-src/jxse-src-2.5/api/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - net.jxta.platform - jxta - 1.0 - ../pom.xml - - 4.0.0 - jxta-api - net.jxta.platform - jxta-api - jar - 1.0 - - diff --git a/p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/Version.java b/p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/Version.java deleted file mode 100644 index f6604de0..00000000 --- a/p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/Version.java +++ /dev/null @@ -1,149 +0,0 @@ -/* - * - * ==================================================================== - * - * Copyright (c) 2001 Sun Microsystems, Inc. All rights reserved. - * - * The Sun Project JXTA(TM) Software License - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * 3. The end-user documentation included with the redistribution, if any, must - * include the following acknowledgment: "This product includes software - * developed by Sun Microsystems, Inc. for JXTA(TM) technology." - * Alternately, this acknowledgment may appear in the software itself, if - * and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Sun", "Sun Microsystems, Inc.", "JXTA" and "Project JXTA" must - * not be used to endorse or promote products derived from this software - * without prior written permission. For written permission, please contact - * Project JXTA at http://www.jxta.org. - * - * 5. Products derived from this software may not be called "JXTA", nor may - * "JXTA" appear in their name, without prior written permission of Sun. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SUN - * MICROSYSTEMS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * JXTA is a registered trademark of Sun Microsystems, Inc. in the United - * States and other countries. - * - * Please see the license information page at : - * for instructions on use of - * the license in source files. - * - * ==================================================================== - * - * This software consists of voluntary contributions made by many individuals - * on behalf of Project JXTA. For more information on Project JXTA, please see - * http://www.jxta.org. - * - * This license is based on the BSD license adopted by the Apache Foundation. - */ - -package net.jxta; - -import java.lang.Package; - -/** - * Provides easy access to Java Package information for the JXSE API. - */ -public final class Version { - - /** - * Returns the package. - * - * @return The specification title. - */ - public static Package getPackage() { - return Version.class.getPackage(); - } - - /** - * Returns the specification title. - * - * @return The specification title. - */ - public static String getSpecTitle() { - Package versionPackage = Version.class.getPackage(); - - return versionPackage.getSpecificationTitle(); - } - - /** - * Returns the specification vendor. - * - * @return The specification vendor. - */ - public static String getSpecVendor() { - Package versionPackage = Version.class.getPackage(); - - return versionPackage.getSpecificationVendor(); - } - - /** - * Returns the specification version. - * - * @return The specification version. - */ - public static String getSpecVersion() { - Package versionPackage = Version.class.getPackage(); - - return versionPackage.getSpecificationVersion(); - } - - /** - * Returns the specification title. - * - * @return The specification title. - */ - public static String getImplTitle() { - Package versionPackage = Version.class.getPackage(); - - return versionPackage.getImplementationTitle(); - } - - /** - * Returns the specification vendor. - * - * @return The specification vendor. - */ - public static String getImplVendor() { - Package versionPackage = Version.class.getPackage(); - - return versionPackage.getImplementationVendor(); - } - - /** - * Returns the specification version. - * - * @return The specification version. - */ - public static String getImplVersion() { - Package versionPackage = Version.class.getPackage(); - - return versionPackage.getImplementationVersion(); - } - - /** - * This class is a singleton. - */ - private Version() { - } -} diff --git a/p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/access/AccessService.java b/p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/access/AccessService.java deleted file mode 100644 index e5183e82..00000000 --- a/p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/access/AccessService.java +++ /dev/null @@ -1,146 +0,0 @@ -/* - * - * ==================================================================== - * - * Copyright (c) 2001 Sun Microsystems, Inc. All rights reserved. - * - * The Sun Project JXTA(TM) Software License - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * 3. The end-user documentation included with the redistribution, if any, must - * include the following acknowledgment: "This product includes software - * developed by Sun Microsystems, Inc. for JXTA(TM) technology." - * Alternately, this acknowledgment may appear in the software itself, if - * and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Sun", "Sun Microsystems, Inc.", "JXTA" and "Project JXTA" must - * not be used to endorse or promote products derived from this software - * without prior written permission. For written permission, please contact - * Project JXTA at http://www.jxta.org. - * - * 5. Products derived from this software may not be called "JXTA", nor may - * "JXTA" appear in their name, without prior written permission of Sun. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SUN - * MICROSYSTEMS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * JXTA is a registered trademark of Sun Microsystems, Inc. in the United - * States and other countries. - * - * Please see the license information page at : - * for instructions on use of - * the license in source files. - * - * ==================================================================== - * - * This software consists of voluntary contributions made by many individuals - * on behalf of Project JXTA. For more information on Project JXTA, please see - * http://www.jxta.org. - * - * This license is based on the BSD license adopted by the Apache Foundation. - */ - -package net.jxta.access; - - -import net.jxta.credential.Credential; -import net.jxta.credential.PrivilegedOperation; -import net.jxta.document.Element; -import net.jxta.service.Service; - - -/** - * The Access Service is used by JXTA Applications and Services to determine if - specific operations are permitted for a particular identity. - * - *

Each Access Service implementation provides a mechanism for determining - * if, for a given operation and identity, the operation is permitted. - **/ -public interface AccessService extends Service { - - /** - * The result of an access check. - **/ - public enum AccessResult { - - /** - * State is unknown or could not be established. - * - *

The operation should not be performed. - * - *

This result may not be used by all Access Service - * implementations. - **/ - UNDETERMINED, /** - * Operation is disallowed. - * - *

The operation should not be performed. - * - **/ DISALLOWED, /** - * Operation is permitted. - * - *

The operation should be performed. - * - **/ PERMITTED, /** - * Operation would be permitted, but one (or more) of the provided - * credentials was expired. - * - *

The operation should not be performed. - * - *

This result may not be used by all Access Service - * implementations. - **/ PERMITTED_EXPIRED - } - - /** - * Determine if a privileged operation is permitted for a given identity. - * - * @param operation The operation which is being requested or {@code null}. - * {@code null} signifies that the operation is unimportant though the - * credential must be valid. - * @param credential The identity which is requesting or {@code null}. A - * {@code null} value indicates that no credential is available. - * @return the result of the access check. - **/ - public AccessResult doAccessCheck(PrivilegedOperation operation, Credential credential); - - /** - * Create a new privileged operation with the specified subject. Each - * operation is also associated with an identity, the offerer. Generally - * the privileged operation is cryptographically signed by the offerer. - * - * @see net.jxta.credential.Credential - * - * @param subject The subject of the operation. This usually identifies - * what operation is being requested. - * @param offerer The identity which is offering the operation. - * @return The privileged operation object - **/ - public PrivilegedOperation newPrivilegedOperation(Object subject, Credential offerer); - - /** - * Read a privileged operation from a portion of a structured document. - * - * @param source The root of the document portion containing the serialized - * representation of the privileged operation. - * @return The privileged operation object. - **/ - public PrivilegedOperation newPrivilegedOperation(Element source); -} diff --git a/p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/access/package.html b/p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/access/package.html deleted file mode 100644 index e9f7516f..00000000 --- a/p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/access/package.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - The Access Service provides a framework for using the identities created - with the Membership Service to control whether specific operations are - permitted. - -

The Access Service, like the Membership Service, is not associated with - a particular JXTA protocol. Each Access Service implementation is - responsible for its own protocol definition (if any). This approach is used - primarily so that JXTA bridges well to existing common Membership and Access - technologies. For example; PKI, LDAP Kerberos, NTLM and API based interfaces - such as PAM and JAAS. - - @see net.jxta.credential.Credential - @see net.jxta.credential.PrivilegedOperation - @see net.jxta.membership.MembershipService - @see JXTA Protocols Specification : Protocols - - diff --git a/p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/codat/Codat.java b/p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/codat/Codat.java deleted file mode 100644 index 75a45844..00000000 --- a/p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/codat/Codat.java +++ /dev/null @@ -1,168 +0,0 @@ -/* - * Copyright (c) 2001-2007 Sun Microsystems, Inc. All rights reserved. - * - * The Sun Project JXTA(TM) Software License - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * 3. The end-user documentation included with the redistribution, if any, must - * include the following acknowledgment: "This product includes software - * developed by Sun Microsystems, Inc. for JXTA(TM) technology." - * Alternately, this acknowledgment may appear in the software itself, if - * and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Sun", "Sun Microsystems, Inc.", "JXTA" and "Project JXTA" must - * not be used to endorse or promote products derived from this software - * without prior written permission. For written permission, please contact - * Project JXTA at http://www.jxta.org. - * - * 5. Products derived from this software may not be called "JXTA", nor may - * "JXTA" appear in their name, without prior written permission of Sun. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SUN - * MICROSYSTEMS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * JXTA is a registered trademark of Sun Microsystems, Inc. in the United - * States and other countries. - * - * Please see the license information page at : - * for instructions on use of - * the license in source files. - * - * ==================================================================== - * - * This software consists of voluntary contributions made by many individuals - * on behalf of Project JXTA. For more information on Project JXTA, please see - * http://www.jxta.org. - * - * This license is based on the BSD license adopted by the Apache Foundation. - */ - -package net.jxta.codat; - - -import net.jxta.document.Document; -import net.jxta.id.ID; -import net.jxta.id.IDFactory; -import net.jxta.peergroup.PeerGroupID; - -import java.io.IOException; - - -/** - * The common container for managing content within JXTA. A Codat consists of: - *

    - *
  • Content data for the Codat in the form of a JXTA - * {@link net.jxta.document.Document}.
  • - *
  • A persistent canonical identifier for the Codat in the form of a - * {@link net.jxta.codat.CodatID}.
  • - *
  • An optional CodatID for an associated Codat for which this Codat is - * metadata.
  • - *
- * - * @see net.jxta.codat.CodatID - * @see net.jxta.document.Document - */ -public class Codat { - - /** - * CodatID of this Codat. A persistent canonical identifier for this Codat. - */ - private final CodatID id; - - /** - * CodatID for an associated Codat for which this Codat is metadata. This - * may be the CodatId of another Codat in the same Peer Group or - * null. - */ - private final CodatID metaId; - - /** - * Contains the data of this Codat. - */ - private final Document doc; - - /** - * Constructs a Codat instance with a new CodatId given a PeerGroupID and - * a Document. - * - * @param groupID The peer group to which this Codat will belong. - * @param about The CodatID of an associated Codat for which this Codat is - * metadata or null if there is no associated Codat. - * @param document Document which contains the content data for this Codat. - * @throws IOException if there is an error accessing the document. - */ - public Codat(PeerGroupID groupID, CodatID about, Document document) throws IOException { - this(IDFactory.newCodatID(groupID, document.getStream()), about, document); - } - - /** - * Constructs a Codat instance for an existing Codat given it's - * CodatID and a document. - *

- *

This implementation does not verify that the CodatID matches the - * provided Document. - * - * @param id CodatId of the new Codat. - * @param about CodatID of an associated Codat for which this Codat is metadata. - * @param document Document which contains the content data for this Codat. - */ - public Codat(CodatID id, CodatID about, Document document) { - if (null == id) { - throw new IllegalArgumentException("CodatID may not be null."); - } - - if (null == document) { - throw new IllegalArgumentException("Document may not be null."); - } - - this.id = id; - this.metaId = about; - this.doc = document; - } - - /** - * Returns the CodatID of this Codat. - * - * @return The CodatID of this Codat. - */ - public ID getCodatID() { - return id; - } - - /** - * Returns the CodatID of an associated Codat for which this Codat is - * metadata or null if there is no associated Codat. - * - * @return CodatID The CodatID of an associated Codat for which this Codat - * is metadata or null if there is no associated Codat. - */ - public ID getMetaID() { - return metaId; - } - - /** - * Returns a Document containing the data of this Codat. - * - * @return A Document containing the data of this Codat. - */ - public Document getDocument() { - return doc; - } -} diff --git a/p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/codat/CodatID.java b/p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/codat/CodatID.java deleted file mode 100644 index 5e7c94d7..00000000 --- a/p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/codat/CodatID.java +++ /dev/null @@ -1,128 +0,0 @@ -/* - * Copyright (c) 2001-2007 Sun Microsystems, Inc. All rights reserved. - * - * The Sun Project JXTA(TM) Software License - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * 3. The end-user documentation included with the redistribution, if any, must - * include the following acknowledgment: "This product includes software - * developed by Sun Microsystems, Inc. for JXTA(TM) technology." - * Alternately, this acknowledgment may appear in the software itself, if - * and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Sun", "Sun Microsystems, Inc.", "JXTA" and "Project JXTA" must - * not be used to endorse or promote products derived from this software - * without prior written permission. For written permission, please contact - * Project JXTA at http://www.jxta.org. - * - * 5. Products derived from this software may not be called "JXTA", nor may - * "JXTA" appear in their name, without prior written permission of Sun. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SUN - * MICROSYSTEMS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * JXTA is a registered trademark of Sun Microsystems, Inc. in the United - * States and other countries. - * - * Please see the license information page at : - * for instructions on use of - * the license in source files. - * - * ==================================================================== - * - * This software consists of voluntary contributions made by many individuals - * on behalf of Project JXTA. For more information on Project JXTA, please see - * http://www.jxta.org. - * - * This license is based on the BSD license adopted by the Apache Foundation. - */ - -package net.jxta.codat; - - -import java.net.URI; -import net.jxta.id.ID; - - -/** - * An identifier that enables canonical references to be made to a Codat within - * the context of a specific peer group. - *

- *

A CodatID is formed by the conjuction of:

    - *
  • a PeerGroupID
  • - *
  • a randomly chosen value that has a high probability of being unique
  • - *
  • an optional SHA1 cryptographic hash of the Codat contents
- *

- *

Codats which contain static content will normally include the hash value - * as part of their CodatID. - * - * @see net.jxta.codat.Codat - * @see net.jxta.peergroup.PeerGroupID - */ -public abstract class CodatID extends ID { - - /** - * Creates an ID by parsing the given URI. - * - *

This convenience factory method works as if by invoking the - * {@link net.jxta.id.IDFactory#fromURI(URI)} method; any - * {@link java.net.URISyntaxException} thrown is caught and wrapped in a - * new {@link IllegalArgumentException} object, which is then thrown. - * - *

This method is provided for use in situations where it is known that - * the given string is a legal ID, for example for ID constants declared - * within in a program, and so it would be considered a programming error - * for the URI not to parse as such. The {@link net.jxta.id.IDFactory}, - * which throws {@link java.net.URISyntaxException} directly, should be used - * situations where a ID is being constructed from user input or from some - * other source that may be prone to errors. - * - * @param fromURI The URI to be parsed into an ID - * @return The new ID - * - * @throws NullPointerException If {@code fromURI} is {@code null}. - * @throws IllegalArgumentException If the given URI is not a valid ID. - */ - public static CodatID create(URI fromURI) { - return (CodatID) ID.create(fromURI); - } - - /** - * {@inheritDoc} - */ - public CodatID intern() { - return (CodatID) super.intern(); - } - - /** - * Returns PeerGroupID of the Peer Group to which this Codat ID belongs. - * - * @return PeerGroupID of the Peer Group which this ID is part of. - */ - public abstract ID getPeerGroupID(); - - /** - * Returns true if this CodatID is associated with a static Codat. - * - * @return true if the codatId is for a Codat with static content - * otherwise false. - */ - public abstract boolean isStatic(); -} diff --git a/p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/codat/Metadata.java b/p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/codat/Metadata.java deleted file mode 100644 index 1d1f7bbd..00000000 --- a/p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/codat/Metadata.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (c) 2001-2007 Sun Microsystems, Inc. All rights reserved. - * - * The Sun Project JXTA(TM) Software License - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * 3. The end-user documentation included with the redistribution, if any, must - * include the following acknowledgment: "This product includes software - * developed by Sun Microsystems, Inc. for JXTA(TM) technology." - * Alternately, this acknowledgment may appear in the software itself, if - * and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Sun", "Sun Microsystems, Inc.", "JXTA" and "Project JXTA" must - * not be used to endorse or promote products derived from this software - * without prior written permission. For written permission, please contact - * Project JXTA at http://www.jxta.org. - * - * 5. Products derived from this software may not be called "JXTA", nor may - * "JXTA" appear in their name, without prior written permission of Sun. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SUN - * MICROSYSTEMS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * JXTA is a registered trademark of Sun Microsystems, Inc. in the United - * States and other countries. - * - * Please see the license information page at : - * for instructions on use of - * the license in source files. - * - * ==================================================================== - * - * This software consists of voluntary contributions made by many individuals - * on behalf of Project JXTA. For more information on Project JXTA, please see - * http://www.jxta.org. - * - * This license is based on the BSD license adopted by the Apache Foundation. - */ -package net.jxta.codat; - - -import net.jxta.document.Document; -import net.jxta.peergroup.PeerGroupID; - -import java.io.IOException; - - -/** - * Medata Codats are special codats that contain information about another - * Codat. Multiple medata Codats can refer to the same Codat. Medata codats can - * hold any kind of information about a codat, such as a symbolic name, - * description, index and searching information, etc. - * - * @see net.jxta.codat.Codat - * @see net.jxta.codat.CodatID - * @see net.jxta.document.Document - */ -public class Metadata extends Codat { - - /** - * Constructs a Metadata instance with a new CodatId given a PeerGroupID, - * the CodatID of the associated Codat and a Document. - * - * @param groupID The peer group to which this Codat will belong. - * @param about The CodatID of an associated Codat for which this Codat is - * metadata or null if there is no associated Codat. - * @param document Document which contains the content data for this Codat. - * @throws IOException if there is an error accessing the document. - */ - public Metadata(PeerGroupID groupID, CodatID about, Document document) throws IOException { - super(groupID, about, document); - } - - /** - * Constructs a Metadata instance for an existing Codat given it's - * CodatID, the CodatID of the associated Codat and a Document. - *

- *

This implementation does not verify that the CodatID matches the - * provided Document. - * - * @param id CodatId of the new Codat. - * @param about CodatID of an associated Codat for which this Codat is metadata. - * @param document Document which contains the content data for this Codat. - */ - public Metadata(CodatID id, CodatID about, Document document) { - super(id, about, document); - } -} diff --git a/p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/codat/package.html b/p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/codat/package.html deleted file mode 100644 index 7b4aa9a5..00000000 --- a/p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/codat/package.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - -Codats are container objects that can hold both data or code and are -associated with a JXTA ID. - -@see net.jxta.id -@see JXTA Protocols - Specification : Protocols - - -file:///home/mike/code/jxta/spec/www/v1.0/docbook/JXTAProtocols.html#overview-codats diff --git a/p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/credential/AuthenticationCredential.java b/p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/credential/AuthenticationCredential.java deleted file mode 100644 index 081e8364..00000000 --- a/p2pproxy/dependencies-src/jxse-src-2.5/api/src/net/jxta/credential/AuthenticationCredential.java +++ /dev/null @@ -1,386 +0,0 @@ -/* - * Copyright (c) 2001-2007 Sun Microsystems, Inc. All rights reserved. - * - * The Sun Project JXTA(TM) Software License - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * 3. The end-user documentation included with the redistribution, if any, must - * include the following acknowledgment: "This product includes software - * developed by Sun Microsystems, Inc. for JXTA(TM) technology." - * Alternately, this acknowledgment may appear in the software itself, if - * and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Sun", "Sun Microsystems, Inc.", "JXTA" and "Project JXTA" must - * not be used to endorse or promote products derived from this software - * without prior written permission. For written permission, please contact - * Project JXTA at http://www.jxta.org. - * - * 5. Products derived from this software may not be called "JXTA", nor may - * "JXTA" appear in their name, without prior written permission of Sun. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SUN - * MICROSYSTEMS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * JXTA is a registered trademark of Sun Microsystems, Inc. in the United - * States and other countries. - * - * Please see the license information page at : - * for instructions on use of - * the license in source files. - * - * ==================================================================== - * - * This software consists of voluntary contributions made by many individuals - * on behalf of Project JXTA. For more information on Project JXTA, please see - * http://www.jxta.org. - * - * This license is based on the BSD license adopted by the Apache Foundation. - */ - -package net.jxta.credential; - -import net.jxta.document.*; -import net.jxta.id.ID; -import net.jxta.id.IDFactory; -import net.jxta.peergroup.PeerGroup; -import net.jxta.service.Service; - -import java.util.logging.Level; - -import net.jxta.logging.Logging; - -import java.util.logging.Logger; - -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Enumeration; - -/** - * Authenication credentials are used by JXTA Membership Services as the - * basis for applications for peergroup membership. The AuthenticationCredential - * provides two important pieces of inforamtion: - *