From 9289e9840b1036748ed5a4d3ede499bf6b0795fa Mon Sep 17 00:00:00 2001 From: ayyoob Date: Tue, 24 May 2016 19:27:16 +0530 Subject: [PATCH] removed UI Publisher --- .../pom.xml | 78 --- .../src/main/java/SubscriptionEndpoint.java | 73 --- .../java/SuperTenantSubscriptionEndpoint.java | 134 ----- .../main/java/TenantSubscriptionEndpoint.java | 134 ----- .../main/java/oauth/OAuthTokenValdiator.java | 201 -------- .../oauth/OAuthTokenValidaterStubFactory.java | 177 ------- .../OAuthTokenValidationException.java | 56 --- .../main/java/util/AuthenticationInfo.java | 60 --- .../src/main/java/util/ServiceHolder.java | 27 - .../src/main/java/util/UIConstants.java | 38 -- .../src/main/webapp/WEB-INF/web.xml | 24 - .../pom.xml | 137 ------ .../adapter/extensions/ui/UIEventAdapter.java | 460 ------------------ .../extensions/ui/UIEventAdapterFactory.java | 89 ---- .../ui/UIOutputCallbackControllerService.java | 61 --- ...UIOutputCallbackControllerServiceImpl.java | 210 -------- ...tAdaptorEventStreamServiceValueHolder.java | 37 -- ...ventAdaptorServiceInternalValueHolder.java | 56 --- .../ui/internal/ds/UILocalEventAdapterDS.java | 80 --- .../ui/internal/util/CEPWebSocketSession.java | 62 --- .../util/UIEventAdapterConstants.java | 54 -- .../extensions/ui/i18n/Resources.properties | 22 - .../components/das-extensions/pom.xml | 39 -- .../pom.xml | 106 ---- .../src/main/resources/build.properties | 20 - .../src/main/resources/p2.inf | 4 - .../resources/websocket-validation.properties | 5 - .../features/das-extensions-feature/pom.xml | 40 -- modules/iot-extensions/pom.xml | 2 - modules/p2-profile-gen/pom.xml | 7 - pom.xml | 43 -- 31 files changed, 2536 deletions(-) delete mode 100644 modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/pom.xml delete mode 100644 modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/SubscriptionEndpoint.java delete mode 100644 modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/SuperTenantSubscriptionEndpoint.java delete mode 100644 modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/TenantSubscriptionEndpoint.java delete mode 100644 modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/oauth/OAuthTokenValdiator.java delete mode 100644 modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/oauth/OAuthTokenValidaterStubFactory.java delete mode 100644 modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/oauth/exception/OAuthTokenValidationException.java delete mode 100644 modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/util/AuthenticationInfo.java delete mode 100644 modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/util/ServiceHolder.java delete mode 100644 modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/util/UIConstants.java delete mode 100644 modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/webapp/WEB-INF/web.xml delete mode 100644 modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/pom.xml delete mode 100644 modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/UIEventAdapter.java delete mode 100644 modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/UIEventAdapterFactory.java delete mode 100644 modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/UIOutputCallbackControllerService.java delete mode 100644 modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/internal/UIOutputCallbackControllerServiceImpl.java delete mode 100644 modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/internal/ds/OutputAdaptorEventStreamServiceValueHolder.java delete mode 100644 modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/internal/ds/UIEventAdaptorServiceInternalValueHolder.java delete mode 100644 modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/internal/ds/UILocalEventAdapterDS.java delete mode 100644 modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/internal/util/CEPWebSocketSession.java delete mode 100644 modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/internal/util/UIEventAdapterConstants.java delete mode 100644 modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/resources/org/wso2/carbon/event/output/adapter/extensions/ui/i18n/Resources.properties delete mode 100644 modules/iot-extensions/components/das-extensions/pom.xml delete mode 100644 modules/iot-extensions/features/das-extensions-feature/org.wso2.carbon.event.adapter.extensions.server.feature/pom.xml delete mode 100644 modules/iot-extensions/features/das-extensions-feature/org.wso2.carbon.event.adapter.extensions.server.feature/src/main/resources/build.properties delete mode 100644 modules/iot-extensions/features/das-extensions-feature/org.wso2.carbon.event.adapter.extensions.server.feature/src/main/resources/p2.inf delete mode 100644 modules/iot-extensions/features/das-extensions-feature/org.wso2.carbon.event.adapter.extensions.server.feature/src/main/resources/websocket-validation.properties delete mode 100644 modules/iot-extensions/features/das-extensions-feature/pom.xml diff --git a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/pom.xml b/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/pom.xml deleted file mode 100644 index 7f210fd7..00000000 --- a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/pom.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - das-extensions - org.wso2.iot - 1.0.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - org.wso2.carbon.event.output.adapter.extensions.ui.endpoint - war - WSO2 Carbon UI Webapp - Webapp for UI Output Event Adapter - http://wso2.org - - - - junit - junit - test - - - org.apache.tomcat - tomcat-websocket-api - - - org.wso2.iot - org.wso2.carbon.event.output.adapter.extensions.ui - provided - - - javax.ws.rs - javax.ws.rs-api - - - org.apache.cxf - cxf-rt-frontend-jaxrs - - - org.apache.httpcomponents.wso2 - httpcore - provided - - - org.wso2.orbit.org.apache.httpcomponents - httpclient - provided - - - org.wso2.carbon.identity - org.wso2.carbon.identity.oauth.stub - provided - - - - - secured-outputui - - diff --git a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/SubscriptionEndpoint.java b/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/SubscriptionEndpoint.java deleted file mode 100644 index 9439b422..00000000 --- a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/SubscriptionEndpoint.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * - * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import util.ServiceHolder; - -import javax.websocket.CloseReason; -import javax.websocket.Session; - -/** - * Interface for subscription and un-subscription for web socket - */ - -public class SubscriptionEndpoint { - - private static final Log log = LogFactory.getLog(SubscriptionEndpoint.class); - - public SubscriptionEndpoint() { - - } - - /** - * Web socket onClose - Remove the registered sessions - * - * @param session - Users registered session. - * @param reason - Status code for web-socket close. - * @param streamName - StreamName extracted from the ws url. - * @param version - Version extracted from the ws url. - */ - public void onClose(Session session, CloseReason reason, String streamName, String version) { - if (log.isDebugEnabled()) { - log.debug("Closing a WebSocket due to " + reason.getReasonPhrase() + ", for session ID:" + session.getId - () + - ", for request URI - " + session.getRequestURI()); - } - ServiceHolder.getInstance().getUiOutputCallbackControllerService().unsubscribeWebsocket(streamName, version, - session); - } - - /** - * Web socket onError - Remove the registered sessions - * - * @param session - Users registered session. - * @param throwable - Status code for web-socket close. - * @param streamName - StreamName extracted from the ws url. - * @param version - Version extracted from the ws url. - */ - public void onError(Session session, Throwable throwable, String streamName, String version) { - log.error( - "Error occurred in session ID: " + session.getId() + ", for request URI - " + session.getRequestURI() + - ", " + throwable.getMessage(), throwable); - ServiceHolder.getInstance().getUiOutputCallbackControllerService().unsubscribeWebsocket(streamName, version, - session); - } -} diff --git a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/SuperTenantSubscriptionEndpoint.java b/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/SuperTenantSubscriptionEndpoint.java deleted file mode 100644 index 546473cd..00000000 --- a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/SuperTenantSubscriptionEndpoint.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import oauth.OAuthTokenValdiator; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.context.PrivilegedCarbonContext; -import util.ServiceHolder; -import org.wso2.carbon.utils.multitenancy.MultitenantConstants; -import util.AuthenticationInfo; - -import javax.websocket.CloseReason; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.PathParam; -import javax.websocket.server.ServerEndpoint; -import java.io.IOException; - -/** - * Connect to web socket with Super tenant - */ - -@ServerEndpoint(value = "/{streamname}/{version}") -public class SuperTenantSubscriptionEndpoint extends SubscriptionEndpoint { - - private static final Log log = LogFactory.getLog(SuperTenantSubscriptionEndpoint.class); - - /** - * Web socket onOpen - When client sends a message - * - * @param session - Users registered session. - * @param streamName - StreamName extracted from the ws url. - * @param version - Version extracted from the ws url. - */ - @OnOpen - public void onOpen(Session session, @PathParam("streamname") String streamName, - @PathParam("version") String version) { - if (log.isDebugEnabled()) { - log.debug("WebSocket opened, for Session id: " + session.getId() + ", for the Stream:" + streamName); - } - AuthenticationInfo authenticationInfo = OAuthTokenValdiator.getInstance().validateToken(session); - //TODO Authorization - if (authenticationInfo != null && authenticationInfo.isAuthenticated()) { - try { - PrivilegedCarbonContext.startTenantFlow(); - PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(MultitenantConstants.SUPER_TENANT_ID); - ServiceHolder.getInstance().getUiOutputCallbackControllerService().subscribeWebsocket(streamName, - version, session); - } finally { - PrivilegedCarbonContext.endTenantFlow(); - } - } else { - try { - session.close(new CloseReason(CloseReason.CloseCodes.CANNOT_ACCEPT, "Unauthorized Access")); - } catch (IOException e) { - log.error("Failed to disconnect the unauthorized client."); - } - } - } - - /** - * Web socket onMessage - When client sens a message - * - * @param session - Users registered session. - * @param message - Status code for web-socket close. - * @param streamName - StreamName extracted from the ws url. - */ - @OnMessage - public void onMessage(Session session, String message, @PathParam("streamname") String streamName) { - if (log.isDebugEnabled()) { - log.debug("Received and dropped message from client. Message: " + message + ", " + - "for Session id: " + session.getId() + ", for the Stream:" + streamName); - } - } - - /** - * Web socket onClose - Remove the registered sessions - * - * @param session - Users registered session. - * @param reason - Status code for web-socket close. - * @param streamName - StreamName extracted from the ws url. - * @param version - Version extracted from the ws url. - */ - @OnClose - public void onClose(Session session, CloseReason reason, @PathParam("streamname") String streamName, - @PathParam("version") String version) { - try { - PrivilegedCarbonContext.startTenantFlow(); - PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(MultitenantConstants.SUPER_TENANT_ID); - super.onClose(session, reason, streamName, version); - } finally { - PrivilegedCarbonContext.endTenantFlow(); - } - } - - /** - * Web socket onError - Remove the registered sessions - * - * @param session - Users registered session. - * @param throwable - Status code for web-socket close. - * @param streamName - StreamName extracted from the ws url. - * @param version - Version extracted from the ws url. - */ - @OnError - public void onError(Session session, Throwable throwable, @PathParam("streamname") String streamName, - @PathParam("version") String version) { - try { - PrivilegedCarbonContext.startTenantFlow(); - PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(MultitenantConstants.SUPER_TENANT_ID); - super.onError(session, throwable, streamName, version); - } finally { - PrivilegedCarbonContext.endTenantFlow(); - } - } - -} diff --git a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/TenantSubscriptionEndpoint.java b/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/TenantSubscriptionEndpoint.java deleted file mode 100644 index 837e75f0..00000000 --- a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/TenantSubscriptionEndpoint.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import oauth.OAuthTokenValdiator; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.context.PrivilegedCarbonContext; -import util.ServiceHolder; -import util.AuthenticationInfo; - -import javax.websocket.CloseReason; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.PathParam; -import javax.websocket.server.ServerEndpoint; -import java.io.IOException; - -/** - * Connect to web socket with a tenant - */ - -@ServerEndpoint(value = "/t/{tdomain}/{streamname}/{version}") -public class TenantSubscriptionEndpoint extends SubscriptionEndpoint { - - private static final Log log = LogFactory.getLog(TenantSubscriptionEndpoint.class); - - /** - * Web socket onOpen - When client sends a message - * - * @param session - Users registered session. - * @param streamName - StreamName extracted from the ws url. - * @param version - Version extracted from the ws url. - * @param tdomain - Tenant domain extracted from ws url. - */ - @OnOpen - public void onOpen (Session session, @PathParam("streamname") String streamName , - @PathParam("version") String version, @PathParam("tdomain") String tdomain) { - if (log.isDebugEnabled()) { - log.debug("WebSocket opened, for Session id: "+session.getId()+", for the Stream:"+streamName); - } - AuthenticationInfo authenticationInfo = OAuthTokenValdiator.getInstance().validateToken(session); - //TODO Authorization - if (authenticationInfo != null && authenticationInfo.isAuthenticated()) { - try { - PrivilegedCarbonContext.startTenantFlow(); - PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(tdomain, true); - ServiceHolder.getInstance().getUiOutputCallbackControllerService().subscribeWebsocket(streamName, - version, session); - } finally { - PrivilegedCarbonContext.endTenantFlow(); - } - } else { - try { - session.close(new CloseReason(CloseReason.CloseCodes.CANNOT_ACCEPT, "Unauthorized Access")); - } catch (IOException e) { - log.error("Failed to disconnect the unauthorized client."); - } - } - } - - /** - * Web socket onMessage - When client sens a message - * - * @param session - Users registered session. - * @param message - Status code for web-socket close. - * @param streamName - StreamName extracted from the ws url. - */ - @OnMessage - public void onMessage (Session session, String message, @PathParam("streamname") String streamName, @PathParam("tdomain") String tdomain) { - if (log.isDebugEnabled()) { - log.debug("Received and dropped message from client. Message: " + message+", for Session id: "+session.getId()+", for tenant domain"+tdomain+", for the Adaptor:"+streamName); - } - } - - /** - * Web socket onClose - Remove the registered sessions - * - * @param session - Users registered session. - * @param reason - Status code for web-socket close. - * @param streamName - StreamName extracted from the ws url. - * @param version - Version extracted from the ws url. - */ - @OnClose - public void onClose (Session session, CloseReason reason, @PathParam("streamname") String streamName, - @PathParam("version") String version, @PathParam("tdomain") String tdomain) { - - try { - PrivilegedCarbonContext.getThreadLocalCarbonContext().startTenantFlow(); - PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(tdomain,true); - super.onClose(session, reason, streamName, version); - } finally { - PrivilegedCarbonContext.getThreadLocalCarbonContext().endTenantFlow(); - } - } - - /** - * Web socket onError - Remove the registered sessions - * - * @param session - Users registered session. - * @param throwable - Status code for web-socket close. - * @param streamName - StreamName extracted from the ws url. - * @param version - Version extracted from the ws url. - */ - @OnError - public void onError (Session session, Throwable throwable, @PathParam("streamname") String streamName, - @PathParam("version") String version, @PathParam("tdomain") String tdomain) { - - try { - PrivilegedCarbonContext.getThreadLocalCarbonContext().startTenantFlow(); - PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(tdomain, true); - super.onError(session, throwable, streamName, version); - } finally { - PrivilegedCarbonContext.getThreadLocalCarbonContext().endTenantFlow(); - } - } -} diff --git a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/oauth/OAuthTokenValdiator.java b/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/oauth/OAuthTokenValdiator.java deleted file mode 100644 index 9ab47d39..00000000 --- a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/oauth/OAuthTokenValdiator.java +++ /dev/null @@ -1,201 +0,0 @@ -/* - * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and limitations under the License. - * - */ - -package oauth; - -import org.apache.axis2.context.ServiceContext; -import org.apache.axis2.transport.http.HTTPConstants; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.commons.pool.impl.GenericObjectPool; -import org.wso2.carbon.identity.oauth2.stub.OAuth2TokenValidationServiceStub; -import org.wso2.carbon.identity.oauth2.stub.dto.OAuth2TokenValidationRequestDTO; -import org.wso2.carbon.identity.oauth2.stub.dto.OAuth2TokenValidationRequestDTO_OAuth2AccessToken; -import org.wso2.carbon.identity.oauth2.stub.dto.OAuth2TokenValidationResponseDTO; -import org.wso2.carbon.user.api.UserStoreException; -import org.wso2.carbon.utils.CarbonUtils; -import org.wso2.carbon.utils.multitenancy.MultitenantUtils; -import util.AuthenticationInfo; - -import javax.websocket.Session; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.rmi.RemoteException; -import java.util.Properties; - -/** - * This acts as a contract point for OAuth token validation. - */ -public class OAuthTokenValdiator { - - private static String cookie; - private GenericObjectPool stubs; - private static Log log = LogFactory.getLog(OAuthTokenValdiator.class); - private static final String WEBSOCKET_CONFIG_LOCATION = - CarbonUtils.getEtcCarbonConfigDirPath() + File.separator + "websocket-validation.properties"; - private static final String QUERY_STRING_SEPERATOR = "&"; - private static final String QUERY_KEY_VALUE_SEPERATOR = "="; - private static final String TOKEN_TYPE = "bearer"; - private static final String TOKEN_IDENTIFIER = "token"; - private static OAuthTokenValdiator oAuthTokenValdiator; - - public static OAuthTokenValdiator getInstance() { - if (oAuthTokenValdiator == null) { - synchronized (OAuthTokenValdiator.class) { - if (oAuthTokenValdiator == null) { - oAuthTokenValdiator = new OAuthTokenValdiator(); - } - } - } - return oAuthTokenValdiator; - } - - private OAuthTokenValdiator() { - try { - Properties properties = getWebSocketConfig(); - this.stubs = new GenericObjectPool(new OAuthTokenValidaterStubFactory(properties)); - } catch (IOException e) { - log.error("Failed to parse the web socket config file " + WEBSOCKET_CONFIG_LOCATION); - } - } - - /** - * This method gets a string accessToken and validates it - * - * @param session which need to be validated. - * @return AuthenticationInfo with the validated results. - */ - public AuthenticationInfo validateToken(Session session) { - String token = getTokenFromSession(session); - if (token == null) { - AuthenticationInfo authenticationInfo = new AuthenticationInfo(); - authenticationInfo.setAuthenticated(false); - return authenticationInfo; - } - OAuth2TokenValidationServiceStub tokenValidationServiceStub = null; - try { - Object stub = this.stubs.borrowObject(); - if (stub != null) { - tokenValidationServiceStub = (OAuth2TokenValidationServiceStub) stub; - if (cookie != null) { - tokenValidationServiceStub._getServiceClient().getOptions().setProperty( - HTTPConstants.COOKIE_STRING, cookie); - } - return getAuthenticationInfo(token, tokenValidationServiceStub); - } else { - log.warn("Stub initialization failed."); - } - } catch (RemoteException e) { - log.error("Error on connecting with the validation endpoint.", e); - } catch (Exception e) { - log.error("Error occurred in borrowing an validation stub from the pool.", e); - - } finally { - try { - if (tokenValidationServiceStub != null) { - this.stubs.returnObject(tokenValidationServiceStub); - } - } catch (Exception e) { - log.warn("Error occurred while returning the object back to the oauth token validation service " + - "stub pool.", e); - } - } - AuthenticationInfo authenticationInfo = new AuthenticationInfo(); - authenticationInfo.setAuthenticated(false); - return authenticationInfo; - } - - /** - * This creates an AuthenticationInfo object that is used for authorization. This method will validate the token - * and - * sets the required parameters to the object. - * - * @param token that needs to be validated. - * @param tokenValidationServiceStub stub that is used to call the external service. - * @return AuthenticationInfo This contains the information related to authenticated client. - * @throws RemoteException that triggers when failing to call the external service.. - */ - private AuthenticationInfo getAuthenticationInfo(String token, - OAuth2TokenValidationServiceStub tokenValidationServiceStub) - throws RemoteException, UserStoreException { - AuthenticationInfo authenticationInfo = new AuthenticationInfo(); - OAuth2TokenValidationRequestDTO validationRequest = new OAuth2TokenValidationRequestDTO(); - OAuth2TokenValidationRequestDTO_OAuth2AccessToken accessToken = - new OAuth2TokenValidationRequestDTO_OAuth2AccessToken(); - accessToken.setTokenType(TOKEN_TYPE); - accessToken.setIdentifier(token); - validationRequest.setAccessToken(accessToken); - boolean authenticated; - OAuth2TokenValidationResponseDTO tokenValidationResponse; - tokenValidationResponse = tokenValidationServiceStub.validate(validationRequest); - if (tokenValidationResponse == null) { - authenticationInfo.setAuthenticated(false); - return authenticationInfo; - } - authenticated = tokenValidationResponse.getValid(); - if (authenticated) { - String authorizedUser = tokenValidationResponse.getAuthorizedUser(); - String username = MultitenantUtils.getTenantAwareUsername(authorizedUser); - String tenantDomain = MultitenantUtils.getTenantDomain(authorizedUser); - authenticationInfo.setUsername(username); - authenticationInfo.setTenantDomain(tenantDomain); - } else { - if (log.isDebugEnabled()) { - log.debug("Token validation failed for token: " + token); - } - } - ServiceContext serviceContext = tokenValidationServiceStub._getServiceClient() - .getLastOperationContext().getServiceContext(); - cookie = (String) serviceContext.getProperty(HTTPConstants.COOKIE_STRING); - authenticationInfo.setAuthenticated(authenticated); - return authenticationInfo; - } - - /** - * Retrieve JWT configs from registry. - */ - private Properties getWebSocketConfig() throws IOException { - Properties properties = new Properties(); - File configFile =new File(WEBSOCKET_CONFIG_LOCATION); - if (configFile.exists()) { - InputStream fileInputStream = new FileInputStream(configFile); - if (fileInputStream != null) { - properties.load(fileInputStream); - } - } - return properties; - } - - private String getTokenFromSession(Session session) { - String queryString = session.getQueryString(); - if (queryString != null) { - String[] allQueryParamPairs = queryString.split(QUERY_STRING_SEPERATOR); - - for (String keyValuePair : allQueryParamPairs) { - String[] queryParamPair = keyValuePair.split(QUERY_KEY_VALUE_SEPERATOR); - - if (queryParamPair.length != 2) { - log.warn("Invalid query string [" + queryString + "] passed in."); - break; - } - if (queryParamPair[0].equals(TOKEN_IDENTIFIER)) { - return queryParamPair[1]; - } - } - } - return null; - } -} diff --git a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/oauth/OAuthTokenValidaterStubFactory.java b/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/oauth/OAuthTokenValidaterStubFactory.java deleted file mode 100644 index a43f8747..00000000 --- a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/oauth/OAuthTokenValidaterStubFactory.java +++ /dev/null @@ -1,177 +0,0 @@ -/* - * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package oauth; - -import oauth.exception.OAuthTokenValidationException; -import org.apache.axis2.AxisFault; -import org.apache.axis2.Constants; -import org.apache.axis2.client.Options; -import org.apache.axis2.client.ServiceClient; -import org.apache.axis2.transport.http.HTTPConstants; -import org.apache.axis2.transport.http.HttpTransportProperties; -import org.apache.commons.httpclient.HttpClient; -import org.apache.commons.httpclient.HttpConnectionManager; -import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager; -import org.apache.commons.httpclient.contrib.ssl.EasySSLProtocolSocketFactory; -import org.apache.commons.httpclient.params.HttpConnectionManagerParams; -import org.apache.commons.httpclient.protocol.Protocol; -import org.apache.commons.httpclient.protocol.ProtocolSocketFactory; -import org.apache.commons.pool.BasePoolableObjectFactory; -import org.apache.log4j.Logger; -import org.wso2.carbon.identity.oauth2.stub.OAuth2TokenValidationServiceStub; -import util.UIConstants; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; -import java.security.GeneralSecurityException; -import java.util.Properties; - -/** - * This follows object pool pattern to manage the stub for oauth validation service. - */ -public class OAuthTokenValidaterStubFactory extends BasePoolableObjectFactory { - private static final Logger log = Logger.getLogger(OAuthTokenValidaterStubFactory.class); - private HttpClient httpClient; - Properties tokenValidationProperties; - - - public OAuthTokenValidaterStubFactory(Properties tokenValidationProperties) { - this.tokenValidationProperties = tokenValidationProperties; - this.httpClient = createHttpClient(); - } - - /** - * This creates a OAuth2TokenValidationServiceStub object to the pool. - * - * @return an OAuthValidationStub object - * @throws Exception thrown when creating the object. - */ - @Override - public Object makeObject() throws Exception { - return this.generateStub(); - } - - /** - * This is used to clean up the OAuth validation stub and releases to the object pool. - * - * @param o object that needs to be released. - * @throws Exception throws when failed to release to the pool - */ - @Override - public void passivateObject(Object o) throws Exception { - if (o instanceof OAuth2TokenValidationServiceStub) { - OAuth2TokenValidationServiceStub stub = (OAuth2TokenValidationServiceStub) o; - stub._getServiceClient().cleanupTransport(); - } - } - - /** - * This is used to create a stub which will be triggered through object pool factory, which will create an - * instance of it. - * - * @return OAuth2TokenValidationServiceStub stub that is used to call an external service. - * @throws OAuthTokenValidationException will be thrown when initialization failed. - */ - private OAuth2TokenValidationServiceStub generateStub() throws OAuthTokenValidationException { - OAuth2TokenValidationServiceStub stub; - try { - URL hostURL = new URL(tokenValidationProperties.getProperty((UIConstants.TOKEN_VALIDATION_ENDPOINT_URL))); - if (hostURL != null) { - stub = new OAuth2TokenValidationServiceStub(hostURL.toString()); - if (stub != null) { - ServiceClient client = stub._getServiceClient(); - client.getServiceContext().getConfigurationContext().setProperty( - HTTPConstants.CACHED_HTTP_CLIENT, httpClient); - - HttpTransportProperties.Authenticator auth = - new HttpTransportProperties.Authenticator(); - auth.setPreemptiveAuthentication(true); - String username = tokenValidationProperties.getProperty(UIConstants.USERNAME); - String password = tokenValidationProperties.getProperty(UIConstants.PASSWORD); - auth.setPassword(username); - auth.setUsername(password); - Options options = client.getOptions(); - options.setProperty(HTTPConstants.AUTHENTICATE, auth); - options.setProperty(HTTPConstants.REUSE_HTTP_CLIENT, Constants.VALUE_TRUE); - client.setOptions(options); - if (hostURL.getProtocol().equals("https")) { - // set up ssl factory since axis2 https transport is used. - EasySSLProtocolSocketFactory sslProtocolSocketFactory = - createProtocolSocketFactory(); - Protocol authhttps = new Protocol(hostURL.getProtocol(), - (ProtocolSocketFactory) sslProtocolSocketFactory, - hostURL.getPort()); - Protocol.registerProtocol(hostURL.getProtocol(), authhttps); - options.setProperty(HTTPConstants.CUSTOM_PROTOCOL_HANDLER, authhttps); - } - } else { - String errorMsg = "OAuth Validation instanization failed."; - throw new OAuthTokenValidationException(errorMsg); - } - } else { - String errorMsg = "host url is invalid"; - throw new OAuthTokenValidationException(errorMsg); - } - } catch (AxisFault axisFault) { - throw new OAuthTokenValidationException( - "Error occurred while creating the OAuth2TokenValidationServiceStub.", axisFault); - } catch (MalformedURLException e) { - throw new OAuthTokenValidationException( - "Error occurred while parsing token endpoint URL", e); - } - - return stub; - } - - /** - * This is required to create a trusted connection with the external entity. - * Have to manually configure it since we use CommonHTTPTransport(axis2 transport) in axis2. - * - * @return an EasySSLProtocolSocketFactory for SSL communication. - */ - private EasySSLProtocolSocketFactory createProtocolSocketFactory() throws OAuthTokenValidationException { - try { - EasySSLProtocolSocketFactory easySSLPSFactory = new EasySSLProtocolSocketFactory(); - return easySSLPSFactory; - } catch (IOException e) { - String errorMsg = "Failed to initiate EasySSLProtocolSocketFactory."; - throw new OAuthTokenValidationException(errorMsg, e); - } catch (GeneralSecurityException e) { - String errorMsg = "Failed to set the key material in easy ssl factory."; - throw new OAuthTokenValidationException(errorMsg, e); - } - } - - /** - * This created httpclient pool that can be used to connect to external entity. This connection can be configured - * via broker.xml by setting up the required http connection parameters. - * - * @return an instance of HttpClient that is configured with MultiThreadedHttpConnectionManager - */ - private HttpClient createHttpClient() { - HttpConnectionManagerParams params = new HttpConnectionManagerParams(); - params.setDefaultMaxConnectionsPerHost(Integer.parseInt(tokenValidationProperties.getProperty( - UIConstants.MAXIMUM_HTTP_CONNECTION_PER_HOST))); - params.setMaxTotalConnections(Integer.parseInt(tokenValidationProperties.getProperty( - UIConstants.MAXIMUM_TOTAL_HTTP_CONNECTION))); - HttpConnectionManager connectionManager = new MultiThreadedHttpConnectionManager(); - connectionManager.setParams(params); - return new HttpClient(connectionManager); - } -} diff --git a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/oauth/exception/OAuthTokenValidationException.java b/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/oauth/exception/OAuthTokenValidationException.java deleted file mode 100644 index 3f54c524..00000000 --- a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/oauth/exception/OAuthTokenValidationException.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package oauth.exception; - -/** - * This Exception will be thrown, when there any interference with token validation flow. - */ -public class OAuthTokenValidationException extends Exception { - private String errMessage; - - public OAuthTokenValidationException(String msg, Exception nestedEx) { - super(msg, nestedEx); - setErrorMessage(msg); - } - - public OAuthTokenValidationException(String message, Throwable cause) { - super(message, cause); - setErrorMessage(message); - } - - public OAuthTokenValidationException(String msg) { - super(msg); - setErrorMessage(msg); - } - - public OAuthTokenValidationException() { - super(); - } - - public OAuthTokenValidationException(Throwable cause) { - super(cause); - } - - public String getErrorMessage() { - return errMessage; - } - - public void setErrorMessage(String errMessage) { - this.errMessage = errMessage; - } -} diff --git a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/util/AuthenticationInfo.java b/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/util/AuthenticationInfo.java deleted file mode 100644 index 4e2115cf..00000000 --- a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/util/AuthenticationInfo.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and limitations under the License. - * - */ - -package util; - -/** - * This is returned after authentication. - */ -public class AuthenticationInfo { - - /** - * this variable is used to check whether the client is authenticated. - */ - private boolean authenticated; - private String username; - private String tenantDomain; - /** - * returns whether the client is authenticated - */ - public boolean isAuthenticated() { - return authenticated; - } - - public void setAuthenticated(boolean authenticated) { - this.authenticated = authenticated; - } - - /** - * returns the authenticated client username - */ - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - /** - * return the authenticated client tenant domain - */ - public String getTenantDomain() { - return tenantDomain; - } - - public void setTenantDomain(String tenantDomain) { - this.tenantDomain = tenantDomain; - } -} diff --git a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/util/ServiceHolder.java b/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/util/ServiceHolder.java deleted file mode 100644 index 249d5cb7..00000000 --- a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/util/ServiceHolder.java +++ /dev/null @@ -1,27 +0,0 @@ -package util; - - -import org.wso2.carbon.context.PrivilegedCarbonContext; -import org.wso2.carbon.event.output.adapter.extensions.ui.UIOutputCallbackControllerService; - -public class ServiceHolder { - - private static ServiceHolder instance; - private UIOutputCallbackControllerService uiOutputCallbackControllerService; - - private ServiceHolder(){ - uiOutputCallbackControllerService = (UIOutputCallbackControllerService) PrivilegedCarbonContext - .getThreadLocalCarbonContext().getOSGiService(UIOutputCallbackControllerService.class, null); - } - - public synchronized static ServiceHolder getInstance(){ - if (instance==null){ - instance= new ServiceHolder(); - } - return instance; - } - - public UIOutputCallbackControllerService getUiOutputCallbackControllerService() { - return uiOutputCallbackControllerService; - } -} diff --git a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/util/UIConstants.java b/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/util/UIConstants.java deleted file mode 100644 index 2db13ce8..00000000 --- a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/java/util/UIConstants.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * - * * - * * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * * - * * WSO2 Inc. licenses this file to you under the Apache License, - * * Version 2.0 (the "License"); you may not use this file except - * * in compliance with the License. - * * You may obtain a copy of the License at - * * - * * http://www.apache.org/licenses/LICENSE-2.0 - * * - * * Unless required by applicable law or agreed to in writing, - * * software distributed under the License is distributed on an - * * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * * KIND, either express or implied. See the License for the - * * specific language governing permissions and limitations - * * under the License. - * * - * - */ - -package util; - -/** - * This class contains the constants related to ui client. - */ -public class UIConstants { - - private UIConstants() { - } - public static final String ADAPTER_UI_COLON = ":"; - public static final String MAXIMUM_TOTAL_HTTP_CONNECTION = "maximumTotalHttpConnection"; - public static final String MAXIMUM_HTTP_CONNECTION_PER_HOST = "maximumHttpConnectionPerHost"; - public static final String TOKEN_VALIDATION_ENDPOINT_URL = "tokenValidationEndpoint"; - public static final String USERNAME = "username"; - public static final String PASSWORD = "password"; -} diff --git a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/webapp/WEB-INF/web.xml b/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 2ec7fc7e..00000000 --- a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - Output WebSocket - diff --git a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/pom.xml b/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/pom.xml deleted file mode 100644 index 78f1b81b..00000000 --- a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/pom.xml +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - das-extensions - org.wso2.iot - 1.0.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - org.wso2.carbon.event.output.adapter.extensions.ui - bundle - WSO2 Carbon - Event Output UI Adapter Module - org.wso2.carbon.event.output.adapter.ui provides the back-end functionality of - ui event adapter - - http://wso2.org - - - - org.wso2.carbon.analytics-common - org.wso2.carbon.event.output.adapter.core - - - org.wso2.carbon - org.wso2.carbon.logging - - - org.wso2.carbon - org.wso2.carbon.core - - - javax.websocket - javax.websocket-api - - - org.wso2.carbon.analytics-common - org.wso2.carbon.databridge.commons - - - com.google.code.gson - gson - - - org.wso2.carbon.analytics-common - org.wso2.carbon.event.stream.core - - - - - - - org.apache.felix - maven-scr-plugin - - - generate-scr-descriptor - - scr - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - org.apache.felix - maven-bundle-plugin - true - - - ${project.artifactId} - ${project.artifactId} - - org.wso2.carbon.event.output.adapter.extensions.ui.internal, - org.wso2.carbon.event.output.adapter.extensions.ui.internal.* - - - !org.wso2.carbon.event.output.adapter.extensions.ui.internal, - !org.wso2.carbon.event.output.adapter.extensions.ui.internal.*, - org.wso2.carbon.event.output.adapter.extensions.ui.* - - - org.wso2.carbon.event.output.adapter.core.*, - javax.xml.namespace; version=0.0.0, - org.apache.axis2, - org.apache.axis2.client, - org.apache.axis2.context, - org.apache.axis2.transport.http, - org.apache.commons.httpclient, - org.apache.commons.httpclient.contrib.ssl, - org.apache.commons.httpclient.params, - org.apache.commons.httpclient.protocol, - org.apache.commons.pool, - org.apache.commons.pool.impl, - org.apache.log4j, - com.google.gson, - javax.websocket, - org.apache.commons.logging, - org.osgi.framework, - org.osgi.service.component, - org.wso2.carbon.context, - org.wso2.carbon.databridge.commons, - org.wso2.carbon.event.stream.core, - org.wso2.carbon.event.stream.core.exception, - org.wso2.carbon.utils - - - - - - - - - - - diff --git a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/UIEventAdapter.java b/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/UIEventAdapter.java deleted file mode 100644 index 1da9949c..00000000 --- a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/UIEventAdapter.java +++ /dev/null @@ -1,460 +0,0 @@ -/* - * - * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -package org.wso2.carbon.event.output.adapter.extensions.ui; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.context.CarbonContext; -import org.wso2.carbon.context.PrivilegedCarbonContext; -import org.wso2.carbon.databridge.commons.Attribute; -import org.wso2.carbon.databridge.commons.Event; -import org.wso2.carbon.databridge.commons.StreamDefinition; -import org.wso2.carbon.event.output.adapter.core.EventAdapterUtil; -import org.wso2.carbon.event.output.adapter.core.OutputEventAdapter; -import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterConfiguration; -import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException; -import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterRuntimeException; -import org.wso2.carbon.event.output.adapter.core.exception.TestConnectionNotSupportedException; -import org.wso2.carbon.event.output.adapter.extensions.ui.internal.ds.OutputAdaptorEventStreamServiceValueHolder; -import org.wso2.carbon.event.output.adapter.extensions.ui.internal.util.UIEventAdapterConstants; -import org.wso2.carbon.event.output.adapter.extensions.ui.internal.UIOutputCallbackControllerServiceImpl; -import org.wso2.carbon.event.output.adapter.extensions.ui.internal.ds.UIEventAdaptorServiceInternalValueHolder; -import org.wso2.carbon.event.output.adapter.extensions.ui.internal.util.CEPWebSocketSession; -import org.wso2.carbon.event.stream.core.EventStreamService; -import org.wso2.carbon.event.stream.core.exception.EventStreamConfigurationException; - -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.LinkedBlockingDeque; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.RejectedExecutionException; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; - -/** - * Contains the life cycle of executions regarding the UI Adapter - */ - -public class UIEventAdapter implements OutputEventAdapter { - - private static final Log log = LogFactory.getLog(UIEventAdapter.class); - private OutputEventAdapterConfiguration eventAdapterConfiguration; - private Map globalProperties; - private int queueSize; - private LinkedBlockingDeque streamSpecificEvents; - private static ThreadPoolExecutor executorService; - private int tenantId; - private boolean doLogDroppedMessage; - - private String streamId; - private StreamDefinition streamDefinition; - private List streamMetaAttributes; - private List streamCorrelationAttributes; - private List streamPayloadAttributes; - - public UIEventAdapter(OutputEventAdapterConfiguration eventAdapterConfiguration, Map globalProperties) { - this.eventAdapterConfiguration = eventAdapterConfiguration; - this.globalProperties = globalProperties; - this.doLogDroppedMessage = true; - } - - @Override - public void init() throws OutputEventAdapterException { - - tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(); - - //ExecutorService will be assigned if it is null - if (executorService == null) { - int minThread; - int maxThread; - long defaultKeepAliveTime; - int jobQueSize; - - //If global properties are available those will be assigned else constant values will be assigned - if (globalProperties.get(UIEventAdapterConstants.ADAPTER_MIN_THREAD_POOL_SIZE_NAME) != null) { - minThread = Integer.parseInt(globalProperties.get( - UIEventAdapterConstants.ADAPTER_MIN_THREAD_POOL_SIZE_NAME)); - } else { - minThread = UIEventAdapterConstants.ADAPTER_MIN_THREAD_POOL_SIZE; - } - - if (globalProperties.get(UIEventAdapterConstants.ADAPTER_MAX_THREAD_POOL_SIZE_NAME) != null) { - maxThread = Integer.parseInt(globalProperties.get( - UIEventAdapterConstants.ADAPTER_MAX_THREAD_POOL_SIZE_NAME)); - } else { - maxThread = UIEventAdapterConstants.ADAPTER_MAX_THREAD_POOL_SIZE; - } - - if (globalProperties.get(UIEventAdapterConstants.ADAPTER_KEEP_ALIVE_TIME_NAME) != null) { - defaultKeepAliveTime = Integer.parseInt(globalProperties.get( - UIEventAdapterConstants.ADAPTER_KEEP_ALIVE_TIME_NAME)); - } else { - defaultKeepAliveTime = UIEventAdapterConstants.DEFAULT_KEEP_ALIVE_TIME_IN_MILLIS; - } - - if (globalProperties.get(UIEventAdapterConstants.ADAPTER_EXECUTOR_JOB_QUEUE_SIZE_NAME) != null) { - jobQueSize = Integer.parseInt(globalProperties.get( - UIEventAdapterConstants.ADAPTER_EXECUTOR_JOB_QUEUE_SIZE_NAME)); - } else { - jobQueSize = UIEventAdapterConstants.ADAPTER_EXECUTOR_JOB_QUEUE_SIZE; - } - - executorService = new ThreadPoolExecutor(minThread, maxThread, defaultKeepAliveTime, TimeUnit.MILLISECONDS, - new LinkedBlockingQueue(jobQueSize)); - } - - streamId = eventAdapterConfiguration.getOutputStreamIdOfWso2eventMessageFormat(); - if (streamId == null || streamId.isEmpty()) { - throw new OutputEventAdapterRuntimeException("UI event adapter needs a output stream id"); - } - - // fetch the "streamDefinition" corresponding to the "streamId" and then fetch the different attribute types - // of the streamDefinition corresponding to the event's streamId. They are required when validating values in - // the events against the streamDef attributes. - streamDefinition = getStreamDefinition(streamId); - streamMetaAttributes = streamDefinition.getMetaData(); - streamCorrelationAttributes = streamDefinition.getCorrelationData(); - streamPayloadAttributes = streamDefinition.getPayloadData(); - - ConcurrentHashMap> tenantSpecifcEventOutputAdapterMap = - UIEventAdaptorServiceInternalValueHolder.getTenantSpecificOutputEventStreamAdapterMap(); - - ConcurrentHashMap streamSpecifAdapterMap = tenantSpecifcEventOutputAdapterMap.get(tenantId); - - if (streamSpecifAdapterMap == null) { - streamSpecifAdapterMap = new ConcurrentHashMap(); - if (null != tenantSpecifcEventOutputAdapterMap.putIfAbsent(tenantId, streamSpecifAdapterMap)) { - streamSpecifAdapterMap = tenantSpecifcEventOutputAdapterMap.get(tenantId); - } - } - - String adapterName = streamSpecifAdapterMap.get(streamId); - - if (adapterName != null) { - throw new OutputEventAdapterException(("An Output ui event adapter \"" + adapterName + "\" is already" + - " exist for stream id \"" + streamId + "\"")); - } else { - streamSpecifAdapterMap.put(streamId, eventAdapterConfiguration.getName()); - - ConcurrentHashMap>> tenantSpecificStreamMap = - UIEventAdaptorServiceInternalValueHolder.getTenantSpecificStreamEventMap(); - ConcurrentHashMap> streamSpecificEventsMap = - tenantSpecificStreamMap.get(tenantId); - - if (streamSpecificEventsMap == null) { - streamSpecificEventsMap = new ConcurrentHashMap>(); - if (null != tenantSpecificStreamMap.putIfAbsent(tenantId, streamSpecificEventsMap)) { - streamSpecificEventsMap = tenantSpecificStreamMap.get(tenantId); - } - } - streamSpecificEvents = streamSpecificEventsMap.get(streamId); - - if (streamSpecificEvents == null) { - streamSpecificEvents = new LinkedBlockingDeque(); - if (null != streamSpecificEventsMap.putIfAbsent(streamId, streamSpecificEvents)) { - streamSpecificEvents = streamSpecificEventsMap.get(streamId); - } - } - } - - if (globalProperties.get(UIEventAdapterConstants.ADAPTER_EVENT_QUEUE_SIZE_NAME) != null) { - try { - queueSize = Integer.parseInt( - globalProperties.get(UIEventAdapterConstants.ADAPTER_EVENT_QUEUE_SIZE_NAME)); - } catch (NumberFormatException e) { - log.error("String does not have the appropriate format for conversion." + e.getMessage()); - queueSize = UIEventAdapterConstants.EVENTS_QUEUE_SIZE; - } - } else { - queueSize = UIEventAdapterConstants.EVENTS_QUEUE_SIZE; - } - } - - @Override - public void testConnect() throws TestConnectionNotSupportedException { - throw new TestConnectionNotSupportedException("Test connection is not available"); - } - - @Override - public void connect() { - //Not needed - } - - @Override - public void publish(Object message, Map dynamicProperties) { - - Event event = (Event) message; - StringBuilder eventBuilder = new StringBuilder("["); - - if (streamSpecificEvents.size() == queueSize) { - streamSpecificEvents.removeFirst(); - } - - eventBuilder.append(event.getTimeStamp()); - - if (event.getMetaData() != null) { - eventBuilder.append(","); - Object[] metaData = event.getMetaData(); - for (int i = 0; i < metaData.length; i++) { - eventBuilder.append("\""); - eventBuilder.append(metaData[i]); - eventBuilder.append("\""); - if (i != (metaData.length - 1)) { - eventBuilder.append(","); - } - } - } - - if (event.getCorrelationData() != null) { - Object[] correlationData = event.getCorrelationData(); - - eventBuilder.append(","); - - for (int i = 0; i < correlationData.length; i++) { - eventBuilder.append("\""); - eventBuilder.append(correlationData[i]); - eventBuilder.append("\""); - if (i != (correlationData.length - 1)) { - eventBuilder.append(","); - } - } - } - - if (event.getPayloadData() != null) { - Object[] payloadData = event.getPayloadData(); - eventBuilder.append(","); - for (int i = 0; i < payloadData.length; i++) { - eventBuilder.append("\""); - eventBuilder.append(payloadData[i]); - eventBuilder.append("\""); - if (i != (payloadData.length - 1)) { - eventBuilder.append(","); - } - } - } - - eventBuilder.append("]"); - String eventString = eventBuilder.toString(); - Object[] eventValues = new Object[UIEventAdapterConstants.INDEX_TWO]; - eventValues[UIEventAdapterConstants.INDEX_ZERO] = eventString; - eventValues[UIEventAdapterConstants.INDEX_ONE] = System.currentTimeMillis(); - streamSpecificEvents.add(eventValues); - - // fetch all valid sessions checked against any queryParameters provided when subscribing. - CopyOnWriteArrayList validSessions = getValidSessions(event); - - try { - executorService.execute(new WebSocketSender(validSessions, eventString)); - } catch (RejectedExecutionException e) { - EventAdapterUtil.logAndDrop(eventAdapterConfiguration.getName(), message, "Job queue is full", e, log, - tenantId); - } - - } - - @Override - public void disconnect() { - //Not needed - } - - @Override - public void destroy() { - - int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); - - ConcurrentHashMap tenantSpecificAdapterMap = UIEventAdaptorServiceInternalValueHolder - .getTenantSpecificOutputEventStreamAdapterMap().get(tenantId); - if (tenantSpecificAdapterMap != null && streamId != null) { - tenantSpecificAdapterMap.remove(streamId); //Removing outputadapter and streamId - } - - ConcurrentHashMap> tenantSpecificStreamEventMap = - UIEventAdaptorServiceInternalValueHolder.getTenantSpecificStreamEventMap().get(tenantId); - if (tenantSpecificStreamEventMap != null && streamId != null) { - //Removing the streamId and events registered for the output adapter - tenantSpecificStreamEventMap.remove(streamId); - } - } - - @Override - public boolean isPolled() { - return true; - } - - /** - * Fetch the StreamDefinition corresponding to the given StreamId from the EventStreamService. - * - * @param streamId the streamId of this UIEventAdaptor. - * @return the "StreamDefinition" object corresponding to the streamId of this EventAdaptor. - * @throws OutputEventAdapterException if the "EventStreamService" OSGI service is unavailable/unregistered or if - * the matching Steam-Definition for the given StreamId cannot be retrieved. - */ - private StreamDefinition getStreamDefinition(String streamId) throws OutputEventAdapterException { - EventStreamService eventStreamService = OutputAdaptorEventStreamServiceValueHolder.getEventStreamService(); - if (eventStreamService != null) { - try { - return eventStreamService.getStreamDefinition(streamId); - } catch (EventStreamConfigurationException e) { - String adaptorType = eventAdapterConfiguration.getType(); - String adaptorName = eventAdapterConfiguration.getName(); - String errorMsg = "Error while retrieving Stream-Definition for Stream with id [" + streamId + "] " + - "for Adaptor [" + adaptorName + "] of type [" + adaptorType + "]."; - log.error(errorMsg); - throw new OutputEventAdapterException(errorMsg, e); - } - } - throw new OutputEventAdapterException( - "Could not retrieve the EventStreamService whilst trying to fetch the Stream-Definition of Stream " + - "with Id [" + streamId + "]."); - } - - /** - * Fetches all valid web-socket sessions from the entire pool of subscribed sessions. The validity is checked - * against any queryString provided when subscribing to the web-socket endpoint. - * - * @param event the current event received and that which needs to be published to subscribed sessions. - * @return a list of all validated web-socket sessions against the queryString values. - */ - private CopyOnWriteArrayList getValidSessions(Event event) { - CopyOnWriteArrayList validSessions = new CopyOnWriteArrayList<>(); - UIOutputCallbackControllerServiceImpl uiOutputCallbackControllerServiceImpl = - UIEventAdaptorServiceInternalValueHolder.getUIOutputCallbackRegisterServiceImpl(); - // get all subscribed web-socket sessions. - CopyOnWriteArrayList cepWebSocketSessions = - uiOutputCallbackControllerServiceImpl.getSessions(tenantId, streamId); - if (cepWebSocketSessions != null) { - for (CEPWebSocketSession cepWebSocketSession : cepWebSocketSessions) { - boolean isValidSession = validateEventAgainstSessionFilters(event, cepWebSocketSession); - if (isValidSession) { - validSessions.add(cepWebSocketSession); - } - } - } - return validSessions; - } - - - /** - * Processes the given session's validity to receive the current "event" against any queryParams that was used at - * the time when the web-socket-session is subscribed. This method can be extended to validate the event against - * any additional attribute of the given session too. - * - * @param event the current event received and that which needs to be published to subscribed - * sessions. - * @param cepWebSocketSession the session which needs validated for its authenticity to receive this event. - * @return "true" if the session is valid to receive the event else "false". - */ - private boolean validateEventAgainstSessionFilters(Event event, CEPWebSocketSession cepWebSocketSession) { - - // fetch the queryString Key:Value pair map of the given session. - Map queryParamValuePairs = cepWebSocketSession.getQueryParamValuePairs(); - if (queryParamValuePairs != null) { - // fetch the different attribute values received as part of the current event. - Object[] eventMetaData = event.getMetaData(); - Object[] eventCorrelationData = event.getCorrelationData(); - Object[] eventPayloadData = event.getPayloadData(); - - if (streamMetaAttributes != null) { - for (int i = 0; i < streamMetaAttributes.size(); i++) { - String attributeName = streamMetaAttributes.get(i).getName(); - String queryValue = queryParamValuePairs.get(attributeName); - - if (queryValue != null && - (eventMetaData == null || !eventMetaData[i].toString().equals(queryValue))) { - return false; - } - } - } - - if (streamCorrelationAttributes != null) { - for (int i = 0; i < streamCorrelationAttributes.size(); i++) { - String attributeName = streamCorrelationAttributes.get(i).getName(); - String queryValue = queryParamValuePairs.get(attributeName); - - if (queryValue != null && - (eventCorrelationData == null || !eventCorrelationData[i].toString().equals(queryValue))) { - return false; - } - } - } - - if (streamPayloadAttributes != null) { - for (int i = 0; i < streamPayloadAttributes.size(); i++) { - String attributeName = streamPayloadAttributes.get(i).getName(); - String queryValue = queryParamValuePairs.get(attributeName); - - if (queryValue != null && (eventPayloadData == null || !eventPayloadData[i].toString().equals( - queryValue))) { - return false; - } - } - } - } - return true; - } - - private class WebSocketSender implements Runnable { - - private String message; - private CopyOnWriteArrayList cepWebSocketSessions; - - public WebSocketSender(CopyOnWriteArrayList cepWebSocketSessions, String message) { - this.cepWebSocketSessions = cepWebSocketSessions; - this.message = message; - } - - /** - * When an object implementing interface Runnable is used - * to create a thread, starting the thread causes the object's - * run method to be called in that separately executing - * thread. - *

