http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.manager/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/pom.xml b/components/org.apache.stratos.manager/pom.xml index 3d450f6..82a29da 100644 --- a/components/org.apache.stratos.manager/pom.xml +++ b/components/org.apache.stratos.manager/pom.xml @@ -34,42 +34,72 @@ <dependencies> <dependency> <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.registry.core</artifactId> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.base</artifactId> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.user.api</artifactId> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.logging</artifactId> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.ntask.core</artifactId> - <version>${carbon.kernel.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.utils</artifactId> - <version>${carbon.kernel.version}</version> </dependency> <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.databridge.commons</artifactId> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.1</version> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.stratos.common</artifactId> </dependency> + + <!-- Stratos components --> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.common</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.messaging</artifactId> - <version>${project.version}</version> </dependency> <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.tenant.mgt</artifactId> - <version>2.2.2</version> + <groupId>org.apache.stratos</groupId> + <artifactId>org.apache.stratos.cloud.controller.service.stub</artifactId> + </dependency> + <dependency> + <groupId>org.apache.stratos</groupId> + <artifactId>org.apache.stratos.autoscaler.service.stub</artifactId> + </dependency> + + <!-- Misc --> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-lang.wso2</groupId> + <artifactId>commons-lang</artifactId> </dependency> </dependencies> @@ -89,20 +119,35 @@ <Bundle-Name>${project.artifactId}</Bundle-Name> <Private-Package>org.apache.stratos.manager.internal.*</Private-Package> <Export-Package> - org.apache.stratos.manager.domain.*, - org.apache.stratos.manager.utils.*, - org.apache.stratos.manager.service.*, + !org.apache.stratos.manager.internal.*, + !org.apache.stratos.manager.service.stub.*, org.apache.stratos.manager.* </Export-Package> <Import-Package> - org.apache.stratos.cloud.controller.registry.*; version="${project.version}", - org.apache.axis2.*; version="1.6.1-wso2v10", - org.apache.axiom.*; version="${axiom.osgi.version.range}", - org.apache.stratos.autoscaler.stub; version="${project.version}", - org.apache.neethi.*; version="2.0.4.wso2v4", - javax.xml.stream.*; version="1.0.1", - javax.wsdl.*; version="1.6.2", - org.osgi.framework.*, + org.wso2.carbon.utils.*;version="${carbon.platform.imp.pkg.version.range}", + org.wso2.carbon.base.*;version="${carbon.base.imp.pkg.version.range}", + org.wso2.carbon.registry.core.*;version="${carbon.kernel.registry.imp.pkg.version.range}", + org.wso2.carbon.ntask.core.*;version="0.0.0", + org.wso2.carbon.databridge.commons.*;version="${carbon.platform.imp.pkg.version.range}", + org.wso2.carbon.databridge.agent.thrift.*;version="${carbon.platform.imp.pkg.version.range}", + org.wso2.carbon.user.api.*;version="${carbon.user.api.imp.pkg.version.range}", + + org.apache.stratos.common.*;version="${project.version}", + org.apache.stratos.messaging.*;version="${project.version}", + org.apache.stratos.cloud.controller.stub.*;version="${project.version}", + org.apache.stratos.autoscaler.stub;version="${project.version}", + + org.wso2.carbon.stratos.common.*;version="${wso2.carbon.stratos.common.version}", + + org.apache.commons.logging.*;version="${commons.logging.imp.pkg.version.range}", + org.apache.commons.lang.*;version="${commons.lang.imp.pkg.version.range}", + com.google.gson.*;version="${gson.imp.pkg.version.range}", + org.apache.axis2.*; version="${axis2.imp.pkg.version.range}", + org.apache.axiom.*; version="${axiom.imp.pkg.version.range}", + org.apache.neethi.*; version="${neethi.wso2.version}", + javax.wsdl.*; version="${wsdl4j.wso2.version}", + org.osgi.framework; version="${osgi.framework.imp.pkg.version.range}", + org.osgi.service.component; version="${osgi.service.component.imp.pkg.version.range}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> @@ -127,4 +172,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.manager/src/conf/tenant-resource-policy.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/conf/tenant-resource-policy.xml b/components/org.apache.stratos.manager/src/conf/tenant-resource-policy.xml deleted file mode 100644 index 19b4e78..0000000 --- a/components/org.apache.stratos.manager/src/conf/tenant-resource-policy.xml +++ /dev/null @@ -1,22 +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. - ---> - http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java index e4fa435..3574055 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java @@ -46,8 +46,10 @@ public class StratosManagerContext implements Serializable { private static final String SM_CARTRIDGES_CARTRIDGEGROUPS_WRITE_LOCK = "SM_CARTRIDGES_CARTRIDGEGROUPS_WRITE_LOCK"; private static final String SM_CARTRIDGES_APPLICATIONS_WRITE_LOCK = "SM_CARTRIDGES_APPLICATIONS_WRITE_LOCK"; - private static final String SM_CARTRIDGEGROUPS_CARTRIDGESUBGROUPS_WRITE_LOCK = "SM_CARTRIDGEGROUPS_CARTRIDGESUBGROUPS_WRITE_LOCK"; - private static final String SM_CARTRIDGEGROUPS_APPLICATIONS_WRITE_LOCK = "SM_CARTRIDGEGROUPS_APPLICATIONS_WRITE_LOCK"; + private static final String SM_CARTRIDGEGROUPS_CARTRIDGESUBGROUPS_WRITE_LOCK + = "SM_CARTRIDGEGROUPS_CARTRIDGESUBGROUPS_WRITE_LOCK"; + private static final String SM_CARTRIDGEGROUPS_APPLICATIONS_WRITE_LOCK + = "SM_CARTRIDGEGROUPS_APPLICATIONS_WRITE_LOCK"; private static final Log log = LogFactory.getLog(StratosManagerContext.class); private static volatile StratosManagerContext instance; private final transient DistributedObjectProvider distributedObjectProvider; @@ -91,7 +93,8 @@ public class StratosManagerContext implements Serializable { // Get maps from distributed object provider cartridgeTypeToCartridgeGroupsMap = distributedObjectProvider.getMap(SM_CARTRIDGE_TYPE_TO_CARTIDGE_GROUPS_MAP); cartridgeTypeToApplicationsMap = distributedObjectProvider.getMap(SM_CARTRIDGE_TYPE_TO_APPLICATIONS_MAP); - cartridgeGroupToCartridgeSubGroupsMap = distributedObjectProvider.getMap(SM_CARTRIDGE_GROUP_TO_CARTIDGE_GROUPS_MAP); + cartridgeGroupToCartridgeSubGroupsMap = distributedObjectProvider + .getMap(SM_CARTRIDGE_GROUP_TO_CARTIDGE_GROUPS_MAP); cartridgeGroupToApplicationsMap = distributedObjectProvider.getMap(SM_CARTRIDGE_GROUP_TO_APPLICATIONS_MAP); // Update context from the registry @@ -256,7 +259,8 @@ public class StratosManagerContext implements Serializable { } } - public void removeUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupName, String[] cartridgeGroupNames) { + public void removeUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupName, + String[] cartridgeGroupNames) { if (cartridgeGroupNames == null) { return; } @@ -343,7 +347,8 @@ public class StratosManagerContext implements Serializable { copyMap(serializedObj.cartridgeTypeToCartridgeGroupsMap, cartridgeTypeToCartridgeGroupsMap); copyMap(serializedObj.cartridgeTypeToApplicationsMap, cartridgeTypeToApplicationsMap); - copyMap(serializedObj.cartridgeGroupToCartridgeSubGroupsMap, cartridgeGroupToCartridgeSubGroupsMap); + copyMap(serializedObj.cartridgeGroupToCartridgeSubGroupsMap, + cartridgeGroupToCartridgeSubGroupsMap); copyMap(serializedObj.cartridgeGroupToApplicationsMap, cartridgeGroupToApplicationsMap); if (log.isDebugEnabled()) { @@ -356,8 +361,8 @@ public class StratosManagerContext implements Serializable { } } } catch (Exception e) { - String msg = "Unable to read Stratos Manager context from the registry. " + - "Hence, any historical data will not be reflected"; + String msg = "Unable to read Stratos Manager context from the registry. " + + "Hence, any historical data will not be reflected"; log.warn(msg, e); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java index 8b464ea..47f401a 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java @@ -155,6 +155,7 @@ public class StratosManagerServiceComponent { componentStartUpSynchronizer .waitForAxisServiceActivation(Component.StratosManager, "StratosManagerService"); componentStartUpSynchronizer.setComponentStatus(Component.StratosManager, true); + if (log.isInfoEnabled()) { log.info("Stratos manager component is activated"); } http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/registry/RegistryManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/registry/RegistryManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/registry/RegistryManager.java index e3deed0..86454bf 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/registry/RegistryManager.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/registry/RegistryManager.java @@ -23,7 +23,7 @@ package org.apache.stratos.manager.registry; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.common.internal.ServiceReferenceHolder; +import org.apache.stratos.manager.internal.ServiceReferenceHolder; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.registry.core.Registry; import org.wso2.carbon.registry.core.Resource; http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.manager/src/scripts/append_zone_file.sh ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/scripts/append_zone_file.sh b/components/org.apache.stratos.manager/src/scripts/append_zone_file.sh deleted file mode 100644 index 007cc58..0000000 --- a/components/org.apache.stratos.manager/src/scripts/append_zone_file.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -# -# -# 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. -# -# -echo "subdomain $1 and ip $2 added to $3" -appending_file=$3 -subdomain=$1 -ip=$2 - -#appending the zone file -echo $subdomain'\t'IN'\t'A'\t'$ip>> $appending_file - -#increasing the count -for file in $appending_file; -do - if [ -f $file ]; - then - OLD=`egrep -ho "2010-9[0-9]*" $file` - NEW=$(($OLD + 1)) - sed -i "s/$OLD/$NEW/g" $file - echo "fixed $file" - fi -done - - -#reloading bind server -/etc/init.d/bind9 reload http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.messaging/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/pom.xml b/components/org.apache.stratos.messaging/pom.xml index a79a3d3..3f2089a 100644 --- a/components/org.apache.stratos.messaging/pom.xml +++ b/components/org.apache.stratos.messaging/pom.xml @@ -32,14 +32,33 @@ <dependencies> <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.base</artifactId> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.logging</artifactId> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.utils</artifactId> + </dependency> + + <!-- Stratos components --> + <dependency> + <groupId>org.apache.stratos</groupId> + <artifactId>org.apache.stratos.common</artifactId> + </dependency> + + <!-- Misc --> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_1.1_spec</artifactId> - <version>1.1</version> </dependency> <dependency> <groupId>com.google.code.gson</groupId> @@ -48,48 +67,26 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.1</version> </dependency> <dependency> - <groupId>commons-collections</groupId> + <groupId>org.wso2.orbit.commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.logging</artifactId> - <version>${carbon.kernel.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.utils</artifactId> - <version>${carbon.kernel.version}</version> </dependency> <dependency> - <groupId>com.jamesmurty.utils</groupId> + <groupId>com.jamesmurty.utils.wso2</groupId> <artifactId>java-xmlbuilder</artifactId> - <version>0.6</version> </dependency> <dependency> <groupId>org.eclipse.paho</groupId> <artifactId>mqtt-client</artifactId> - <version>0.4.0</version> - </dependency> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.common</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-client</artifactId> - <version>5.10.0</version> </dependency> <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-all</artifactId> - <version>5.10.0</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.apache.felix</groupId> @@ -112,15 +109,19 @@ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-Name>${project.artifactId}</Bundle-Name> <Export-Package> - org.apache.stratos.messaging, - org.apache.stratos.messaging.*, - org.apache.stratos.messaging.topology, - org.apache.stratos.messaging.topology.*, - org.apache.stratos.messaging.util.MessagingConstants, + org.apache.stratos.messaging.*;version="${project.version}" </Export-Package> <Import-Package> - !org.apache.commons.logging, - org.apache.commons.logging; version=0.0.0, + org.wso2.carbon.base.*;version="${carbon.base.imp.pkg.version.range}", + org.wso2.carbon.utils.*;version="${carbon.platform.imp.pkg.version.range}", + + org.apache.stratos.common.*;version="${project.version}", + + org.apache.commons.logging.*;version="${commons.logging.imp.pkg.version.range}", + org.apache.commons.lang.*;version="${commons.lang.imp.pkg.version.range}", + org.apache.commons.lang3.*;version="${commons.lang3.imp.pkg.version.range}", + org.apache.commons.collections.*;version="${commons.collections.imp.pkg.version.range}", + com.google.gson.*;version="${gson.imp.pkg.version.range}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> @@ -129,4 +130,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.metadata.client/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.metadata.client/pom.xml b/components/org.apache.stratos.metadata.client/pom.xml index 93b42a3..f280c09 100644 --- a/components/org.apache.stratos.metadata.client/pom.xml +++ b/components/org.apache.stratos.metadata.client/pom.xml @@ -32,13 +32,15 @@ <dependencies> <dependency> <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>4.3.5</version> + <artifactId>httpclient-osgi</artifactId> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore-osgi</artifactId> </dependency> <dependency> <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> - <version>1.9</version> </dependency> <dependency> <groupId>com.google.code.gson</groupId> @@ -61,13 +63,16 @@ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-Name>${project.artifactId}</Bundle-Name> <Export-Package> - org.apache.stratos.metadata.client.*, + org.apache.stratos.metadata.client.* </Export-Package> <Import-Package> - !org.apache.stratos.metadata.client, - org.apache.commons.logging; version=0.0.0, - org.apache.commons.configuration; version=0.0.0, - org.apache.http.conn.ssl;version=0.0.0, + com.google.gson.*;version="${gson.imp.pkg.version.range}", + org.apache.commons.configuration.*;version="${commons.configuration.imp.pkg.version.range}", + org.apache.http.auth.*;version="${http.client.imp.pkg.version.range}", + org.apache.http.cookie.*;version="${http.client.imp.pkg.version.range}", + org.apache.http.conn.*;version="${http.client.imp.pkg.version.range}", + org.apache.http.client.*;version="${http.client.imp.pkg.version.range}", + org.apache.http.entity.*;version="${http.client.imp.pkg.version.range}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> @@ -76,4 +81,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.metadata.service/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.metadata.service/pom.xml b/components/org.apache.stratos.metadata.service/pom.xml index 3bd55c1..12f8c72 100644 --- a/components/org.apache.stratos.metadata.service/pom.xml +++ b/components/org.apache.stratos.metadata.service/pom.xml @@ -53,105 +53,101 @@ </profile> </profiles> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webResources> - <resource> - <directory>src/main/webapp/${appName}</directory> - </resource> - </webResources> - <warName>metadata</warName> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> <!-- Dependency scope is set to provided to avoid dependent jar files being packaged with the war file --> <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-bundle</artifactId> - <version>2.7.7</version> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.ntask.core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.registry.ws.stub</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.core</artifactId> - <version>${carbon.kernel.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.user.api</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.utils</artifactId> - <version>${carbon.kernel.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.identity.oauth.stub</artifactId> - <version>${carbon.kernel.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.tenant.mgt</artifactId> - <version>2.2.2</version> <scope>provided</scope> </dependency> + + <!-- Stratos components --> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.common</artifactId> - <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.manager</artifactId> - <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.cloud.controller.service.stub</artifactId> - <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.autoscaler.service.stub</artifactId> - <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.messaging</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.ntask.core</artifactId> - <version>${carbon.kernel.version}</version> <scope>provided</scope> </dependency> + + <!-- Misc --> <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.registry.ws.stub</artifactId> - <version>${carbon.kernel.version}</version> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-bundle</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>com.nimbusds.wso2</groupId> <artifactId>nimbus-jose-jwt</artifactId> - <version>2.26.1.wso2v2</version> <scope>provided</scope> </dependency> </dependencies> -</project> \ No newline at end of file + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <directory>src/main/webapp/${appName}</directory> + </resource> + </webResources> + <warName>metadata</warName> + </configuration> + </plugin> + </plugins> + </build> +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/oauth2/ValidationServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/oauth2/ValidationServiceClient.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/oauth2/ValidationServiceClient.java index 2c03b35..27c7da1 100644 --- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/oauth2/ValidationServiceClient.java +++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/oauth2/ValidationServiceClient.java @@ -24,6 +24,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants; import org.wso2.carbon.identity.oauth2.stub.OAuth2TokenValidationServiceStub; import org.wso2.carbon.identity.oauth2.stub.dto.OAuth2TokenValidationRequestDTO; +import org.wso2.carbon.identity.oauth2.stub.dto.OAuth2TokenValidationRequestDTO_OAuth2AccessToken; import org.wso2.carbon.identity.oauth2.stub.dto.OAuth2TokenValidationResponseDTO; import org.wso2.carbon.utils.CarbonUtils; @@ -36,24 +37,24 @@ public class ValidationServiceClient { private static final Log log = LogFactory.getLog(OAuth2TokenValidationServiceStub.class); private OAuth2TokenValidationServiceStub stub = null; - public ValidationServiceClient(String backendServerURL, String username, String password) - throws Exception { + public ValidationServiceClient(String backendServerURL, String username, String password) throws Exception { String serviceURL = backendServerURL + "OAuth2TokenValidationService"; try { stub = new OAuth2TokenValidationServiceStub(serviceURL); - CarbonUtils.setBasicAccessSecurityHeaders(username, password, true, - stub._getServiceClient()); + CarbonUtils.setBasicAccessSecurityHeaders(username, password, true, stub._getServiceClient()); } catch (AxisFault e) { log.error("Error initializing OAuth2 Client"); throw new Exception("Error initializing OAuth Client", e); } } - public OAuth2TokenValidationResponseDTO validateAuthenticationRequest(String accessToken) - throws Exception { + public OAuth2TokenValidationResponseDTO validateAuthenticationRequest(String accessToken) throws Exception { OAuth2TokenValidationRequestDTO oauthReq = new OAuth2TokenValidationRequestDTO(); - oauthReq.setAccessToken(accessToken); - oauthReq.setTokenType(OAuthConstants.BEARER_TOKEN_TYPE); + OAuth2TokenValidationRequestDTO_OAuth2AccessToken oAuth2AccessToken + = new OAuth2TokenValidationRequestDTO_OAuth2AccessToken(); + oAuth2AccessToken.setIdentifier(accessToken); + oAuth2AccessToken.setTokenType(OAuthConstants.BEARER_TOKEN_TYPE); + oauthReq.setAccessToken(oAuth2AccessToken); try { return stub.validate(oauthReq); } catch (RemoteException e) { @@ -61,5 +62,4 @@ public class ValidationServiceClient { throw new Exception("Error while validating OAuth2 request", e); } } - } http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/MetadataApiRegistry.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/MetadataApiRegistry.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/MetadataApiRegistry.java index f6b1ee4..7531b16 100644 --- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/MetadataApiRegistry.java +++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/MetadataApiRegistry.java @@ -23,6 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.common.concurrent.locks.ReadWriteLock; import org.apache.stratos.metadata.service.MetadataTopologyEventReceiver; +import org.apache.stratos.metadata.service.ServiceHolder; import org.apache.stratos.metadata.service.definition.Property; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.registry.core.Registry; @@ -250,8 +251,7 @@ public class MetadataApiRegistry implements DataStore { } private UserRegistry getRegistry() throws RegistryException { - return org.apache.stratos.common.internal.ServiceReferenceHolder.getInstance(). - getRegistryService().getGovernanceSystemRegistry(); + return ServiceHolder.getRegistryService().getGovernanceSystemRegistry(); } /** http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.mock.iaas.api/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.mock.iaas.api/pom.xml b/components/org.apache.stratos.mock.iaas.api/pom.xml index 0dbbced..b88c6c2 100644 --- a/components/org.apache.stratos.mock.iaas.api/pom.xml +++ b/components/org.apache.stratos.mock.iaas.api/pom.xml @@ -41,70 +41,67 @@ </profile> </profiles> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webResources> - <resource> - <!-- this is relative to the pom.xml directory --> - <directory>src/main/webapp/${appName}</directory> - </resource> - </webResources> - <warName>mock-iaas</warName> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> <!-- Dependency scope is set to provided to avoid dependent jar files being packaged with the war file --> <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-bundle</artifactId> - <version>2.7.12</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.core</artifactId> - <version>${carbon.kernel.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.utils</artifactId> - <version>${carbon.kernel.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.identity.oauth.stub</artifactId> - <version>${carbon.kernel.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.tenant.mgt</artifactId> - <version>2.2.2</version> <scope>provided</scope> </dependency> + + <!-- Stratos components --> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.common</artifactId> - <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.mock.iaas</artifactId> - <version>${project.version}</version> + <scope>provided</scope> + </dependency> + + <!-- Misc --> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-bundle</artifactId> <scope>provided</scope> </dependency> </dependencies> -</project> \ No newline at end of file + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <!-- this is relative to the pom.xml directory --> + <directory>src/main/webapp/${appName}</directory> + </resource> + </webResources> + <warName>mock-iaas</warName> + </configuration> + </plugin> + </plugins> + </build> +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.mock.iaas.client/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.mock.iaas.client/pom.xml b/components/org.apache.stratos.mock.iaas.client/pom.xml index 8d1c7e8..4fe9b57 100644 --- a/components/org.apache.stratos.mock.iaas.client/pom.xml +++ b/components/org.apache.stratos.mock.iaas.client/pom.xml @@ -32,19 +32,42 @@ <dependencies> <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.logging</artifactId> + </dependency> + + <!-- Stratos components --> + <dependency> + <groupId>org.apache.stratos</groupId> + <artifactId>org.apache.stratos.mock.iaas</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.httpcomponents.wso2</groupId> + <artifactId>httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents.wso2</groupId> + <artifactId>httpcore</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.axis2.wso2</groupId> + <artifactId>axis2-client</artifactId> + </exclusion> + </exclusions> + </dependency> + + <!-- Misc --> + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.1</version> </dependency> <dependency> - <groupId>org.apache.httpcomponents.wso2</groupId> - <artifactId>httpcore</artifactId> - <version>4.3.0.wso2v1</version> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore-osgi</artifactId> </dependency> <dependency> - <groupId>org.apache.httpcomponents.wso2</groupId> - <artifactId>httpclient</artifactId> - <version>4.2.5.wso2v1</version> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient-osgi</artifactId> </dependency> <dependency> <groupId>com.google.code.gson</groupId> @@ -53,23 +76,15 @@ <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1.1</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>commons-lang</groupId> + <groupId>commons-lang.wso2</groupId> <artifactId>commons-lang</artifactId> - <version>2.6</version> - </dependency> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.mock.iaas</artifactId> - <version>${project.version}</version> </dependency> </dependencies> @@ -88,14 +103,18 @@ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-Name>${project.artifactId}</Bundle-Name> <Export-Package> - org.apache.stratos.mock.iaas.client.*, + org.apache.stratos.mock.iaas.client.* </Export-Package> - <Private-Package> - org.apache.stratos.mock.iaas.client.internal; - </Private-Package> <Import-Package> - !org.apache.commons.logging, - org.apache.commons.logging; version=0.0.0, + org.apache.stratos.mock.iaas.*;version="${project.version}", + + org.apache.commons.logging.*;version="${commons.logging.imp.pkg.version.range}", + com.google.gson.*;version="${gson.imp.pkg.version.range}", + org.apache.http.auth.*;version="${http.client.imp.pkg.version.range}", + org.apache.http.cookie.*;version="${http.client.imp.pkg.version.range}", + org.apache.http.conn.*;version="${http.client.imp.pkg.version.range}", + org.apache.http.client.*;version="${http.client.imp.pkg.version.range}", + org.apache.http.impl.*;version="${http.client.imp.pkg.version.range}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> @@ -104,4 +123,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.mock.iaas/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.mock.iaas/pom.xml b/components/org.apache.stratos.mock.iaas/pom.xml index d78a5a9..cc11078 100644 --- a/components/org.apache.stratos.mock.iaas/pom.xml +++ b/components/org.apache.stratos.mock.iaas/pom.xml @@ -33,28 +33,35 @@ <dependencies> <dependency> <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.core</artifactId> - <version>${carbon.kernel.version}</version> + <artifactId>org.wso2.carbon.logging</artifactId> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.logging</artifactId> - <version>${carbon.kernel.version}</version> + <artifactId>org.wso2.carbon.databridge.commons</artifactId> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.databridge.commons</artifactId> - <version>${carbon.kernel.version}</version> + <artifactId>org.wso2.carbon.utils</artifactId> </dependency> + + <!-- Stratos components --> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.common</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.messaging</artifactId> - <version>${project.version}</version> + </dependency> + + <!-- Misc --> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>commons-lang.wso2</groupId> + <artifactId>commons-lang</artifactId> </dependency> </dependencies> @@ -73,15 +80,22 @@ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-Name>${project.artifactId}</Bundle-Name> <Export-Package> - org.apache.stratos.mock.iaas.*, - org.apache.stratos.mock.iaas.domain.*, - org.apache.stratos.mock.iaas.services.MockIaasService, + !org.apache.stratos.mock.iaas.internal.*, + org.apache.stratos.mock.iaas.* </Export-Package> <Private-Package> - org.apache.stratos.mock.iaas.internal; + org.apache.stratos.mock.iaas.internal.* </Private-Package> <Import-Package> - org.apache.stratos.common.*, + org.wso2.carbon.registry.core.*;version="${carbon.kernel.registry.imp.pkg.version.range}", + org.wso2.carbon.utils.*;version="${carbon.platform.imp.pkg.version.range}", + + org.apache.stratos.common.*="${project.version}", + org.apache.stratos.messaging.*;version="${project.version}", + + org.apache.commons.logging.*;version="${commons.logging.imp.pkg.version.range}", + org.apache.commons.lang.*;version="${commons.lang.imp.pkg.version.range}", + org.apache.commons.lang3.*;version="${commons.lang3.imp.pkg.version.range}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.python.cartridge.agent/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.python.cartridge.agent/pom.xml b/components/org.apache.stratos.python.cartridge.agent/pom.xml index 904c771..1ea6aa7 100644 --- a/components/org.apache.stratos.python.cartridge.agent/pom.xml +++ b/components/org.apache.stratos.python.cartridge.agent/pom.xml @@ -70,49 +70,45 @@ <dependencies> <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.logging</artifactId> + </dependency> + + <!-- Stratos components --> + <dependency> + <groupId>org.apache.stratos</groupId> + <artifactId>org.apache.stratos.messaging</artifactId> + </dependency> + + <!-- Misc --> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.logging</artifactId> - <version>${carbon.kernel.version}</version> - </dependency> - <dependency> <groupId>commons-lang.wso2</groupId> <artifactId>commons-lang</artifactId> - <version>2.6.0.wso2v1</version> </dependency> <dependency> - <groupId>org.apache.commons</groupId> + <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>1.3.2</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-exec</artifactId> - <version>1.0.1</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.1</version> </dependency> <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-all</artifactId> - <version>5.10.0</version> </dependency> <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-mqtt</artifactId> - <version>5.10.0</version> - </dependency> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.messaging</artifactId> - <version>${project.version}</version> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.rest.endpoint/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/pom.xml b/components/org.apache.stratos.rest.endpoint/pom.xml index b846426..2aaeada 100644 --- a/components/org.apache.stratos.rest.endpoint/pom.xml +++ b/components/org.apache.stratos.rest.endpoint/pom.xml @@ -53,95 +53,93 @@ </profile> </profiles> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webResources> - <resource> - <!-- this is relative to the pom.xml directory --> - <directory>src/main/webapp/${appName}</directory> - </resource> - </webResources> - <warName>api</warName> - <attachClasses>true</attachClasses> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> <!-- Dependency scope is set to provided to avoid dependent jar files being packaged with the war file --> <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-bundle</artifactId> - <version>2.7.12</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.core</artifactId> - <version>${carbon.kernel.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.utils</artifactId> - <version>${carbon.kernel.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.identity.oauth.stub</artifactId> - <version>${carbon.kernel.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.tenant.mgt</artifactId> - <version>2.2.2</version> <scope>provided</scope> </dependency> <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.user.api</artifactId> + <scope>provided</scope> + </dependency> + + <!-- Stratos components --> + <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.common</artifactId> - <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.stratos.common</artifactId> - <version>2.2.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.manager</artifactId> - <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.kubernetes.client</artifactId> - <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.cloud.controller.service.stub</artifactId> - <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.autoscaler.service.stub</artifactId> - <version>${project.version}</version> + <scope>provided</scope> + </dependency> + + <!-- Misc --> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-bundle</artifactId> <scope>provided</scope> </dependency> </dependencies> -</project> \ No newline at end of file + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <!-- this is relative to the pom.xml directory --> + <directory>src/main/webapp/${appName}</directory> + </resource> + </webResources> + <warName>api</warName> + <attachClasses>true</attachClasses> + </configuration> + </plugin> + </plugins> + </build> +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/ComponentSynchronizerHandler.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/ComponentSynchronizerHandler.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/ComponentSynchronizerHandler.java index ba4c8fd..5148257 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/ComponentSynchronizerHandler.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/ComponentSynchronizerHandler.java @@ -25,7 +25,7 @@ import org.apache.cxf.message.Message; import org.apache.stratos.common.Component; import org.apache.stratos.common.beans.ResponseMessageBean; import org.apache.stratos.common.services.ComponentStartUpSynchronizer; -import org.apache.stratos.manager.internal.ServiceReferenceHolder; +import org.wso2.carbon.context.PrivilegedCarbonContext; import javax.ws.rs.core.Response; @@ -35,8 +35,13 @@ import javax.ws.rs.core.Response; public class ComponentSynchronizerHandler implements RequestHandler { public Response handleRequest(Message message, ClassResourceInfo classResourceInfo) { - ComponentStartUpSynchronizer componentStartUpSynchronizer = - ServiceReferenceHolder.getInstance().getComponentStartUpSynchronizer(); + PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + Object serviceObj = carbonContext.getOSGiService(ComponentStartUpSynchronizer.class); + if (serviceObj == null || !(serviceObj instanceof ComponentStartUpSynchronizer)) { + throw new RuntimeException("Could not retrieve ComponentSynchronizerHandler OSGi service"); + } + + ComponentStartUpSynchronizer componentStartUpSynchronizer = (ComponentStartUpSynchronizer) serviceObj; if (!componentStartUpSynchronizer.isComponentActive(Component.StratosManager)) { ResponseMessageBean responseBean = new ResponseMessageBean(); responseBean.setMessage("Stratos manager component is not active"); http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/oauth2/ValidationServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/oauth2/ValidationServiceClient.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/oauth2/ValidationServiceClient.java index aaf1f5b..cc58b65 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/oauth2/ValidationServiceClient.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/oauth2/ValidationServiceClient.java @@ -24,6 +24,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants; import org.wso2.carbon.identity.oauth2.stub.OAuth2TokenValidationServiceStub; import org.wso2.carbon.identity.oauth2.stub.dto.OAuth2TokenValidationRequestDTO; +import org.wso2.carbon.identity.oauth2.stub.dto.OAuth2TokenValidationRequestDTO_OAuth2AccessToken; import org.wso2.carbon.identity.oauth2.stub.dto.OAuth2TokenValidationResponseDTO; import org.wso2.carbon.utils.CarbonUtils; @@ -36,7 +37,6 @@ public class ValidationServiceClient { private OAuth2TokenValidationServiceStub stub = null; private static final Log log = LogFactory.getLog(OAuth2TokenValidationServiceStub.class); - public ValidationServiceClient(String backendServerURL, String username, String password) throws Exception { String serviceURL = backendServerURL + "OAuth2TokenValidationService"; try { @@ -48,11 +48,13 @@ public class ValidationServiceClient { } } - public OAuth2TokenValidationResponseDTO validateAuthenticationRequest(String accessToken) throws Exception { OAuth2TokenValidationRequestDTO oauthReq = new OAuth2TokenValidationRequestDTO(); - oauthReq.setAccessToken(accessToken); - oauthReq.setTokenType(OAuthConstants.BEARER_TOKEN_TYPE); + OAuth2TokenValidationRequestDTO_OAuth2AccessToken oAuth2AccessToken + = new OAuth2TokenValidationRequestDTO_OAuth2AccessToken(); + oAuth2AccessToken.setIdentifier(accessToken); + oAuth2AccessToken.setTokenType(OAuthConstants.BEARER_TOKEN_TYPE); + oauthReq.setAccessToken(oAuth2AccessToken); try { return stub.validate(oauthReq); } catch (RemoteException e) { @@ -60,6 +62,4 @@ public class ValidationServiceClient { throw new Exception("Error while validating OAuth2 request", e); } } - - } http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/fabric8/kubernetes-api/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/fabric8/kubernetes-api/pom.xml b/dependencies/fabric8/kubernetes-api/pom.xml index b001325..d60c976 100644 --- a/dependencies/fabric8/kubernetes-api/pom.xml +++ b/dependencies/fabric8/kubernetes-api/pom.xml @@ -16,7 +16,7 @@ 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"; +<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns="http://maven.apache.org/POM/4.0.0"; 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> @@ -37,93 +37,125 @@ <dependencies> <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-base</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.module</groupId> + <artifactId>jackson-module-jaxb-annotations</artifactId> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </dependency> + + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + </dependency> + <dependency> <groupId>io.fabric8</groupId> <artifactId>kubernetes-api</artifactId> - <version>${kubernetes.api.version}</version> </dependency> <dependency> <groupId>io.fabric8</groupId> <artifactId>cxf-utils</artifactId> - <version>${kubernetes.api.version}</version> </dependency> <dependency> <groupId>io.fabric8</groupId> <artifactId>kubernetes-model</artifactId> - <version>1.0.2</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-json-provider</artifactId> - <version>2.4.1</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-yaml</artifactId> - <version>2.4.1</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-client</artifactId> - <version>3.0.4</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.12</version> </dependency> <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> - <version>1.5</version> </dependency> <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> - <version>20140107</version> </dependency> <dependency> <groupId>net.oauth.core</groupId> <artifactId>oauth</artifactId> - <version>20100527</version> + </dependency> + <dependency> + <groupId>org.apache.ws.xmlschema</groupId> + <artifactId>xmlschema-core</artifactId> + </dependency> + <dependency> + <groupId>io.fabric8</groupId> + <artifactId>fabric8-utils</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxrs</artifactId> </dependency> <dependency> <groupId>dnsjava</groupId> <artifactId>dnsjava</artifactId> - <version>2.1.7</version> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-client</artifactId> - <version>9.1.5.v20140505</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>9.1.5.v20140505</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>9.1.5.v20140505</version> </dependency> <!-- testing --> <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>1.7.0</version> <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.7.12</version> <scope>test</scope> </dependency> <!-- lets force the codegen to run first --> <dependency> <groupId>io.fabric8</groupId> <artifactId>kubernetes-codegen</artifactId> - <version>${kubernetes.api.version}</version> <scope>test</scope> </dependency> </dependencies> @@ -142,7 +174,7 @@ <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.*;version=${kubernetes.api.version} </Export-Package> <Import-Package> !javax.xml.bind.annotation.adapters, @@ -156,6 +188,7 @@ cxf-rt-rs-client,cxf-rt-transports-http,cxf-rt-frontend-jaxrs,cxf-core,dnsjava </Embed-Dependency> <Embed-Transitive>true</Embed-Transitive> + <Embed-Directory>lib</Embed-Directory> </instructions> </configuration> </plugin> @@ -176,4 +209,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/guice-assistedinject/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/guice-assistedinject/pom.xml b/dependencies/guice-assistedinject/pom.xml index 0058b3a..76185af 100644 --- a/dependencies/guice-assistedinject/pom.xml +++ b/dependencies/guice-assistedinject/pom.xml @@ -36,9 +36,9 @@ <dependency> <groupId>com.google.inject.extensions</groupId> <artifactId>guice-assistedinject</artifactId> - <version>${guice.assistedinject.version}</version> </dependency> </dependencies> + <build> <plugins> <plugin> @@ -53,7 +53,7 @@ </Export-Package> <Import-Package> !com.google.inject.assistedinject.*, - com.google.inject.*;version="${guice.imp.pkg.version}", + com.google.inject.*;version="${guice.imp.pkg.version.range}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> @@ -62,4 +62,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/guice-multibindings/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/guice-multibindings/pom.xml b/dependencies/guice-multibindings/pom.xml index 8b1c189..3d002e3 100644 --- a/dependencies/guice-multibindings/pom.xml +++ b/dependencies/guice-multibindings/pom.xml @@ -36,9 +36,9 @@ <dependency> <groupId>com.google.inject.extensions</groupId> <artifactId>guice-multibindings</artifactId> - <version>${guice.multibindings.version}</version> </dependency> </dependencies> + <build> <plugins> <plugin> @@ -60,4 +60,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/guice/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/guice/pom.xml b/dependencies/guice/pom.xml index 6f975fe..89cf949 100644 --- a/dependencies/guice/pom.xml +++ b/dependencies/guice/pom.xml @@ -52,7 +52,7 @@ </Export-Package> <Import-Package> javax.inject;version="${javax.inject.imp.pkg.version}", - org.aopalliance*;version="${aopalliance.imp.pkg.version}", + org.aopalliance*;version="${aopalliance.imp.pkg.version.range}", com.google.inject.internal.asm.util.*;resolution:=optional, *;resolution:=optional </Import-Package> @@ -62,4 +62,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/cloudstack/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/cloudstack/pom.xml b/dependencies/jclouds/cloudstack/pom.xml index 626f770..2b95424 100644 --- a/dependencies/jclouds/cloudstack/pom.xml +++ b/dependencies/jclouds/cloudstack/pom.xml @@ -36,7 +36,6 @@ <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>cloudstack</artifactId> - <version>${jclouds.version}</version> </dependency> </dependencies> @@ -82,7 +81,7 @@ <Export-Package>org.jclouds.cloudstack*;version="${jclouds.version}"</Export-Package> <Import-Package> org.jclouds*;version="${jclouds.version}", - com.google.inject.*;version="${guice.imp.pkg.version}", + com.google.inject.*;version="${guice.imp.pkg.version.range}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> @@ -91,4 +90,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/ec2/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/ec2/pom.xml b/dependencies/jclouds/ec2/pom.xml index f07e922..1a8ec6c 100644 --- a/dependencies/jclouds/ec2/pom.xml +++ b/dependencies/jclouds/ec2/pom.xml @@ -36,7 +36,6 @@ <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>ec2</artifactId> - <version>${jclouds.version}</version> </dependency> </dependencies> @@ -82,7 +81,7 @@ <Export-Package>org.jclouds.ec2*;version="${jclouds.version}"</Export-Package> <Import-Package> org.jclouds*;version="${jclouds.version}", - com.google.inject.*;version="${guice.imp.pkg.version}", + com.google.inject.*;version="${guice.imp.pkg.version.range}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> @@ -91,4 +90,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/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 b4bf11c..021d587 100644 --- a/dependencies/jclouds/google-jclouds-labs/google-cloud-storage/pom.xml +++ b/dependencies/jclouds/google-jclouds-labs/google-cloud-storage/pom.xml @@ -36,7 +36,6 @@ <dependency> <groupId>org.apache.jclouds.labs</groupId> <artifactId>google-cloud-storage</artifactId> - <version>${jclouds.version}</version> </dependency> </dependencies> @@ -86,7 +85,7 @@ </Private-Package> <Import-Package> org.jclouds.*; version="${jclouds.version}", - com.google.inject.*;version="${guice.imp.pkg.version}", + com.google.inject.*;version="${guice.imp.pkg.version.range}", *;resolution:=optional </Import-Package> <Include-Resource> @@ -98,4 +97,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/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 80c9eed..0af4e36 100644 --- a/dependencies/jclouds/google-jclouds-labs/google-compute-engine/pom.xml +++ b/dependencies/jclouds/google-jclouds-labs/google-compute-engine/pom.xml @@ -36,7 +36,6 @@ <dependency> <groupId>org.apache.jclouds.labs</groupId> <artifactId>google-compute-engine</artifactId> - <version>${jclouds.version}</version> </dependency> </dependencies> @@ -90,7 +89,7 @@ </Private-Package> <Import-Package> org.jclouds.*; version="${jclouds.version}", - com.google.inject.*;version="${guice.imp.pkg.version}", + com.google.inject.*;version="${guice.imp.pkg.version.range}", *;resolution:=optional </Import-Package> <Include-Resource> @@ -103,4 +102,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/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 344f1d3..5d4dea5 100644 --- a/dependencies/jclouds/google-jclouds-labs/googlecloud/pom.xml +++ b/dependencies/jclouds/google-jclouds-labs/googlecloud/pom.xml @@ -36,7 +36,6 @@ <dependency> <groupId>org.apache.jclouds.labs</groupId> <artifactId>googlecloud</artifactId> - <version>${jclouds.version}</version> </dependency> </dependencies> @@ -57,7 +56,7 @@ </Private-Package> <Import-Package> org.jclouds.*; version="${jclouds.version}", - com.google.inject.*;version="${guice.imp.pkg.version}", + com.google.inject.*;version="${guice.imp.pkg.version.range}", *;resolution:=optional </Import-Package> <Include-Resource> @@ -69,4 +68,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/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 7e221b9..2eac9c0 100644 --- a/dependencies/jclouds/google-jclouds-labs/oauth/pom.xml +++ b/dependencies/jclouds/google-jclouds-labs/oauth/pom.xml @@ -36,7 +36,6 @@ <dependency> <groupId>org.apache.jclouds.labs</groupId> <artifactId>oauth</artifactId> - <version>${jclouds.version}</version> </dependency> </dependencies> @@ -57,7 +56,7 @@ </Private-Package> <Import-Package> org.jclouds*;version="${jclouds.version}", - com.google.inject.*;version="${guice.imp.pkg.version}", + com.google.inject.*;version="${guice.imp.pkg.version.range}", *;resolution:=optional </Import-Package> <Include-Resource> @@ -69,4 +68,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/jclouds-blobstore/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/jclouds-blobstore/pom.xml b/dependencies/jclouds/jclouds-blobstore/pom.xml index 1aae683..c831798 100644 --- a/dependencies/jclouds/jclouds-blobstore/pom.xml +++ b/dependencies/jclouds/jclouds-blobstore/pom.xml @@ -36,7 +36,6 @@ <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-blobstore</artifactId> - <version>${jclouds.version}</version> </dependency> </dependencies> @@ -82,7 +81,7 @@ <Export-Package>org.jclouds.blobstore*;version="${jclouds.version}"</Export-Package> <Import-Package> org.jclouds*;version="${jclouds.version}", - com.google.inject.*;version="${guice.imp.pkg.version}", + com.google.inject.*;version="${guice.imp.pkg.version.range}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> @@ -91,4 +90,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/jclouds-bouncycastle/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/jclouds-bouncycastle/pom.xml b/dependencies/jclouds/jclouds-bouncycastle/pom.xml index cf94e67..c4be8ec 100644 --- a/dependencies/jclouds/jclouds-bouncycastle/pom.xml +++ b/dependencies/jclouds/jclouds-bouncycastle/pom.xml @@ -36,7 +36,6 @@ <dependency> <groupId>org.apache.jclouds.driver</groupId> <artifactId>jclouds-bouncycastle</artifactId> - <version>${jclouds.version}</version> </dependency> </dependencies> @@ -51,10 +50,11 @@ <instructions> <Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.jclouds.encryption.bouncycastle*;version="${jclouds.version}"</Export-Package> + <Export-Package>org.jclouds.encryption.bouncycastle*;version="${jclouds.version}" + </Export-Package> <Import-Package> org.jclouds*;version="${jclouds.version}", - com.google.inject.*;version="${guice.imp.pkg.version}", + com.google.inject.*;version="${guice.imp.pkg.version.range}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> @@ -63,4 +63,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/jclouds-compute/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/jclouds-compute/pom.xml b/dependencies/jclouds/jclouds-compute/pom.xml index 31cf78c..a07126d 100644 --- a/dependencies/jclouds/jclouds-compute/pom.xml +++ b/dependencies/jclouds/jclouds-compute/pom.xml @@ -36,7 +36,6 @@ <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-compute</artifactId> - <version>${jclouds.version}</version> </dependency> </dependencies> @@ -87,7 +86,7 @@ </Export-Package> <Import-Package> org.jclouds*;version="${jclouds.version}", - com.google.inject.*;version="${guice.imp.pkg.version}", + com.google.inject.*;version="${guice.imp.pkg.version.range}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> @@ -96,4 +95,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/jclouds-core/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/jclouds-core/pom.xml b/dependencies/jclouds/jclouds-core/pom.xml index 6db6245..4e5ac81 100644 --- a/dependencies/jclouds/jclouds-core/pom.xml +++ b/dependencies/jclouds/jclouds-core/pom.xml @@ -36,7 +36,6 @@ <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>${jclouds.version}</version> </dependency> </dependencies> @@ -83,7 +82,7 @@ <Export-Package>org.jclouds*;version="${jclouds.version}"</Export-Package> <Import-Package> org.nnsoft.guice.rocoto*;version="${rocoto.version}", - com.google.inject.*;version="${guice.imp.pkg.version}", + com.google.inject.*;version="${guice.imp.pkg.version.range}", *;resolution:=optional </Import-Package> <Bundle-Activator>org.jclouds.osgi.Activator</Bundle-Activator> @@ -93,4 +92,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/jclouds-enterprise/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/jclouds-enterprise/pom.xml b/dependencies/jclouds/jclouds-enterprise/pom.xml index d2e817e..5401ad4 100644 --- a/dependencies/jclouds/jclouds-enterprise/pom.xml +++ b/dependencies/jclouds/jclouds-enterprise/pom.xml @@ -36,7 +36,6 @@ <dependency> <groupId>org.apache.jclouds.driver</groupId> <artifactId>jclouds-enterprise</artifactId> - <version>${jclouds.version}</version> </dependency> </dependencies> @@ -54,7 +53,7 @@ <Export-Package>org.jclouds.enterprise*;version="${jclouds.version}"</Export-Package> <Import-Package> org.jclouds*;version="${jclouds.version}", - com.google.inject.*;version="${guice.imp.pkg.version}", + com.google.inject.*;version="${guice.imp.pkg.version.range}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> @@ -63,4 +62,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project>
