change child device xml

Author: Max Robert

redhawk/src/control/parser/internal/spd-pimpl.cpp

@@ -932,40 +932,20 @@ post_values ()
 // childPropertyFile_pimpl
 //
 
-void childPropertyFile_pimpl::
+void childSoftwarePackageFile_pimpl::
 pre ()
 {
 }
 
-void childPropertyFile_pimpl::
+void childSoftwarePackageFile_pimpl::
 localfile (const ::std::string& localfile)
 {
 // TODO
 //
 }
 
-void childPropertyFile_pimpl::
-post_childPropertyFile ()
-{
-}
-
-// childDescriptorFile_pimpl
-//
-
-void childDescriptorFile_pimpl::
-pre ()
-{
-}
-
-void childDescriptorFile_pimpl::
-localfile (const ::std::string& localfile)
-{
-// TODO
-//
-}
-
-void childDescriptorFile_pimpl::
-post_childDescriptorFile ()
+void childSoftwarePackageFile_pimpl::
+post_childSoftwarePackageFile ()
 {
 }
 
@@ -978,12 +958,7 @@ pre ()
 }
 
 void child_pimpl::
-childPropertyFile ()
-{
-}
-
-void child_pimpl::
-childDescriptorFile ()
+childSoftwarePackageFile ()
 {
 }
 

redhawk/src/control/parser/internal/spd-pimpl.h

@@ -600,7 +600,7 @@ namespace spd
     ::std::vector<std::string> values;
   };
 
-  class childPropertyFile_pimpl: public virtual childPropertyFile_pskel
+  class childSoftwarePackageFile_pimpl: public virtual childSoftwarePackageFile_pskel
   {
     public:
     virtual void
@@ -610,20 +610,7 @@ namespace spd
     localfile (const ::std::string&);
 
     virtual void
-    post_childPropertyFile ();
-  };
-
-  class childDescriptorFile_pimpl: public virtual childDescriptorFile_pskel
-  {
-    public:
-    virtual void
-    pre ();
-
-    virtual void
-    localfile (const ::std::string&);
-
-    virtual void
-    post_childDescriptorFile ();
+    post_childSoftwarePackageFile ();
   };
 
   class child_pimpl: public virtual child_pskel
@@ -633,10 +620,7 @@ namespace spd
     pre ();
 
     virtual void
-    childPropertyFile ();
-
-    virtual void
-    childDescriptorFile ();
+    childSoftwarePackageFile ();
 
     virtual void
     name (const ::std::string&);

redhawk/src/xml/xsd/spd.xsd

@@ -35,7 +35,7 @@ with this program.  If not, see http://www.gnu.org/licenses/.
 			<xs:element name="description" type="xs:string" minOccurs="0"/>
 			<xs:element name="propertyfile" type="propertyFile" minOccurs="0" ecore:name="propertyFile"/>
 			<xs:element name="descriptor" type="descriptor" minOccurs="0"/>
-			<xs:element name="implementation" type="implementation" maxOccurs="unbounded"/>
+			<xs:element name="implementation" type="implementation" minOccurs="0" maxOccurs="unbounded"/>
 			<xs:element name="usesdevice" type="usesDevice" minOccurs="0" maxOccurs="unbounded" ecore:name="usesDevice"/>
                         <xs:element name="child" type="child" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
@@ -208,20 +208,14 @@ with this program.  If not, see http://www.gnu.org/licenses/.
 			<xs:element name="value" type="xs:string" maxOccurs="unbounded"/>
 		</xs:sequence>
 	</xs:complexType>
-        <xs:complexType name="childPropertyFile">
-                <xs:sequence>
-                        <xs:element name="localfile" type="localFile" ecore:name="localFile"/>
-                </xs:sequence>
-        </xs:complexType>
-        <xs:complexType name="childDescriptorFile">
+        <xs:complexType name="childSoftwarePackageFile">
                 <xs:sequence>
                         <xs:element name="localfile" type="localFile" ecore:name="localFile"/>
                 </xs:sequence>
         </xs:complexType>
         <xs:complexType name="child">
             <xs:sequence>
-                <xs:element name="childPropertyFile" type="childPropertyFile"/>
-                <xs:element name="childDescriptorFile" type="childDescriptorFile"/>
+                <xs:element name="childSoftwarePackageFile" type="childSoftwarePackageFile"/>
             </xs:sequence>
             <xs:attribute name="name" type="xs:string"/>
         </xs:complexType>