You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by do...@apache.org on 2007/05/01 01:15:18 UTC

svn commit: r533875 [6/30] - in /incubator/felix/sandbox/donsez/upnp.devicegen: ./ doc/ generation/ generation/res/ generation/res/device/ generation/res/service/ manifest/ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/...

Added: incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/SecurityConsole1.xml
URL: http://svn.apache.org/viewvc/incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/SecurityConsole1.xml?view=auto&rev=533875
==============================================================================
--- incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/SecurityConsole1.xml (added)
+++ incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/SecurityConsole1.xml Mon Apr 30 16:15:05 2007
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<scpd>
+  <specVersion> <!-- UPnP version 1.x -->
+    <major>1</major>
+    <minor>0</minor>
+  </specVersion>
+  <actionList>
+    <action>
+      <name>PresentKey</name>
+      <argumentList>
+        <argument>
+          <name>HashAlgorithm</name>
+          <relatedStateVariable>A_ARG_TYPE_string</relatedStateVariable>
+          <direction>in</direction>
+        </argument>
+        <argument>
+          <name>Key</name>
+          <relatedStateVariable>A_ARG_TYPE_string</relatedStateVariable>
+          <direction>in</direction>
+        </argument>
+        <argument>
+          <name>PreferredName</name>
+          <relatedStateVariable>A_ARG_TYPE_string</relatedStateVariable>
+          <direction>in</direction>
+        </argument>
+        <argument>
+          <name>IconDesc</name>
+          <relatedStateVariable>A_ARG_TYPE_string</relatedStateVariable>
+          <direction>in</direction>
+        </argument>
+      </argumentList>
+    </action>
+    <action>
+      <Optional/>
+      <name>GetNameList</name>
+      <argumentList>
+        <argument>
+          <name>Names</name>
+          <relatedStateVariable>A_ARG_TYPE_string</relatedStateVariable>
+          <direction>out</direction>
+	    <retval/>
+        </argument>
+      </argumentList>
+    </action> 
+    <action>
+      <Optional/>
+      <name>GetMyCertificates</name>
+      <argumentList>
+        <argument>
+          <name>HashAlgorithm</name>
+          <relatedStateVariable>A_ARG_TYPE_string</relatedStateVariable>
+          <direction>in</direction>
+        </argument>
+        <argument>
+          <name>Hash</name>
+          <relatedStateVariable>A_ARG_TYPE_base64</relatedStateVariable>
+          <direction>in</direction>
+        </argument>
+        <argument>
+          <name>Certificates</name>
+          <relatedStateVariable>A_ARG_TYPE_string</relatedStateVariable>
+          <direction>out</direction>
+	    <retval/>
+        </argument>
+      </argumentList>
+    </action>
+    <action>
+      <Optional/>
+      <name>RenewCertificate</name>
+      <argumentList>
+        <argument>
+          <name>OldCertificate</name>
+          <relatedStateVariable>A_ARG_TYPE_string</relatedStateVariable>
+          <direction>in</direction>
+        </argument>
+        <argument>
+          <name>NewCertificate</name>
+          <relatedStateVariable>A_ARG_TYPE_string</relatedStateVariable>
+          <direction>out</direction>
+	    <retval/>
+        </argument>
+      </argumentList>
+    </action> 
+  </actionList>
+  <serviceStateTable>
+    <stateVariable sendEvents="yes">
+      <Optional/>
+      <name>PendingCPList</name> 
+      <dataType>string</dataType> 
+    </stateVariable>
+    <stateVariable sendEvents="yes">
+      <Optional/>
+      <name>NameListVersion</name> 
+      <dataType>string</dataType> 
+    </stateVariable>
+    <stateVariable sendEvents="no">
+      <name>A_ARG_TYPE_string</name> 
+      <dataType>string</dataType> 
+    </stateVariable>
+    <stateVariable sendEvents="no">
+      <name>A_ARG_TYPE_base64</name> 
+      <dataType>bin.base64</dataType> 
+    </stateVariable>
+  </serviceStateTable>
+</scpd>

Propchange: incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/SecurityConsole1.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/SimpleCameraStillImage1.xml
URL: http://svn.apache.org/viewvc/incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/SimpleCameraStillImage1.xml?view=auto&rev=533875
==============================================================================
--- incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/SimpleCameraStillImage1.xml (added)
+++ incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/SimpleCameraStillImage1.xml Mon Apr 30 16:15:05 2007
@@ -0,0 +1,21 @@
+<scpd>
+  <serviceStateTable>
+    <stateVariable>
+      <name>Image</name>
+	  <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>bin.base64</dataType>
+    </stateVariable>
+  </serviceStateTable>
+  <actionList>
+    <action>
+    <name>GetDefaultImage</name>
+      <argumentList>
+        <argument>
+          <name>RetImage</name>
+         <relatedStateVariable>Image</relatedStateVariable>
+          <direction>out</direction>
+        </argument>
+      </argumentList>
+    </action>
+  </actionList>
+</scpd>

Propchange: incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/SimpleCameraStillImage1.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/SwitchPower1.xml
URL: http://svn.apache.org/viewvc/incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/SwitchPower1.xml?view=auto&rev=533875
==============================================================================
--- incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/SwitchPower1.xml (added)
+++ incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/SwitchPower1.xml Mon Apr 30 16:15:05 2007
@@ -0,0 +1,47 @@
+<scpd>
+  <serviceStateTable>
+    <stateVariable>
+      <name>Target</name>
+      <sendEventsAttribute>no</sendEventsAttribute> 
+      <dataType>boolean</dataType>
+      <defaultValue>0</defaultValue>
+    </stateVariable>
+    <stateVariable>
+      <name>Status</name>
+      <dataType>boolean</dataType>
+      <defaultValue>0</defaultValue>
+    </stateVariable>
+  </serviceStateTable>
+  <actionList>
+    <action>
+    <name>SetTarget</name>
+      <argumentList>
+        <argument>
+          <name>newTargetValue</name>
+          <direction>in</direction>
+          <relatedStateVariable>Target</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+    <action>
+    <name>GetTarget</name>
+      <argumentList>
+        <argument>
+          <name>RetTargetValue</name>
+          <direction>out</direction>
+          <relatedStateVariable>Target</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+    <action>
+    <name>GetStatus</name>
+      <argumentList>
+        <argument>
+          <name>ResultStatus</name>
+          <direction>out</direction>
+          <relatedStateVariable>Status</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+  </actionList>
+</scpd>

Propchange: incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/SwitchPower1.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/TemperatureSensor1.xml
URL: http://svn.apache.org/viewvc/incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/TemperatureSensor1.xml?view=auto&rev=533875
==============================================================================
--- incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/TemperatureSensor1.xml (added)
+++ incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/TemperatureSensor1.xml Mon Apr 30 16:15:05 2007
@@ -0,0 +1,92 @@
+<scpd>
+   <serviceStateTable>
+      <stateVariable>
+         <name>CurrentTemperature</name>
+         <sendEventsAttribute>yes</sendEventsAttribute>
+         <dataType>i4</dataType>
+         <defaultValue>2000</defaultValue>
+         <allowedValueRange>
+            <minimum>0</minimum>
+            <maximum>4000</maximum>
+            <step>1</step>
+         </allowedValueRange>
+      </stateVariable>
+      <stateVariable>
+         <name>Application</name>
+         <sendEventsAttribute>yes</sendEventsAttribute>
+         <dataType>string</dataType>
+         <defaultValue>Room</defaultValue>
+         <allowedValueList>
+            <allowedValue>Room</allowedValue>
+            <allowedValue>Outdoor</allowedValue>
+            <allowedValue>Pipe</allowedValue>
+            <allowedValue>AirDuct</allowedValue>
+         </allowedValueList>
+      </stateVariable>
+      <stateVariable>
+         <Optional/>
+         <name>Name</name>
+         <sendEventsAttribute>yes</sendEventsAttribute>
+         <dataType>string</dataType>
+         <defaultValue/>
+      </stateVariable>
+   </serviceStateTable>
+   <actionList>
+      <action>
+         <name>GetApplication</name>
+         <argumentList>
+            <argument>
+               <name>CurrentApplication</name>
+               <direction>out</direction>
+               <relatedStateVariable>Application</relatedStateVariable>
+               <retval/>
+            </argument>
+         </argumentList>
+      </action>
+      <action>
+         <Optional/>
+         <name>SetApplication</name>
+         <argumentList>
+            <argument>
+               <name>NewApplication</name>
+               <direction>in</direction>
+               <relatedStateVariable>Application</relatedStateVariable>
+            </argument>
+         </argumentList>
+      </action>
+      <action>
+         <name>GetCurrentTemperature</name>
+         <argumentList>
+            <argument>
+               <name>CurrentTemp</name>
+               <direction>out</direction>
+               <relatedStateVariable>CurrentTemperature</relatedStateVariable>
+               <retval/>
+            </argument>
+         </argumentList>
+      </action>
+      <action>
+         <Optional/>
+         <name>GetName</name>
+         <argumentList>
+            <argument>
+               <name>CurrentName</name>
+               <direction>out</direction>
+               <relatedStateVariable>Name</relatedStateVariable>
+               <retval/>
+            </argument>
+         </argumentList>
+      </action>
+      <action>
+         <Optional/>
+         <name>SetName</name>
+         <argumentList>
+            <argument>
+               <name>NewName</name>
+               <direction>in</direction>
+               <relatedStateVariable>Name</relatedStateVariable>
+            </argument>
+         </argumentList>
+      </action>
+   </actionList>
+</scpd>

