Author: donsez
Date: Tue Jul 1 07:04:07 2008
New Revision: 673083
URL: http://svn.apache.org/viewvc?rev=673083&view=rev
Log:
add commands for tracing service events; fix serviceAdded and serviceResolved;
add NOTICE and LICENSE files
Added:
felix/sandbox/donsez/mdns/LICENSE
felix/sandbox/donsez/mdns/NOTICE
Modified:
felix/sandbox/donsez/mdns/ (props changed)
felix/sandbox/donsez/mdns/src/main/java/org/apache/felix/sandbox/mdns/impl/MDnsCmd.java
felix/sandbox/donsez/mdns/src/main/java/org/apache/felix/sandbox/mdns/impl/MDnsEventSender.java
felix/sandbox/donsez/mdns/src/site/mdns.txt
Propchange: felix/sandbox/donsez/mdns/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jul 1 07:04:07 2008
@@ -0,0 +1,5 @@
+.classpath
+.project
+.settings
+unstable
+target
Added: felix/sandbox/donsez/mdns/LICENSE
URL:
http://svn.apache.org/viewvc/felix/sandbox/donsez/mdns/LICENSE?rev=673083&view=auto
==============================================================================
--- felix/sandbox/donsez/mdns/LICENSE (added)
+++ felix/sandbox/donsez/mdns/LICENSE Tue Jul 1 07:04:07 2008
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Added: felix/sandbox/donsez/mdns/NOTICE
URL:
http://svn.apache.org/viewvc/felix/sandbox/donsez/mdns/NOTICE?rev=673083&view=auto
==============================================================================
--- felix/sandbox/donsez/mdns/NOTICE (added)
+++ felix/sandbox/donsez/mdns/NOTICE Tue Jul 1 07:04:07 2008
@@ -0,0 +1,14 @@
+Apache Felix mDNS
+Copyright 2008 The Apache Software Foundation
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+II. Used Software
+* jmdns, v1.0, http://jmdns.sourceforge.net/, Apache License 2.0
+
+III. License Summary
+- Apache License 2.0
Modified:
felix/sandbox/donsez/mdns/src/main/java/org/apache/felix/sandbox/mdns/impl/MDnsCmd.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/donsez/mdns/src/main/java/org/apache/felix/sandbox/mdns/impl/MDnsCmd.java?rev=673083&r1=673082&r2=673083&view=diff
==============================================================================
---
felix/sandbox/donsez/mdns/src/main/java/org/apache/felix/sandbox/mdns/impl/MDnsCmd.java
(original)
+++
felix/sandbox/donsez/mdns/src/main/java/org/apache/felix/sandbox/mdns/impl/MDnsCmd.java
Tue Jul 1 07:04:07 2008
@@ -22,9 +22,11 @@
import java.io.IOException;
import java.io.PrintStream;
import java.util.Dictionary;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Hashtable;
import java.util.Iterator;
+import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
@@ -52,6 +54,8 @@
private static final String SETDEBUG_OPTION = "setdebug";
private static final String REGISTER_OPTION = "register";
private static final String UNREGISTER_OPTION = "unregister";
+ private static final String LISTEN_OPTION = "listen";
+ private static final String UNLISTEN_OPTION = "unlisten";
private static final String BROWSER_OPTION = "browser";
private ServiceRegistration m_serviceRegistration;
@@ -60,6 +64,8 @@
private ServiceTypeListener m_serviceTypeListFeeder;
+ private Map/*<String,ServiceListener>*/ m_myServiceListeners=new
HashMap/*<String,ServiceListener>*/();
+
public MDnsCmd(JmDNS jmDNS) {
this.m_jmDNS=jmDNS;
}
@@ -106,6 +112,8 @@
out.println("mdns "+ REGISTER_OPTION + " <type>
<name> <port> <text>\t- register a service.");
out.println("mdns "+ REGISTER_OPTION + " <type>
<name> <port> <priority> <weight> <key=value;key=value;...>\t- register a
service.");
out.println("mdns "+ UNREGISTER_OPTION + " all \t-
register all the services.");
+ out.println("mdns "+ LISTEN_OPTION + " <type> \t-
trace mDNS service events.");
+ out.println("mdns "+ UNLISTEN_OPTION + "<type> \t-
stop the mDNS service events trace.");
out.println("mdns "+ BROWSER_OPTION + "\t- open a
gui browser.");
out.println("mdns "+ SETDEBUG_OPTION +
"\t<levelnumber> - set/get the debug level for mDNS.");
return;
@@ -126,10 +134,38 @@
if (option.equals(HELP_OPTION)) {
printUsage(out);
+ } else if (option.equals(LISTEN_OPTION)) {
+
+ if(st.countTokens()!=1){
+ printUsage(err);
+ return;
+ }
+ String type=st.nextToken();
+
+ if(m_myServiceListeners.containsKey(type)) return;
+
+ m_jmDNS.addServiceListener(type, new MyServiceListener(out));
+
+
+ } else if (option.equals(UNLISTEN_OPTION)) {
+
+ if(st.countTokens()!=1){
+ printUsage(err);
+ return;
+ }
+ String type=st.nextToken();
+
+ ServiceListener serviceListener=(MyServiceListener)
m_myServiceListeners.remove(type);
+
+ m_jmDNS.removeServiceListener(type, serviceListener);
+
} else if (option.equals(TYPES_OPTION)) {
Iterator iterator=m_serviceTypes.iterator();
- while(iterator.hasNext())
- out.println(iterator.next());
+ if(!iterator.hasNext()) {
+ out.println("No type");
+ } else
+ while(iterator.hasNext())
+ out.println(iterator.next());
} else if (option.equals(SERVICES_OPTION)) {
if(st.countTokens()!=1){
printUsage(err);
@@ -137,10 +173,13 @@
}
String type=st.nextToken();
ServiceInfo[] infos = m_jmDNS.list(type);
- if(infos!=null)
+ if(infos!=null && infos.length>0) {
for (int i=0; i < infos.length; i++) {
out.println(infos[i]);
}
+ } else {
+ out.println("No service");
+ }
} else if (option.equals(REGISTER_OPTION)) {
ServiceInfo info;
@@ -240,21 +279,32 @@
class MyServiceListener implements ServiceListener {
+
+ private PrintStream out;
+ public MyServiceListener(PrintStream out){
+ this.out=out;
+ }
public void serviceAdded(ServiceEvent event) {
- System.out.println("Service added : " +
event.getName()+"."+event.getType());
+ out.println("Service added : " +
event.getName()+"."+event.getType());
+ event.getDNS().getServiceInfo(event.getName(),event.getType());
}
public void serviceRemoved(ServiceEvent event) {
- System.out.println("Service removed : " +
event.getName()+"."+event.getType());
+ out.println("Service removed : " +
event.getName()+"."+event.getType());
}
public void serviceResolved(ServiceEvent event) {
- System.out.println("Service resolved: " + event.getInfo());
+ out.println("Service resolved: " + event.getInfo());
}
}
class MyServiceTypeListener implements ServiceTypeListener {
+
+ private PrintStream out;
+ public MyServiceTypeListener(PrintStream out){
+ this.out=out;
+ }
public void serviceTypeAdded(ServiceEvent event) {
- System.out.println("Service type added: " +event.getType());
+ out.println("Service type added: " +event.getType());
}
}
}
Modified:
felix/sandbox/donsez/mdns/src/main/java/org/apache/felix/sandbox/mdns/impl/MDnsEventSender.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/donsez/mdns/src/main/java/org/apache/felix/sandbox/mdns/impl/MDnsEventSender.java?rev=673083&r1=673082&r2=673083&view=diff
==============================================================================
---
felix/sandbox/donsez/mdns/src/main/java/org/apache/felix/sandbox/mdns/impl/MDnsEventSender.java
(original)
+++
felix/sandbox/donsez/mdns/src/main/java/org/apache/felix/sandbox/mdns/impl/MDnsEventSender.java
Tue Jul 1 07:04:07 2008
@@ -26,6 +26,7 @@
import javax.jmdns.JmDNS;
import javax.jmdns.ServiceEvent;
+import javax.jmdns.ServiceInfo;
import org.apache.felix.sandbox.mdns.Constants;
import org.osgi.framework.BundleActivator;
@@ -60,8 +61,20 @@
EventAdmin eventAdmin=(EventAdmin)
m_serviceTracker.getService();
if (eventAdmin != null) {
Dictionary properties=new Hashtable();
- properties.put("serviceInfo", new
ServiceInfoImpl(serviceEvent.getInfo()));
+ String name=serviceEvent.getName();
+ String type=serviceEvent.getType();
+ ServiceInfo serviceInfo=serviceEvent.getInfo();
+
+ properties.put("name", name);
+ properties.put("type", type);
+
+ if(serviceInfo!=null) {
+ properties.put("serviceInfo", new
ServiceInfoImpl(serviceInfo));
+ }
eventAdmin.sendEvent(new
Event(Constants.SERVICE_ADDED_TOPIC,properties));
+ if(serviceInfo==null) {
+ serviceEvent.getDNS().getServiceInfo(name,type);
+ }
}
}
@@ -72,8 +85,16 @@
EventAdmin eventAdmin=(EventAdmin)
m_serviceTracker.getService();
if (eventAdmin != null) {
Dictionary properties=new Hashtable();
- properties.put("serviceInfo", new
ServiceInfoImpl(serviceEvent.getInfo()));
- eventAdmin.sendEvent(new
Event(Constants.SERVICE_ADDED_TOPIC,properties));
+ String name=serviceEvent.getName();
+ String type=serviceEvent.getType();
+ ServiceInfo serviceInfo=serviceEvent.getInfo();
+
+ properties.put("name", name);
+ properties.put("type", type);
+ if(serviceInfo!=null) {
+ properties.put("serviceInfo", new
ServiceInfoImpl(serviceInfo));
+ }
+ eventAdmin.sendEvent(new
Event(Constants.SERVICE_REMOVED_TOPIC,properties));
}
}
@@ -84,8 +105,13 @@
EventAdmin eventAdmin=(EventAdmin)
m_serviceTracker.getService();
if (eventAdmin != null) {
Dictionary properties=new Hashtable();
- properties.put("serviceInfo", new
ServiceInfoImpl(serviceEvent.getInfo()));
- eventAdmin.sendEvent(new
Event(Constants.SERVICE_ADDED_TOPIC,properties));
+ String name=serviceEvent.getName();
+ String type=serviceEvent.getType();
+ ServiceInfo serviceInfo=serviceEvent.getInfo();
+ properties.put("name", name);
+ properties.put("type", type);
+ properties.put("serviceInfo", new
ServiceInfoImpl(serviceInfo));
+ eventAdmin.sendEvent(new
Event(Constants.SERVICE_RESOLVED_TOPIC,properties));
}
}
Modified: felix/sandbox/donsez/mdns/src/site/mdns.txt
URL:
http://svn.apache.org/viewvc/felix/sandbox/donsez/mdns/src/site/mdns.txt?rev=673083&r1=673082&r2=673083&view=diff
==============================================================================
--- felix/sandbox/donsez/mdns/src/site/mdns.txt (original)
+++ felix/sandbox/donsez/mdns/src/site/mdns.txt Tue Jul 1 07:04:07 2008
@@ -33,9 +33,9 @@
mdns register _http._tcp.local. HTMLJMXAdaptorOn8000 8000 0 0 path=/
mdns services _http._tcp.local.
rem locate connectors by DNS-SD
-mdns register _jmx._tcp.local. JMXConnectorOn1999 1999 0 0
servicejmx=rmi:///jndi/rmi://;path=/server
-mdns register _jmx._tcp.local. JMXConnectorOn9999 9999 0 0
servicejmx=rmi:///jndi/rmi://;path=/server
-mdns register _jmx._tcp.local. JMXConnectorOn7777 7777 0 0
servicejmx=rmi:///jndi/iiop://;path=/server
+mdns register _jmx._tcp.local. JMXConnectorOn1999 1999 0 0
protocol=rmi:///jndi/rmi://;path=/server
+mdns register _jmx._tcp.local. JMXConnectorOn9999 9999 0 0
protocol=rmi:///jndi/rmi://;path=/server
+mdns register _jmx._tcp.local. JMXConnectorOn7777 7777 0 0
protocol=rmi:///jndi/iiop://;path=/server
mdns types
mdns services _jmx._tcp.local.
@@ -50,5 +50,5 @@
rem in replacement of JOnAS discovery service
rem service:jmx:rmi:///jndi/rmi://host:1099/jrmpconnector_jonas
-mdns register _jmx._tcp.local. JOnASJMXConnectorOn1099 1099 0 0
servicejmx=rmi:///jndi/rmi://;path=/jrmpconnector_jonas
-mdns register _jonas._tcp.local. JOnASJMXConnectorOn1099 1099 0 0
servicejmx=rmi:///jndi/rmi://;path=/jrmpconnector_jonas
+mdns register _jmx._tcp.local. JOnASJMXConnectorOn1099 1099 0 0
protocol=rmi:///jndi/rmi://;path=/jrmpconnector_jonas
+mdns register _jonas._tcp.local. JOnASJMXConnectorOn1099 1099 0 0
protocol=rmi:///jndi/rmi://;path=/jrmpconnector_jonas
