removed liferay exceptions causing classnotfound exceptions
git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/trunk/portal/portal-manager@130881 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
1c9d5af09e
commit
93fdce97c5
|
@ -14,8 +14,6 @@ import org.gcube.vomanagement.usermanagement.model.CustomAttributeKeys;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.liferay.portal.kernel.exception.PortalException;
|
|
||||||
import com.liferay.portal.kernel.exception.SystemException;
|
|
||||||
import com.liferay.portal.kernel.util.StringBundler;
|
import com.liferay.portal.kernel.util.StringBundler;
|
||||||
import com.liferay.portal.kernel.util.StringPool;
|
import com.liferay.portal.kernel.util.StringPool;
|
||||||
import com.liferay.portal.model.Group;
|
import com.liferay.portal.model.Group;
|
||||||
|
@ -152,9 +150,7 @@ public class PortalContext {
|
||||||
CompanyLocalServiceUtil.getCompany(defaultCompanyId);
|
CompanyLocalServiceUtil.getCompany(defaultCompanyId);
|
||||||
|
|
||||||
return PortalUtil.getPortalURL(CompanyLocalServiceUtil.getCompany(defaultCompanyId).getVirtualHostname(), 443, true);
|
return PortalUtil.getPortalURL(CompanyLocalServiceUtil.getCompany(defaultCompanyId).getVirtualHostname(), 443, true);
|
||||||
} catch (PortalException e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
|
||||||
} catch (SystemException e) {
|
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
return "";
|
return "";
|
||||||
|
@ -210,7 +206,7 @@ public class PortalContext {
|
||||||
* @throws PortalException
|
* @throws PortalException
|
||||||
* @throws SystemException
|
* @throws SystemException
|
||||||
*/
|
*/
|
||||||
private Group getSiteFromServletRequest(final HttpServletRequest request) throws PortalException, SystemException {
|
private Group getSiteFromServletRequest(final HttpServletRequest request) throws Exception {
|
||||||
String serverName = request.getServerName();
|
String serverName = request.getServerName();
|
||||||
Group site = null;
|
Group site = null;
|
||||||
List<VirtualHost> vHosts = VirtualHostLocalServiceUtil.getVirtualHosts(0, VirtualHostLocalServiceUtil.getVirtualHostsCount());
|
List<VirtualHost> vHosts = VirtualHostLocalServiceUtil.getVirtualHosts(0, VirtualHostLocalServiceUtil.getVirtualHostsCount());
|
||||||
|
@ -233,7 +229,7 @@ public class PortalContext {
|
||||||
* @throws PortalException
|
* @throws PortalException
|
||||||
* @throws SystemException
|
* @throws SystemException
|
||||||
*/
|
*/
|
||||||
private Group getSiteFromServerName(final String serverName) throws PortalException, SystemException {
|
private Group getSiteFromServerName(final String serverName) throws Exception {
|
||||||
_log.debug("serverName passed is " + serverName);
|
_log.debug("serverName passed is " + serverName);
|
||||||
Group site = null;
|
Group site = null;
|
||||||
List<VirtualHost> vHosts = VirtualHostLocalServiceUtil.getVirtualHosts(0, VirtualHostLocalServiceUtil.getVirtualHostsCount());
|
List<VirtualHost> vHosts = VirtualHostLocalServiceUtil.getVirtualHosts(0, VirtualHostLocalServiceUtil.getVirtualHostsCount());
|
||||||
|
@ -260,7 +256,7 @@ public class PortalContext {
|
||||||
* @throws SystemException
|
* @throws SystemException
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
private static String getGroupFriendlyURL(HttpServletRequest request, final Group currentGroup) throws PortalException, SystemException {
|
private static String getGroupFriendlyURL(HttpServletRequest request, final Group currentGroup) throws Exception {
|
||||||
String friendlyURL = GCubePortalConstants.PREFIX_GROUP_URL;
|
String friendlyURL = GCubePortalConstants.PREFIX_GROUP_URL;
|
||||||
StringBundler sb = new StringBundler();
|
StringBundler sb = new StringBundler();
|
||||||
sb.append(friendlyURL).append(currentGroup.getFriendlyURL());
|
sb.append(friendlyURL).append(currentGroup.getFriendlyURL());
|
||||||
|
@ -275,7 +271,7 @@ public class PortalContext {
|
||||||
* @throws PortalException
|
* @throws PortalException
|
||||||
* @throws SystemException
|
* @throws SystemException
|
||||||
*/
|
*/
|
||||||
private static String getGroupFriendlyURL(final Group currentGroup) throws PortalException, SystemException {
|
private static String getGroupFriendlyURL(final Group currentGroup) throws Exception {
|
||||||
String friendlyURL = GCubePortalConstants.PREFIX_GROUP_URL;
|
String friendlyURL = GCubePortalConstants.PREFIX_GROUP_URL;
|
||||||
StringBundler sb = new StringBundler();
|
StringBundler sb = new StringBundler();
|
||||||
sb.append(friendlyURL).append(currentGroup.getFriendlyURL());
|
sb.append(friendlyURL).append(currentGroup.getFriendlyURL());
|
||||||
|
|
Loading…
Reference in New Issue