diff --git a/components/org.apache.stratos.deployment/2.1.0/pom.xml b/components/org.apache.stratos.deployment/2.1.0/pom.xml new file mode 100644 index 0000000..559ee28 --- /dev/null +++ b/components/org.apache.stratos.deployment/2.1.0/pom.xml @@ -0,0 +1,102 @@ + + + + org.apache.stratos + stratos-components-parent + 2.0.0 + ../../pom.xml + + + 4.0.0 + org.apache.stratos.deployment + 2.1.0 + bundle + Apache Stratos - Deployment + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0 + + 1.5 + 1.5 + + + + org.apache.felix + maven-scr-plugin + + + org.apache.felix + maven-bundle-plugin + + true + + + ${project.artifactId} + ${project.artifactId} + + org.apache.stratos.deployment.internal.* + + + !org.apache.stratos.deployment.internal.*, + org.apache.stratos.deployment.* + + + !javax.xml.namespace, + org.apache.axis2.*; version="${axis2.osgi.version.range}", + javax.xml.namespace; version=0.0.0, + javax.servlet;version="${imp.pkg.version.javax.servlet}", + javax.servlet.http;version="${imp.pkg.version.javax.servlet}", + *;resolution:=optional + + + + + + + + + + org.wso2.carbon + org.wso2.carbon.stratos.common + 2.1.0 + + + org.apache.axis2.wso2 + axis2 + + + log4j + log4j + + + org.wso2.carbon + org.wso2.carbon.registry.core + ${wso2carbon.version} + + + commons-logging + commons-logging + + + diff --git a/components/org.apache.stratos.deployment/2.1.0/src/main/java/org/apache/stratos/deployment/CloudDeploymentInterceptor.java b/components/org.apache.stratos.deployment/2.1.0/src/main/java/org/apache/stratos/deployment/CloudDeploymentInterceptor.java new file mode 100644 index 0000000..fa9f854 --- /dev/null +++ b/components/org.apache.stratos.deployment/2.1.0/src/main/java/org/apache/stratos/deployment/CloudDeploymentInterceptor.java @@ -0,0 +1,91 @@ +/* +* Copyright (c) 2005-2011, 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.apache.stratos.deployment; + +import org.apache.axiom.om.OMElement; +import org.apache.axis2.AxisFault; +import org.apache.axis2.description.AxisModule; +import org.apache.axis2.description.AxisOperation; +import org.apache.axis2.description.AxisService; +import org.apache.axis2.description.AxisServiceGroup; +import org.apache.axis2.description.Parameter; +import org.apache.axis2.engine.AxisConfiguration; +import org.apache.axis2.engine.AxisEvent; +import org.apache.axis2.engine.AxisObserver; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.xml.namespace.QName; +import java.util.ArrayList; + +/** + * Deployment interceptor for handling modification of ServiceAdmin so that the service list is not + * displayed when the user has not logged in. + */ +public class CloudDeploymentInterceptor implements AxisObserver { + private static final Log log = LogFactory.getLog(CloudDeploymentInterceptor.class); + + public void init(AxisConfiguration axisConfiguration) { + } + + public void serviceUpdate(AxisEvent axisEvent, AxisService axisService) { + try { + if (axisEvent.getEventType() == AxisEvent.SERVICE_DEPLOY && + axisService.getName().equals("ServiceAdmin")){ + AxisOperation operation = axisService.getOperation(new QName("listServiceGroups")); + ArrayList params = operation.getParameters(); + for(Parameter param: params) { + operation.removeParameter(param); + } + Parameter authAction = new Parameter("AuthorizationAction", + "/permission/admin/manage/monitor/service"); + operation.addParameter(authAction); + } + } catch (AxisFault e) { + log.error("Cannot add AuthorizationAction parameter to ServiceAdmin", e); + } + } + + public void serviceGroupUpdate(AxisEvent axisEvent, AxisServiceGroup axisServiceGroup) { + } + + public void moduleUpdate(AxisEvent axisEvent, AxisModule axisModule) { + } + + public void addParameter(Parameter parameter) throws AxisFault { + } + + public void removeParameter(Parameter parameter) throws AxisFault { + } + + public void deserializeParameters(OMElement omElement) throws AxisFault { + } + + public Parameter getParameter(String s) { + return null; + } + + public ArrayList getParameters() { + return null; + } + + public boolean isParameterLocked(String s) { + return false; + } +} diff --git a/components/org.apache.stratos.deployment/2.1.0/src/main/java/org/apache/stratos/deployment/SuperTenantRolePlayer.java b/components/org.apache.stratos.deployment/2.1.0/src/main/java/org/apache/stratos/deployment/SuperTenantRolePlayer.java new file mode 100644 index 0000000..efd37d9 --- /dev/null +++ b/components/org.apache.stratos.deployment/2.1.0/src/main/java/org/apache/stratos/deployment/SuperTenantRolePlayer.java @@ -0,0 +1,45 @@ +/* +* Copyright (c) 2005-2011, 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.apache.stratos.deployment; + +import org.apache.axiom.soap.RolePlayer; +import org.wso2.carbon.base.MultitenantConstants; +import org.wso2.carbon.context.CarbonContext; + +import java.util.List; +import java.util.ArrayList; + +public class SuperTenantRolePlayer implements RolePlayer{ + + private List roles; + + public SuperTenantRolePlayer() { + this.roles = new ArrayList(); + this.roles.add("supertenant"); + } + + public List getRoles() { + return this.roles; + } + + public boolean isUltimateDestination() { + return (CarbonContext.getCurrentContext().getTenantId() == + MultitenantConstants.SUPER_TENANT_ID); + } +} diff --git a/components/org.apache.stratos.deployment/2.1.0/src/main/java/org/apache/stratos/deployment/internal/CloudDeploymentServiceComponent.java b/components/org.apache.stratos.deployment/2.1.0/src/main/java/org/apache/stratos/deployment/internal/CloudDeploymentServiceComponent.java new file mode 100644 index 0000000..397171c --- /dev/null +++ b/components/org.apache.stratos.deployment/2.1.0/src/main/java/org/apache/stratos/deployment/internal/CloudDeploymentServiceComponent.java @@ -0,0 +1,73 @@ +/* +* Copyright (c) 2005-2011, 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.apache.stratos.deployment.internal; + +import org.apache.axis2.context.ConfigurationContext; +import org.apache.axis2.description.Parameter; +import org.apache.axis2.engine.AxisConfiguration; +import org.apache.axis2.engine.AxisObserver; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.stratos.deployment.CloudDeploymentInterceptor; +import org.apache.stratos.deployment.SuperTenantRolePlayer; +import org.osgi.service.component.ComponentContext; +import org.wso2.carbon.CarbonConstants; +import org.wso2.carbon.utils.ConfigurationContextService; + +import java.util.Dictionary; +import java.util.Hashtable; + +/** + * @scr.component name="org.apache.stratos.deployment.internal.CloudDeploymentServiceComponent" immediate="true" + * @scr.reference name="config.context.service" + * interface="org.wso2.carbon.utils.ConfigurationContextService" cardinality="1..1" + * policy="dynamic" bind="setConfigurationContextService" + * unbind="unsetConfigurationContextService" + */ +public class CloudDeploymentServiceComponent { + private static final Log log = LogFactory.getLog(CloudDeploymentServiceComponent.class); + + protected void activate(ComponentContext ctxt) { + //TODO: Modify the permission in the UI + try { + ConfigurationContext configContext = DataHolder.getInstance().getServerConfigContext(); + Dictionary props = new Hashtable(); + props.put(CarbonConstants.AXIS2_CONFIG_SERVICE, AxisObserver.class.getName()); + ctxt.getBundleContext().registerService(AxisObserver.class.getName(), new CloudDeploymentInterceptor(),props); + + // register the role player for this configuration + AxisConfiguration axisConfiguration = configContext.getAxisConfiguration(); + axisConfiguration.addParameter(new Parameter("rolePlayer", new SuperTenantRolePlayer())); + } catch (Exception e) { + log.error("CloudDeploymentServiceComponent activation failed", e); + } + } + + protected void deactivate(ComponentContext ctxt) { + + } + + protected void setConfigurationContextService(ConfigurationContextService contextService) { + DataHolder.getInstance().setServerConfigContext(contextService.getServerConfigContext()); + } + + protected void unsetConfigurationContextService(ConfigurationContextService contextService) { + DataHolder.getInstance().setServerConfigContext(null); + } +} diff --git a/components/org.apache.stratos.deployment/2.1.0/src/main/java/org/apache/stratos/deployment/internal/DataHolder.java b/components/org.apache.stratos.deployment/2.1.0/src/main/java/org/apache/stratos/deployment/internal/DataHolder.java new file mode 100644 index 0000000..585ac1e --- /dev/null +++ b/components/org.apache.stratos.deployment/2.1.0/src/main/java/org/apache/stratos/deployment/internal/DataHolder.java @@ -0,0 +1,45 @@ +/* +* Copyright (c) 2005-2011, 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.apache.stratos.deployment.internal; + +import org.apache.axis2.context.ConfigurationContext; + +/** + * DataHolder for Service deployment component + */ +public class DataHolder { + private static DataHolder instance = new DataHolder(); + + private ConfigurationContext serverConfigContext; + + public static DataHolder getInstance() { + return instance; + } + + private DataHolder() { + } + + public ConfigurationContext getServerConfigContext() { + return serverConfigContext; + } + + public void setServerConfigContext(ConfigurationContext serverConfigContext) { + this.serverConfigContext = serverConfigContext; + } +} diff --git a/components/pom.xml b/components/pom.xml index f480876..82dac46 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -168,6 +168,19 @@ org.wso2.carbon.autoscaler.service.jvm.agentmgt.stub ${carbon.platform.version} + + + + log4j + log4j + ${version.log4j} + + + commons-logging + commons-logging + ${version.commons.logging} + + @@ -194,6 +207,8 @@ 1.6.1.wso2v9 1.1.0.wso2v1 3.0.wso2v1 + 1.2.13 + 1.1.1 - - - org.wso2.carbon - stratos-components - 2.1.0 -../../pom.xml - - - 4.0.0 - org.wso2.carbon.stratos.deployment - 2.1.0 - bundle - WSO2 Stratos - Deployment - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0 - - 1.5 - 1.5 - - - - org.apache.felix - maven-scr-plugin - - - org.apache.felix - maven-bundle-plugin - - true - - - ${project.artifactId} - ${project.artifactId} - - org.wso2.carbon.stratos.deployment.internal.* - - - !org.wso2.carbon.stratos.deployment.internal.*, - org.wso2.carbon.stratos.deployment.* - - - !javax.xml.namespace, - org.apache.axis2.*; version="${axis2.osgi.version.range}", - javax.xml.namespace; version=0.0.0, - javax.servlet;version="${imp.pkg.version.javax.servlet}", - javax.servlet.http;version="${imp.pkg.version.javax.servlet}", - *;resolution:=optional - - - - - - - - - - org.wso2.carbon - org.wso2.carbon.stratos.common - 2.1.0 - - - org.apache.axis2.wso2 - axis2 - - - log4j - log4j - - - org.wso2.carbon - org.wso2.carbon.registry.core - ${wso2carbon.version} - - - commons-logging - commons-logging - - - diff --git a/components/stratos/org.wso2.carbon.stratos.deployment/2.1.0/src/main/java/org/wso2/carbon/stratos/deployment/CloudDeploymentInterceptor.java b/components/stratos/org.wso2.carbon.stratos.deployment/2.1.0/src/main/java/org/wso2/carbon/stratos/deployment/CloudDeploymentInterceptor.java deleted file mode 100644 index fb059a1..0000000 --- a/components/stratos/org.wso2.carbon.stratos.deployment/2.1.0/src/main/java/org/wso2/carbon/stratos/deployment/CloudDeploymentInterceptor.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright 2004,2005 The Apache Software Foundation. - * - * 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.stratos.deployment; - -import org.apache.axiom.om.OMElement; -import org.apache.axis2.AxisFault; -import org.apache.axis2.description.AxisModule; -import org.apache.axis2.description.AxisOperation; -import org.apache.axis2.description.AxisService; -import org.apache.axis2.description.AxisServiceGroup; -import org.apache.axis2.description.Parameter; -import org.apache.axis2.engine.AxisConfiguration; -import org.apache.axis2.engine.AxisEvent; -import org.apache.axis2.engine.AxisObserver; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.xml.namespace.QName; -import java.util.ArrayList; - -/** - * Deployment interceptor for handling modification of ServiceAdmin so that the service list is not - * displayed when the user has not logged in. - */ -public class CloudDeploymentInterceptor implements AxisObserver { - private static final Log log = LogFactory.getLog(CloudDeploymentInterceptor.class); - - public void init(AxisConfiguration axisConfiguration) { - } - - public void serviceUpdate(AxisEvent axisEvent, AxisService axisService) { - try { - if (axisEvent.getEventType() == AxisEvent.SERVICE_DEPLOY && - axisService.getName().equals("ServiceAdmin")){ - AxisOperation operation = axisService.getOperation(new QName("listServiceGroups")); - ArrayList params = operation.getParameters(); - for(Parameter param: params) { - operation.removeParameter(param); - } - Parameter authAction = new Parameter("AuthorizationAction", - "/permission/admin/manage/monitor/service"); - operation.addParameter(authAction); - } - } catch (AxisFault e) { - log.error("Cannot add AuthorizationAction parameter to ServiceAdmin", e); - } - } - - public void serviceGroupUpdate(AxisEvent axisEvent, AxisServiceGroup axisServiceGroup) { - } - - public void moduleUpdate(AxisEvent axisEvent, AxisModule axisModule) { - } - - public void addParameter(Parameter parameter) throws AxisFault { - } - - public void removeParameter(Parameter parameter) throws AxisFault { - } - - public void deserializeParameters(OMElement omElement) throws AxisFault { - } - - public Parameter getParameter(String s) { - return null; - } - - public ArrayList getParameters() { - return null; - } - - public boolean isParameterLocked(String s) { - return false; - } -} diff --git a/components/stratos/org.wso2.carbon.stratos.deployment/2.1.0/src/main/java/org/wso2/carbon/stratos/deployment/SuperTenantRolePlayer.java b/components/stratos/org.wso2.carbon.stratos.deployment/2.1.0/src/main/java/org/wso2/carbon/stratos/deployment/SuperTenantRolePlayer.java deleted file mode 100644 index 58d9abf..0000000 --- a/components/stratos/org.wso2.carbon.stratos.deployment/2.1.0/src/main/java/org/wso2/carbon/stratos/deployment/SuperTenantRolePlayer.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2004,2005 The Apache Software Foundation. - * - * 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.stratos.deployment; - -import org.apache.axiom.soap.RolePlayer; -import org.wso2.carbon.base.MultitenantConstants; -import org.wso2.carbon.context.CarbonContext; - -import java.util.List; -import java.util.ArrayList; - -public class SuperTenantRolePlayer implements RolePlayer{ - - private List roles; - - public SuperTenantRolePlayer() { - this.roles = new ArrayList(); - this.roles.add("supertenant"); - } - - public List getRoles() { - return this.roles; - } - - public boolean isUltimateDestination() { - return (CarbonContext.getCurrentContext().getTenantId() == - MultitenantConstants.SUPER_TENANT_ID); - } -} diff --git a/components/stratos/org.wso2.carbon.stratos.deployment/2.1.0/src/main/java/org/wso2/carbon/stratos/deployment/internal/CloudDeploymentServiceComponent.java b/components/stratos/org.wso2.carbon.stratos.deployment/2.1.0/src/main/java/org/wso2/carbon/stratos/deployment/internal/CloudDeploymentServiceComponent.java deleted file mode 100644 index 399dd3a..0000000 --- a/components/stratos/org.wso2.carbon.stratos.deployment/2.1.0/src/main/java/org/wso2/carbon/stratos/deployment/internal/CloudDeploymentServiceComponent.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright 2004,2005 The Apache Software Foundation. - * - * 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.stratos.deployment.internal; - -import org.apache.axis2.context.ConfigurationContext; -import org.apache.axis2.description.Parameter; -import org.apache.axis2.engine.AxisConfiguration; -import org.apache.axis2.engine.AxisObserver; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.osgi.service.component.ComponentContext; -import org.wso2.carbon.CarbonConstants; -import org.wso2.carbon.stratos.deployment.CloudDeploymentInterceptor; -import org.wso2.carbon.stratos.deployment.SuperTenantRolePlayer; -import org.wso2.carbon.utils.ConfigurationContextService; - -import java.util.Dictionary; -import java.util.Hashtable; - -/** - * @scr.component name="org.wso2.carbon.stratos.deployment.internal.CloudDeploymentServiceComponent" immediate="true" - * @scr.reference name="config.context.service" - * interface="org.wso2.carbon.utils.ConfigurationContextService" cardinality="1..1" - * policy="dynamic" bind="setConfigurationContextService" - * unbind="unsetConfigurationContextService" - */ -public class CloudDeploymentServiceComponent { - private static final Log log = LogFactory.getLog(CloudDeploymentServiceComponent.class); - - protected void activate(ComponentContext ctxt) { - //TODO: Modify the permission in the UI - try { - ConfigurationContext configContext = DataHolder.getInstance().getServerConfigContext(); - Dictionary props = new Hashtable(); - props.put(CarbonConstants.AXIS2_CONFIG_SERVICE, AxisObserver.class.getName()); - ctxt.getBundleContext().registerService(AxisObserver.class.getName(), new CloudDeploymentInterceptor(),props); - - // register the role player for this configuration - AxisConfiguration axisConfiguration = configContext.getAxisConfiguration(); - axisConfiguration.addParameter(new Parameter("rolePlayer", new SuperTenantRolePlayer())); - } catch (Exception e) { - log.error("CloudDeploymentServiceComponent activation failed", e); - } - } - - protected void deactivate(ComponentContext ctxt) { - - } - - protected void setConfigurationContextService(ConfigurationContextService contextService) { - DataHolder.getInstance().setServerConfigContext(contextService.getServerConfigContext()); - } - - protected void unsetConfigurationContextService(ConfigurationContextService contextService) { - DataHolder.getInstance().setServerConfigContext(null); - } -} diff --git a/components/stratos/org.wso2.carbon.stratos.deployment/2.1.0/src/main/java/org/wso2/carbon/stratos/deployment/internal/DataHolder.java b/components/stratos/org.wso2.carbon.stratos.deployment/2.1.0/src/main/java/org/wso2/carbon/stratos/deployment/internal/DataHolder.java deleted file mode 100644 index dc4e154..0000000 --- a/components/stratos/org.wso2.carbon.stratos.deployment/2.1.0/src/main/java/org/wso2/carbon/stratos/deployment/internal/DataHolder.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2004,2005 The Apache Software Foundation. - * - * 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.stratos.deployment.internal; - -import org.apache.axis2.context.ConfigurationContext; - -/** - * DataHolder for Service deployment component - */ -public class DataHolder { - private static DataHolder instance = new DataHolder(); - - private ConfigurationContext serverConfigContext; - - public static DataHolder getInstance() { - return instance; - } - - private DataHolder() { - } - - public ConfigurationContext getServerConfigContext() { - return serverConfigContext; - } - - public void setServerConfigContext(ConfigurationContext serverConfigContext) { - this.serverConfigContext = serverConfigContext; - } -}