Repository: stratos Updated Branches: refs/heads/master c55271694 -> 09c3313b2
s/org.apache.stratos.cloud.controller.iaas.*/org.apache.stratos.cloud.controller.iaases.* Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/09c3313b Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/09c3313b Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/09c3313b Branch: refs/heads/master Commit: 09c3313b2aa30876d68b3437cef48ec455bdd72b Parents: c552716 Author: Lahiru Sandaruwan <[email protected]> Authored: Tue Dec 2 22:03:25 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Tue Dec 2 22:03:25 2014 +0530 ---------------------------------------------------------------------- .../src/test/resources/cloud-controller.xml | 2 +- .../src/main/resources/conf/cloud-controller.xml | 4 ++-- .../config/all/repository/conf/cloud-controller.xml | 6 +++--- .../config/cc/repository/conf/cloud-controller.xml | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/09c3313b/components/org.apache.stratos.cloud.controller/src/test/resources/cloud-controller.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/test/resources/cloud-controller.xml b/components/org.apache.stratos.cloud.controller/src/test/resources/cloud-controller.xml index 9a256d1..0d56822 100644 --- a/components/org.apache.stratos.cloud.controller/src/test/resources/cloud-controller.xml +++ b/components/org.apache.stratos.cloud.controller/src/test/resources/cloud-controller.xml @@ -56,7 +56,7 @@ name="A.x" value="a"/> <property name="B" value="b"/> <imageId>tempEC2</imageId> </iaasProvider> --> <iaasProvider type="openstack" name="openstack specific details"> - <className>org.apache.stratos.cloud.controller.iaas.OpenstackNovaIaas</className> + <className>org.apache.stratos.cloud.controller.iaasese.OpenstackNovaIaas</className> <provider>openstack-nova</provider> <identity svns:secretAlias="cloud.controller.openstack.identity">demo:demo</identity> <credential svns:secretAlias="cloud.controller.openstack.credential">openstack</credential> http://git-wip-us.apache.org/repos/asf/stratos/blob/09c3313b/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 03ab854..76ac074 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 @@ -50,7 +50,7 @@ same property over and over again. --> <iaasProviders> <!-- iaasProvider type="openstack" name="openstack specific details"> - <className>org.apache.stratos.cloud.controller.iaas.OpenstackNovaIaas</className> + <className>org.apache.stratos.cloud.controller.iaases.OpenstackNovaIaas</className> <provider>openstack-nova</provider> <identity svns:secretAlias="cloud.controller.openstack.identity">demo:demo</identity> <credential svns:secretAlias="cloud.controller.openstack.credential">openstack</credential> @@ -61,7 +61,7 @@ <property name="Y" value="y" /> </iaasProvider --> <iaasProvider type="docker" name="Docker"> - <className>org.apache.stratos.cloud.controller.iaas.DockerIaas</className> + <className>org.apache.stratos.cloud.controller.iaases.DockerIaas</className> <provider>docker</provider> <identity svns:secretAlias="cloud.controller.docker.identity">identity</identity> <credential svns:secretAlias="cloud.controller.docker.credential">credential</credential> http://git-wip-us.apache.org/repos/asf/stratos/blob/09c3313b/tools/stratos-installer/config/all/repository/conf/cloud-controller.xml ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/config/all/repository/conf/cloud-controller.xml b/tools/stratos-installer/config/all/repository/conf/cloud-controller.xml index 14f97e1..20cfcc7 100644 --- a/tools/stratos-installer/config/all/repository/conf/cloud-controller.xml +++ b/tools/stratos-installer/config/all/repository/conf/cloud-controller.xml @@ -50,7 +50,7 @@ same property over and over again. --> <iaasProviders> <EC2_PROVIDER_STARTiaasProvider type="ec2" name="ec2 specific details"> - <className>org.apache.stratos.cloud.controller.iaas.AWSEC2Iaas</className> + <className>org.apache.stratos.cloud.controller.iaases.AWSEC2Iaas</className> <provider>aws-ec2</provider> <identity svns:secretAlias="cloud.controller.ec2.identity">EC2_IDENTITY</identity> <credential svns:secretAlias="cloud.controller.ec2.credential">EC2_CREDENTIAL</credential> @@ -61,7 +61,7 @@ <property name="keyPair" value="EC2_KEYPAIR"/> </iaasProviderEC2_PROVIDER_END> <OPENSTACK_PROVIDER_STARTiaasProvider type="openstack" name="openstack specific details"> - <className>org.apache.stratos.cloud.controller.iaas.OpenstackNovaIaas</className> + <className>org.apache.stratos.cloud.controller.iaases.OpenstackNovaIaas</className> <provider>openstack-nova</provider> <identity svns:secretAlias="cloud.controller.openstack.identity">OPENSTACK_IDENTITY</identity> <credential svns:secretAlias="cloud.controller.openstack.credential">OPENSTACK_CREDENTIAL</credential> @@ -74,7 +74,7 @@ <property name="keyPair" value="OPENSTACK_KEYPAIR"/> </iaasProviderOPENSTACK_PROVIDER_END> <VCLOUD_PROVIDER_STARTiaasProvider type="vcloud" name="VMware vCloud specific details"> - <className>org.apache.stratos.cloud.controller.iaas.VCloudIaas</className> + <className>org.apache.stratos.cloud.controller.iaases.VCloudIaas</className> <provider>vcloud</provider> <identity svns:secretAlias="cloud.controller.vcloud.identity">VCLOUD_IDENTITY</identity> <credential svns:secretAlias="cloud.controller.vcloud.credential">VCLOUD_CREDENTIAL</credential> http://git-wip-us.apache.org/repos/asf/stratos/blob/09c3313b/tools/stratos-installer/config/cc/repository/conf/cloud-controller.xml ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/config/cc/repository/conf/cloud-controller.xml b/tools/stratos-installer/config/cc/repository/conf/cloud-controller.xml index d79ded0..7a2f220 100644 --- a/tools/stratos-installer/config/cc/repository/conf/cloud-controller.xml +++ b/tools/stratos-installer/config/cc/repository/conf/cloud-controller.xml @@ -51,7 +51,7 @@ same property over and over again. --> <iaasProviders> <EC2_PROVIDER_STARTiaasProvider type="ec2" name="ec2 specific details"> - <className>org.apache.stratos.cloud.controller.iaas.AWSEC2Iaas</className> + <className>org.apache.stratos.cloud.controller.iaases.AWSEC2Iaas</className> <provider>aws-ec2</provider> <identity svns:secretAlias="cloud.controller.ec2.identity">EC2_IDENTITY</identity> <credential svns:secretAlias="cloud.controller.ec2.credential">EC2_CREDENTIAL</credential> @@ -62,7 +62,7 @@ <property name="keyPair" value="EC2_KEYPAIR"/> </iaasProviderEC2_PROVIDER_END> <OPENSTACK_PROVIDER_STARTiaasProvider type="openstack" name="openstack specific details"> - <className>org.apache.stratos.cloud.controller.iaas.OpenstackNovaIaas</className> + <className>org.apache.stratos.cloud.controller.iaases.OpenstackNovaIaas</className> <provider>openstack-nova</provider> <identity svns:secretAlias="cloud.controller.openstack.identity">OPENSTACK_IDENTITY</identity> <credential svns:secretAlias="cloud.controller.openstack.credential">OPENSTACK_CREDENTIAL</credential> @@ -75,7 +75,7 @@ <property name="keyPair" value="OPENSTACK_KEYPAIR"/> </iaasProviderOPENSTACK_PROVIDER_END> <VCLOUD_PROVIDER_STARTiaasProvider type="vcloud" name="VMware vCloud specific details"> - <className>org.apache.stratos.cloud.controller.iaas.VCloudIaas</className> + <className>org.apache.stratos.cloud.controller.iaases.VCloudIaas</className> <provider>vcloud</provider> <identity svns:secretAlias="cloud.controller.vcloud.identity">VCLOUD_IDENTITY</identity> <credential svns:secretAlias="cloud.controller.vcloud.credential">VCLOUD_CREDENTIAL</credential>
