Commit 3e11905c authored by Ryan Graham's avatar Ryan Graham Committed by ryang

changed schema so that usernames are used rather than Jid in the <User> element.


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@1767 b35dd754-fafc-0310-a699-88a17e54d16e
parent 951184ac
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<xs:element name="User"> <xs:element name="User">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element ref="Jid" use="required"/> <xs:element ref="Username" use="required"/>
<xs:element ref="Password" use="required"/> <xs:element ref="Password" use="required"/>
<xs:element ref="Email"/> <xs:element ref="Email"/>
<xs:element ref="Name"/> <xs:element ref="Name"/>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="Jid" type="xs:string"/> <xs:element name="Username" type="xs:string"/>
<xs:element name="Password" type="xs:string"/> <xs:element name="Password" type="xs:string"/>
<xs:element name="Email" type="xs:string"/> <xs:element name="Email" type="xs:string"/>
<xs:element name="Name" type="xs:string"/> <xs:element name="Name" type="xs:string"/>
......
...@@ -173,7 +173,7 @@ public class ImportExportPlugin implements Plugin { ...@@ -173,7 +173,7 @@ public class ImportExportPlugin implements Plugin {
// } else { // } else {
// userName = ""; // userName = "";
// } // }
userElement.addElement("Jid").addText(userName); userElement.addElement("Username").addText(userName);
try { try {
userElement.addElement("Password").addText(provider.getPassword(user.getUsername())); userElement.addElement("Password").addText(provider.getPassword(user.getUsername()));
...@@ -250,7 +250,7 @@ public class ImportExportPlugin implements Plugin { ...@@ -250,7 +250,7 @@ public class ImportExportPlugin implements Plugin {
String nameElement = userElement.getName(); String nameElement = userElement.getName();
if ("Jid".equals(nameElement)) { if ("Username".equals(nameElement)) {
userName = userElement.getText(); userName = userElement.getText();
} }
else if ("Password".equals(nameElement)) { else if ("Password".equals(nameElement)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment