BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /hostadmiral/trunk/src/ak/hostadmiral/core/model @ 1022

  → /hostadmiral/trunk/src/ak/hostadmiral/core/model/ @ 1024

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 1022 → Rev 1024

/hostadmiral/trunk/src/ak/hostadmiral/core/model/UserLogin.java
8,7 → 8,7
*/
public class UserLogin
{
private Long id;
private Long id;
private User user;
private String login;
private Date loginTime;
28,20 → 28,20
this.ip = ip;
}
/**
*
* @hibernate.id generator-class="native"
*/
public Long getId()
{
return id;
}
protected void setId(Long id)
{
this.id = id;
}
/**
*
* @hibernate.id generator-class="native"
*/
public Long getId()
{
return id;
}
protected void setId(Long id)
{
this.id = id;
}
/**
*
* @hibernate.many-to-one column="usr"

/hostadmiral/trunk/src/ak/hostadmiral/core/model/Mailbox.java
104,17 → 104,17
}
}
/**
*
* @hibernate.set cascade="all" lazy="true"
* @hibernate.collection-key column="obj"
* @hibernate.collection-one-to-many class="ak.hostadmiral.core.model.PasswordStoreAbstract"
*/
protected Collection getPasswords()
{
return passwords;
}
/**
*
* @hibernate.set cascade="all" lazy="true"
* @hibernate.collection-key column="obj"
* @hibernate.collection-one-to-many class="ak.hostadmiral.core.model.PasswordStoreAbstract"
*/
protected Collection getPasswords()
{
return passwords;
}
protected void setPasswords(Collection passwords)
{
this.passwords = passwords;

/hostadmiral/trunk/src/ak/hostadmiral/core/model/User.java
150,17 → 150,17
return getDefaultPasswordStore().checkPassword(password);
}
/**
*
* @hibernate.set cascade="all" lazy="true"
* @hibernate.collection-key column="obj"
* @hibernate.collection-one-to-many class="ak.hostadmiral.core.model.PasswordStoreAbstract"
*/
protected Collection getPasswords()
{
return passwords;
}
/**
*
* @hibernate.set cascade="all" lazy="true"
* @hibernate.collection-key column="obj"
* @hibernate.collection-one-to-many class="ak.hostadmiral.core.model.PasswordStoreAbstract"
*/
protected Collection getPasswords()
{
return passwords;
}
protected void setPasswords(Collection passwords)
{
this.passwords = passwords;

/hostadmiral/trunk/src/ak/hostadmiral/core/model/PasswordStoreCrypt.java
21,13 → 21,13
return DigestCrypt.crypt(password);
}
public boolean checkPassword(String password)
throws ModelException
public boolean checkPassword(String password)
throws ModelException
{
if(this.password == null || this.password.length() < 3) return false;
String salt = this.password.substring(0, 2);
String salt = this.password.substring(0, 2);
String crypted = DigestCrypt.crypt(salt, password);
return crypted.equals(this.password);
}
}
}