Propchange: incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/TemperatureSensor1.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/TemperatureSetpoint1.xml
URL: http://svn.apache.org/viewvc/incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/TemperatureSetpoint1.xml?view=auto&rev=533875
==============================================================================
--- incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/TemperatureSetpoint1.xml (added)
+++ incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/TemperatureSetpoint1.xml Mon Apr 30 16:15:05 2007
@@ -0,0 +1,108 @@
+<scpd>
+   <serviceStateTable>
+      <stateVariable>
+         <name>Application</name>
+         <sendEventsAttribute>yes</sendEventsAttribute>
+         <dataType>string</dataType>
+      </stateVariable>
+      <stateVariable>
+         <name>CurrentSetpoint</name>
+         <sendEventsAttribute>yes</sendEventsAttribute>
+         <dataType>i4</dataType>
+      </stateVariable>
+      <stateVariable>
+         <Optional/>
+         <name>SetpointAchieved</name>
+         <sendEventsAttribute>yes</sendEventsAttribute>
+         <dataType>boolean</dataType>
+         <defaultValue>0</defaultValue>
+      </stateVariable>
+      <stateVariable>
+         <Optional/>
+         <name>Name</name>
+         <sendEventsAttribute>yes</sendEventsAttribute>
+         <dataType>string</dataType>
+         <defaultValue/>
+      </stateVariable>
+   </serviceStateTable>
+   <actionList>
+      <action>
+         <name>GetApplication</name>
+         <argumentList>
+            <argument>
+               <name>CurrentApplication</name>
+               <direction>out</direction>
+               <relatedStateVariable>Application</relatedStateVariable>
+               <retval/>
+            </argument>
+         </argumentList>
+      </action>
+      <action>
+         <Optional/>
+         <name>SetApplication</name>
+         <argumentList>
+            <argument>
+               <name>NewApplication</name>
+               <direction>in</direction>
+               <relatedStateVariable>Application</relatedStateVariable>
+            </argument>
+         </argumentList>
+      </action>
+      <action>
+         <name>SetCurrentSetpoint</name>
+         <argumentList>
+            <argument>
+               <name>NewCurrentSetpoint</name>
+               <direction>in</direction>
+               <relatedStateVariable>CurrentSetpoint</relatedStateVariable>
+            </argument>
+         </argumentList>
+      </action>
+      <action>
+         <name>GetCurrentSetpoint</name>
+         <argumentList>
+            <argument>
+               <name>CurrentSP</name>
+               <direction>out</direction>
+               <relatedStateVariable>CurrentSetpoint</relatedStateVariable>
+               <retval/>
+            </argument>
+         </argumentList>
+      </action>
+      <action>
+         <Optional/>
+         <name>GetSetpointAchieved</name>
+         <argumentList>
+            <argument>
+               <name>CurrentSPA</name>
+               <direction>out</direction>
+               <relatedStateVariable>SetpointAchieved</relatedStateVariable>
+               <retval/>
+            </argument>
+         </argumentList>
+      </action>
+      <action>
+         <Optional/>
+         <name>GetName</name>
+         <argumentList>
+            <argument>
+               <name>CurrentName</name>
+               <direction>out</direction>
+               <relatedStateVariable>Name</relatedStateVariable>
+               <retval/>
+            </argument>
+         </argumentList>
+      </action>
+      <action>
+         <Optional/>
+         <name>SetName</name>
+         <argumentList>
+            <argument>
+               <name>NewName</name>
+               <direction>in</direction>
+               <relatedStateVariable>Name</relatedStateVariable>
+            </argument>
+         </argumentList>
+      </action>
+   </actionList>
+</scpd>

Propchange: incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/TemperatureSetpoint1.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/VolumeSelector1.xml
URL: http://svn.apache.org/viewvc/incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/VolumeSelector1.xml?view=auto&rev=533875
==============================================================================
--- incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/VolumeSelector1.xml (added)
+++ incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/VolumeSelector1.xml Mon Apr 30 16:15:05 2007
@@ -0,0 +1,76 @@
+<scpd>
+  <serviceStateTable>
+    <stateVariable>
+      <name>VolumeDB</name>
+      <dataType>int</dataType>
+      <defaultValue>0</defaultValue>
+    </stateVariable>
+    <stateVariable>
+      <name>Mute</name>
+      <dataType>boolean</dataType>
+      <defaultValue>false</defaultValue>
+    </stateVariable>
+  </serviceStateTable>
+  <actionList>
+    <action>
+	  <name>SetVolumeDB</name>
+      <argumentList>
+        <argument>
+          <name>newVolumeDBValue</name>
+          <direction>in</direction>
+          <relatedStateVariable>VolumeDB</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+    <action>
+	  <name>SetMute</name>
+      <argumentList>
+        <argument>
+          <name>NewMute</name>
+          <direction>in</direction>
+          <relatedStateVariable>Mute</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+    <action>
+    <name>GetVolumeDB</name>
+      <argumentList>
+        <argument>
+          <name>RetVolumeDBValue</name>
+          <direction>out</direction>
+          <relatedStateVariable>VolumeDB</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+    <action>
+    <name>GetMute</name>
+      <argumentList>
+        <argument>
+          <name>CurrentMute</name>
+          <direction>out</direction>
+          <relatedStateVariable>Mute</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+    <action>
+    <name>IncrementVolumeDB</name>
+      <argumentList>
+        <argument>
+          <name>RetVolumeDBValue</name>
+          <direction>out</direction>
+          <relatedStateVariable>VolumeDB</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+    <action>
+    <name>DecrementVolumeDB</name>
+      <argumentList>
+        <argument>
+          <name>RetVolumeDBValue</name>
+          <direction>out</direction>
+          <relatedStateVariable>VolumeDB</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+  </actionList>
+</scpd>

