Repository: stratos Updated Branches: refs/heads/master a75c0db65 -> 2363c84f7
Renaming metadata service api context /stratosmetadataservice/api to /metadata/api and mock iaas api context /mock-iaas-api to /mock-iaas/api Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2363c84f Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2363c84f Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2363c84f Branch: refs/heads/master Commit: 2363c84f7b765dc28a5c80b992374a323ef07f35 Parents: a75c0db Author: Imesh Gunaratne <[email protected]> Authored: Tue Jan 27 22:13:52 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Tue Jan 27 22:14:15 2015 +0530 ---------------------------------------------------------------------- .../apache/stratos/kubernetes/client/KubernetesApiClient.java | 1 - components/org.apache.stratos.mock.iaas.api/pom.xml | 2 +- .../src/main/resources/conf/cloud-controller.xml | 2 +- .../org.apache.stratos.metadata.service.feature/pom.xml | 2 +- .../src/main/resources/p2.inf | 2 +- .../mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml | 2 +- .../src/main/resources/p2.inf | 2 +- products/stratos/modules/distribution/src/assembly/bin.xml | 4 ++-- .../modules/distribution/src/main/conf/metadataservice.xml | 2 +- tools/puppet3/modules/mysql/templates/publish-metadata.py.erb | 2 +- 10 files changed, 10 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/2363c84f/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/KubernetesApiClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/KubernetesApiClient.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/KubernetesApiClient.java index dc068c2..5c86ae8 100644 --- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/KubernetesApiClient.java +++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/KubernetesApiClient.java @@ -329,7 +329,6 @@ public class KubernetesApiClient implements KubernetesAPIClientInterface { } // Set container ports -// List<Port> ports = convertIntPortListToPortList(portMappings); containerTemplate.setPorts(ports); manifest.addContainer(containerTemplate); http://git-wip-us.apache.org/repos/asf/stratos/blob/2363c84f/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 fe8be8c..ef30681 100644 --- a/components/org.apache.stratos.mock.iaas.api/pom.xml +++ b/components/org.apache.stratos.mock.iaas.api/pom.xml @@ -61,7 +61,7 @@ <directory>src/main/webapp/${appName}</directory> </resource> </webResources> - <warName>mock-iaas-api</warName> + <warName>mock-iaas</warName> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/stratos/blob/2363c84f/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml ---------------------------------------------------------------------- diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml index 66f9b61..dc0ea72 100644 --- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml +++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml @@ -75,7 +75,7 @@ <provider>mock</provider> <identity svns:secretAlias="cloud.controller.mock.identity">identity</identity> <credential svns:secretAlias="cloud.controller.mock.credential">credential</credential> - <property name="api.endpoint" value="https://localhost:9443/mock-iaas-api"; /> + <property name="api.endpoint" value="https://localhost:9443/mock-iaas/api"; /> </iaasProvider> </iaasProviders> </cloudController> http://git-wip-us.apache.org/repos/asf/stratos/blob/2363c84f/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml b/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml index 42d709d..ff15910 100644 --- a/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml +++ b/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml @@ -263,7 +263,7 @@ <type>war</type> <overWrite>true</overWrite> <outputDirectory>${project.build.directory}/web-app/web-app</outputDirectory> - <destFileName>stratosmetadataservice.war</destFileName> + <destFileName>metadata.war</destFileName> </artifactItem> </artifactItems> </configuration> http://git-wip-us.apache.org/repos/asf/stratos/blob/2363c84f/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/src/main/resources/p2.inf ---------------------------------------------------------------------- diff --git a/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/src/main/resources/p2.inf b/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/src/main/resources/p2.inf index 68be3a2..6e8c559 100644 --- a/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/src/main/resources/p2.inf +++ b/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/src/main/resources/p2.inf @@ -16,7 +16,7 @@ # under the License. instructions.configure = \ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.metadata.service_${feature.version}/web-app/stratosmetadataservice.war,target:${installFolder}/../../deployment/server/webapps/stratosmetadataservice.war,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.metadata.service_${feature.version}/web-app/metadata.war,target:${installFolder}/../../deployment/server/webapps/metadata.war,overwrite:true);\ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.metadata.service_${feature.version}/tomcat/webapp-classloading.xml,target:${installFolder}/../../conf/tomcat/webapp-classloading.xml,overwrite:true);\ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.metadata.service_${feature.version}/tomcat/webapp-classloading-environments.xml,target:${installFolder}/../../conf/tomcat/webapp-classloading-environments.xml,overwrite:true);\ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.metadata.service_${feature.version}/tomcat/context.xml,target:${installFolder}/../../conf/tomcat/context.xml,overwrite:true);\ http://git-wip-us.apache.org/repos/asf/stratos/blob/2363c84f/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml b/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml index a0f14a1..7f479cd 100644 --- a/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml +++ b/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml @@ -256,7 +256,7 @@ <type>war</type> <overWrite>true</overWrite> <outputDirectory>${project.build.directory}/web-app/web-app</outputDirectory> - <destFileName>mock-iaas-api.war</destFileName> + <destFileName>mock-iaas.war</destFileName> </artifactItem> </artifactItems> </configuration> http://git-wip-us.apache.org/repos/asf/stratos/blob/2363c84f/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/src/main/resources/p2.inf ---------------------------------------------------------------------- diff --git a/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/src/main/resources/p2.inf b/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/src/main/resources/p2.inf index 02594c1..c712c5b 100644 --- a/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/src/main/resources/p2.inf +++ b/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/src/main/resources/p2.inf @@ -16,7 +16,7 @@ # under the License. instructions.configure = \ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.mock.iaas.api_${feature.version}/web-app/mock-iaas-api.war,target:${installFolder}/../../deployment/server/webapps/mock-iaas-api.war,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.mock.iaas.api_${feature.version}/web-app/mock-iaas.war,target:${installFolder}/../../deployment/server/webapps/mock-iaas.war,overwrite:true);\ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.mock.iaas.api_${feature.version}/tomcat/webapp-classloading.xml,target:${installFolder}/../../conf/tomcat/webapp-classloading.xml,overwrite:true);\ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.mock.iaas.api_${feature.version}/tomcat/webapp-classloading-environments.xml,target:${installFolder}/../../conf/tomcat/webapp-classloading-environments.xml,overwrite:true);\ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.mock.iaas.api_${feature.version}/tomcat/context.xml,target:${installFolder}/../../conf/tomcat/context.xml,overwrite:true);\ http://git-wip-us.apache.org/repos/asf/stratos/blob/2363c84f/products/stratos/modules/distribution/src/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/assembly/bin.xml b/products/stratos/modules/distribution/src/assembly/bin.xml index dc62b58..b48f3c4 100755 --- a/products/stratos/modules/distribution/src/assembly/bin.xml +++ b/products/stratos/modules/distribution/src/assembly/bin.xml @@ -940,7 +940,7 @@ </file> <!-- Mock iaas webapp --> <file> - <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mock-iaas-api.war</source> + <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mock-iaas.war</source> <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory> <fileMode>644</fileMode> </file> @@ -960,7 +960,7 @@ <!-- Meta data service webapp --> <file> <source> - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/stratosmetadataservice.war + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/metadata.war </source> <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory> <fileMode>644</fileMode> http://git-wip-us.apache.org/repos/asf/stratos/blob/2363c84f/products/stratos/modules/distribution/src/main/conf/metadataservice.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/main/conf/metadataservice.xml b/products/stratos/modules/distribution/src/main/conf/metadataservice.xml index 5073e24..3f2d217 100644 --- a/products/stratos/modules/distribution/src/main/conf/metadataservice.xml +++ b/products/stratos/modules/distribution/src/main/conf/metadataservice.xml @@ -34,7 +34,7 @@ </metadataservice> --> <metadataService> - <baseUrl>https://localhost:9443/stratosmetadataservice/</baseUrl> + <baseUrl>https://localhost:9443/metadata/api/</baseUrl> <username>admin</username> <password>admin</password> </metadataService> http://git-wip-us.apache.org/repos/asf/stratos/blob/2363c84f/tools/puppet3/modules/mysql/templates/publish-metadata.py.erb ---------------------------------------------------------------------- diff --git a/tools/puppet3/modules/mysql/templates/publish-metadata.py.erb b/tools/puppet3/modules/mysql/templates/publish-metadata.py.erb index 2a4f734..21745dc 100755 --- a/tools/puppet3/modules/mysql/templates/publish-metadata.py.erb +++ b/tools/puppet3/modules/mysql/templates/publish-metadata.py.erb @@ -82,7 +82,7 @@ my_password = generate_mysql_password() set_mysql_password(my_password) app_id= get_paylod_property('APP_ID') -resource_url = get_metadataserviceurl()+ "/stratosmetadataservice/application/" + app_id + "/cluster/" + my_alias + "/property" +resource_url = get_metadataserviceurl()+ "/metadata/api/application/" + app_id + "/cluster/" + my_alias + "/property" data = {"key":"MYSQL_IP","values":my_ip} do_post(resource_url, data) data = {"key":"MYSQL_PASS","values":my_password}
