Skip to content

refactor: [CO-3718] declare zattr module usage #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
frisonisland wants to merge 1 commit into
base: devel
Choose a base branch
from
Draft

refactor: [CO-3718] declare zattr module usage #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 44 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
<properties>
<revision>4.31.0</revision>
<changelist>-SNAPSHOT</changelist>
<carbonio-revision>4.26.0</carbonio-revision>
<carbonio-revision>4.27.1</carbonio-revision>
<carbonio.version>${carbonio-revision}${changelist}</carbonio.version>
<directory-server.version>4.32.0-SNAPSHOT</directory-server.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jackson.version>2.15.4</jackson.version>
<jfreechart.version>1.0.15</jfreechart.version>
Expand Down Expand Up @@ -185,6 +186,42 @@
</exclusions>
</dependency>

<dependency>
<groupId>com.zextras</groupId>
<artifactId>mailbox-attribute-manager</artifactId>
<version>${directory-server.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>com.zextras</groupId>
<artifactId>zattr</artifactId>
<version>${directory-server.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>com.zextras</groupId>
<artifactId>right-manager</artifactId>
<version>${carbonio.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
Expand Down Expand Up @@ -422,6 +459,12 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.zextras</groupId>
<artifactId>zm-store</artifactId>
<version>${carbonio.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.zextras</groupId>
<artifactId>zm-store</artifactId>
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/openzal/zal/DomainStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

package org.openzal.zal;

import com.zextras.entry.IServiceException;
import com.zimbra.common.account.ZAttrProvisioning;
import com.zimbra.common.service.ServiceException;
import com.zimbra.cs.account.Provisioning;
Expand Down Expand Up @@ -48,7 +49,7 @@ protected DomainStatus(@Nonnull Object domainStatus) {
public DomainStatus(@Nonnull String domainStatusString) {
try {
this.domainStatus = ZAttrProvisioning.DomainStatus.fromString(domainStatusString);
} catch (ServiceException e) {
} catch (IServiceException e) {
throw ExceptionWrapper.wrap(e);
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/openzal/zal/PrefExternalSendersType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

package org.openzal.zal;

import com.zextras.entry.IServiceException;
import org.openzal.zal.exceptions.ExceptionWrapper;
import org.openzal.zal.exceptions.ZimbraException;
import com.zimbra.common.account.ZAttrProvisioning;
Expand Down Expand Up @@ -57,7 +58,7 @@ public static PrefExternalSendersType fromString(String s)
{
return new PrefExternalSendersType(ZAttrProvisioning.PrefExternalSendersType.fromString(s));
}
catch (ServiceException e)
catch (IServiceException e)
{
throw ExceptionWrapper.wrap(e);
}
Expand Down