initial commit of C++ Bluetooth transport

2 files changed, 22 insertions, 6 deletions

diff --git a/java/src/Ice/src/main/java/IceInternal/PropertyNames.java b/java/src/Ice/src/main/java/IceInternal/PropertyNames.java
index 401fc14ae66..929bb424f48 100644
--- a/java/src/Ice/src/main/java/IceInternal/PropertyNames.java
+++ b/java/src/Ice/src/main/java/IceInternal/PropertyNames.java
@@ -6,7 +6,7 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Nov  5 12:25:50 2015
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Nov  6 09:55:41 2015
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -1019,6 +1019,14 @@ public final class PropertyNames
         null
     };
 
+    public static final Property IceBTProps[] = 
+    {
+        new Property("IceBT\\.DefaultAddress", false, null),
+        new Property("IceBT\\.RcvSize", false, null),
+        new Property("IceBT\\.SndSize", false, null),
+        null
+    };
+
     public static final Property Glacier2Props[] = 
     {
         new Property("Glacier2\\.AddConnectionContext", false, null),
@@ -1219,6 +1227,7 @@ public final class PropertyNames
         IcePatch2ClientProps,
         IceSSLProps,
         IceStormAdminProps,
+        IceBTProps,
         Glacier2Props,
         Glacier2CryptPermissionsVerifierProps,
         FreezeProps,
@@ -1239,6 +1248,7 @@ public final class PropertyNames
         "IcePatch2Client",
         "IceSSL",
         "IceStormAdmin",
+        "IceBT",
         "Glacier2",
         "Glacier2CryptPermissionsVerifier",
         "Freeze",
diff --git a/java/src/IceBT/src/main/java/IceBT/EndpointI.java b/java/src/IceBT/src/main/java/IceBT/EndpointI.java
index 0830e757a0d..4c18fbdb687 100644
--- a/java/src/IceBT/src/main/java/IceBT/EndpointI.java
+++ b/java/src/IceBT/src/main/java/IceBT/EndpointI.java
@@ -274,6 +274,17 @@ final class EndpointI extends IceInternal.EndpointI
     {
         super.initWithOptions(args);
 
+        if(_addr.length() == 0)
+        {
+            _addr = _instance.properties().getProperty("IceBT.DefaultAddress");
+        }
+
+        if(!oaEndpoint && _addr.length() == 0)
+        {
+            throw new Ice.EndpointParseException(
+                "a device address must be specified using the -a option or IceBT.DefaultAddress");
+        }
+
         if(_name.length() == 0)
         {
             _name = "Ice Service";
@@ -284,11 +295,6 @@ final class EndpointI extends IceInternal.EndpointI
             throw new Ice.EndpointParseException("a UUID must be specified using the -u option");
         }
 
-        if(!oaEndpoint && _addr.length() == 0)
-        {
-            throw new Ice.EndpointParseException("a device address must be specified using the -a option");
-        }
-
         hashInit();
     }