Skip to content
This repository has been archived by the owner on Apr 29, 2018. It is now read-only.

Commit

Permalink
Merge pull request #39 from phaus/master
Browse files Browse the repository at this point in the history 
merging updates from dev branch
  • Loading branch information
@phaus
phaus authored Dec 27, 2017
2 parents f6c9705 + 42da0e2 commit ae3de2c
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 49 deletions.
8 changes: 4 additions & 4 deletions ldap-connector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
<parent>
<groupId>com.innoq.liqid</groupId>
<artifactId>liqid-parent</artifactId>
<version>1.7.4-SNAPSHOT</version>
<version>1.7.5-SNAPSHOT</version>
</parent>
<artifactId>ldap-connector</artifactId>
<version>1.7.4-SNAPSHOT</version>
<version>1.7.5-SNAPSHOT</version>
<packaging>jar</packaging>
<name>LiQID LDAP-connector</name>
<dependencies>
Expand All @@ -35,12 +35,12 @@
<dependency>
<groupId>com.innoq.liqid</groupId>
<artifactId>utils</artifactId>
<version>1.7.4-SNAPSHOT</version>
<version>1.7.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.innoq.liqid</groupId>
<artifactId>model</artifactId>
<version>1.7.4-SNAPSHOT</version>
<version>1.7.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.owasp.esapi</groupId>
Expand Down
18 changes: 2 additions & 16 deletions ldap-connector/src/main/java/com/innoq/ldap/connector/LdapHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1118,13 +1118,7 @@ private LdapUser fillAttributesInUser(LdapUser user, Attributes attributes) {
if (userIdentifyer.equals(key)) {
user.setUid(getAttributeOrNa(attributes, key));
}
if (LdapKeys.MODIFY_TIMESTAMP.equals(key)) {
user.setModifyTimestamp(getAttributeOrNa(attributes, key));
} else if (LdapKeys.MODIFIERS_NAME.equals(key)) {
user.setModifiersName(getAttributeOrNa(attributes, key));
} else if (LdapKeys.ENTRY_UUID.equals(key)) {
user.setEntryUUID(getAttributeOrNa(attributes, key));
} else if (LdapKeys.USER_PASSWORD.equals(key)) {
if (LdapKeys.USER_PASSWORD.equals(key)) {
user.addAttribute(new BasicAttribute(LdapKeys.USER_PASSWORD, null));
} else {
user.addAttribute((BasicAttribute) attributes.get(key));
Expand All @@ -1144,15 +1138,7 @@ private LdapGroup fillAttributesInGroup(LdapGroup group, Attributes attributes)
group = (LdapGroup) fillObjectClasses(group, attributes);
while (keys.hasMoreElements()) {
key = keys.nextElement();
if (LdapKeys.MODIFY_TIMESTAMP.equals(key)) {
group.setModifyTimestamp(getAttributeOrNa(attributes, key));
} else if (LdapKeys.MODIFIERS_NAME.equals(key)) {
group.setModifiersName(getAttributeOrNa(attributes, key));
} else if (LdapKeys.ENTRY_UUID.equals(key)) {
group.setEntryUUID(getAttributeOrNa(attributes, key));
} else {
group.addAttribute((BasicAttribute) attributes.get(key));
}
group.addAttribute((BasicAttribute) attributes.get(key));
if (groupIdentifyer.equals(key)) {
group.setCn(getAttributeOrNa(attributes, key));
}
Expand Down
12 changes: 0 additions & 12 deletions ldap-connector/src/main/java/com/innoq/ldap/connector/LdapNode.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,22 +188,10 @@ public void setDn(final String dn) {
this.dn = dn;
}

public void setModifyTimestamp(final String modifyTimestamp) {
set(LdapKeys.MODIFY_TIMESTAMP, modifyTimestamp);
}

public void setModifiersName(final String modifiersName) {
set(LdapKeys.MODIFIERS_NAME, modifiersName);
}

public String getEntryUUID() {
return get(LdapKeys.ENTRY_UUID);
}

public void setEntryUUID(String entryUUID) {
set(LdapKeys.ENTRY_UUID, entryUUID);
}

public String getModifiersName() {
return get(LdapKeys.MODIFIERS_NAME);
}
Expand Down
4 changes: 2 additions & 2 deletions model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
<parent>
<groupId>com.innoq.liqid</groupId>
<artifactId>liqid-parent</artifactId>
<version>1.7.4-SNAPSHOT</version>
<version>1.7.5-SNAPSHOT</version>
</parent>
<artifactId>model</artifactId>
<version>1.7.4-SNAPSHOT</version>
<version>1.7.5-SNAPSHOT</version>
<packaging>jar</packaging>
<name>LiQID Model</name>
<dependencies>
Expand Down
34 changes: 22 additions & 12 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.innoq.liqid</groupId>
<artifactId>liqid-parent</artifactId>
<version>1.7.4-SNAPSHOT</version>
<version>1.7.5-SNAPSHOT</version>
<packaging>pom</packaging>
<description>LiQID</description>
<name>LiQID</name>
Expand All @@ -38,6 +38,16 @@
<system>GitHub</system>
<url>https://github.com/innoq/LiQID/issues</url>
</issueManagement>
<distributionManagement>
<snapshotRepository>
<id>sonatype-nexus-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>sonatype-nexus-staging</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
<developers>
<developer>
<id>phl</id>
Expand Down Expand Up @@ -118,18 +128,18 @@
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
<configuration>
<keyname>${gpg.keyname}</keyname>
<passphraseServerId>${gpg.keyname}</passphraseServerId>
</configuration>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
<configuration>
<keyname>${gpg.keyname}</keyname>
<passphraseServerId>${gpg.keyname}</passphraseServerId>
</configuration>
</execution>
</executions>
</plugin>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
Expand Down Expand Up @@ -164,4 +174,4 @@
</plugin>
</plugins>
</reporting>
</project>
</project>
6 changes: 3 additions & 3 deletions utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
<parent>
<groupId>com.innoq.liqid</groupId>
<artifactId>liqid-parent</artifactId>
<version>1.7.4-SNAPSHOT</version>
<version>1.7.5-SNAPSHOT</version>
</parent>
<artifactId>utils</artifactId>
<version>1.7.4-SNAPSHOT</version>
<version>1.7.5-SNAPSHOT</version>
<packaging>jar</packaging>
<name>LiQID Utilities</name>
<dependencies>
Expand All @@ -35,7 +35,7 @@
<dependency>
<groupId>com.innoq.liqid</groupId>
<artifactId>model</artifactId>
<version>1.7.4-SNAPSHOT</version>
<version>1.7.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
Expand Down

0 comments on commit ae3de2c

Please sign in to comment.