Minor

hplan · Nov 6, 2014 · 0bc1b6f · 0bc1b6f
1 parent 0f285df
commit 0bc1b6f
Show file tree

Hide file tree

Showing 2 changed files with 85 additions and 23 deletions.
diff --git a/core/src/main/java/org/fourthline/cling/UpnpServiceConfiguration.java b/core/src/main/java/org/fourthline/cling/UpnpServiceConfiguration.java
@@ -35,7 +35,7 @@
 import java.util.concurrent.ExecutorService;
 
 /**
- * Shared configuration data of the UPnP stack..
+ * Shared configuration data of the UPnP stack.
  * <p>
  * This interface offers methods for retrieval of configuration data by the
  * {@link org.fourthline.cling.transport.Router} and the {@link org.fourthline.cling.registry.Registry},
@@ -185,7 +185,7 @@ public interface UpnpServiceConfiguration {
      * remote device disappears from the network and you will not receive its periodic heartbeat
      * alive messages. Only an initial search response (UDP unicast) has been received from the
      * remote device, with its proposed maximum age. To avoid (early) expiration of the remote
-     * device, you can override its maxium age with this configuration setting, ignoring the
+     * device, you can override its maximum age with this configuration setting, ignoring the
      * initial maximum age sent by the device. You most likely want to return
      * <code>0</code> in this case, so that the remote device is never expired unless you
      * manually remove it from the {@link org.fourthline.cling.registry.Registry}. You typically remove

diff --git a/website/src/site/xhtml/inproduction.xhtml b/website/src/site/xhtml/inproduction.xhtml
@@ -19,54 +19,69 @@
 
     <ul>
         <li>
-            <strong><a class="externalLink" href="https://market.android.com/details?id=com.bubblesoft.android.bubbleds">BubbleDS</a></strong>
+            <strong><a class="externalLink"
+                       href="https://market.android.com/details?id=com.bubblesoft.android.bubbleds">BubbleDS</a></strong>
+
             <p>
-                A UPnP control point for Android and <a class="externalLink" href="http://linn.co.uk/digital_stream_players">LinnDS</a>
-                streamer appliances.
+                A UPnP control point for Android and
+                <a class="externalLink" href="http://linn.co.uk/digital_stream_players">LinnDS</a> streamer appliances.
             </p>
         </li>
 
         <li>
-            <strong><a class="externalLink" href="https://market.android.com/details?id=com.bubblesoft.android.bubbleupnp">BubbleUPnP</a></strong>
+            <strong><a class="externalLink"
+                       href="https://market.android.com/details?id=com.bubblesoft.android.bubbleupnp">BubbleUPnP</a></strong>
+
             <p>
                 A generic UPnP/DLNA media control point and renderer for Android.
             </p>
         </li>
 
         <li>
             <strong><a class="externalLink" href="https://github.com/jinzora/">Jinzora UPnP</a></strong>
+
             <p>
                 The Jinzora music management and streaming server can be accessed through a UPnP MediaServer
                 gateway written with Cling. The Android client also uses Cling to access the MediaServer.
             </p>
         </li>
 
         <li>
-            <strong><a class="externalLink" href="https://market.android.com/details?id=com.adree.moviebrowser.upnp">MovieBrowser UPnP</a></strong>
+            <strong><a class="externalLink" href="https://market.android.com/details?id=com.adree.moviebrowser.upnp">MovieBrowser
+                UPnP</a></strong>
+
             <p>
-                MovieBrowser is a movie manager to use with your favorite player on your Android tablet. Manage your videos anywhere on 
-                your network (Samba &amp; UPnP/DLNA) and watch them with your favorite player or using the unique Play-To feature (Android airplay).
+                MovieBrowser is a movie manager to use with your favorite player on your Android tablet. Manage your
+                videos anywhere on your network (Samba &amp; UPnP/DLNA) and watch them with your favorite player or
+                using the unique Play-To feature (Android airplay).
             </p>
         </li>
 
         <li>
-            <strong><a class="externalLink" href="https://market.android.com/details?id=com.abk.privatedancer">Private Dancer</a></strong>
+            <strong><a class="externalLink" href="https://market.android.com/details?id=com.abk.privatedancer">Private
+                Dancer</a></strong>
+
             <p>
-                Private Dancer is a UPnP/DLNA Media Renderer for Android. It is designed to be used on a device attached to speakers 
-                and power. Unlike other UPnP Android applications, Private Dancer is designed for always-on (headless) use.
+                Private Dancer is a UPnP/DLNA Media Renderer for Android. It is designed to be used on a device attached
+                to speakers and power. Unlike other UPnP Android applications, Private Dancer is designed for always-on
+                (headless) use.
             </p>
         </li>
-        
+
         <li>
-            <strong><a class="externalLink" href="https://play.google.com/store/apps/details?id=com.dbapp.android.mediahouse">MediaHouse</a></strong>
+            <strong><a class="externalLink"
+                       href="https://play.google.com/store/apps/details?id=com.dbapp.android.mediahouse">MediaHouse</a></strong>
+
             <p>
-                Stream music, videos, movies and pictures from PC, NAS or any other device running UPnP/DLNA compliant media server to
-                your Android phone/handset/tablet.
+                Stream music, videos, movies and pictures from PC, NAS or any other device running UPnP/DLNA compliant
+                media server to your Android phone/handset/tablet.
             </p>
         </li>
 
         <li>
-            <strong><a class="externalLink" href="https://play.google.com/store/apps/details?id=be.wyseur.photo">Digital Photo Frame Slideshow</a></strong>
+            <strong><a class="externalLink" href="https://play.google.com/store/apps/details?id=be.wyseur.photo">Digital
+                Photo Frame Slideshow</a></strong>
+
             <p>
                 Turn your Android device in a digital photo viewer showing a slideshow of local files, photos from
                 network shares (Samba/SMB) or pictures from a UPnP server.
@@ -75,30 +90,77 @@
 
         <li>
             <strong><a class="externalLink" href="http://www.i-frame.net">I-Frame Home</a></strong>
+
             <p>
                 Full HD digital photo frame, picture-like design, displays files located in internal memory, LAN or
                 Internet.
             </p>
         </li>
 
         <li>
-            <strong><a class="externalLink" href="https://play.google.com/store/apps/details?id=de.simatex.free.mediaconnect">MediaConnect</a></strong>
+            <strong><a class="externalLink"
+                       href="https://play.google.com/store/apps/details?id=de.simatex.free.mediaconnect">MediaConnect</a></strong>
+
+            <p>
+                MediaConnect enables you to connect mediaservers with mediaplayers and also remote control these
+                mediaplayers within a WLAN.
+            </p>
+        </li>
+
+        <li>
+            <strong><a class="externalLink"
+                       href="https://play.google.com/store/apps/details?id=de.simatex.free.mediaconnect">MediaConnect</a></strong>
+
+            <p>
+                MediaConnect enables you to connect mediaservers with mediaplayers and also remote control these
+                mediaplayers within a WLAN.
+            </p>
+        </li>
+
+        <li>
+            <strong><a class="externalLink"
+                       href="https://play.google.com/store/apps/details?id=de.mip.shufflebox.android">ShuffleBox</a></strong>
+
             <p>
-                MediaConnect enables you to connect mediaservers with mediaplayers and also remote control these mediaplayers within a WLAN.
+                Use your smartphone or tablet as a remote control and play music on your laptop, mobile phone or any
+                other DNLA device.
             </p>
         </li>
 
+    </ul>
+
+    <h2>Free Projects</h2>
+
+    <ul>
         <li>
-            <strong><a class="externalLink" href="https://play.google.com/store/apps/details?id=de.simatex.free.mediaconnect">MediaConnect</a></strong>
+            <strong><a class="externalLink" href="https://github.com/trishika/DroidUPnP">DroidUPnP</a></strong>
+
             <p>
-                MediaConnect enables you to connect mediaservers with mediaplayers and also remote control these mediaplayers within a WLAN.
+                DroidUPnP is an UPnP control point application for Android. DroidUPnP discover your home UPnP device,
+                content provider and renderer. It allows you to browse your UPnP content directory, select the media you
+                want to use and allows you to play it on your connected television or any UPnP renderer compatible
+                device. It also allows you to use your Android device as a UPnP content provider.
             </p>
         </li>
+    </ul>
+
+    <h2>Noteworthy Forks</h2>
 
+    <ul>
         <li>
-            <strong><a class="externalLink" href="https://play.google.com/store/apps/details?id=de.mip.shufflebox.android">ShuffleBox</a></strong>
+            <strong><a class="externalLink" href="http://www.openhab.org/jupnp/">jUPnP</a></strong>
+
+            <p>
+                Forked from pre-2.0, this code base still contains the OSGi feature, which has been removed in Cling
+                2.0.
+            </p>
+        </li>
+        <li>
+            <strong><a class="externalLink" href="https://github.com/COLTRAM/cling">DIAL Support</a></strong>
+
             <p>
-                Use your smartphone or tablet as a remote control and play music on your laptop, mobile phone or any other DNLA device.
+                Based on alpha 2.0 code, this UPnP/DLNA library for Java and Android contains modifications to discover
+                DIAL devices.
             </p>
         </li>