Propchange: incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/VolumeSelector1.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANCableLinkConfig1.xml
URL: http://svn.apache.org/viewvc/incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANCableLinkConfig1.xml?view=auto&rev=533875
==============================================================================
--- incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANCableLinkConfig1.xml (added)
+++ incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANCableLinkConfig1.xml Mon Apr 30 16:15:05 2007
@@ -0,0 +1,229 @@
+<scpd>
+    <serviceStateTable>
+        <stateVariable>
+          <name>CableLinkConfigState</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>string</dataType>      
+          <allowedValueList>
+                <allowedValue>notReady</allowedValue>
+                <allowedValue>dsSyncComplete</allowedValue>
+                <allowedValue>usParamAcquired</allowedValue>
+                <allowedValue>rangingComplete</allowedValue>
+	            <allowedValue>ipComplete</allowedValue>
+                <allowedValue>todEstablished</allowedValue>
+                <allowedValue>paramTransferComplete</allowedValue>
+                <allowedValue>registrationComplete</allowedValue>
+                <allowedValue>operational</allowedValue>
+                <allowedValue>accessDenied</allowedValue>
+          </allowedValueList>
+        </stateVariable>
+
+        <stateVariable>
+          <name>LinkType</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>string</dataType>      
+          <allowedValueList>
+            <allowedValue>Ethernet</allowedValue>
+          </allowedValueList>
+        </stateVariable>
+
+        <stateVariable>
+          <Optional/>
+          <name>DownstreamFrequency</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>ui4</dataType>
+        </stateVariable>
+
+        <stateVariable>
+          <Optional/>
+          <name>DownstreamModulation</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>string</dataType>
+          <allowedValueList>
+            <allowedValue>64QAM</allowedValue>
+            <allowedValue>256QAM</allowedValue>
+          </allowedValueList>
+        </stateVariable>
+
+        <stateVariable>
+          <Optional/>
+          <name>UpstreamFrequency</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>ui4</dataType>
+        </stateVariable>
+
+        <stateVariable>
+          <Optional/>
+          <name>UpstreamModulation</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>string</dataType>
+          <allowedValueList>
+            <allowedValue>QPSK</allowedValue>
+            <allowedValue>16QAM</allowedValue>
+          </allowedValueList>
+        </stateVariable>
+
+        <stateVariable>
+          <Optional/>
+          <name>UpstreamChannelID</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>ui4</dataType>
+        </stateVariable>
+
+        <stateVariable>
+          <Optional/>
+          <name>UpstreamPowerLevel</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>ui4</dataType>
+        </stateVariable>
+
+        <stateVariable>
+          <Optional/>
+          <name>ConfigFile</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>string</dataType>      
+        </stateVariable>
+
+        <stateVariable>
+          <Optional/>
+          <name>TFTPServer</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>string</dataType>     
+        </stateVariable>
+
+        <stateVariable>
+          <Optional/>
+          <name>BPIEncryptionEnabled</name>
+          <dataType>boolean</dataType>      
+        </stateVariable>
+
+    </serviceStateTable>
+
+    <actionList>
+        <action>
+            <name>GetCableLinkConfigInfo</name>
+            <argumentList>
+                <argument>
+                  <name>NewCableLinkConfigState</name>
+                  <direction>out</direction>
+                  <relatedStateVariable>CableLinkConfigState</relatedStateVariable>
+                </argument>
+                <argument>
+                  <name>NewLinkType</name>
+                  <direction>out</direction>
+                  <relatedStateVariable>LinkType</relatedStateVariable>
+                </argument>
+            </argumentList>
+        </action>
+
+        <action>
+            <Optional/>
+            <name>GetDownstreamFrequency</name>
+              <argumentList>
+                <argument>
+                  <name>NewDownstreamFrequency</name>
+                  <direction>out</direction>
+                  <relatedStateVariable>DownstreamFrequency</relatedStateVariable>
+                </argument>
+              </argumentList>
+        </action>
+
+        <action>
+            <Optional/>
+            <name>GetDownstreamModulation</name>
+            <argumentList>
+                <argument>
+                  <name>NewDownstreamModulation</name>
+                  <direction>out</direction>
+                  <relatedStateVariable>DownstreamModulation</relatedStateVariable>
+                </argument>
+            </argumentList>
+        </action>
+
+        <action>
+            <Optional/>
+            <name>GetUpstreamFrequency</name>
+            <argumentList>
+                <argument>
+                  <name>NewUpstreamFrequency</name>
+                  <direction>out</direction>
+                  <relatedStateVariable>UpstreamFrequency</relatedStateVariable>
+                </argument>
+            </argumentList>
+        </action>
+
+        <action>
+            <Optional/>
+            <name>GetUpstreamModulation</name>
+            <argumentList>
+                <argument>
+                  <name>NewUpstreamModulation</name>
+                  <direction>out</direction>
+                 <relatedStateVariable>UpstreamModulation</relatedStateVariable>
+                </argument>
+            </argumentList>
+        </action>
+    
+        <action>
+            <Optional/>
+            <name>GetUpstreamChannelID</name>
+            <argumentList>
+                <argument>
+                  <name>NewUpstreamChannelID</name>
+                  <direction>out</direction>
+                  <relatedStateVariable>UpstreamChannelID</relatedStateVariable>
+                </argument>
+            </argumentList>
+        </action>
+
+        <action>
+            <Optional/>
+            <name>GetUpstreamPowerLevel</name>
+            <argumentList>
+                <argument>
+                  <name>NewUpstreamPowerLevel</name>
+                  <direction>out</direction>
+                 <relatedStateVariable>UpstreamPowerLevel</relatedStateVariable>
+                </argument>
+            </argumentList>
+        </action>
+        
+    <action>
+        <Optional/>
+        <name>GetBPIEncryptionEnabled</name>
+        <argumentList>
+            <argument>
+              <name>NewBPIEncryptionEnabled</name>
+              <direction>out</direction>
+              <relatedStateVariable>BPIEncryptionEnabled</relatedStateVariable>
+            </argument>
+        </argumentList>
+    </action>
+
+    <action>
+        <Optional/>
+        <name>GetConfigFile</name>
+        <argumentList>
+            <argument>
+              <name>NewConfigFile</name>
+              <direction>out</direction>
+              <relatedStateVariable>ConfigFile</relatedStateVariable>
+            </argument>
+        </argumentList>
+    </action>
+
+    <action>
+        <Optional/>
+        <name>GetTFTPServer</name>
+        <argumentList>
+            <argument>
+              <name>NewTFTPServer</name>
+              <direction>out</direction>
+              <relatedStateVariable>TFTPServer</relatedStateVariable>
+            </argument>
+        </argumentList>
+    </action>
+  </actionList>
+
+
+</scpd>
\ No newline at end of file

