You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ma...@apache.org on 2014/01/09 05:33:40 UTC
git commit: Upload conf files
Updated Branches:
refs/heads/master c866aa079 -> d764b281d
Upload conf files
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d764b281
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d764b281
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d764b281
Branch: refs/heads/master
Commit: d764b281deaea701ea9f316d49e33882999052c4
Parents: c866aa0
Author: Manula Thantriwatte <ma...@apache.org>
Authored: Thu Jan 9 10:03:03 2014 +0530
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Thu Jan 9 10:03:03 2014 +0530
----------------------------------------------------------------------
.../config/as/repository/conf/jndi.properties | 1 -
.../cc/repository/conf/cloud-controller.xml | 2 --
.../config/cc/repository/conf/jndi.properties | 1 -
.../config/cep/repository/conf/jndi.properties | 26 +++++++++++++++++---
.../config/sm/repository/conf/carbon.xml | 17 +++++++++++++
.../config/sm/repository/conf/jndi.properties | 1 -
6 files changed, 39 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d764b281/tools/stratos-installer/config/as/repository/conf/jndi.properties
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/config/as/repository/conf/jndi.properties b/tools/stratos-installer/config/as/repository/conf/jndi.properties
index 4251482..7194d88 100644
--- a/tools/stratos-installer/config/as/repository/conf/jndi.properties
+++ b/tools/stratos-installer/config/as/repository/conf/jndi.properties
@@ -1,4 +1,3 @@
java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory
connectionfactoryName=topicConnectionfactory
connectionfactory.topicConnectionfactory=amqp://admin:admin@clientID/carbon?brokerlist='tcp://MB_HOSTNAME:MB_LISTEN_PORT'&reconnect='true'
-java.naming.provider.url=repository/conf/jndi.properties
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d764b281/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 7167d87..8434700 100644
--- a/tools/stratos-installer/config/cc/repository/conf/cloud-controller.xml
+++ b/tools/stratos-installer/config/cc/repository/conf/cloud-controller.xml
@@ -65,7 +65,6 @@
<property name="autoAssignIp" value="true" />
<property name="keyPair" value="EC2_KEYPAIR"/>
<maxInstanceLimit>30</maxInstanceLimit>
- <imageId>EC2_IMAGE_ID</imageId>
</iaasProviderEC2_PROVIDER_END>
<OPENSTACK_PROVIDER_STARTiaasProvider type="openstack" name="openstack specific details">
<className>org.apache.stratos.cloud.controller.iaases.OpenstackNovaIaas</className>
@@ -80,7 +79,6 @@
<property name="X" value="x" />
<property name="Y" value="y" />
<maxInstanceLimit>30</maxInstanceLimit>
- <imageId>OPENSTACK_IMAGE_ID</imageId>
</iaasProviderOPENSTACK_PROVIDER_END>
</iaasProviders>
</cloudController>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d764b281/tools/stratos-installer/config/cc/repository/conf/jndi.properties
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/config/cc/repository/conf/jndi.properties b/tools/stratos-installer/config/cc/repository/conf/jndi.properties
index 4251482..7194d88 100644
--- a/tools/stratos-installer/config/cc/repository/conf/jndi.properties
+++ b/tools/stratos-installer/config/cc/repository/conf/jndi.properties
@@ -1,4 +1,3 @@
java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory
connectionfactoryName=topicConnectionfactory
connectionfactory.topicConnectionfactory=amqp://admin:admin@clientID/carbon?brokerlist='tcp://MB_HOSTNAME:MB_LISTEN_PORT'&reconnect='true'
-java.naming.provider.url=repository/conf/jndi.properties
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d764b281/tools/stratos-installer/config/cep/repository/conf/jndi.properties
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/config/cep/repository/conf/jndi.properties b/tools/stratos-installer/config/cep/repository/conf/jndi.properties
index ca2dd41..f8eac5b 100644
--- a/tools/stratos-installer/config/cep/repository/conf/jndi.properties
+++ b/tools/stratos-installer/config/cep/repository/conf/jndi.properties
@@ -1,11 +1,29 @@
-java.naming.factory.initial = org.wso2.andes.jndi.PropertiesFileInitialContextFactory
+#
+# Copyright (c) 2011, WSO2 Inc. (http://wso2.com) All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# register some connection factories
+# connectionfactory.[jndiname] = [ConnectionURL]
+
+#java.naming.factory.initial = org.wso2.andes.jndi.PropertiesFileInitialContextFactory
# use the following property to configure the default connector
-connectionfactory.topicConnectionfactory=amqp://admin:admin@clientID/carbon?brokerlist='tcp://MB_HOSTNAME:MB_LISTEN_PORT'&reconnect='true'
+connectionfactory.topicConnectionfactory = amqp://admin:admin@clientID/carbon?brokerlist='tcp://localhost:5677'&reconnect='true'
-# use the following property to specify the JNDI name of the connection factory
+# use the following property to specify the JNDI name of the connection factory
connectionFactoryNames = connectionfactory, topicConnectionfactory
-java.naming.provider.url=repository/conf/jndi.properties
# register some topics in JNDI using the form
# topic.[jndiName] = [physicalName]
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d764b281/tools/stratos-installer/config/sm/repository/conf/carbon.xml
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/config/sm/repository/conf/carbon.xml b/tools/stratos-installer/config/sm/repository/conf/carbon.xml
index 218c279..cf88630 100644
--- a/tools/stratos-installer/config/sm/repository/conf/carbon.xml
+++ b/tools/stratos-installer/config/sm/repository/conf/carbon.xml
@@ -383,6 +383,23 @@
org.wso2.carbon.security.util.SecurityTokenStore
-->
<!--<TokenStoreClassName>org.wso2.carbon.security.util.SecurityTokenStore</TokenStoreClassName> -->
+
+
+ <!--
+ Encrypt Decrypt Store will be used for encrypting and decrypting
+ -->
+ <RegistryKeyStore>
+ <!-- Keystore file location-->
+ <Location>${carbon.home}/repository/resources/security/wso2carbon.jks</Location>
+ <!-- Keystore type (JKS/PKCS12 etc.)-->
+ <Type>JKS</Type>
+ <!-- Keystore password-->
+ <Password>wso2carbon</Password>
+ <!-- Private Key alias-->
+ <KeyAlias>wso2carbon</KeyAlias>
+ <!-- Private Key password-->
+ <KeyPassword>wso2carbon</KeyPassword>
+ </RegistryKeyStore>
</Security>
<!--
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d764b281/tools/stratos-installer/config/sm/repository/conf/jndi.properties
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/config/sm/repository/conf/jndi.properties b/tools/stratos-installer/config/sm/repository/conf/jndi.properties
index 4251482..7194d88 100644
--- a/tools/stratos-installer/config/sm/repository/conf/jndi.properties
+++ b/tools/stratos-installer/config/sm/repository/conf/jndi.properties
@@ -1,4 +1,3 @@
java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory
connectionfactoryName=topicConnectionfactory
connectionfactory.topicConnectionfactory=amqp://admin:admin@clientID/carbon?brokerlist='tcp://MB_HOSTNAME:MB_LISTEN_PORT'&reconnect='true'
-java.naming.provider.url=repository/conf/jndi.properties