From c6b68ee17b0ada3b362d6d73b5a31c2c22223a9a Mon Sep 17 00:00:00 2001 From: Fredrik Teschke Date: Mon, 9 Feb 2015 22:36:55 +0100 Subject: [PATCH] move MailException to common bundle (needed by GWT) --- java/com.sap.sse.common/META-INF/MANIFEST.MF | 1 + .../src/com/sap/sse/common}/mail/MailException.java | 2 +- java/com.sap.sse.mail/src/com/sap/sse/mail/MailService.java | 1 + .../src/com/sap/sse/mail/impl/MailServiceImpl.java | 2 +- .../src/com/sap/sse/mail/impl/ReplicableMailService.java | 2 +- .../replication/test/SimpleSecurityReplicationTest.java | 2 +- .../com/sap/sse/security/ui/client/UserManagementService.java | 2 +- .../sap/sse/security/ui/server/UserManagementServiceImpl.java | 2 +- .../src/com/sap/sse/security/SecurityService.java | 2 +- .../src/com/sap/sse/security/impl/SecurityServiceImpl.java | 2 +- 10 files changed, 10 insertions(+), 8 deletions(-) rename java/{com.sap.sse.mail/src/com/sap/sse => com.sap.sse.common/src/com/sap/sse/common}/mail/MailException.java (88%) diff --git a/java/com.sap.sse.common/META-INF/MANIFEST.MF b/java/com.sap.sse.common/META-INF/MANIFEST.MF index 56290d7ee65..d41f336204f 100644 --- a/java/com.sap.sse.common/META-INF/MANIFEST.MF +++ b/java/com.sap.sse.common/META-INF/MANIFEST.MF @@ -8,6 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Export-Package: com.sap.sse.common, com.sap.sse.common.filter, com.sap.sse.common.impl, + com.sap.sse.common.mail, com.sap.sse.common.scalablevalue, com.sap.sse.common.search Require-Bundle: com.sap.sse.datamining.shared;bundle-version="1.0.0" diff --git a/java/com.sap.sse.mail/src/com/sap/sse/mail/MailException.java b/java/com.sap.sse.common/src/com/sap/sse/common/mail/MailException.java similarity index 88% rename from java/com.sap.sse.mail/src/com/sap/sse/mail/MailException.java rename to java/com.sap.sse.common/src/com/sap/sse/common/mail/MailException.java index 79013c8aebb..84c9ab3e5e4 100755 --- a/java/com.sap.sse.mail/src/com/sap/sse/mail/MailException.java +++ b/java/com.sap.sse.common/src/com/sap/sse/common/mail/MailException.java @@ -1,4 +1,4 @@ -package com.sap.sse.mail; +package com.sap.sse.common.mail; import java.io.Serializable; diff --git a/java/com.sap.sse.mail/src/com/sap/sse/mail/MailService.java b/java/com.sap.sse.mail/src/com/sap/sse/mail/MailService.java index 810f473c0c1..6578e8b05d6 100644 --- a/java/com.sap.sse.mail/src/com/sap/sse/mail/MailService.java +++ b/java/com.sap.sse.mail/src/com/sap/sse/mail/MailService.java @@ -2,6 +2,7 @@ package com.sap.sse.mail; import javax.mail.Multipart; +import com.sap.sse.common.mail.MailException; import com.sap.sse.mail.impl.ReplicableMailService; import com.sap.sse.replication.Replicable; import com.sap.sse.replication.impl.ReplicableWithObjectInputStream; diff --git a/java/com.sap.sse.mail/src/com/sap/sse/mail/impl/MailServiceImpl.java b/java/com.sap.sse.mail/src/com/sap/sse/mail/impl/MailServiceImpl.java index 111a5b0c7f4..7ef047c3a5c 100644 --- a/java/com.sap.sse.mail/src/com/sap/sse/mail/impl/MailServiceImpl.java +++ b/java/com.sap.sse.mail/src/com/sap/sse/mail/impl/MailServiceImpl.java @@ -21,7 +21,7 @@ import javax.mail.Transport; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; -import com.sap.sse.mail.MailException; +import com.sap.sse.common.mail.MailException; import com.sap.sse.replication.OperationExecutionListener; import com.sap.sse.replication.OperationWithResult; import com.sap.sse.replication.ReplicationMasterDescriptor; diff --git a/java/com.sap.sse.mail/src/com/sap/sse/mail/impl/ReplicableMailService.java b/java/com.sap.sse.mail/src/com/sap/sse/mail/impl/ReplicableMailService.java index 3d1508e500d..116ae1f798c 100644 --- a/java/com.sap.sse.mail/src/com/sap/sse/mail/impl/ReplicableMailService.java +++ b/java/com.sap.sse.mail/src/com/sap/sse/mail/impl/ReplicableMailService.java @@ -2,7 +2,7 @@ package com.sap.sse.mail.impl; import javax.mail.Multipart; -import com.sap.sse.mail.MailException; +import com.sap.sse.common.mail.MailException; import com.sap.sse.mail.MailService; public interface ReplicableMailService extends MailService { diff --git a/java/com.sap.sse.security.replication.test/src/com/sap/sse/security/replication/test/SimpleSecurityReplicationTest.java b/java/com.sap.sse.security.replication.test/src/com/sap/sse/security/replication/test/SimpleSecurityReplicationTest.java index 1c22fdaedae..08b962910ce 100755 --- a/java/com.sap.sse.security.replication.test/src/com/sap/sse/security/replication/test/SimpleSecurityReplicationTest.java +++ b/java/com.sap.sse.security.replication.test/src/com/sap/sse/security/replication/test/SimpleSecurityReplicationTest.java @@ -9,7 +9,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.sap.sse.mail.MailException; +import com.sap.sse.common.mail.MailException; import com.sap.sse.security.User; import com.sap.sse.security.shared.UserManagementException; diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/UserManagementService.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/UserManagementService.java index 8b727a0f63f..01a4f952a44 100644 --- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/UserManagementService.java +++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/UserManagementService.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.Map; import com.google.gwt.user.client.rpc.RemoteService; -import com.sap.sse.mail.MailException; +import com.sap.sse.common.mail.MailException; import com.sap.sse.security.shared.DefaultRoles; import com.sap.sse.security.shared.UserManagementException; import com.sap.sse.security.ui.oauth.client.CredentialDTO; diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/server/UserManagementServiceImpl.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/server/UserManagementServiceImpl.java index f7949841b2a..31ef0aa6901 100644 --- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/server/UserManagementServiceImpl.java +++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/server/UserManagementServiceImpl.java @@ -27,7 +27,7 @@ import org.osgi.util.tracker.ServiceTracker; import com.google.gwt.user.server.rpc.RemoteServiceServlet; import com.sap.sailing.domain.common.impl.NaturalComparator; import com.sap.sse.common.Util; -import com.sap.sse.mail.MailException; +import com.sap.sse.common.mail.MailException; import com.sap.sse.security.Credential; import com.sap.sse.security.SecurityService; import com.sap.sse.security.SessionUtils; diff --git a/java/com.sap.sse.security/src/com/sap/sse/security/SecurityService.java b/java/com.sap.sse.security/src/com/sap/sse/security/SecurityService.java index 1ac82ca09f7..237dcc46241 100644 --- a/java/com.sap.sse.security/src/com/sap/sse/security/SecurityService.java +++ b/java/com.sap.sse.security/src/com/sap/sse/security/SecurityService.java @@ -8,7 +8,7 @@ import javax.servlet.ServletContext; import org.apache.shiro.cache.CacheManager; import org.apache.shiro.mgt.SecurityManager; -import com.sap.sse.mail.MailException; +import com.sap.sse.common.mail.MailException; import com.sap.sse.replication.impl.ReplicableWithObjectInputStream; import com.sap.sse.security.impl.ReplicableSecurityService; import com.sap.sse.security.operations.SecurityOperation; diff --git a/java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java b/java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java index 314e5baea7a..00ba1efcd8a 100644 --- a/java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java +++ b/java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java @@ -64,7 +64,7 @@ import org.scribe.oauth.OAuthService; import com.google.gwt.user.server.rpc.RemoteServiceServlet; import com.sap.sse.common.Util; -import com.sap.sse.mail.MailException; +import com.sap.sse.common.mail.MailException; import com.sap.sse.mail.MailService; import com.sap.sse.replication.OperationExecutionListener; import com.sap.sse.replication.OperationWithResult;