You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/08/23 21:15:20 UTC
[06/11] stratos git commit: Cleaning up pom files,
removing unused features from p2 profile,
removing unused components in Stratos
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/redirect_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/redirect_ajaxprocessor.jsp b/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/redirect_ajaxprocessor.jsp
deleted file mode 100644
index ac204c9..0000000
--- a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/redirect_ajaxprocessor.jsp
+++ /dev/null
@@ -1,177 +0,0 @@
-<%--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF 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.
- --%>
-<%@page import="org.opensaml.saml2.core.AuthnRequest" %>
-<%@page import="org.opensaml.saml2.core.LogoutRequest" %>
-<%@ page
- import="org.wso2.carbon.identity.authenticator.saml2.sso.common.SAML2SSOAuthenticatorConstants" %>
-<%@ page import="org.wso2.carbon.identity.authenticator.saml2.sso.common.SSOSessionManager" %>
-<%@ page
- import="org.wso2.carbon.identity.authenticator.saml2.sso.common.builders.AuthenticationRequestBuilder" %>
-<%@ page
- import="org.wso2.carbon.identity.authenticator.saml2.sso.common.builders.LogoutRequestBuilder" %>
-<%@ page
- import="org.wso2.carbon.identity.authenticator.saml2.sso.common.Util" %>
-<%@ page import="org.wso2.carbon.registry.core.utils.UUIDGenerator" %>
-<%@ page import="org.wso2.carbon.utils.multitenancy.MultitenantConstants" %>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<html>
-<head>
- <title>WSO2 Stratos Identity</title>
- <style type="text/css" media="screen"><!--
- body {
- color: #111111;
- font: 13px/27px Arial,sans-serif;
- font-size-adjust: none;
- font-style: normal;
- font-variant: normal;
- }
-
-
-
- .redirectForm {
- display: inline;
- }
- .dots{
- border:solid 1x #ccc;
- width:10px;
- height:10px;
- float:left;
- margin:5px;
- -moz-border-radius: 4px;
- border-radius: 4px;
- -moz-box-shadow: 3px 3px 3px #888;
- -webkit-box-shadow: 3px 3px 3px #888;
- box-shadow: 3px 3px 3px #888;
- }
- .dots-pane{
- width:150px;
- margin:0px 10px;
- }
- .dot0{
- background-color:#111;
- }
- .dot1{
- background-color:#444;
- }
- .dot2{
- background-color:#777;
- }
- .dot3{
- background-color:#ddd;
- }
- .dot4{
- background-color:#eee;
- }
- .dot5{
- background-color:#fff;
- }
- .loading-text{
- padding:10px;
- font-weight:bold;
- font-size:16px;
- }
- --></style>
-</head>
-<body>
-<%
- String encodedReq = null;
- String relayState = "";
- String domain = null;
- if (request.getParameter(SAML2SSOAuthenticatorConstants.LOG_OUT_REQ) != null) {
- LogoutRequestBuilder logoutRequestBuilder = new LogoutRequestBuilder();
- LogoutRequest logoutReq = logoutRequestBuilder.buildLogoutRequest((String) request.getAttribute(
- SAML2SSOAuthenticatorConstants.LOGGED_IN_USER), SAML2SSOAuthenticatorConstants.LOGOUT_USER);
- encodedReq = Util.encode(Util.marshall(logoutReq));
- relayState = UUIDGenerator.generateUUID();
- } else {
- AuthenticationRequestBuilder authnReqGenerator = new AuthenticationRequestBuilder();
- AuthnRequest authRequest = authnReqGenerator.buildAuthenticationRequest(null);
- encodedReq = Util.encode(Util.marshall(authRequest));
- relayState = UUIDGenerator.generateUUID();
- domain = (String) request.getAttribute(MultitenantConstants.TENANT_DOMAIN);
- }
- // add the relay state to Session Manager
- SSOSessionManager.addAuthnRequest(relayState);
-
-%>
-<div class="loading-text">Loading WSO2 StratosLive...</div>
-<div class="dots-pane" id="dotsContainer">
- <div class="dots"></div>
- <div class="dots"></div>
- <div class="dots"></div>
- <div class="dots"></div>
- <div class="dots"></div>
- <div class="dots"></div>
-</div>
-
-<script>
- var t;
- var timer_is_on = 0;
- var j=0;
- var dotsContainer = document.getElementById('dotsContainer');
- var dots = dotsContainer.childNodes;
- var divdots = new Array();
- for(var i=0;i<dots.length;i++){
- if(dots[i].nodeName == "DIV" ){
- divdots.push(dots[i]);
- }
- }
- function animateStuff(){
- for(var i=0;i<divdots.length;i++){
- var classNumber;
- if((i+j)<divdots.length){
- classNumber = i + j;
- }else{
- classNumber = i + j - divdots.length;
- }
- divdots[i].className = "dots dot"+classNumber;
-
- }
- if(j<=5){
- j++;
- }else{
- j=0;
- }
- t = setTimeout(animateStuff,200);
- }
-
- if(!timer_is_on){
- animateStuff();
- }
-</script>
-
-
-
-<form method="post" action="<%=Util.getIdentityProviderSSOServiceURL()%>" class="redirectForm">
- <input type="hidden"
- name="<%=SAML2SSOAuthenticatorConstants.HTTP_POST_PARAM_SAML2_AUTH_REQ%>"
- value="<%= encodedReq %>"/>
- <input type="hidden" name="RelayState" value="<%= relayState %>"/>
- <input type="hidden" name="<%= MultitenantConstants.TENANT_DOMAIN %>"
- value="<%= domain %>"/>
- <input type="hidden" name="<%= MultitenantConstants.SSO_AUTH_SESSION_ID %>" value="<%= session.getId() %>"/>
-
-</form>
-
-<script type="text/javascript">
- document.forms[0].submit();
-</script>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.tenant.activity/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity/pom.xml b/components/org.apache.stratos.tenant.activity/pom.xml
deleted file mode 100644
index 6562af9..0000000
--- a/components/org.apache.stratos.tenant.activity/pom.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<!--
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements. See the NOTICE file
- # distributed with this work for additional information
- # regarding copyright ownership. The ASF 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.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.apache.stratos</groupId>
- <artifactId>stratos-components-parent</artifactId>
- <version>4.1.2-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.stratos.tenant.activity</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Stratos - TenantActivity</name>
-
- <build>
-
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/generated-code/src</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-Name>${project.artifactId}</Bundle-Name>
- <Private-Package>
- org.apache.stratos.tenant.activity.internal.*,
- org.apache.stratos.tenant.activity.services.*,
- </Private-Package>
- <Export-Package>
- org.apache.stratos.tenant.activity.api.*,
- org.apache.stratos.tenant.activity.util.*,
- org.apache.stratos.tenant.activity.beans.*,
- org.apache.stratos.tenant.activity.commands.*,
- </Export-Package>
- <Import-Package>
- !org.apache.stratos.tenanat.activity.stub.*,
- org.apache.stratos.common.*,
- org.wso2.carbon.cluster.mgt.core.*,
- !javax.xml.namespace,
- javax.xml.namespace; version=0.0.0,
- javax.servlet;version="${imp.pkg.version.javax.servlet}",
- javax.servlet.http;version="${imp.pkg.version.javax.servlet}",
- org.apache.axiom.*; version="${axiom.wso2.version}",
- *;resolution:=optional
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.axis2.wso2</groupId>
- <artifactId>axis2</artifactId>
- <version>${axis2.wso2.version}</version>
- </dependency>
- <!--dependency>
- <groupId>org.apache.axis2.wso2</groupId>
- <artifactId>axis2-kernel</artifactId>
- <version>${orbit.version.axis2}</version>
- </dependency-->
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.core</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.user.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.user.mgt</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.cluster.mgt.core</artifactId>
- <version>4.2.0</version>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/beans/PaginatedTenantDataBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/beans/PaginatedTenantDataBean.java b/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/beans/PaginatedTenantDataBean.java
deleted file mode 100644
index c7ea51b..0000000
--- a/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/beans/PaginatedTenantDataBean.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF 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.tenant.activity.beans;
-
-import org.wso2.carbon.utils.Pageable;
-
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Bean for paginated tenant information
- */
-public class PaginatedTenantDataBean implements Pageable, Serializable {
- private TenantDataBean[] tenantInfoBeans;
- private int numberOfPages;
-
- public TenantDataBean[] getTenantInfoBeans() {
- return tenantInfoBeans;
- }
-
- public void setTenantInfoBeans(TenantDataBean[] tenantInfoBeans) {
- if(tenantInfoBeans == null) {
- this.tenantInfoBeans = new TenantDataBean[0];
- } else {
- this.tenantInfoBeans = Arrays.copyOf(tenantInfoBeans, tenantInfoBeans.length);
- }
- }
-
- public int getNumberOfPages() {
- return numberOfPages;
- }
-
- public void setNumberOfPages(int numberOfPages) {
- this.numberOfPages = numberOfPages;
- }
-
- public <T> void set(List<T> items) {
- this.tenantInfoBeans = items.toArray(new TenantDataBean[items.size()]);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/beans/TenantDataBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/beans/TenantDataBean.java b/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/beans/TenantDataBean.java
deleted file mode 100644
index 4220044..0000000
--- a/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/beans/TenantDataBean.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.apache.stratos.tenant.activity.beans;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF 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 java.io.Serializable;
-
-/**
- * Represents a Tenant
- */
-@SuppressWarnings("unused")
-public class TenantDataBean implements Serializable {
-
- /**
- * The tenant Id
- */
- private int id;
-
- /**
- * The domain name of the tenant
- */
- private String domain;
-
- /**
- * The admin user name of the tenant
- */
- private String adminName;
-
- /**
- * The email address of the tenant
- */
- private String email;
-
- /**
- * Indicates whether this tenant is active or not
- */
- private boolean active;
-
-
- public String getEmail() {
- return email;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-
- public int getId() {
- return id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getAdminName() {
- return adminName;
- }
-
- public void setAdminName(String adminName) {
- this.adminName = adminName;
- }
-
- public String getDomain() {
- return domain;
- }
-
- public void setDomain(String domain) {
- this.domain = domain;
- }
-
- public boolean isActive() {
- return active;
- }
-
- public void setActive(boolean active) {
- this.active = active;
- }
-
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/commands/GetActiveTenantsInMemberRequest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/commands/GetActiveTenantsInMemberRequest.java b/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/commands/GetActiveTenantsInMemberRequest.java
deleted file mode 100644
index 394dd9a..0000000
--- a/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/commands/GetActiveTenantsInMemberRequest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF 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.tenant.activity.commands;
-
-import org.apache.axis2.clustering.ClusteringCommand;
-import org.apache.axis2.clustering.ClusteringMessage;
-import org.apache.axis2.clustering.ClusteringFault;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.core.multitenancy.utils.TenantAxisUtils;
-import org.apache.stratos.tenant.activity.beans.TenantDataBean;
-import org.wso2.carbon.user.api.Tenant;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * This Cluster message is used to get active tenants in each node then
- * send response as other cluster command which holds active tenants
- */
-public class GetActiveTenantsInMemberRequest extends ClusteringMessage {
- private static final Log log = LogFactory.getLog(GetActiveTenantsInMemberRequest.class);
- private List<TenantDataBean> tenants = new ArrayList<TenantDataBean>();
-
- public void execute(ConfigurationContext configurationContext) throws ClusteringFault {
- try {
- for (Tenant tenant : TenantAxisUtils.getActiveTenants(configurationContext)) {
- TenantDataBean tb = new TenantDataBean();
- tb.setDomain(tenant.getDomain());
- tenants.add(tb);
- }
- } catch (Exception e) {
- String msg = "Cannot get Active tenants";
- log.error(msg, e);
- throw new ClusteringFault(msg, e);
- }
- }
-
- public ClusteringCommand getResponse() {
- return new GetActiveTenantsInMemberResponse(tenants);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/commands/GetActiveTenantsInMemberResponse.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/commands/GetActiveTenantsInMemberResponse.java b/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/commands/GetActiveTenantsInMemberResponse.java
deleted file mode 100644
index ec4dd49..0000000
--- a/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/commands/GetActiveTenantsInMemberResponse.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF 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.tenant.activity.commands;
-
-import org.apache.axis2.clustering.ClusteringCommand;
-import org.apache.axis2.clustering.ClusteringFault;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.stratos.tenant.activity.beans.TenantDataBean;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * This clustering command is used send active tenants list if we send clustering message
- * GetActiveTenantsInMemberRequest then as a response we can get GetActiveTenantsInMemberResponse
- * which holds active tenants list
- */
-public class GetActiveTenantsInMemberResponse extends ClusteringCommand {
-
- private List<TenantDataBean> tenants = new ArrayList<TenantDataBean>();
-
- public GetActiveTenantsInMemberResponse(List<TenantDataBean> tenantList) {
- tenants = tenantList;
- }
-
- public void addTenant(TenantDataBean tenant) {
- tenants.add(tenant);
- }
-
- public List<TenantDataBean> getTenants() {
- return Collections.unmodifiableList(tenants);
- }
-
- @Override
- public void execute(ConfigurationContext configurationContext) throws ClusteringFault {
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/internal/TenantActivityServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/internal/TenantActivityServiceComponent.java b/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/internal/TenantActivityServiceComponent.java
deleted file mode 100644
index 9485ef0..0000000
--- a/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/internal/TenantActivityServiceComponent.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF 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.tenant.activity.internal;
-
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.transport.local.LocalTransportReceiver;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.tenant.activity.util.Util;
-import org.osgi.service.component.ComponentContext;
-import org.wso2.carbon.registry.core.service.RegistryService;
-import org.wso2.carbon.user.core.service.RealmService;
-import org.wso2.carbon.utils.ConfigurationContextService;
-
-/**
- * @scr.component name="org.apache.stratos.tenant.activity" immediate="true"
- * @scr.reference name="registry.service"
- * interface="org.wso2.carbon.registry.core.service.RegistryService" cardinality="1..1"
- * policy="dynamic" bind="setRegistryService" unbind="unsetRegistryService"
- * @scr.reference name="user.realmservice.default"
- * interface="org.wso2.carbon.user.core.service.RealmService" cardinality="1..1"
- * policy="dynamic" bind="setRealmService" unbind="unsetRealmService"
- * @scr.reference name="config.context.service"
- * interface="org.wso2.carbon.utils.ConfigurationContextService" cardinality="1..1"
- * policy="dynamic" bind="setConfigurationContextService" unbind="unsetConfigurationContextService"
- */
-public class TenantActivityServiceComponent {
- private static Log log = LogFactory.getLog(TenantActivityServiceComponent.class);
-
-
- protected void activate(ComponentContext context) {
- try {
- Util.registerRetrieverServices(context.getBundleContext());
- if(log.isDebugEnabled()){
- log.debug("******* Tenant Activity bundle is activated ******* ");
- }
- } catch (Exception e) {
- log.error("******* Error in activating Tenant Activity bundle ******* ", e);
- }
- }
-
- protected void deactivate(ComponentContext context) {
- if (log.isDebugEnabled()) {
- log.debug("******* Tenant Activity is deactivated ******* ");
- }
- }
-
- protected void setRegistryService(RegistryService registryService) {
- Util.setRegistryService(registryService);
- }
-
- protected void unsetRegistryService(RegistryService registryService) {
- Util.setRegistryService(null);
- }
-
- protected void setRealmService(RealmService realmService) {
- Util.setRealmService(realmService);
- }
-
- protected void unsetRealmService(RealmService realmService) {
- Util.setRealmService(null);
- }
-
- protected void setConfigurationContextService(ConfigurationContextService ccService) {
- ConfigurationContext serverCtx = ccService.getServerConfigContext();
- AxisConfiguration serverConfig = serverCtx.getAxisConfiguration();
- LocalTransportReceiver.CONFIG_CONTEXT = new ConfigurationContext(serverConfig);
- LocalTransportReceiver.CONFIG_CONTEXT.setServicePath("services");
- LocalTransportReceiver.CONFIG_CONTEXT.setContextRoot("local:/");
-
- Util.setConfigurationContextService(ccService);
- }
-
- protected void unsetConfigurationContextService(ConfigurationContextService ccService) {
- Util.setConfigurationContextService(null);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/services/TenantActivityService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/services/TenantActivityService.java b/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/services/TenantActivityService.java
deleted file mode 100644
index 2df63de..0000000
--- a/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/services/TenantActivityService.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF 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.tenant.activity.services;
-
-import org.apache.stratos.tenant.activity.util.Util;
-import org.wso2.carbon.core.multitenancy.utils.TenantAxisUtils;
-import org.wso2.carbon.core.AbstractAdmin;
-import org.apache.stratos.tenant.activity.beans.PaginatedTenantDataBean;
-import org.apache.stratos.tenant.activity.beans.TenantDataBean;
-import org.apache.stratos.tenant.activity.util.TenantActivityUtil;
-import org.wso2.carbon.user.api.Tenant;
-import org.wso2.carbon.utils.DataPaginator;
-
-import java.util.*;
-
-/**
- * This service use to get active tenants related data.If its single node
- */
-public class TenantActivityService extends AbstractAdmin {
- List<String> list = new ArrayList<String>();
-
- public int getActiveTenantCount() throws Exception {
- return getAllActiveTenantList().size();
- }
-
- /**
- *
- * @return Active tenants list on service cluster
- * @throws Exception when error in retrieving active tenants list
- */
- private List<TenantDataBean> getAllActiveTenantList() throws Exception {
- // ClusterMgtUtil cm = new ClusterMgtUtil();
- List<TenantDataBean> list = new ArrayList<TenantDataBean>();
- //This will add current node active tenants list to tenant list
- for (Tenant tenant : TenantAxisUtils.getActiveTenants(Util.getConfigurationContextService().getServerConfigContext())) {
- TenantDataBean tb = new TenantDataBean();
- tb.setDomain(tenant.getDomain());
- list.add(tb);
- }
- //if there are multiple nodes in clusters get active tenants from there as well
- for (TenantDataBean tenantDataBean : TenantActivityUtil.getActiveTenantsInCluster()) {
- if (TenantActivityUtil.indexOfTenantInList(list, tenantDataBean) < 0) {
- list.add(tenantDataBean);
- }
-
- }
- return list;
- }
-
- public PaginatedTenantDataBean retrievePaginatedActiveTenants(int pageNumber) throws Exception {
- List<TenantDataBean> tenantList = getAllActiveTenantList();
- // Pagination
- PaginatedTenantDataBean paginatedTenantInfoBean = new PaginatedTenantDataBean();
- DataPaginator.doPaging(pageNumber, tenantList, paginatedTenantInfoBean);
- return paginatedTenantInfoBean;
- }
-
- public boolean isActiveTenantOnService(String domainName) throws Exception {
- boolean state = false;
- for (TenantDataBean tenant : getAllActiveTenantList()) {
- if (tenant.getDomain().equalsIgnoreCase(domainName)) {
- return true;
- }
- }
- return state;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/util/TenantActivityUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/util/TenantActivityUtil.java b/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/util/TenantActivityUtil.java
deleted file mode 100644
index ec8b389..0000000
--- a/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/util/TenantActivityUtil.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF 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.tenant.activity.util;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.clustering.ClusteringAgent;
-import org.apache.axis2.clustering.ClusteringCommand;
-import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.stratos.tenant.activity.commands.GetActiveTenantsInMemberRequest;
-import org.apache.stratos.tenant.activity.commands.GetActiveTenantsInMemberResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.tenant.activity.beans.TenantDataBean;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-public class TenantActivityUtil {
- private static final Log log = LogFactory.getLog(TenantActivityUtil.class);
-
- public static List<TenantDataBean> getActiveTenantsInCluster() throws AxisFault {
- List<TenantDataBean> tenants = new ArrayList<TenantDataBean>();
- try {
- ClusteringAgent agent = getClusteringAgent();
- List<ClusteringCommand> list = agent.sendMessage(new GetActiveTenantsInMemberRequest(), true);
- if (log.isDebugEnabled()) {
- log.debug("sent cluster command to to get Active tenants on cluster");
- }
- for (ClusteringCommand command : list) {
- if (command instanceof GetActiveTenantsInMemberResponse) {
- GetActiveTenantsInMemberResponse response = (GetActiveTenantsInMemberResponse) command;
- for (TenantDataBean tenant : response.getTenants()) {
- tenants.add(tenant);
- }
- }
- }
-
- } catch (AxisFault f) {
- String msg = "Error in getting active tenant by cluster commands";
- log.error(msg, f);
- throw new AxisFault(msg);
- }
- return tenants;
- }
-
-
- private static ClusteringAgent getClusteringAgent() throws AxisFault {
-
- AxisConfiguration axisConfig =
- Util.getConfigurationContextService().getServerConfigContext().getAxisConfiguration();
- return axisConfig.getClusteringAgent();
- }
-
- public static int indexOfTenantInList(List<TenantDataBean> list, TenantDataBean tenant) {
- for (int i = 0; i < list.size(); i++) {
- if (tenant.getDomain().equalsIgnoreCase(list.get(i).getDomain())) {
- return i;
- }
- }
- return -1;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/util/Util.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/util/Util.java b/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/util/Util.java
deleted file mode 100644
index 13a399e..0000000
--- a/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/util/Util.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF 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.tenant.activity.util;
-
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.osgi.framework.BundleContext;
-import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import org.wso2.carbon.registry.core.service.RegistryService;
-import org.wso2.carbon.registry.core.session.UserRegistry;
-import org.wso2.carbon.user.core.UserRealm;
-import org.wso2.carbon.user.core.service.RealmService;
-import org.wso2.carbon.utils.ConfigurationContextService;
-
-/**
- * Util methods for usage.
- */
-public class Util {
-
- private static final Log log = LogFactory.getLog(Util.class);
-
- private static RegistryService registryService;
- private static RealmService realmService;
- private static ConfigurationContextService configurationContextService;
-
- public static synchronized void setRegistryService(RegistryService service) {
- registryService = service;
- }
-
- public static void setConfigurationContextService(
- ConfigurationContextService configurationContextService) {
- Util.configurationContextService = configurationContextService;
- }
-
- public static ConfigurationContextService getConfigurationContextService() {
- return configurationContextService;
- }
-
- public static synchronized void setRealmService(RealmService service) {
- realmService = service;
- }
-
- public static RealmService getRealmService() {
- return realmService;
- }
-
- public static RegistryService getRegistryService() {
- return registryService;
- }
-
- public static UserRealm getUserRealm(int tenantId) throws RegistryException {
- return registryService.getUserRealm(tenantId);
- }
-
- public static UserRegistry getSuperTenantGovernanceSystemRegistry() throws RegistryException {
- return registryService.getGovernanceSystemRegistry();
- }
-
- public static void registerRetrieverServices(BundleContext bundleContext) throws Exception {
- ConfigurationContextService configCtxSvc = Util.getConfigurationContextService();
-
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.tenant.activity/src/main/resources/META-INF/component.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity/src/main/resources/META-INF/component.xml b/components/org.apache.stratos.tenant.activity/src/main/resources/META-INF/component.xml
deleted file mode 100644
index 29855c4..0000000
--- a/components/org.apache.stratos.tenant.activity/src/main/resources/META-INF/component.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements. See the NOTICE file
- # distributed with this work for additional information
- # regarding copyright ownership. The ASF 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.
- -->
-<component xmlns="http://products.wso2.org/carbon">
- <ManagementPermissions>
- <ManagementPermission>
- <DisplayName>Monitor</DisplayName>
- <ResourceId>/permission/admin/monitor</ResourceId>
- </ManagementPermission>
- <ManagementPermission>
- <DisplayName>Tenant-Activity</DisplayName>
- <ResourceId>/permission/admin/monitor/tenantActivity</ResourceId>
- </ManagementPermission>
- <ManagementPermission>
- <DisplayName>Protected</DisplayName>
- <ResourceId>/permission/protected</ResourceId>
- </ManagementPermission>
- <ManagementPermission>
- <DisplayName>Monitor</DisplayName>
- <ResourceId>/permission/protected/monitor</ResourceId>
- </ManagementPermission>
- </ManagementPermissions>
-</component>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.tenant.activity/src/main/resources/META-INF/services.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity/src/main/resources/META-INF/services.xml b/components/org.apache.stratos.tenant.activity/src/main/resources/META-INF/services.xml
deleted file mode 100644
index a33bdc3..0000000
--- a/components/org.apache.stratos.tenant.activity/src/main/resources/META-INF/services.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements. See the NOTICE file
- # distributed with this work for additional information
- # regarding copyright ownership. The ASF 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.
- -->
-<serviceGroup>
-
- <service name="TenantActivityService" scope="transportsession">
- <transports>
- <transport>https</transport>
- </transports>
- <parameter name="ServiceClass" locked="false">
- org.apache.stratos.tenant.activity.services.TenantActivityService
- </parameter>
- <operation name="getActiveTenantCount">
- <parameter name="superTenantService" locked="true">true</parameter>
- <parameter name="AuthorizationAction" locked="true">/permission/protected/monitor/tenantActivity</parameter>
- </operation>
- <operation name="retrievePaginatedActiveTenants">
- <parameter name="superTenantService" locked="true">true</parameter>
- <parameter name="AuthorizationAction" locked="true">/permission/protected/monitor/tenantActivity</parameter>
- </operation>
- <operation name="isActiveTenantOnService">
- <parameter name="superTenantService" locked="true">true</parameter>
- <parameter name="AuthorizationAction" locked="true">/permission/protected/monitor/tenantActivity</parameter>
- </operation>
- </service>
- <parameter name="adminService" locked="true">true</parameter>
- <parameter name="hiddenService" locked="true">true</parameter>
-</serviceGroup>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index a2c3eac..7369775 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -17,63 +17,38 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-parent</artifactId>
<version>4.1.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>stratos-components-parent</artifactId>
<packaging>pom</packaging>
<name>Apache Stratos - Components</name>
- <url>http://apache.org</url>
+ <description>Apache Stratos - Aggregator pom for Components</description>
<modules>
- <!-- Common -->
<module>org.apache.stratos.common</module>
- <!-- Messaging -->
<module>org.apache.stratos.messaging</module>
- <!-- Autoscaler -->
<module>org.apache.stratos.autoscaler</module>
- <!-- CC -->
<module>org.apache.stratos.cloud.controller</module>
<module>org.apache.stratos.kubernetes.client</module>
- <!-- SM -->
<module>org.apache.stratos.manager</module>
- <module>org.apache.stratos.deployment</module>
- <!-- CLI -->
<module>org.apache.stratos.cli</module>
- <!-- Python Cartridge Agent -->
<module>org.apache.stratos.python.cartridge.agent</module>
- <!-- Cartridge Agent -->
<module>org.apache.stratos.cartridge.agent</module>
- <!-- Load Balancer -->
<module>org.apache.stratos.load.balancer.common</module>
<module>org.apache.stratos.load.balancer</module>
<module>org.apache.stratos.load.balancer.extension.api</module>
- <!-- Tenant Activity -->
- <module>org.apache.stratos.tenant.activity</module>
- <!-- Account Mgt -->
- <module>org.apache.stratos.email.sender</module>
- <!-- Domain Validation -->
- <!-- Redirector -->
- <module>org.apache.stratos.sso.redirector.ui</module>
- <!--Logging mgt-->
- <module>org.apache.stratos.logging.view.ui</module>
- <!-- RESTful admin services -->
<module>org.apache.stratos.rest.endpoint</module>
- <!-- Stratos manager styles bundle -->
<module>org.apache.stratos.manager.styles</module>
<module>org.apache.stratos.custom.handlers</module>
<module>org.apache.stratos.metadata.service</module>
<module>org.apache.stratos.metadata.client</module>
- <!-- Mock IaaS -->
<module>org.apache.stratos.mock.iaas</module>
<module>org.apache.stratos.mock.iaas.api</module>
<module>org.apache.stratos.mock.iaas.client</module>
@@ -84,7 +59,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -105,8 +79,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <!-- Minimal supported version is 2.4 -->
- <version>2.13</version>
<configuration>
<properties>
<property>
@@ -118,172 +90,6 @@
</plugin>
</plugins>
</build>
-
- <dependencies>
- <dependency>
- <groupId>org.codehaus.sonar-plugins.java</groupId>
- <artifactId>sonar-jacoco-listeners</artifactId>
- <version>1.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
</profile>
</profiles>
-
- <dependencyManagement>
- <dependencies>
- <!-- OSGi dependencies -->
- <dependency>
- <groupId>org.eclipse.osgi</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>${version.equinox.osgi}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.osgi</groupId>
- <artifactId>org.eclipse.osgi.services</artifactId>
- <version>${version.equinox.osgi.services}</version>
- </dependency>
-
- <!-- Carbon Core dependencies -->
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.logging</artifactId>
- <version>${carbon.platform.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.core</artifactId>
- <version>${carbon.platform.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.core.services</artifactId>
- <version>${carbon.platform.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.application.deployer</artifactId>
- <version>${carbon.platform.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.feature.mgt.core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.feature.mgt.services</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.server</artifactId>
- <version>${carbon.platform.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.server.admin.common</artifactId>
- <version>${carbon.platform.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.server.admin.ui</artifactId>
- <version>${carbon.platform.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.base</artifactId>
- <version>${carbon.platform.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.core</artifactId>
- <version>${carbon.platform.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.user.core</artifactId>
- <version>${carbon.platform.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.user.mgt</artifactId>
- <version>${carbon.platform.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.utils</artifactId>
- <version>${carbon.platform.version}</version>
- </dependency>
-
- <!-- Axis2 -->
- <dependency>
- <groupId>org.apache.axis2.wso2</groupId>
- <artifactId>axis2</artifactId>
- <version>${axis2.wso2.version}</version>
- </dependency>
-
-
- <!-- Registry dependencies -->
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.ws.client</artifactId>
- <version>${carbon.platform.version}</version>
- </dependency>
-
- <!-- Other -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${version.log4j}</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${version.commons.logging}</version>
- </dependency>
-
- <!-- Service Stubs -->
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.autoscaler.service.jvm.agentmgt.stub</artifactId>
- <version>${carbon.platform.version}</version>
- </dependency>
- <!-- Test Scope -->
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <wso2carbon.version>4.2.0</wso2carbon.version>
- <junit.version>4.11</junit.version>
- <synapse.core.version>2.1.1-wso2v4</synapse.core.version>
- <google.guava.wso2.version>12.0.0.wso2v1</google.guava.wso2.version>
- <carbon.platform.version>4.2.0</carbon.platform.version>
- <version.equinox.osgi.services>3.3.100.v20120522-1822</version.equinox.osgi.services>
- <version.equinox.osgi>3.8.1.v20120830-144521</version.equinox.osgi>
- <axiom.osgi.version.range>[1.2.11.wso2v4, 1.3.0)</axiom.osgi.version.range>
- <version.tomcat>7.0.34</version.tomcat>
- <axis2.wso2.version>1.6.1.wso2v10</axis2.wso2.version>
- <axis2.kernel.version>1.6.1-wso2v10</axis2.kernel.version>
- <version.log4j>1.2.17</version.log4j>
- <version.commons.logging>1.1.1</version.commons.logging>
- <orbit.version.geronimo-jms_1.1_spec>1.1.0.wso2v1</orbit.version.geronimo-jms_1.1_spec>
- <google.guice.wso2.version>3.0.wso2v1</google.guice.wso2.version>
- <commons-httpclient.version>3.0.1</commons-httpclient.version>
- <json.wso2.version>2.0.0.wso2v1</json.wso2.version>
- <axiom.wso2.version>1.2.11.wso2v4</axiom.wso2.version>
- <orbit.version.axis2>1.6.1.wso2v5</orbit.version.axis2>
- <orbit.version.axiom>1.2.11.wso2v3</orbit.version.axiom>
- <neethi.wso2.version>2.0.4.wso2v4</neethi.wso2.version>
- <imp.pkg.version.javax.servlet>[2.6.0, 3.0.0)</imp.pkg.version.javax.servlet>
- <rampart.wso2.version>1.6.1.wso2v9</rampart.wso2.version>
- </properties>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/fabric8/kubernetes-api/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/fabric8/kubernetes-api/pom.xml b/dependencies/fabric8/kubernetes-api/pom.xml
index 4d2194a..b12c3d3 100644
--- a/dependencies/fabric8/kubernetes-api/pom.xml
+++ b/dependencies/fabric8/kubernetes-api/pom.xml
@@ -26,6 +26,7 @@
</parent>
<artifactId>kubernetes-api</artifactId>
+ <version>2.2.16</version>
<packaging>bundle</packaging>
<name>Fabric8 :: Kubernetes API</name>
<description>
@@ -132,19 +133,19 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <inherited>false</inherited>
<extensions>true</extensions>
- <version>2.3.7</version>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Name>${project.artifactId}</Bundle-Name>
<Export-Package>
io.fabric8.kubernetes.api.*;version=${kubernetes.api.version},
io.fabric8.kubernetes.api.model.*;version=${kubernetes.api.version},
- io.fabric8.kubernetes.internal.*,
+ io.fabric8.kubernetes.internal.*
</Export-Package>
<Import-Package>
!javax.xml.bind.annotation.adapters,
- org.osgi.framework,
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -161,7 +162,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
<executions>
<execution>
<goals>
@@ -176,4 +176,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/fabric8/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/fabric8/pom.xml b/dependencies/fabric8/pom.xml
index 7fcbd21..6e01c93 100644
--- a/dependencies/fabric8/pom.xml
+++ b/dependencies/fabric8/pom.xml
@@ -20,13 +20,13 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-dependents</artifactId>
<version>4.1.2-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>stratos-dependencies-fabric8</artifactId>
<packaging>pom</packaging>
<name>Fabric8</name>
@@ -35,18 +35,4 @@
<modules>
<module>kubernetes-api</module>
</modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/guice-assistedinject/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/guice-assistedinject/pom.xml b/dependencies/guice-assistedinject/pom.xml
index 04da48c..ac4c97b 100644
--- a/dependencies/guice-assistedinject/pom.xml
+++ b/dependencies/guice-assistedinject/pom.xml
@@ -19,17 +19,17 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-dependents</artifactId>
<version>4.1.2-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>guice-assistedinject</artifactId>
<packaging>bundle</packaging>
<name>Guice Assistedinject</name>
- <version>${guice.assistedinject.version}</version>
+ <version>3.0</version>
<description>This bundle will expose com.google.inject.assistedinject</description>
<dependencies>
@@ -44,7 +44,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/guice-multibindings/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/guice-multibindings/pom.xml b/dependencies/guice-multibindings/pom.xml
index f0499a8..de1b391 100644
--- a/dependencies/guice-multibindings/pom.xml
+++ b/dependencies/guice-multibindings/pom.xml
@@ -19,17 +19,17 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-dependents</artifactId>
<version>4.1.2-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>guice-multibindings</artifactId>
<packaging>bundle</packaging>
<name>Google Guice - Extensions - MultiBindings</name>
- <version>${guice.multibindings.version}</version>
+ <version>3.0</version>
<description>This bundle will expose com.google.inject.multibindings</description>
<dependencies>
@@ -44,7 +44,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/guice/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/guice/pom.xml b/dependencies/guice/pom.xml
index eed1ee1..341b2e3 100644
--- a/dependencies/guice/pom.xml
+++ b/dependencies/guice/pom.xml
@@ -19,24 +19,23 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-dependents</artifactId>
<version>4.1.2-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>guice</artifactId>
<packaging>bundle</packaging>
<name>Guice</name>
- <version>${guice.version}</version>
+ <version>3.0</version>
<description>This OSGi bundle wraps guice 3.0 jar files.</description>
<dependencies>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
- <version>${guice.version}</version>
</dependency>
</dependencies>
<build>
@@ -44,7 +43,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/jclouds/aws-ec2/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/aws-ec2/pom.xml b/dependencies/jclouds/aws-ec2/pom.xml
index 3742290..83107b6 100644
--- a/dependencies/jclouds/aws-ec2/pom.xml
+++ b/dependencies/jclouds/aws-ec2/pom.xml
@@ -19,13 +19,13 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-project</artifactId>
<version>1.9.1</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.stratos</groupId>
<artifactId>aws-ec2</artifactId>
<name>jclouds Amazon EC2 provider</name>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/jclouds/cloudstack/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/cloudstack/pom.xml b/dependencies/jclouds/cloudstack/pom.xml
index 97b4a95..fcc11ae 100644
--- a/dependencies/jclouds/cloudstack/pom.xml
+++ b/dependencies/jclouds/cloudstack/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>cloudstack</artifactId>
- <version>${jclouds.version}</version>
+ <version>1.9.1</version>
<name>jclouds cloudstack core</name>
<description>jclouds components to access cloudstack</description>
<packaging>bundle</packaging>
@@ -73,7 +73,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<inherited>true</inherited>
<configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/jclouds/ec2/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/ec2/pom.xml b/dependencies/jclouds/ec2/pom.xml
index bf4530b..e14ce62 100644
--- a/dependencies/jclouds/ec2/pom.xml
+++ b/dependencies/jclouds/ec2/pom.xml
@@ -19,15 +19,15 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-dependencies-jclouds</artifactId>
<version>4.1.2-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>ec2</artifactId>
- <version>${jclouds.version}</version>
+ <version>1.9.1</version>
<name>jclouds ec2 api</name>
<description>jclouds components to access an implementation of EC2</description>
<packaging>bundle</packaging>
@@ -73,7 +73,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<inherited>true</inherited>
<configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/jclouds/google-jclouds-labs/google-cloud-storage/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/google-jclouds-labs/google-cloud-storage/pom.xml b/dependencies/jclouds/google-jclouds-labs/google-cloud-storage/pom.xml
index cb5fa2c..cd894bd 100644
--- a/dependencies/jclouds/google-jclouds-labs/google-cloud-storage/pom.xml
+++ b/dependencies/jclouds/google-jclouds-labs/google-cloud-storage/pom.xml
@@ -19,17 +19,17 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>google-jclouds-labs</artifactId>
<version>4.1.2-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>google-cloud-storage</artifactId>
<name>jclouds Google Cloud Storage provider</name>
<description>jclouds components to access Google Cloud Storage</description>
- <version>${jclouds.version}</version>
+ <version>1.9.1</version>
<packaging>bundle</packaging>
<dependencies>
@@ -74,7 +74,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/jclouds/google-jclouds-labs/google-compute-engine/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/google-jclouds-labs/google-compute-engine/pom.xml b/dependencies/jclouds/google-jclouds-labs/google-compute-engine/pom.xml
index 39002d4..8ae870b 100644
--- a/dependencies/jclouds/google-jclouds-labs/google-compute-engine/pom.xml
+++ b/dependencies/jclouds/google-jclouds-labs/google-compute-engine/pom.xml
@@ -19,17 +19,17 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>google-jclouds-labs</artifactId>
<version>4.1.2-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>google-compute-engine</artifactId>
<name>jclouds Google Compute Engine provider</name>
<description>jclouds components to access GoogleCompute</description>
- <version>${jclouds.version}</version>
+ <version>1.9.1</version>
<packaging>bundle</packaging>
<dependencies>
@@ -74,7 +74,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/jclouds/google-jclouds-labs/googlecloud/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/google-jclouds-labs/googlecloud/pom.xml b/dependencies/jclouds/google-jclouds-labs/googlecloud/pom.xml
index 0ca28cd..d8372ce 100644
--- a/dependencies/jclouds/google-jclouds-labs/googlecloud/pom.xml
+++ b/dependencies/jclouds/google-jclouds-labs/googlecloud/pom.xml
@@ -19,17 +19,17 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>google-jclouds-labs</artifactId>
<version>4.1.2-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>googlecloud</artifactId>
<name>jclouds Google Cloud Core</name>
<description>jclouds components common to Google Cloud products</description>
- <version>${jclouds.version}</version>
+ <version>1.9.1</version>
<packaging>bundle</packaging>
<dependencies>
@@ -45,7 +45,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/jclouds/google-jclouds-labs/oauth/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/google-jclouds-labs/oauth/pom.xml b/dependencies/jclouds/google-jclouds-labs/oauth/pom.xml
index 1a177a9..36c225f 100644
--- a/dependencies/jclouds/google-jclouds-labs/oauth/pom.xml
+++ b/dependencies/jclouds/google-jclouds-labs/oauth/pom.xml
@@ -19,17 +19,17 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>google-jclouds-labs</artifactId>
<version>4.1.2-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>oauth</artifactId>
<name>jclouds OAuth Core</name>
<description>jclouds components to access OAuth</description>
- <version>${jclouds.version}</version>
+ <version>1.9.1</version>
<packaging>bundle</packaging>
<dependencies>
@@ -45,7 +45,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/jclouds/google-jclouds-labs/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/google-jclouds-labs/pom.xml b/dependencies/jclouds/google-jclouds-labs/pom.xml
index 5dcd9cc..80ff5f2 100644
--- a/dependencies/jclouds/google-jclouds-labs/pom.xml
+++ b/dependencies/jclouds/google-jclouds-labs/pom.xml
@@ -19,13 +19,13 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-dependencies-jclouds</artifactId>
<version>4.1.2-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>google-jclouds-labs</artifactId>
<packaging>pom</packaging>
<name>Apache Stratos - Dependent Projects</name>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/jclouds/jclouds-blobstore/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/jclouds-blobstore/pom.xml b/dependencies/jclouds/jclouds-blobstore/pom.xml
index 0fd463e..8c4ef3a 100644
--- a/dependencies/jclouds/jclouds-blobstore/pom.xml
+++ b/dependencies/jclouds/jclouds-blobstore/pom.xml
@@ -19,15 +19,15 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-dependencies-jclouds</artifactId>
<version>4.1.2-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>jclouds-blobstore</artifactId>
- <version>${jclouds.version}</version>
+ <version>1.9.1</version>
<name>jclouds Components blobstore</name>
<packaging>bundle</packaging>
<description>jclouds components to access blobstore</description>
@@ -73,7 +73,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<inherited>true</inherited>
<configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/jclouds/jclouds-bouncycastle/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/jclouds-bouncycastle/pom.xml b/dependencies/jclouds/jclouds-bouncycastle/pom.xml
index a7636cb..0801f9a 100644
--- a/dependencies/jclouds/jclouds-bouncycastle/pom.xml
+++ b/dependencies/jclouds/jclouds-bouncycastle/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>jclouds-bouncycastle</artifactId>
- <version>${jclouds.version}</version>
+ <version>1.9.1</version>
<name>jclouds Components bouncycastle</name>
<packaging>bundle</packaging>
<description>jclouds bouncycastle EncryptionService Module</description>
@@ -45,7 +45,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<inherited>true</inherited>
<configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/jclouds/jclouds-compute/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/jclouds-compute/pom.xml b/dependencies/jclouds/jclouds-compute/pom.xml
index 9864966..1801eaf 100644
--- a/dependencies/jclouds/jclouds-compute/pom.xml
+++ b/dependencies/jclouds/jclouds-compute/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>jclouds-compute</artifactId>
- <version>${jclouds.version}</version>
+ <version>1.9.1</version>
<name>jclouds Components compute</name>
<packaging>bundle</packaging>
<description>jclouds bouncycastle EncryptionService Module</description>
@@ -73,7 +73,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<inherited>true</inherited>
<configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/jclouds/jclouds-core/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/jclouds-core/pom.xml b/dependencies/jclouds/jclouds-core/pom.xml
index bea8768..bdc49c5 100644
--- a/dependencies/jclouds/jclouds-core/pom.xml
+++ b/dependencies/jclouds/jclouds-core/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>jclouds-core</artifactId>
- <version>${jclouds.version}</version>
+ <version>1.9.1</version>
<name>jclouds Components Core</name>
<packaging>bundle</packaging>
<description>Core components to access jclouds services</description>
@@ -74,7 +74,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<inherited>true</inherited>
<configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/jclouds/jclouds-enterprise/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/jclouds-enterprise/pom.xml b/dependencies/jclouds/jclouds-enterprise/pom.xml
index b85f623..1633121 100644
--- a/dependencies/jclouds/jclouds-enterprise/pom.xml
+++ b/dependencies/jclouds/jclouds-enterprise/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>jclouds-enterprise</artifactId>
- <version>${jclouds.version}</version>
+ <version>1.9.1</version>
<name>jclouds Components enterprise</name>
<packaging>bundle</packaging>
<description>jclouds enterprise configuration</description>
@@ -45,7 +45,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<inherited>true</inherited>
<configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/jclouds/jclouds-joda/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/jclouds-joda/pom.xml b/dependencies/jclouds/jclouds-joda/pom.xml
index 448deec..1cada22 100644
--- a/dependencies/jclouds/jclouds-joda/pom.xml
+++ b/dependencies/jclouds/jclouds-joda/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>jclouds-joda</artifactId>
- <version>${jclouds.version}</version>
+ <version>1.9.1</version>
<name>jclouds Components joda</name>
<packaging>bundle</packaging>
<description>jclouds enterprise configuration</description>
@@ -45,7 +45,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<inherited>true</inherited>
<configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/jclouds/jclouds-netty/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/jclouds-netty/pom.xml b/dependencies/jclouds/jclouds-netty/pom.xml
index 5f034bb..ee5c9df 100644
--- a/dependencies/jclouds/jclouds-netty/pom.xml
+++ b/dependencies/jclouds/jclouds-netty/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>jclouds-netty</artifactId>
- <version>${jclouds.version}</version>
+ <version>1.9.1</version>
<name>jclouds Components netty</name>
<packaging>bundle</packaging>
<description>jclouds netty payload module</description>
@@ -45,7 +45,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<inherited>true</inherited>
<configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/jclouds/jclouds-sshj/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/jclouds-sshj/pom.xml b/dependencies/jclouds/jclouds-sshj/pom.xml
index 3e02f5a..2e20b26 100644
--- a/dependencies/jclouds/jclouds-sshj/pom.xml
+++ b/dependencies/jclouds/jclouds-sshj/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>jclouds-sshj</artifactId>
- <version>${jclouds.version}</version>
+ <version>1.9.1</version>
<name>jclouds Components sshj</name>
<packaging>bundle</packaging>
<description>jclouds sshj ssh client</description>
@@ -45,7 +45,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<inherited>true</inherited>
<configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/jclouds/openstack-common/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-common/pom.xml b/dependencies/jclouds/openstack-common/pom.xml
index fe28da7..48311d6 100644
--- a/dependencies/jclouds/openstack-common/pom.xml
+++ b/dependencies/jclouds/openstack-common/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>openstack-common</artifactId>
- <version>${jclouds.version}</version>
+ <version>1.9.1</version>
<name>jclouds OpenStack Components Core</name>
<description>jclouds Core components to access OpenStack apis</description>
<packaging>bundle</packaging>
@@ -45,7 +45,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<inherited>true</inherited>
<configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/jclouds/openstack-keystone/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-keystone/pom.xml b/dependencies/jclouds/openstack-keystone/pom.xml
index d49847b..42ceeba 100644
--- a/dependencies/jclouds/openstack-keystone/pom.xml
+++ b/dependencies/jclouds/openstack-keystone/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>openstack-keystone</artifactId>
- <version>${jclouds.version}</version>
+ <version>1.9.1</version>
<name>jclouds openstack-keystone api</name>
<description>jclouds components to access an implementation of OpenStack Keystone</description>
<packaging>bundle</packaging>
@@ -74,7 +74,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<inherited>true</inherited>
<configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/jclouds/openstack-neutron/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-neutron/pom.xml b/dependencies/jclouds/openstack-neutron/pom.xml
index 0ddf1d3..a19757e 100644
--- a/dependencies/jclouds/openstack-neutron/pom.xml
+++ b/dependencies/jclouds/openstack-neutron/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>openstack-neutron</artifactId>
- <version>${jclouds.version}</version>
+ <version>1.9.1</version>
<name>jclouds openstack-neutron api</name>
<description>jclouds components to access an implementation of OpenStack Neutron</description>
<packaging>bundle</packaging>
@@ -73,7 +73,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<inherited>true</inherited>
<configuration>