Propchange: incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANCableLinkConfig1.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANCommonInterfaceConfig1.xml
URL: http://svn.apache.org/viewvc/incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANCommonInterfaceConfig1.xml?view=auto&rev=533875
==============================================================================
--- incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANCommonInterfaceConfig1.xml (added)
+++ incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANCommonInterfaceConfig1.xml Mon Apr 30 16:15:05 2007
@@ -0,0 +1,257 @@
+<scpd>
+    <serviceStateTable>
+
+        <stateVariable>
+          <name>WANAccessType</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>string</dataType>
+          <allowedValueList>
+            <allowedValue>DSL</allowedValue>
+            <allowedValue>POTS</allowedValue>
+            <allowedValue>Cable</allowedValue>
+            <allowedValue>Ethernet</allowedValue>
+          </allowedValueList>
+        </stateVariable>
+
+        <stateVariable>
+            <name>Layer1UpstreamMaxBitRate</name>
+            <sendEventsAttribute>no</sendEventsAttribute>
+            <dataType>ui4</dataType>    
+        </stateVariable>
+
+        <stateVariable>
+          <name>Layer1DownstreamMaxBitRate</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>ui4</dataType>
+        </stateVariable>
+
+        <stateVariable>
+          <name>PhysicalLinkStatus</name>
+          <dataType>string</dataType>
+          <allowedValueList>
+            <allowedValue>Up</allowedValue>
+            <allowedValue>Down</allowedValue>
+          </allowedValueList>
+        </stateVariable>
+
+        <stateVariable>
+        <Optional/>
+          <name>WANAccessProvider</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>string</dataType>
+        </stateVariable>
+
+        <stateVariable>
+        <Optional/>
+          <name>MaximumActiveConnections</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>ui2</dataType>
+          <allowedValueRange>
+            <minimum>1</minimum>
+            <step>1</step>
+          </allowedValueRange>
+        </stateVariable>
+
+        <stateVariable>
+        <Optional/>
+          <name>NumberOfActiveConnections</name>
+          <dataType>ui2</dataType>
+        </stateVariable>
+
+        <stateVariable>
+        <Optional/>
+          <name>ActiveConnectionDeviceContainer</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>string</dataType>
+        </stateVariable>
+
+        <stateVariable>
+        <Optional/>
+          <name>ActiveConnectionServiceID</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>string</dataType>
+        </stateVariable>
+
+        <stateVariable>
+        <Optional/>
+          <name>TotalBytesSent</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>ui4</dataType>
+        </stateVariable>
+
+        <stateVariable>
+        <Optional/>
+          <name>TotalBytesReceived</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>ui4</dataType>
+        </stateVariable>
+
+        <stateVariable>
+        <Optional/>
+          <name>TotalPacketsSent</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>ui4</dataType>
+        </stateVariable>
+
+        <stateVariable>
+        <Optional/>
+          <name>TotalPacketsReceived</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>ui4</dataType>
+        </stateVariable>
+
+        <stateVariable>
+          <Optional/>
+          <name>EnabledForInternet</name>
+          <dataType>boolean</dataType>      
+        </stateVariable>
+    </serviceStateTable>
+
+    <actionList>
+
+        <action>
+        <Optional/>
+          <name>SetEnabledForInternet</name>
+          <argumentList>
+            <argument>
+              <name>NewEnabledForInternet</name>
+              <direction>in</direction>
+             <relatedStateVariable>EnabledForInternet</relatedStateVariable>
+            </argument>
+          </argumentList>
+        </action>
+
+        <action>
+        <Optional/>
+          <name>GetEnabledForInternet</name>
+          <argumentList>
+            <argument>
+              <name>NewEnabledForInternet</name>
+              <direction>out</direction>
+             <relatedStateVariable>EnabledForInternet</relatedStateVariable>
+            </argument>
+          </argumentList>
+        </action>
+
+        <action>
+          <name>GetCommonLinkProperties</name>
+          <argumentList>
+            <argument>
+              <name>NewWANAccessType</name>
+              <direction>out</direction>
+              <relatedStateVariable>WANAccessType</relatedStateVariable>
+            </argument>
+            <argument>
+              <name>NewLayer1UpstreamMaxBitRate</name>
+              <direction>out</direction>
+              <relatedStateVariable>Layer1UpstreamMaxBitRate</relatedStateVariable>
+            </argument>
+            <argument>
+              <name>NewLayer1DownstreamMaxBitRate</name>
+              <direction>out</direction>   <relatedStateVariable>Layer1DownstreamMaxBitRate</relatedStateVariable>
+            </argument>
+            <argument>
+              <name>NewPhysicalLinkStatus</name>
+              <direction>out</direction>
+             <relatedStateVariable>PhysicalLinkStatus</relatedStateVariable>
+            </argument>
+          </argumentList>
+        </action>
+
+        <action>
+        <Optional/>
+          <name>GetWANAccessProvider</name>
+          <argumentList>
+            <argument>
+              <name>NewWANAccessProvider</name>
+              <direction>out</direction>
+              <relatedStateVariable>WANAccessProvider</relatedStateVariable>
+            </argument>
+          </argumentList>
+        </action>
+
+        <action>
+        <Optional/>
+          <name>GetMaximumActiveConnections</name>
+          <argumentList>
+            <argument>
+              <name>NewMaximumActiveConnections</name>
+              <direction>out</direction>
+              <relatedStateVariable>MaximumActiveConnections</relatedStateVariable>
+            </argument>
+          </argumentList>
+        </action>
+
+        <action>
+        <Optional/>
+          <name>GetTotalBytesSent</name>
+          <argumentList>
+            <argument>
+              <name>NewTotalBytesSent</name>
+              <direction>out</direction>
+              <relatedStateVariable>TotalBytesSent</relatedStateVariable>
+            </argument>
+          </argumentList>
+        </action>
+
+        <action>
+        <Optional/>
+          <name>GetTotalBytesReceived</name>
+          <argumentList>
+            <argument>
+              <name>NewTotalBytesReceived</name>
+              <direction>out</direction>
+              <relatedStateVariable>TotalBytesReceived</relatedStateVariable>
+            </argument>
+          </argumentList>
+        </action>
+
+        <action>
+        <Optional/>
+          <name>GetTotalPacketsSent</name>
+          <argumentList>
+            <argument>
+              <name>NewTotalPacketsSent</name>
+              <direction>out</direction>
+              <relatedStateVariable>TotalPacketsSent</relatedStateVariable>
+            </argument>
+          </argumentList>
+        </action>
+
+        <action>
+        <Optional/>
+          <name>GetTotalPacketsReceived</name>
+          <argumentList>
+            <argument>
+              <name>NewTotalPacketsReceived</name>
+              <direction>out</direction>
+             <relatedStateVariable>TotalPacketsReceived</relatedStateVariable>
+            </argument>
+          </argumentList>
+        </action>
+
+        <action>
+        <Optional/>
+          <name>GetActiveConnection</name>
+          <argumentList>
+            <argument>
+              <name>NewActiveConnectionIndex</name>
+              <direction>in</direction>       
+              <relatedStateVariable>NumberOfActiveConnections</relatedStateVariable>
+            </argument>
+            <argument>
+              <name>NewActiveConnDeviceContainer</name>
+              <direction>out</direction>
+              <relatedStateVariable>ActiveConnectionDeviceContainer</relatedStateVariable>
+            </argument>
+            <argument>
+              <name>NewActiveConnectionServiceID</name>
+              <direction>out</direction>
+              <relatedStateVariable>ActiveConnectionServiceID</relatedStateVariable>
+            </argument>
+          </argumentList>
+        </action>
+
+  </actionList>
+
+</scpd>
\ No newline at end of file

Propchange: incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANCommonInterfaceConfig1.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANDSLLinkConfig1.xml
URL: http://svn.apache.org/viewvc/incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANDSLLinkConfig1.xml?view=auto&rev=533875
==============================================================================
--- incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANDSLLinkConfig1.xml (added)
+++ incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANDSLLinkConfig1.xml Mon Apr 30 16:15:05 2007
@@ -0,0 +1,179 @@
+<scpd>
+    <serviceStateTable>
+        <stateVariable>
+            <name>LinkType</name>
+            <sendEventsAttribute>no</sendEventsAttribute>
+            <dataType>string</dataType>
+        </stateVariable>
+
+        <stateVariable>
+            <name>LinkStatus</name>
+            <dataType>string</dataType>
+            <allowedValueList>
+                <allowedValue>Up</allowedValue>
+                <allowedValue>Down</allowedValue>
+            </allowedValueList>
+        </stateVariable>
+
+        <stateVariable>
+            <Optional/> 
+            <name>ModulationType</name>
+            <sendEventsAttribute>no</sendEventsAttribute>
+            <dataType>string</dataType>
+        </stateVariable>
+
+        <stateVariable>
+            <Optional/> 
+            <name>DestinationAddress</name>
+            <sendEventsAttribute>no</sendEventsAttribute>
+            <dataType>string</dataType>
+        </stateVariable>
+
+        <stateVariable>
+            <Optional/> 
+            <name>ATMEncapsulation</name>
+            <sendEventsAttribute>no</sendEventsAttribute>
+            <dataType>string</dataType>
+        </stateVariable>
+
+        <stateVariable>
+            <Optional/> 
+            <name>FCSPreserved</name>
+            <sendEventsAttribute>no</sendEventsAttribute>
+            <dataType>boolean</dataType>
+        </stateVariable>
+
+        <stateVariable>
+        <name>AutoConfig</name>
+        <dataType>boolean</dataType>
+        </stateVariable>
+
+    </serviceStateTable>
+
+  <actionList>
+
+    <action>
+    <name>SetDSLLinkType</name>
+      <argumentList>
+        <argument>
+          <name>NewLinkType</name>
+          <direction>in</direction>
+          <relatedStateVariable>LinkType</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <name>GetDSLLinkInfo</name>
+      <argumentList>
+        <argument>
+          <name>NewLinkType</name>
+          <direction>out</direction>
+          <relatedStateVariable>LinkType</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewLinkStatus</name>
+          <direction>out</direction>
+          <relatedStateVariable>LinkStatus</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <name>GetAutoConfig</name>
+      <argumentList>
+        <argument>
+          <name>NewAutoConfig</name>
+          <direction>out</direction>
+          <relatedStateVariable>AutoConfig</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <Optional/> 
+    <name>GetModulationType</name>
+      <argumentList>
+        <argument>
+          <name>NewModulationType</name>
+          <direction>out</direction>
+          <relatedStateVariable>ModulationType</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <Optional/> 
+    <name>SetDestinationAddress</name>
+      <argumentList>
+        <argument>
+          <name>NewDestinationAddress</name>
+          <direction>in</direction>
+         <relatedStateVariable>DestinationAddress</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <Optional/> 
+    <name>GetDestinationAddress</name>
+      <argumentList>
+        <argument>
+          <name>NewDestinationAddress</name>
+          <direction>out</direction>
+         <relatedStateVariable>DestinationAddress</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <Optional/> 
+    <name>SetATMEncapsulation</name>
+      <argumentList>
+        <argument>
+          <name>NewATMEncapsulation</name>
+          <direction>in</direction>
+          <relatedStateVariable>ATMEncapsulation</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <Optional/> 
+    <name>GetATMEncapsulation</name>
+      <argumentList>
+        <argument>
+          <name>NewATMEncapsulation</name>
+          <direction>out</direction>
+          <relatedStateVariable>ATMEncapsulation</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <Optional/> 
+    <name>SetFCSPreserved</name>
+      <argumentList>
+        <argument>
+          <name>NewFCSPreserved</name>
+          <direction>in</direction>
+          <relatedStateVariable>FCSPreserved</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <Optional/> 
+    <name>GetFCSPreserved</name>
+      <argumentList>
+        <argument>
+          <name>NewFCSPreserved</name>
+          <direction>out</direction>
+          <relatedStateVariable>FCSPreserved</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+  </actionList>
+
+</scpd>
\ No newline at end of file

