Permalink
Browse files

updated with way cleaner use of jmdns (no src copy anymore)

* the jmdns jar wrongly contained duplicate .class files
* clean the jar and use it instead of copying the sources
* patched netbeans project to bundle jmdns in the android application (apk)
** added option in the "dex" call (search for ADDED in nbproject/build-impl.xml)
  • Loading branch information...
1 parent 89f1474 commit ed71dfcf99e42ae13ccd0a2d4c68df3c53f3051a @twitwi committed Feb 21, 2011
Showing with 36 additions and 28,582 deletions.
  1. +1 −0 .gitignore
  2. +1 −0 AndroidDnssdDiscovery/bundled-libs/jmdns.jar
  3. +1 −0 AndroidDnssdDiscovery/nbproject/build-impl.xml
  4. +1 −1 AndroidDnssdDiscovery/nbproject/project.properties
  5. +0 −422 AndroidDnssdDiscovery/src/javax/jmdns/JmDNS.java
  6. +0 −396 AndroidDnssdDiscovery/src/javax/jmdns/JmmDNS.java
  7. +0 −150 AndroidDnssdDiscovery/src/javax/jmdns/NetworkTopologyDiscovery.java
  8. +0 −45 AndroidDnssdDiscovery/src/javax/jmdns/NetworkTopologyEvent.java
  9. +0 −30 AndroidDnssdDiscovery/src/javax/jmdns/NetworkTopologyListener.java
  10. +0 −74 AndroidDnssdDiscovery/src/javax/jmdns/ServiceEvent.java
  11. +0 −727 AndroidDnssdDiscovery/src/javax/jmdns/ServiceInfo.java
  12. +0 −49 AndroidDnssdDiscovery/src/javax/jmdns/ServiceListener.java
  13. +0 −35 AndroidDnssdDiscovery/src/javax/jmdns/ServiceTypeListener.java
  14. +0 −533 AndroidDnssdDiscovery/src/javax/jmdns/impl/DNSCache.java
  15. +0 −296 AndroidDnssdDiscovery/src/javax/jmdns/impl/DNSEntry.java
  16. +0 −553 AndroidDnssdDiscovery/src/javax/jmdns/impl/DNSIncoming.java
  17. +0 −28 AndroidDnssdDiscovery/src/javax/jmdns/impl/DNSListener.java
  18. +0 −307 AndroidDnssdDiscovery/src/javax/jmdns/impl/DNSMessage.java
  19. +0 −451 AndroidDnssdDiscovery/src/javax/jmdns/impl/DNSOutgoing.java
  20. +0 −328 AndroidDnssdDiscovery/src/javax/jmdns/impl/DNSQuestion.java
  21. +0 −984 AndroidDnssdDiscovery/src/javax/jmdns/impl/DNSRecord.java
  22. +0 −559 AndroidDnssdDiscovery/src/javax/jmdns/impl/DNSStatefulObject.java
  23. +0 −352 AndroidDnssdDiscovery/src/javax/jmdns/impl/DNSTaskStarter.java
  24. +0 −422 AndroidDnssdDiscovery/src/javax/jmdns/impl/HostInfo.java
  25. +0 −2,215 AndroidDnssdDiscovery/src/javax/jmdns/impl/JmDNSImpl.java
  26. +0 −585 AndroidDnssdDiscovery/src/javax/jmdns/impl/JmmDNSImpl.java
  27. +0 −286 AndroidDnssdDiscovery/src/javax/jmdns/impl/ListenerStatus.java
  28. +0 −114 AndroidDnssdDiscovery/src/javax/jmdns/impl/NetworkTopologyDiscoveryImpl.java
  29. +0 −82 AndroidDnssdDiscovery/src/javax/jmdns/impl/NetworkTopologyEventImpl.java
  30. +0 −124 AndroidDnssdDiscovery/src/javax/jmdns/impl/ServiceEventImpl.java
  31. +0 −1,320 AndroidDnssdDiscovery/src/javax/jmdns/impl/ServiceInfoImpl.java
  32. +0 −90 AndroidDnssdDiscovery/src/javax/jmdns/impl/SocketListener.java
  33. +0 −60 AndroidDnssdDiscovery/src/javax/jmdns/impl/constants/DNSConstants.java
  34. +0 −87 AndroidDnssdDiscovery/src/javax/jmdns/impl/constants/DNSLabel.java
  35. +0 −86 AndroidDnssdDiscovery/src/javax/jmdns/impl/constants/DNSOperationCode.java
  36. +0 −78 AndroidDnssdDiscovery/src/javax/jmdns/impl/constants/DNSOptionCode.java
  37. +0 −138 AndroidDnssdDiscovery/src/javax/jmdns/impl/constants/DNSRecordClass.java
  38. +0 −312 AndroidDnssdDiscovery/src/javax/jmdns/impl/constants/DNSRecordType.java
  39. +0 −149 AndroidDnssdDiscovery/src/javax/jmdns/impl/constants/DNSResultCode.java
  40. +0 −215 AndroidDnssdDiscovery/src/javax/jmdns/impl/constants/DNSState.java
  41. +0 −2 AndroidDnssdDiscovery/src/javax/jmdns/impl/constants/package-info.java
  42. +0 −2 AndroidDnssdDiscovery/src/javax/jmdns/impl/package-info.java
  43. +0 −223 AndroidDnssdDiscovery/src/javax/jmdns/impl/tasks/DNSTask.java
  44. +0 −61 AndroidDnssdDiscovery/src/javax/jmdns/impl/tasks/RecordReaper.java
  45. +0 −157 AndroidDnssdDiscovery/src/javax/jmdns/impl/tasks/Responder.java
  46. +0 −2 AndroidDnssdDiscovery/src/javax/jmdns/impl/tasks/package-info.java
  47. +0 −116 AndroidDnssdDiscovery/src/javax/jmdns/impl/tasks/resolver/DNSResolverTask.java
  48. +0 −102 AndroidDnssdDiscovery/src/javax/jmdns/impl/tasks/resolver/ServiceInfoResolver.java
  49. +0 −77 AndroidDnssdDiscovery/src/javax/jmdns/impl/tasks/resolver/ServiceResolver.java
  50. +0 −75 AndroidDnssdDiscovery/src/javax/jmdns/impl/tasks/resolver/TypeResolver.java
  51. +0 −2 AndroidDnssdDiscovery/src/javax/jmdns/impl/tasks/resolver/package-info.java
  52. +0 −146 AndroidDnssdDiscovery/src/javax/jmdns/impl/tasks/state/Announcer.java
  53. +0 −143 AndroidDnssdDiscovery/src/javax/jmdns/impl/tasks/state/Canceler.java
  54. +0 −188 AndroidDnssdDiscovery/src/javax/jmdns/impl/tasks/state/DNSStateTask.java
  55. +0 −161 AndroidDnssdDiscovery/src/javax/jmdns/impl/tasks/state/Prober.java
  56. +0 −141 AndroidDnssdDiscovery/src/javax/jmdns/impl/tasks/state/Renewer.java
  57. +0 −2 AndroidDnssdDiscovery/src/javax/jmdns/impl/tasks/state/package-info.java
  58. +0 −9 AndroidDnssdDiscovery/src/javax/jmdns/package-info.java
  59. +1 −0 AndroidDnssdDiscoveryEclipse/.classpath
  60. +1 −0 AndroidDnssdDiscoveryEclipse/jmdns.jar
  61. +0 −422 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/JmDNS.java
  62. +0 −396 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/JmmDNS.java
  63. +0 −150 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/NetworkTopologyDiscovery.java
  64. +0 −45 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/NetworkTopologyEvent.java
  65. +0 −30 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/NetworkTopologyListener.java
  66. +0 −74 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/ServiceEvent.java
  67. +0 −727 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/ServiceInfo.java
  68. +0 −49 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/ServiceListener.java
  69. +0 −35 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/ServiceTypeListener.java
  70. +0 −533 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/DNSCache.java
  71. +0 −296 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/DNSEntry.java
  72. +0 −553 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/DNSIncoming.java
  73. +0 −28 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/DNSListener.java
  74. +0 −307 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/DNSMessage.java
  75. +0 −451 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/DNSOutgoing.java
  76. +0 −328 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/DNSQuestion.java
  77. +0 −984 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/DNSRecord.java
  78. +0 −559 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/DNSStatefulObject.java
  79. +0 −352 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/DNSTaskStarter.java
  80. +0 −422 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/HostInfo.java
  81. +0 −2,215 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/JmDNSImpl.java
  82. +0 −585 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/JmmDNSImpl.java
  83. +0 −286 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/ListenerStatus.java
  84. +0 −114 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/NetworkTopologyDiscoveryImpl.java
  85. +0 −82 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/NetworkTopologyEventImpl.java
  86. +0 −124 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/ServiceEventImpl.java
  87. +0 −1,319 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/ServiceInfoImpl.java
  88. +0 −90 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/SocketListener.java
  89. +0 −60 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/constants/DNSConstants.java
  90. +0 −87 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/constants/DNSLabel.java
  91. +0 −86 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/constants/DNSOperationCode.java
  92. +0 −78 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/constants/DNSOptionCode.java
  93. +0 −138 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/constants/DNSRecordClass.java
  94. +0 −312 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/constants/DNSRecordType.java
  95. +0 −149 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/constants/DNSResultCode.java
  96. +0 −215 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/constants/DNSState.java
  97. +0 −2 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/constants/package-info.java
  98. +0 −2 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/package-info.java
  99. +0 −223 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/tasks/DNSTask.java
  100. +0 −61 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/tasks/RecordReaper.java
  101. +0 −157 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/tasks/Responder.java
  102. +0 −2 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/tasks/package-info.java
  103. +0 −116 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/tasks/resolver/DNSResolverTask.java
  104. +0 −102 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/tasks/resolver/ServiceInfoResolver.java
  105. +0 −77 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/tasks/resolver/ServiceResolver.java
  106. +0 −75 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/tasks/resolver/TypeResolver.java
  107. +0 −2 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/tasks/resolver/package-info.java
  108. +0 −146 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/tasks/state/Announcer.java
  109. +0 −143 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/tasks/state/Canceler.java
  110. +0 −188 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/tasks/state/DNSStateTask.java
  111. +0 −161 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/tasks/state/Prober.java
  112. +0 −141 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/tasks/state/Renewer.java
  113. +0 −2 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/impl/tasks/state/package-info.java
  114. +0 −9 AndroidDnssdDiscoveryEclipse/src/javax/jmdns/package-info.java
  115. +30 −0 README.txt
  116. BIN jmdns.jar
View
@@ -3,3 +3,4 @@ AndroidDnssdDiscovery/build
AndroidDnssdDiscovery/nbproject/private
AndroidDnssdDiscoveryEclipse/bin
AndroidDnssdDiscoveryEclipse/gen
+unjar
@@ -413,6 +413,7 @@ is divided into following sections:
<arg value="--output=${basedir}/${intermediate.dex}"/>
<arg value="--positions=lines"/>
<arg path="${build.classes.dir}"/>
+ <arg path="bundled-libs"/> <!-- ADDED -->
</exec>
</target>
<target depends="init,compile,-pre-pre-jar,-pre-jar" if="assets.available" name="-package-res-and-assets" unless="bootclasspath1.available">
@@ -17,7 +17,7 @@ dist.apk=${dist.dir}/AndroidDnssdDiscovery.apk
dist.dir=dist
dist.javadoc.dir=${dist.dir}/javadoc
excludes=
-file.reference.jmdns.jar=bundled-libs/jmdns.jar
+file.reference.jmdns.jar=../jmdns.jar
file.reference.projects-AndroidDnssdDiscovery=.
gen.source.dir=${src.dir}
includes=**
Oops, something went wrong.
Oops, something went wrong.

0 comments on commit ed71dfc

Please sign in to comment.