- * The general contract of the method run is that it may - * take any action whatsoever. - * - * @see Thread#run() - */ - @Override - public void run() { - if (cepWebSocketSessions != null) { - doLogDroppedMessage = true; - for (CEPWebSocketSession cepWebSocketSession : cepWebSocketSessions) { - synchronized (cepWebSocketSession) { - try { - cepWebSocketSession.getSession().getBasicRemote().sendText(message); - } catch (IOException e) { - EventAdapterUtil.logAndDrop(eventAdapterConfiguration.getName(), message, - "Cannot send to endpoint", e, log, tenantId); - } - } - } - } else if (doLogDroppedMessage) { - EventAdapterUtil.logAndDrop(eventAdapterConfiguration.getName(), message, "No clients registered", log, - tenantId); - doLogDroppedMessage = false; - } - } - } -} - diff --git a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/UIEventAdapterFactory.java b/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/UIEventAdapterFactory.java deleted file mode 100644 index c28f982f..00000000 --- a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/UIEventAdapterFactory.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * - * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -package org.wso2.carbon.event.output.adapter.extensions.ui; - -import org.wso2.carbon.event.output.adapter.core.MessageType; -import org.wso2.carbon.event.output.adapter.core.OutputEventAdapter; -import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterConfiguration; -import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterFactory; -import org.wso2.carbon.event.output.adapter.core.Property; -import org.wso2.carbon.event.output.adapter.extensions.ui.internal.util.UIEventAdapterConstants; -import org.wso2.carbon.utils.CarbonUtils; - -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.ResourceBundle; - -/** - * The UI event adapter factory class to create a UI output adapter - */ -public class UIEventAdapterFactory extends OutputEventAdapterFactory { - - private ResourceBundle resourceBundle = ResourceBundle.getBundle("org.wso2.carbon.event.output.adapter.extensions.ui.i18n" + - ".Resources", Locale.getDefault()); - private int httpPort; - private int httpsPort; - private int portOffset; - - public UIEventAdapterFactory() { - portOffset = getPortOffset(); - httpPort = UIEventAdapterConstants.DEFAULT_HTTP_PORT + portOffset; - httpsPort = UIEventAdapterConstants.DEFAULT_HTTPS_PORT + portOffset; - } - - @Override - public String getType() { - return UIEventAdapterConstants.ADAPTER_TYPE_UI; - } - - @Override - public List getSupportedMessageFormats() { - List supportedMessageFormats = new ArrayList(); - supportedMessageFormats.add(MessageType.WSO2EVENT); - return supportedMessageFormats; - } - - @Override - public List getStaticPropertyList() { - return null; - } - - @Override - public List getDynamicPropertyList() { - return null; - } - - @Override - public String getUsageTips() { - return resourceBundle.getString(UIEventAdapterConstants.ADAPTER_USAGE_TIPS_PREFIX) + " " + resourceBundle.getString(UIEventAdapterConstants.ADAPTER_USAGE_TIPS_POSTFIX); - } - - @Override - public OutputEventAdapter createEventAdapter(OutputEventAdapterConfiguration eventAdapterConfiguration, - Map globalProperties) { - return new UIEventAdapter(eventAdapterConfiguration, globalProperties); - } - - private int getPortOffset() { - return CarbonUtils.getPortFromServerConfig(UIEventAdapterConstants.CARBON_CONFIG_PORT_OFFSET_NODE) + 1; - } -} diff --git a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/UIOutputCallbackControllerService.java b/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/UIOutputCallbackControllerService.java deleted file mode 100644 index 9b937527..00000000 --- a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/UIOutputCallbackControllerService.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * - * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -package org.wso2.carbon.event.output.adapter.extensions.ui; - -import com.google.gson.JsonObject; - -import javax.websocket.Session; - -/** - * This interface is exposed as an OSGI service, which will be invoked by the local websocket endpoint to inform new subscriptions; and do un-subscriptions.. - */ -public interface UIOutputCallbackControllerService { - - /** - * Used to subscribe the session id and stream id for later web socket connectivity - * - * @param streamName - Stream name which user register to. - * @param version - Stream version which user uses. - * @param session - Session which user registered. - * @return - */ - public void subscribeWebsocket(String streamName, String version, Session session); - - /** - * Used to return events per streamId - * - * @param streamName - Stream name which user register to. - * @param version - Stream version which user uses. - * @param session - Session which user subscribed to. - * @return the events list. - */ - public void unsubscribeWebsocket(String streamName, String version, Session session); - - /** - * Used to return events per http GET request. - * - * @param streamName - Stream name which user register to. - * @param version - Stream version which user uses. - * @param lastUpdatedTime - Last dispatched events time. - * @return the events list. - */ - public JsonObject retrieveEvents(String streamName, String version, String lastUpdatedTime); -} diff --git a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/internal/UIOutputCallbackControllerServiceImpl.java b/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/internal/UIOutputCallbackControllerServiceImpl.java deleted file mode 100644 index 9da8578b..00000000 --- a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/internal/UIOutputCallbackControllerServiceImpl.java +++ /dev/null @@ -1,210 +0,0 @@ -/* - * - * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -package org.wso2.carbon.event.output.adapter.extensions.ui.internal; - -import com.google.gson.JsonObject; -import org.wso2.carbon.context.PrivilegedCarbonContext; -import org.wso2.carbon.event.output.adapter.extensions.ui.UIOutputCallbackControllerService; -import org.wso2.carbon.event.output.adapter.extensions.ui.internal.util.CEPWebSocketSession; -import org.wso2.carbon.event.output.adapter.extensions.ui.internal.util.UIEventAdapterConstants; -import org.wso2.carbon.event.output.adapter.extensions.ui.internal.ds.UIEventAdaptorServiceInternalValueHolder; - -import javax.websocket.Session; -import java.util.Iterator; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.LinkedBlockingDeque; - -/** - * Service implementation class which exposes to front end - */ -public class UIOutputCallbackControllerServiceImpl implements UIOutputCallbackControllerService { - - private ConcurrentHashMap>> - outputEventAdaptorSessionMap; - - public UIOutputCallbackControllerServiceImpl() { - outputEventAdaptorSessionMap = - new ConcurrentHashMap>>(); - } - - - /** - * Used to subscribe the session id and stream id for later web socket connectivity - * - * @param streamName - Stream name which user register to. - * @param version - Stream version which user uses. - * @param session - Session which user registered. - * @return - */ - public void subscribeWebsocket(String streamName, String version, Session session) { - - int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(); - - if (version == null || " ".equals(version)) { - version = UIEventAdapterConstants.ADAPTER_UI_DEFAULT_OUTPUT_STREAM_VERSION; - } - String streamId = streamName + UIEventAdapterConstants.ADAPTER_UI_COLON + version; - ConcurrentHashMap> tenantSpecificAdaptorMap = - outputEventAdaptorSessionMap.get(tenantId); - if (tenantSpecificAdaptorMap == null) { - tenantSpecificAdaptorMap = new ConcurrentHashMap>(); - if (null != outputEventAdaptorSessionMap.putIfAbsent(tenantId, tenantSpecificAdaptorMap)) { - tenantSpecificAdaptorMap = outputEventAdaptorSessionMap.get(tenantId); - } - } - CopyOnWriteArrayList adapterSpecificSessions = tenantSpecificAdaptorMap.get(streamId); - if (adapterSpecificSessions == null) { - adapterSpecificSessions = new CopyOnWriteArrayList(); - if (null != tenantSpecificAdaptorMap.putIfAbsent(streamId, adapterSpecificSessions)) { - adapterSpecificSessions = tenantSpecificAdaptorMap.get(streamId); - } - } - - CEPWebSocketSession cepWebSocketSession = new CEPWebSocketSession(session); - adapterSpecificSessions.add(cepWebSocketSession); - } - - /** - * Used to return registered sessions per streamId - * - * @param tenantId - Tenant id of the user. - * @param streamId - Stream name and version which user register to. - * @return the sessions list. - */ - public CopyOnWriteArrayList getSessions(int tenantId, String streamId) { - ConcurrentHashMap> tenantSpecificAdaptorMap = outputEventAdaptorSessionMap.get(tenantId); - if (tenantSpecificAdaptorMap != null) { - return tenantSpecificAdaptorMap.get(streamId); - } - return null; - } - - /** - * Used to return events per streamId - * - * @param tenanId - Tenant id of the user. - * @param streamName - Stream name which user register to. - * @param version - Stream version which user uses. - * @return the events list. - */ - public LinkedBlockingDeque getEvents(int tenanId, String streamName, String version) { - - ConcurrentHashMap> tenantSpecificStreamMap = - UIEventAdaptorServiceInternalValueHolder.getTenantSpecificStreamEventMap().get(tenanId); - - if (tenantSpecificStreamMap != null) { - String streamId = streamName + UIEventAdapterConstants.ADAPTER_UI_COLON + version; - return tenantSpecificStreamMap.get(streamId); - } - return null; - } - - /** - * Used to return events per streamId - * - * @param streamName - Stream name which user register to. - * @param version - Stream version which user uses. - * @param session - Session which user subscribed to. - * @return the events list. - */ - public void unsubscribeWebsocket(String streamName, String version, Session session) { - - int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(); - - if (version == null || " ".equals(version)) { - version = UIEventAdapterConstants.ADAPTER_UI_DEFAULT_OUTPUT_STREAM_VERSION; - } - String id = streamName + UIEventAdapterConstants.ADAPTER_UI_COLON + version; - ConcurrentHashMap> tenantSpecificAdaptorMap = outputEventAdaptorSessionMap.get(tenantId); - if (tenantSpecificAdaptorMap != null) { - CopyOnWriteArrayList adapterSpecificSessions = tenantSpecificAdaptorMap.get(id); - if (adapterSpecificSessions != null) { - CEPWebSocketSession sessionToRemove = null; - for (Iterator iterator = adapterSpecificSessions.iterator(); iterator.hasNext(); ) { - CEPWebSocketSession cepWebSocketSession = iterator.next(); - if (session.getId().equals(cepWebSocketSession.getSession().getId())) { - sessionToRemove = cepWebSocketSession; - break; - } - } - if (sessionToRemove != null) { - adapterSpecificSessions.remove(sessionToRemove); - } - } - } - } - - /** - * Used to return events per http GET request. - * - * @param streamName - Stream name which user register to. - * @param version - Stream version which user uses. - * @param lastUpdatedTime - Last dispatched events time. - * @return the events list. - */ - @Override - public JsonObject retrieveEvents(String streamName, String version, String lastUpdatedTime) { - - int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(); - LinkedBlockingDeque allEvents = getEvents(tenantId, streamName, version); - //List eventsListToBeSent; - Object lastEventTime = null; - JsonObject eventsData; - - if (allEvents != null) { - eventsData = new JsonObject(); - - Boolean firstFilteredValue = true; - long sentTimeStamp = Long.parseLong(lastUpdatedTime); - //eventsListToBeSent = new ArrayList(); - - StringBuilder allEventsAsString = new StringBuilder("["); - // set Iterator as descending - Iterator iterator = allEvents.descendingIterator(); - - while (iterator.hasNext()) { - - Object[] eventValues = (Object[]) iterator.next(); - long eventTimeStamp = (Long) eventValues[UIEventAdapterConstants.INDEX_ONE]; - if (sentTimeStamp < eventTimeStamp) { - - if (!firstFilteredValue) { - allEventsAsString.append(","); - } - firstFilteredValue = false; - String eventString = (String) eventValues[UIEventAdapterConstants.INDEX_ZERO]; - allEventsAsString.append(eventString); - } - } - allEventsAsString.append("]"); - - if (allEvents.size() != 0) { - Object[] lastObj = (Object[]) allEvents.getLast(); - lastEventTime = lastObj[UIEventAdapterConstants.INDEX_ONE]; - eventsData.addProperty("lastEventTime", String.valueOf(lastEventTime)); - } - eventsData.addProperty("events", allEventsAsString.toString()); - - return eventsData; - } - return null; - } -} diff --git a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/internal/ds/OutputAdaptorEventStreamServiceValueHolder.java b/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/internal/ds/OutputAdaptorEventStreamServiceValueHolder.java deleted file mode 100644 index 5b0ff1d3..00000000 --- a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/internal/ds/OutputAdaptorEventStreamServiceValueHolder.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and limitations under the License. - * - */ - -package org.wso2.carbon.event.output.adapter.extensions.ui.internal.ds; - -import org.wso2.carbon.event.stream.core.EventStreamService; - -/** - * This class holds a reference to the current EventStream OSGI service component "eventStreamService.component" in the - * OSGI runtime. - */ -public class OutputAdaptorEventStreamServiceValueHolder { - private static EventStreamService eventStreamService; - - public static void registerEventStreamService(EventStreamService eventBuilderService) { - OutputAdaptorEventStreamServiceValueHolder.eventStreamService = eventBuilderService; - } - - public static EventStreamService getEventStreamService() { - return OutputAdaptorEventStreamServiceValueHolder.eventStreamService; - } - - public static void unregisterEventStreamService(EventStreamService eventStreamService) { - OutputAdaptorEventStreamServiceValueHolder.eventStreamService = null; - } -} diff --git a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/internal/ds/UIEventAdaptorServiceInternalValueHolder.java b/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/internal/ds/UIEventAdaptorServiceInternalValueHolder.java deleted file mode 100644 index 465dac54..00000000 --- a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/internal/ds/UIEventAdaptorServiceInternalValueHolder.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * - * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -package org.wso2.carbon.event.output.adapter.extensions.ui.internal.ds; - -import org.wso2.carbon.event.output.adapter.extensions.ui.internal.UIOutputCallbackControllerServiceImpl; - -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.LinkedBlockingDeque; - -/** - * Creates a holder of type UIOutputCallbackRegisterServiceImpl. - */ -public final class UIEventAdaptorServiceInternalValueHolder { - - private static UIOutputCallbackControllerServiceImpl UIOutputCallbackRegisterServiceImpl; - private static ConcurrentHashMap> tenantSpecificOutputEventStreamAdapterMap = new - ConcurrentHashMap>(); - private static ConcurrentHashMap>> tenantSpecificStreamEventMap - = new ConcurrentHashMap>>(); - - public static void registerUIOutputCallbackRegisterServiceInternal( - UIOutputCallbackControllerServiceImpl UIOutputCallbackRegisterServiceImpl) { - UIEventAdaptorServiceInternalValueHolder.UIOutputCallbackRegisterServiceImpl = - UIOutputCallbackRegisterServiceImpl; - } - - public static UIOutputCallbackControllerServiceImpl getUIOutputCallbackRegisterServiceImpl() { - return UIEventAdaptorServiceInternalValueHolder.UIOutputCallbackRegisterServiceImpl; - } - - public static ConcurrentHashMap> getTenantSpecificOutputEventStreamAdapterMap() { - return tenantSpecificOutputEventStreamAdapterMap; - } - - public static ConcurrentHashMap>> - getTenantSpecificStreamEventMap() { - return tenantSpecificStreamEventMap; - } -} diff --git a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/internal/ds/UILocalEventAdapterDS.java b/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/internal/ds/UILocalEventAdapterDS.java deleted file mode 100644 index be43fc95..00000000 --- a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/internal/ds/UILocalEventAdapterDS.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * - * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -package org.wso2.carbon.event.output.adapter.extensions.ui.internal.ds; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.osgi.service.component.ComponentContext; -import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterFactory; -import org.wso2.carbon.event.output.adapter.extensions.ui.UIEventAdapterFactory; -import org.wso2.carbon.event.output.adapter.extensions.ui.UIOutputCallbackControllerService; -import org.wso2.carbon.event.output.adapter.extensions.ui.internal.UIOutputCallbackControllerServiceImpl; -import org.wso2.carbon.event.stream.core.EventStreamService; - -/** - * @scr.component component.name="output.extensions.Ui.AdapterService.component" immediate="true" - * @scr.reference name="eventStreamService.service" - * interface="org.wso2.carbon.event.stream.core.EventStreamService" cardinality="1..1" - * policy="dynamic" bind="setEventStreamService" unbind="unsetEventStreamService" - */ -public class UILocalEventAdapterDS { - - private static final Log log = LogFactory.getLog(UILocalEventAdapterDS.class); - - /** - * initialize the ui adapter service here service here. - * - * @param context - */ - protected void activate(ComponentContext context) { - - try { - OutputEventAdapterFactory uiEventAdapterFactory = new UIEventAdapterFactory(); - context.getBundleContext().registerService(OutputEventAdapterFactory.class.getName(), uiEventAdapterFactory, null); - - UIOutputCallbackControllerServiceImpl UIOutputCallbackRegisterServiceImpl = new UIOutputCallbackControllerServiceImpl(); - context.getBundleContext().registerService(UIOutputCallbackControllerService.class.getName(), - UIOutputCallbackRegisterServiceImpl, null); - - UIEventAdaptorServiceInternalValueHolder.registerUIOutputCallbackRegisterServiceInternal( - UIOutputCallbackRegisterServiceImpl); - - if (log.isDebugEnabled()) { - log.debug("Successfully deployed the output ui adapter service"); - } - } catch (RuntimeException e) { - log.error("Can not create the output ui adapter service ", e); - } - } - - protected void setEventStreamService(EventStreamService eventStreamService) { - if (log.isDebugEnabled()) { - log.debug("Setting the EventStreamService reference for the UILocalEventAdaptor Service"); - } - OutputAdaptorEventStreamServiceValueHolder.registerEventStreamService(eventStreamService); - } - - protected void unsetEventStreamService(EventStreamService eventStreamService) { - if (log.isDebugEnabled()) { - log.debug("Un-Setting the EventStreamService reference for the UILocalEventAdaptor Service"); - } - OutputAdaptorEventStreamServiceValueHolder.unregisterEventStreamService(eventStreamService); - } -} diff --git a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/internal/util/CEPWebSocketSession.java b/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/internal/util/CEPWebSocketSession.java deleted file mode 100644 index 751631b3..00000000 --- a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/internal/util/CEPWebSocketSession.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.wso2.carbon.event.output.adapter.extensions.ui.internal.util; - - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.websocket.Session; -import java.util.HashMap; -import java.util.Map; - -/** - * This is wrapper class over the javax.websocket.Session implementation. This class contains additional attributes - * of the Session object derived from processing some of the (default) existing attributes. - * Ex: Query-String's [Key:Value] Map derived from the queryString attribute of the original class. - */ -public class CEPWebSocketSession { - private static final Log log = LogFactory.getLog(CEPWebSocketSession.class); - - private static final String QUERY_STRING_SEPERATOR = "&"; - private static final String QUERY_KEY_VALUE_SEPERATOR = "="; - private Map queryParamValuePairs = null; - private Session session; - - public CEPWebSocketSession(Session session) { - this.session = session; - setQueryParamValuePairs(); - } - - public Map getQueryParamValuePairs() { - return queryParamValuePairs; - } - - public Session getSession() { - return session; - } - - /** - * Processes the queryString from the current instance's Session attribute and constructs a map of Query - * Key:Value pair. - */ - private void setQueryParamValuePairs() { - if (session.getQueryString() != null) { - String queryString = session.getQueryString(); - String[] allQueryParamPairs = queryString.split(QUERY_STRING_SEPERATOR); - - for (String keyValuePair : allQueryParamPairs) { - String[] thisQueryParamPair = keyValuePair.split(QUERY_KEY_VALUE_SEPERATOR); - - if (thisQueryParamPair.length != 2) { - log.warn("Invalid query string [" + queryString + "] passed in."); - break; - } - - if (queryParamValuePairs == null) { - queryParamValuePairs = new HashMap<>(); - } - - queryParamValuePairs.put(thisQueryParamPair[0], thisQueryParamPair[1]); - } - } - } -} diff --git a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/internal/util/UIEventAdapterConstants.java b/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/internal/util/UIEventAdapterConstants.java deleted file mode 100644 index 9c1ea3ad..00000000 --- a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/internal/util/UIEventAdapterConstants.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * - * Copyright (c) 2014-2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -package org.wso2.carbon.event.output.adapter.extensions.ui.internal.util; - -/** - * This class contains the constants related to ui Output Event Adaptor. - */ -public class UIEventAdapterConstants { - - private UIEventAdapterConstants() { - } - - public static final String ADAPTER_TYPE_UI = "iot-ui"; - public static final String ADAPTER_USAGE_TIPS_PREFIX = "ui.usage.tips_prefix"; - public static final String ADAPTER_USAGE_TIPS_POSTFIX = "ui.usage.tips_postfix"; - public static final String ADAPTER_UI_DEFAULT_OUTPUT_STREAM_VERSION = "1.0.0"; - public static final String ADAPTER_UI_COLON = ":"; - public static final int INDEX_ZERO = 0; - public static final int INDEX_ONE = 1; - public static final int INDEX_TWO = 2; - - public static final int ADAPTER_MIN_THREAD_POOL_SIZE = 8; - public static final int ADAPTER_MAX_THREAD_POOL_SIZE = 100; - public static final int ADAPTER_EXECUTOR_JOB_QUEUE_SIZE = 2000; - public static final long DEFAULT_KEEP_ALIVE_TIME_IN_MILLIS = 20000; - public static final String ADAPTER_MIN_THREAD_POOL_SIZE_NAME = "minThread"; - public static final String ADAPTER_MAX_THREAD_POOL_SIZE_NAME = "maxThread"; - public static final String ADAPTER_KEEP_ALIVE_TIME_NAME = "keepAliveTimeInMillis"; - public static final String ADAPTER_EXECUTOR_JOB_QUEUE_SIZE_NAME = "jobQueueSize"; - - public static final String ADAPTER_EVENT_QUEUE_SIZE_NAME = "eventQueueSize"; - public static final int EVENTS_QUEUE_SIZE = 30; - - public static final String CARBON_CONFIG_PORT_OFFSET_NODE = "Ports.Offset"; - public static final int DEFAULT_HTTP_PORT = 9763; - public static final int DEFAULT_HTTPS_PORT = 9443; -} diff --git a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/resources/org/wso2/carbon/event/output/adapter/extensions/ui/i18n/Resources.properties b/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/resources/org/wso2/carbon/event/output/adapter/extensions/ui/i18n/Resources.properties deleted file mode 100644 index 4a3dcba8..00000000 --- a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/resources/org/wso2/carbon/event/output/adapter/extensions/ui/i18n/Resources.properties +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. -# -# WSO2 Inc. licenses this file to you under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -output.event.stream.name=Output Stream Name -output.event.stream.version=Output Stream Version -ui.usage.tips_prefix=There must be an UI output adaptor for each stream to be visualized -ui.usage.tips_postfix= via Analytics Dashboard. diff --git a/modules/iot-extensions/components/das-extensions/pom.xml b/modules/iot-extensions/components/das-extensions/pom.xml deleted file mode 100644 index 6faa1963..00000000 --- a/modules/iot-extensions/components/das-extensions/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - org.wso2.iot - iot-extensions - 1.0.0-SNAPSHOT - ../../pom.xml - - - 4.0.0 - das-extensions - pom - WSO2 Carbon - DAS Extension - http://wso2.org - - - org.wso2.carbon.event.output.adapter.extensions.ui - org.wso2.carbon.event.output.adapter.extensions.ui.endpoint - - diff --git a/modules/iot-extensions/features/das-extensions-feature/org.wso2.carbon.event.adapter.extensions.server.feature/pom.xml b/modules/iot-extensions/features/das-extensions-feature/org.wso2.carbon.event.adapter.extensions.server.feature/pom.xml deleted file mode 100644 index 3127110d..00000000 --- a/modules/iot-extensions/features/das-extensions-feature/org.wso2.carbon.event.adapter.extensions.server.feature/pom.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - das-extensions-feature - org.wso2.iot - 1.0.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - org.wso2.carbon.event.adapter.extensions.server.feature - pom - WSO2 Carbon - Event Input Adapter Server Feature - http://wso2.org - This feature contains the bundles required for Input Event Adapter functionality - - - - org.wso2.iot - org.wso2.carbon.event.output.adapter.extensions.ui - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - package - - copy - - - - - org.wso2.iot - org.wso2.carbon.event.output.adapter.extensions.ui.endpoint - ${carbon.iot.device.mgt.version} - war - true - ${project.build.directory}/maven-shared-archive-resources/webapps/ - secured-outputui.war - - - - - - - - org.wso2.maven - carbon-p2-plugin - ${carbon.p2.plugin.version} - - - 4-p2-feature-generation - package - - p2-feature-gen - - - org.wso2.carbon.event.adapter.extensions.server - ../../etc/feature.properties - - - org.wso2.carbon.p2.category.type:server - org.eclipse.equinox.p2.type.group:true - - - - - org.wso2.iot:org.wso2.carbon.event.output.adapter.extensions.ui:${carbon.iot.device.mgt.version} - - - - org.wso2.carbon.core.server:${carbon.kernel.version} - - - - - - - - - diff --git a/modules/iot-extensions/features/das-extensions-feature/org.wso2.carbon.event.adapter.extensions.server.feature/src/main/resources/build.properties b/modules/iot-extensions/features/das-extensions-feature/org.wso2.carbon.event.adapter.extensions.server.feature/src/main/resources/build.properties deleted file mode 100644 index 6448563e..00000000 --- a/modules/iot-extensions/features/das-extensions-feature/org.wso2.carbon.event.adapter.extensions.server.feature/src/main/resources/build.properties +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright (c) 2005-2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. -# -# WSO2 Inc. licenses this file to you under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -custom = true -root.agent=conf diff --git a/modules/iot-extensions/features/das-extensions-feature/org.wso2.carbon.event.adapter.extensions.server.feature/src/main/resources/p2.inf b/modules/iot-extensions/features/das-extensions-feature/org.wso2.carbon.event.adapter.extensions.server.feature/src/main/resources/p2.inf deleted file mode 100644 index 948ab447..00000000 --- a/modules/iot-extensions/features/das-extensions-feature/org.wso2.carbon.event.adapter.extensions.server.feature/src/main/resources/p2.inf +++ /dev/null @@ -1,4 +0,0 @@ -instructions.configure = \ -org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.event.adapter.extensions.server_${feature.version}/webapps/,target:${installFolder}/../../deployment/server/webapps/,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.event.adapter.extensions.server_${feature.version}/websocket-validation.properties,target:${installFolder}/../../conf/etc/websocket-validation.properties,overwrite:true);\ diff --git a/modules/iot-extensions/features/das-extensions-feature/org.wso2.carbon.event.adapter.extensions.server.feature/src/main/resources/websocket-validation.properties b/modules/iot-extensions/features/das-extensions-feature/org.wso2.carbon.event.adapter.extensions.server.feature/src/main/resources/websocket-validation.properties deleted file mode 100644 index be0f3747..00000000 --- a/modules/iot-extensions/features/das-extensions-feature/org.wso2.carbon.event.adapter.extensions.server.feature/src/main/resources/websocket-validation.properties +++ /dev/null @@ -1,5 +0,0 @@ -tokenValidationEndpoint=https://localhost:9443/services/OAuth2TokenValidationService -username=admin -password=admin -maximumHttpConnectionPerHost=2 -maximumTotalHttpConnection=100 \ No newline at end of file diff --git a/modules/iot-extensions/features/das-extensions-feature/pom.xml b/modules/iot-extensions/features/das-extensions-feature/pom.xml deleted file mode 100644 index 75eb2a87..00000000 --- a/modules/iot-extensions/features/das-extensions-feature/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - org.wso2.iot - iot-extensions - 1.0.0-SNAPSHOT - ../../pom.xml - - - 4.0.0 - das-extensions-feature - 1.0.0-SNAPSHOT - pom - WSO2 Carbon - Device Management, DAS Extensions Feature - http://wso2.org - - - org.wso2.carbon.event.adapter.extensions.server.feature - - - diff --git a/modules/iot-extensions/pom.xml b/modules/iot-extensions/pom.xml index 0d7fef92..1bb473cb 100644 --- a/modules/iot-extensions/pom.xml +++ b/modules/iot-extensions/pom.xml @@ -33,9 +33,7 @@ http://wso2.org - components/das-extensions components/mb-extensions - features/das-extensions-feature features/mb-extensions-feature diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index a334004e..b0680b24 100644 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -406,9 +406,6 @@ org.wso2.iot:org.wso2.iot.styles.feature:${carbon.iot.device.mgt.version} - - org.wso2.iot:org.wso2.carbon.event.adapter.extensions.server.feature:${carbon.iot.device.mgt.version} - org.wso2.iot:org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature:${carbon.iot.device.mgt.version} @@ -741,10 +738,6 @@ org.wso2.iot.styles.feature.group ${carbon.iot.device.mgt.version} - - org.wso2.carbon.event.adapter.extensions.server.feature.group - ${carbon.iot.device.mgt.version} - org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature.group ${carbon.iot.device.mgt.version} diff --git a/pom.xml b/pom.xml index f6055ed4..2be5f5a0 100644 --- a/pom.xml +++ b/pom.xml @@ -999,45 +999,6 @@ json-path ${json.path.version} - - - - javax.websocket - javax.websocket-api - ${javax.websocket.version} - - - org.apache.tomcat - tomcat-websocket-api - ${tomcat.websocket.version} - provided - - - javax.ws.rs - javax.ws.rs-api - ${javax.version} - - - - org.wso2.carbon.analytics-common - org.wso2.carbon.event.output.adapter.core - ${carbon.analytics.common.version} - - - org.wso2.carbon.analytics-common - org.wso2.carbon.event.stream.core - ${carbon.analytics.common.version} - - - org.wso2.carbon.analytics-common - org.wso2.carbon.databridge.commons - ${carbon.analytics.common.version} - - - org.wso2.iot - org.wso2.carbon.event.output.adapter.extensions.ui - ${carbon.iot.device.mgt.version} - org.wso2.iot @@ -1202,10 +1163,6 @@ 1.1.wso2v1 0.9.1 - - 7.0.54 - 1.0 - 2.0 1.0.2