Propchange: incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANDSLLinkConfig1.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANEthernetLinkConfig1.xml
URL: http://svn.apache.org/viewvc/incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANEthernetLinkConfig1.xml?view=auto&rev=533875
==============================================================================
--- incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANEthernetLinkConfig1.xml (added)
+++ incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANEthernetLinkConfig1.xml Mon Apr 30 16:15:05 2007
@@ -0,0 +1,25 @@
+<scpd>
+    <serviceStateTable>
+        <stateVariable>
+          <name>EthernetLinkStatus</name>
+          <dataType>string</dataType>      
+          <allowedValueList>
+            <allowedValue>Up</allowedValue>
+            <allowedValue>Down</allowedValue>
+          </allowedValueList>
+        </stateVariable>
+    </serviceStateTable>
+
+    <actionList>
+        <action>
+        <name>GetEthernetLinkStatus</name>
+          <argumentList>
+            <argument>
+              <name>NewEthernetLinkStatus</name>
+              <direction>out</direction>
+             <relatedStateVariable>EthernetLinkStatus</relatedStateVariable>
+            </argument>
+          </argumentList>
+        </action>    
+    </actionList>
+</scpd>
\ No newline at end of file

Propchange: incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANEthernetLinkConfig1.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANIPConnection1.xml
URL: http://svn.apache.org/viewvc/incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANIPConnection1.xml?view=auto&rev=533875
==============================================================================
--- incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANIPConnection1.xml (added)
+++ incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANIPConnection1.xml Mon Apr 30 16:15:05 2007
@@ -0,0 +1,471 @@
+<scpd>
+
+  <serviceStateTable>
+
+    <stateVariable>
+      <name>ConnectionType</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>string</dataType>
+    </stateVariable>
+
+    <stateVariable>
+      <name>PossibleConnectionTypes</name>
+      <dataType>string</dataType>
+      <allowedValueList>
+        <allowedValue>Unconfigured</allowedValue>
+	    <allowedValue>IP_Routed</allowedValue>
+	    <allowedValue>IP_Bridged</allowedValue>
+      </allowedValueList>
+    </stateVariable>
+
+    <stateVariable>
+      <name>ConnectionStatus</name>
+      <dataType>string</dataType>
+      <allowedValueList>
+        <allowedValue>Unconfigured</allowedValue>
+	    <allowedValue>Connected</allowedValue>
+        <allowedValue>Disconnected</allowedValue>
+      </allowedValueList>
+    </stateVariable>
+
+    <stateVariable>
+      <name>Uptime</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>ui4</dataType>
+    </stateVariable>
+
+    <stateVariable>
+      <name>LastConnectionError</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>string</dataType>
+      <allowedValueList>
+        <allowedValue>ERROR_NONE</allowedValue>
+      </allowedValueList>
+    </stateVariable>
+
+     <stateVariable>
+      <Optional/>
+      <name>AutoDisconnectTime</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>ui4</dataType>
+    </stateVariable>
+
+
+    <stateVariable>
+      <Optional/>
+      <name>IdleDisconnectTime</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>ui4</dataType>
+    </stateVariable>
+
+    <stateVariable>
+      <Optional/>
+      <name>WarnDisconnectDelay</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>ui4</dataType>
+    </stateVariable>
+
+    <stateVariable>
+      <name>RSIPAvailable</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>boolean</dataType>
+    </stateVariable>
+
+    <stateVariable>
+      <name>NATEnabled</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>boolean</dataType>      
+    </stateVariable>
+        
+    <stateVariable>
+      <name>ExternalIPAddress</name>
+      <dataType>string</dataType>
+    </stateVariable>
+
+    <stateVariable>
+      <name>PortMappingNumberOfEntries</name>
+      <dataType>ui2</dataType>
+    </stateVariable>
+
+    <stateVariable>
+      <name>PortMappingEnabled</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>boolean</dataType>
+    </stateVariable>
+
+    <stateVariable>
+      <name>PortMappingLeaseDuration</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>ui4</dataType>
+    </stateVariable>
+
+    <stateVariable>
+      <name>RemoteHost</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>string</dataType>
+    </stateVariable>
+
+    <stateVariable>
+      <name>ExternalPort</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>ui2</dataType>
+    </stateVariable>
+
+    <stateVariable>
+      <name>InternalPort</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>ui2</dataType>
+    </stateVariable>
+
+    <stateVariable>
+      <name>PortMappingProtocol</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>string</dataType>
+      <allowedValueList>
+        <allowedValue>TCP</allowedValue>
+	    <allowedValue>UDP</allowedValue>
+      </allowedValueList>
+    </stateVariable>
+
+    <stateVariable>
+      <name>InternalClient</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>string</dataType>
+    </stateVariable>
+
+    <stateVariable>
+      <name>PortMappingDescription</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>string</dataType>
+    </stateVariable>
+ </serviceStateTable>
+
+  <actionList>
+
+   <action>
+    <name>SetConnectionType</name>
+      <argumentList>
+        <argument>
+          <name>NewConnectionType</name>
+          <direction>in</direction>
+          <relatedStateVariable>ConnectionType</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+     
+    <action>
+    <name>GetConnectionTypeInfo</name>
+      <argumentList>
+        <argument>
+          <name>NewConnectionType</name>
+          <direction>out</direction>
+          <relatedStateVariable>ConnectionType</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewPossibleConnectionTypes</name>
+          <direction>out</direction>     
+          <relatedStateVariable>PossibleConnectionTypes</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <name>RequestConnection</name>
+    </action>
+
+    <action>
+    <Optional/>
+    <name>RequestTermination</name>
+    </action>
+
+    <action>
+    <name>ForceTermination</name>
+    </action>
+
+    <action>
+    <Optional/>
+    <name>SetAutoDisconnectTime</name>
+      <argumentList>
+        <argument>
+          <name>NewAutoDisconnectTime</name>
+          <direction>in</direction>
+         <relatedStateVariable>AutoDisconnectTime</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <Optional/>
+    <name>SetIdleDisconnectTime</name>
+      <argumentList>
+        <argument>
+          <name>NewIdleDisconnectTime</name>
+          <direction>in</direction>
+         <relatedStateVariable>IdleDisconnectTime</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <Optional/>
+    <name>SetWarnDisconnectDelay</name>
+      <argumentList>
+        <argument>
+          <name>NewWarnDisconnectDelay</name>
+          <direction>in</direction>
+        <relatedStateVariable>WarnDisconnectDelay</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <name>GetStatusInfo</name>
+      <argumentList>
+        <argument>
+          <name>NewConnectionStatus</name>
+          <direction>out</direction>
+          <relatedStateVariable>ConnectionStatus</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewLastConnectionError</name>
+          <direction>out</direction>
+        <relatedStateVariable>LastConnectionError</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewUptime</name>
+          <direction>out</direction>
+          <relatedStateVariable>Uptime</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <Optional/>
+    <name>GetAutoDisconnectTime</name>
+      <argumentList>
+        <argument>
+          <name>NewAutoDisconnectTime</name>
+          <direction>out</direction>
+         <relatedStateVariable>AutoDisconnectTime</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <Optional/>
+    <name>GetIdleDisconnectTime</name>
+      <argumentList>
+        <argument>
+          <name>NewIdleDisconnectTime</name>
+          <direction>out</direction>
+         <relatedStateVariable>IdleDisconnectTime</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <Optional/>
+    <name>GetWarnDisconnectDelay</name>
+      <argumentList>
+        <argument>
+          <name>NewWarnDisconnectDelay</name>
+          <direction>out</direction>
+        <relatedStateVariable>WarnDisconnectDelay</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <name>GetNATRSIPStatus</name>
+      <argumentList>
+        <argument>
+          <name>NewRSIPAvailable</name>
+          <direction>out</direction>
+          <relatedStateVariable>RSIPAvailable</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewNATEnabled</name>
+          <direction>out</direction>
+          <relatedStateVariable>NATEnabled</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <name>GetGenericPortMappingEntry</name>
+      <argumentList>
+        <argument>
+          <name>NewPortMappingIndex</name>
+          <direction>in</direction>       
+          <relatedStateVariable>PortMappingNumberOfEntries</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewRemoteHost</name>
+          <direction>out</direction>
+          <relatedStateVariable>RemoteHost</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewExternalPort</name>
+          <direction>out</direction>
+          <relatedStateVariable>ExternalPort</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewProtocol</name>
+          <direction>out</direction>
+        <relatedStateVariable>PortMappingProtocol</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewInternalPort</name>
+          <direction>out</direction>
+          <relatedStateVariable>InternalPort</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewInternalClient</name>
+          <direction>out</direction>
+          <relatedStateVariable>InternalClient</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewEnabled</name>
+          <direction>out</direction>
+          <relatedStateVariable>PortMappingEnabled</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewPortMappingDescription</name>
+          <direction>out</direction>
+          <relatedStateVariable>PortMappingDescription</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewLeaseDuration</name>
+          <direction>out</direction>     
+          <relatedStateVariable>PortMappingLeaseDuration</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <name>GetSpecificPortMappingEntry</name>
+      <argumentList>
+        <argument>
+          <name>NewRemoteHost</name>
+          <direction>in</direction>
+          <relatedStateVariable>RemoteHost</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewExternalPort</name>
+          <direction>in</direction>
+          <relatedStateVariable>ExternalPort</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewProtocol</name>
+          <direction>in</direction>
+        <relatedStateVariable>PortMappingProtocol</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewInternalPort</name>
+          <direction>out</direction>
+          <relatedStateVariable>InternalPort</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewInternalClient</name>
+          <direction>out</direction>
+          <relatedStateVariable>InternalClient</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewEnabled</name>
+          <direction>out</direction>
+         <relatedStateVariable>PortMappingEnabled</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewPortMappingDescription</name>
+          <direction>out</direction>
+          <relatedStateVariable>PortMappingDescription</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewLeaseDuration</name>
+          <direction>out</direction>
+          <relatedStateVariable>PortMappingLeaseDuration</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <name>AddPortMapping</name>
+      <argumentList>
+        <argument>
+          <name>NewRemoteHost</name>
+          <direction>in</direction>
+          <relatedStateVariable>RemoteHost</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewExternalPort</name>
+          <direction>in</direction>
+          <relatedStateVariable>ExternalPort</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewProtocol</name>
+          <direction>in</direction>
+        <relatedStateVariable>PortMappingProtocol</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewInternalPort</name>
+          <direction>in</direction>
+          <relatedStateVariable>InternalPort</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewInternalClient</name>
+          <direction>in</direction>
+          <relatedStateVariable>InternalClient</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewEnabled</name>
+          <direction>in</direction>
+         <relatedStateVariable>PortMappingEnabled</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewPortMappingDescription</name>
+          <direction>in</direction>      
+          <relatedStateVariable>PortMappingDescription</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewLeaseDuration</name>
+          <direction>in</direction>      
+          <relatedStateVariable>PortMappingLeaseDuration</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <name>DeletePortMapping</name>
+      <argumentList>
+         <argument>
+          <name>NewRemoteHost</name>
+          <direction>in</direction>
+          <relatedStateVariable>RemoteHost</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewExternalPort</name>
+          <direction>in</direction>
+          <relatedStateVariable>ExternalPort</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewProtocol</name>
+          <direction>in</direction>
+        <relatedStateVariable>PortMappingProtocol</relatedStateVariable>
+        </argument> 
+     </argumentList>
+    </action>
+
+    <action>
+    <name>GetExternalIPAddress</name>
+      <argumentList>
+        <argument>
+          <name>NewExternalIPAddress</name>
+          <direction>out</direction>
+        <relatedStateVariable>ExternalIPAddress</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+  </actionList>
+
+</scpd>
\ No newline at end of file

Propchange: incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANIPConnection1.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANPOTSLinkConfig1.xml
URL: http://svn.apache.org/viewvc/incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANPOTSLinkConfig1.xml?view=auto&rev=533875
==============================================================================
--- incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANPOTSLinkConfig1.xml (added)
+++ incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANPOTSLinkConfig1.xml Mon Apr 30 16:15:05 2007
@@ -0,0 +1,212 @@
+<scpd>
+    <serviceStateTable>
+
+        <stateVariable>
+          <name>ISPPhoneNumber</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>string</dataType>
+        </stateVariable>
+
+        <stateVariable>
+          <name>ISPInfo</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>string</dataType>
+        </stateVariable>
+
+        <stateVariable>
+          <name>LinkType</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>string</dataType>
+          <allowedValueList>
+            <allowedValue>PPP_Dialup</allowedValue>
+          </allowedValueList>
+        </stateVariable>
+
+        <stateVariable>
+          <name>NumberOfRetries</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>ui4</dataType>      
+        </stateVariable>
+
+        <stateVariable>
+          <name>DelayBetweenRetries</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>ui4</dataType>      
+        </stateVariable>
+
+        <stateVariable>
+          <Optional/>
+          <name>Fclass</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>string</dataType>
+        </stateVariable>
+
+        <stateVariable>
+          <Optional/>
+          <name>DataModulationSupported</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>string</dataType>
+        </stateVariable>
+
+        <stateVariable>
+          <Optional/>
+          <name>DataProtocol</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>string</dataType>
+        </stateVariable>
+
+        <stateVariable>
+          <Optional/>
+          <name>DataCompression</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>string</dataType>
+        </stateVariable>
+
+        <stateVariable>
+            <Optional/>
+            <name>PlusVTRCommandSupported</name>
+            <sendEventsAttribute>no</sendEventsAttribute>
+            <dataType>boolean</dataType>      
+        </stateVariable>
+    </serviceStateTable>
+
+    <actionList>
+
+        <action>
+        <Optional/>
+        <name>SetISPInfo</name>
+          <argumentList>
+            <argument>
+              <name>NewISPPhoneNumber</name>
+              <direction>in</direction>
+              <relatedStateVariable>ISPPhoneNumber</relatedStateVariable>
+            </argument>
+            <argument>
+              <name>NewISPInfo</name>
+              <direction>in</direction>
+              <relatedStateVariable>ISPInfo</relatedStateVariable>
+            </argument>
+            <argument>
+              <name>NewLinkType</name>
+              <direction>in</direction>
+              <relatedStateVariable>LinkType</relatedStateVariable>
+            </argument>
+          </argumentList>
+        </action>
+
+        <action>
+        <Optional/>
+        <name>SetCallRetryInfo</name>
+          <argumentList>
+            <argument>
+              <name>NewNumberOfRetries</name>
+              <direction>in</direction>
+              <relatedStateVariable>NumberOfRetries</relatedStateVariable>
+            </argument>
+            <argument>
+              <name>NewDelayBetweenRetries</name>
+              <direction>in</direction>
+            <relatedStateVariable>DelayBetweenRetries</relatedStateVariable>
+            </argument>
+          </argumentList>
+        </action>
+
+        <action>
+        <name>GetISPInfo</name>
+          <argumentList>
+            <argument>
+              <name>NewISPPhoneNumber</name>
+              <direction>out</direction>
+              <relatedStateVariable>ISPPhoneNumber</relatedStateVariable>
+            </argument>
+            <argument>
+              <name>NewISPInfo</name>
+              <direction>out</direction>
+              <relatedStateVariable>ISPInfo</relatedStateVariable>
+            </argument>
+            <argument>
+              <name>NewLinkType</name>
+              <direction>out</direction>
+              <relatedStateVariable>LinkType</relatedStateVariable>
+            </argument>
+          </argumentList>
+        </action>
+
+        <action>
+        <name>GetCallRetryInfo</name>
+          <argumentList>
+            <argument>
+              <name>NewNumberOfRetries</name>
+              <direction>out</direction>
+              <relatedStateVariable>NumberOfRetries</relatedStateVariable>
+            </argument>
+            <argument>
+              <name>NewDelayBetweenRetries</name>
+              <direction>out</direction>
+              <relatedStateVariable>DelayBetweenRetries</relatedStateVariable>
+            </argument>
+          </argumentList>
+        </action>
+
+        <action>
+        <Optional/>
+        <name>GetFclass</name>
+          <argumentList>
+            <argument>
+              <name>NewFclass</name>
+              <direction>out</direction>
+              <relatedStateVariable>Fclass</relatedStateVariable>
+            </argument>
+          </argumentList>
+        </action>
+
+        <action>
+        <Optional/>
+        <name>GetDataModulationSupported</name>
+          <argumentList>
+            <argument>
+              <name>NewDataModulationSupported</name>
+              <direction>out</direction>
+              <relatedStateVariable>DataModulationSupported</relatedStateVariable>
+            </argument>
+          </argumentList>
+        </action>
+
+        <action>
+        <Optional/>
+        <name>GetDataProtocol</name>
+          <argumentList>
+            <argument>
+              <name>NewDataProtocol</name>
+              <direction>out</direction>
+              <relatedStateVariable>DataProtocol</relatedStateVariable>
+            </argument>
+          </argumentList>
+        </action>
+
+        <action>
+        <Optional/>
+        <name>GetDataCompression</name>
+          <argumentList>
+            <argument>
+              <name>NewDataCompression</name>
+              <direction>out</direction>
+              <relatedStateVariable>DataCompression</relatedStateVariable>
+            </argument>
+          </argumentList>
+        </action>
+
+        <action>
+        <Optional/>
+        <name>GetPlusVTRCommandSupported</name>
+          <argumentList>
+            <argument>
+              <name>NewPlusVTRCommandSupported</name>
+              <direction>out</direction>
+              <relatedStateVariable>PlusVTRCommandSupported</relatedStateVariable>
+            </argument>
+          </argumentList>
+        </action>
+
+    </actionList>
+</scpd>
\ No newline at end of file

Propchange: incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANPOTSLinkConfig1.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANPPPConnection1.xml
URL: http://svn.apache.org/viewvc/incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANPPPConnection1.xml?view=auto&rev=533875
==============================================================================
--- incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANPPPConnection1.xml (added)
+++ incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANPPPConnection1.xml Mon Apr 30 16:15:05 2007
@@ -0,0 +1,616 @@
+<scpd>
+    <serviceStateTable>
+        <stateVariable>
+          <name>ConnectionType</name>
+          <sendEventsAttribute>no</sendEventsAttribute>
+          <dataType>string</dataType>
+        </stateVariable>
+
+    <stateVariable>
+      <name>PossibleConnectionTypes</name>
+      <dataType>string</dataType>
+      <allowedValueList>
+        <allowedValue>Unconfigured</allowedValue>
+        <allowedValue>IP_Routed</allowedValue>
+        <allowedValue>DHCP_Spoofed</allowedValue>
+        <allowedValue>PPPoE_Bridged</allowedValue>
+        <allowedValue>PPTP_Relay</allowedValue>
+        <allowedValue>L2TP_Relay</allowedValue>
+        <allowedValue>PPPoE_Relay</allowedValue>
+      </allowedValueList>      
+    </stateVariable>
+
+    <stateVariable>
+        <name>ConnectionStatus</name>
+        <dataType>string</dataType>
+        <allowedValueList>
+            <allowedValue>Unconfigured</allowedValue>
+            <allowedValue>Connected</allowedValue>
+            <allowedValue>Disconnected</allowedValue>
+        </allowedValueList>
+    </stateVariable>
+
+
+    <stateVariable>
+        <name>Uptime</name>
+        <sendEventsAttribute>no</sendEventsAttribute>
+        <dataType>ui4</dataType>
+    </stateVariable>
+
+
+    <stateVariable>
+      <name>UpstreamMaxBitRate</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>ui4</dataType>
+    </stateVariable>
+
+    <stateVariable>
+      <name>DownstreamMaxBitRate</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>ui4</dataType>
+    </stateVariable>
+
+
+    <stateVariable>
+      <name>LastConnectionError</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>string</dataType>
+      <allowedValueList>
+        <allowedValue>ERROR_NONE</allowedValue>
+      </allowedValueList>
+    </stateVariable>
+
+
+     <stateVariable>
+     <Optional/>
+      <name>AutoDisconnectTime</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>ui4</dataType>
+    </stateVariable>
+
+    <stateVariable>
+    <Optional/>
+      <name>IdleDisconnectTime</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>ui4</dataType>
+    </stateVariable>
+
+    <stateVariable>
+    <Optional/>
+      <name>WarnDisconnectDelay</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>ui4</dataType>
+    </stateVariable>
+
+
+    <stateVariable>
+      <name>RSIPAvailable</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>boolean</dataType>
+    </stateVariable>
+
+    <stateVariable>
+      <name>NATEnabled</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>boolean</dataType>
+    </stateVariable>
+        
+    <stateVariable>
+    <Optional/>
+      <name>UserName</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>string</dataType>
+    </stateVariable>
+
+    <stateVariable>
+    <Optional/>
+      <name>Password</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>string</dataType>
+    </stateVariable>
+        
+    <stateVariable>
+    <Optional/>
+      <name>PPPEncryptionProtocol</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>string</dataType>
+    </stateVariable>
+
+    <stateVariable>
+    <Optional/>
+      <name>PPPCompressionProtocol</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>string</dataType>
+    </stateVariable>
+
+    <stateVariable>
+    <Optional/>
+      <name>PPPAuthenticationProtocol</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>string</dataType>
+    </stateVariable>
+
+    <stateVariable>
+      <name>ExternalIPAddress</name>
+      <dataType>string</dataType>
+    </stateVariable>
+
+
+    <stateVariable>
+      <name>PortMappingNumberOfEntries</name>
+      <dataType>ui2</dataType>
+    </stateVariable>
+
+    <stateVariable>
+      <name>PortMappingEnabled</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>boolean</dataType>
+    </stateVariable>
+
+    <stateVariable>
+      <name>PortMappingLeaseDuration</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>ui4</dataType>
+    </stateVariable>
+
+    <stateVariable>
+      <name>RemoteHost</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>string</dataType>
+    </stateVariable>
+
+    <stateVariable>
+      <name>ExternalPort</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>ui2</dataType>
+    </stateVariable>
+
+    <stateVariable>
+      <name>InternalPort</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>ui2</dataType>
+    </stateVariable>
+
+    <stateVariable>
+      <name>PortMappingProtocol</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>string</dataType>
+      <allowedValueList>
+        <allowedValue>TCP</allowedValue>
+	    <allowedValue>UDP</allowedValue>
+      </allowedValueList>
+    </stateVariable>
+
+    <stateVariable>
+      <name>InternalClient</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>string</dataType>
+    </stateVariable>
+
+    <stateVariable>
+      <name>PortMappingDescription</name>
+      <sendEventsAttribute>no</sendEventsAttribute>
+      <dataType>string</dataType>
+    </stateVariable>
+  </serviceStateTable>
+
+  <actionList>
+   <action>
+    <name>SetConnectionType</name>
+      <argumentList>
+        <argument>
+          <name>NewConnectionType</name>
+          <direction>in</direction>
+          <relatedStateVariable>ConnectionType</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+     
+    <action>
+    <name>GetConnectionTypeInfo</name>
+      <argumentList>
+        <argument>
+          <name>NewConnectionType</name>
+          <direction>out</direction>
+          <relatedStateVariable>ConnectionType</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewPossibleConnectionTypes</name>
+          <direction>out</direction>
+          <relatedStateVariable>PossibleConnectionTypes</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <Optional/>
+    <name>ConfigureConnection</name>
+      <argumentList>
+        <argument>
+          <name>NewUserName</name>
+          <direction>in</direction>
+          <relatedStateVariable>UserName</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewPassword</name>
+          <direction>in</direction>
+          <relatedStateVariable>Password</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <name>RequestConnection</name>
+    </action>
+
+    <action>
+    <Optional/>
+    <name>RequestTermination</name>
+    </action>
+
+    <action>
+    <name>ForceTermination</name>
+    </action>
+
+    <action>
+    <Optional/>
+    <name>SetAutoDisconnectTime</name>
+      <argumentList>
+        <argument>
+          <name>NewAutoDisconnectTime</name>
+          <direction>in</direction>
+         <relatedStateVariable>AutoDisconnectTime</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <Optional/>
+    <name>SetIdleDisconnectTime</name>
+      <argumentList>
+        <argument>
+          <name>NewIdleDisconnectTime</name>
+          <direction>in</direction>
+         <relatedStateVariable>IdleDisconnectTime</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <Optional/>
+    <name>SetWarnDisconnectDelay</name>
+      <argumentList>
+        <argument>
+          <name>NewWarnDisconnectDelay</name>
+          <direction>in</direction>
+        <relatedStateVariable>WarnDisconnectDelay</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <name>GetStatusInfo</name>
+      <argumentList>
+        <argument>
+          <name>NewConnectionStatus</name>
+          <direction>out</direction>
+          <relatedStateVariable>ConnectionStatus</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewLastConnectionError</name>
+          <direction>out</direction>
+        <relatedStateVariable>LastConnectionError</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewUptime</name>
+          <direction>out</direction>
+          <relatedStateVariable>Uptime</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <name>GetLinkLayerMaxBitRates</name>
+      <argumentList>
+        <argument>
+          <name>NewUpstreamMaxBitRate</name>
+          <direction>out</direction>
+          <relatedStateVariable>UpstreamMaxBitRate</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewDownstreamMaxBitRate</name>
+          <direction>out</direction>
+          <relatedStateVariable>DownstreamMaxBitRate</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <Optional/>
+    <name>GetPPPEncryptionProtocol</name>
+      <argumentList>
+        <argument>
+          <name>NewPPPEncryptionProtocol</name>
+          <direction>out</direction>
+          <relatedStateVariable>PPPEncryptionProtocol</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <Optional/>
+    <name>GetPPPCompressionProtocol</name>
+      <argumentList>
+        <argument>
+          <name>NewPPPCompressionProtocol</name>
+          <direction>out</direction>
+          <relatedStateVariable>PPPCompressionProtocol</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <Optional/>
+    <name>GetPPPAuthenticationProtocol</name>
+      <argumentList>
+        <argument>
+          <name>NewPPPAuthenticationProtocol</name>
+          <direction>out</direction>
+          <relatedStateVariable>PPPAuthenticationProtocol</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <Optional/>
+    <name>GetUserName</name>
+      <argumentList>
+        <argument>
+          <name>NewUserName</name>
+          <direction>out</direction>
+          <relatedStateVariable>UserName</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <Optional/>
+    <name>GetPassword</name>
+      <argumentList>
+        <argument>
+          <name>NewPassword</name>
+          <direction>out</direction>
+          <relatedStateVariable>Password</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <Optional/>
+    <name>GetAutoDisconnectTime</name>
+      <argumentList>
+        <argument>
+          <name>NewAutoDisconnectTime</name>
+          <direction>out</direction>
+         <relatedStateVariable>AutoDisconnectTime</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <Optional/>
+    <name>GetIdleDisconnectTime</name>
+      <argumentList>
+        <argument>
+          <name>NewIdleDisconnectTime</name>
+          <direction>out</direction>
+         <relatedStateVariable>IdleDisconnectTime</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <Optional/>
+    <name>GetWarnDisconnectDelay</name>
+      <argumentList>
+        <argument>
+          <name>NewWarnDisconnectDelay</name>
+          <direction>out</direction>
+        <relatedStateVariable>WarnDisconnectDelay</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <name>GetNATRSIPStatus</name>
+      <argumentList>
+        <argument>
+          <name>NewRSIPAvailable</name>
+          <direction>out</direction>
+          <relatedStateVariable>RSIPAvailable</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewNATEnabled</name>
+          <direction>out</direction>
+          <relatedStateVariable>NATEnabled</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <name>GetGenericPortMappingEntry</name>
+      <argumentList>
+        <argument>
+          <name>NewPortMappingIndex</name>
+          <direction>in</direction>
+          <relatedStateVariable>PortMappingNumberOfEntries</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewRemoteHost</name>
+          <direction>out</direction>
+          <relatedStateVariable>RemoteHost</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewExternalPort</name>
+          <direction>out</direction>
+          <relatedStateVariable>ExternalPort</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewProtocol</name>
+          <direction>out</direction>
+        <relatedStateVariable>PortMappingProtocol</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewInternalPort</name>
+          <direction>out</direction>
+          <relatedStateVariable>InternalPort</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewInternalClient</name>
+          <direction>out</direction>
+          <relatedStateVariable>InternalClient</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewEnabled</name>
+          <direction>out</direction>
+          <relatedStateVariable>PortMappingEnabled</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewPortMappingDescription</name>
+          <direction>out</direction>
+          <relatedStateVariable>PortMappingDescription</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewLeaseDuration</name>
+          <direction>out</direction>
+          <relatedStateVariable>PortMappingLeaseDuration</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <name>GetSpecificPortMappingEntry</name>
+      <argumentList>
+        <argument>
+          <name>NewRemoteHost</name>
+          <direction>in</direction>
+          <relatedStateVariable>RemoteHost</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewExternalPort</name>
+          <direction>in</direction>
+          <relatedStateVariable>ExternalPort</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewProtocol</name>
+          <direction>in</direction>
+        <relatedStateVariable>PortMappingProtocol</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewInternalPort</name>
+          <direction>out</direction>
+          <relatedStateVariable>InternalPort</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewInternalClient</name>
+          <direction>out</direction>
+          <relatedStateVariable>InternalClient</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewEnabled</name>
+          <direction>out</direction>
+         <relatedStateVariable>PortMappingEnabled</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewPortMappingDescription</name>
+          <direction>out</direction>      
+          <relatedStateVariable>PortMappingDescription</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewLeaseDuration</name>
+          <direction>out</direction>        
+          <relatedStateVariable>PortMappingLeaseDuration</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <name>AddPortMapping</name>
+      <argumentList>
+        <argument>
+          <name>NewRemoteHost</name>
+          <direction>in</direction>
+          <relatedStateVariable>RemoteHost</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewExternalPort</name>
+          <direction>in</direction>
+          <relatedStateVariable>ExternalPort</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewProtocol</name>
+          <direction>in</direction>
+        <relatedStateVariable>PortMappingProtocol</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewInternalPort</name>
+          <direction>in</direction>
+          <relatedStateVariable>InternalPort</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewInternalClient</name>
+          <direction>in</direction>
+          <relatedStateVariable>InternalClient</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewEnabled</name>
+          <direction>in</direction>
+          <relatedStateVariable>PortMappingEnabled</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewPortMappingDescription</name>
+          <direction>in</direction>
+          <relatedStateVariable>PortMappingDescription</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewLeaseDuration</name>
+          <direction>in</direction>      
+          <relatedStateVariable>PortMappingLeaseDuration</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+    <action>
+    <name>DeletePortMapping</name>
+      <argumentList>
+         <argument>
+          <name>NewRemoteHost</name>
+          <direction>in</direction>
+          <relatedStateVariable>RemoteHost</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewExternalPort</name>
+          <direction>in</direction>
+          <relatedStateVariable>ExternalPort</relatedStateVariable>
+        </argument>
+        <argument>
+          <name>NewProtocol</name>
+          <direction>in</direction>
+        <relatedStateVariable>PortMappingProtocol</relatedStateVariable>
+        </argument> 
+     </argumentList>
+    </action>
+
+    <action>
+    <name>GetExternalIPAddress</name>
+      <argumentList>
+        <argument>
+          <name>NewExternalIPAddress</name>
+          <direction>out</direction>
+          <relatedStateVariable>ExternalIPAddress</relatedStateVariable>
+        </argument>
+      </argumentList>
+    </action>
+
+  </actionList>
+</scpd>
\ No newline at end of file

Propchange: incubator/felix/sandbox/donsez/upnp.devicegen/generation/res/service/WANPPPConnection1.xml
------------------------------------------------------------------------------
    svn:eol-style = native