Updated Branches: refs/heads/master ba477892b -> bd2924923
Fixing carboncontext issue when persisting into registry. Removing jndi.url property from config file. Incorparating configuration files comes in carbon kernel patches. Renaming cartridge agent startup scrript to stratos.sh Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/bd292492 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/bd292492 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/bd292492 Branch: refs/heads/master Commit: bd2924923c99d6eaa970eb4b197bc9fc87109fee Parents: ba47789 Author: Sajith Kariyawasam <[email protected]> Authored: Wed Jan 8 18:19:28 2014 +0530 Committer: Sajith Kariyawasam <[email protected]> Committed: Wed Jan 8 18:19:28 2014 +0530 ---------------------------------------------------------------------- .../controller/registry/RegistryManager.java | 10 ++++ .../distribution/src/main/assembly/bin.xml | 46 ++++++++++++++- .../distribution/src/main/conf/jndi.properties | 1 - .../distribution/src/main/assembly/bin.xml | 2 +- .../src/main/bin/cartridge-agent.sh | 43 -------------- .../distribution/src/main/bin/stratos.sh | 43 ++++++++++++++ .../src/main/resources/jndi.properties | 1 - .../distribution/src/main/assembly/bin.xml | 60 ++++++++++++++------ .../distribution/src/main/conf/jndi.properties | 1 - .../distribution/src/main/assembly/bin.xml | 47 ++++++++++++--- products/stratos-manager/conf/jndi.properties | 1 - .../modules/distribution/src/assembly/bin.xml | 51 +++++++++++++++-- 12 files changed, 223 insertions(+), 83 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bd292492/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java index aa91dc2..8492acf 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java @@ -80,6 +80,11 @@ public class RegistryManager { */ public void persist(FasterLookUpDataHolder dataObj) throws RegistryException { try { + + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID); + ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME); + registryService.beginTransaction(); Resource nodeResource = registryService.newResource(); @@ -101,6 +106,11 @@ public class RegistryManager { public void persistTopology(Topology topology) throws RegistryException { try { + + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID); + ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME); + registryService.beginTransaction(); Resource nodeResource = registryService.newResource(); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bd292492/products/autoscaler/modules/distribution/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/products/autoscaler/modules/distribution/src/main/assembly/bin.xml b/products/autoscaler/modules/distribution/src/main/assembly/bin.xml index ddee2ed..dd7045a 100644 --- a/products/autoscaler/modules/distribution/src/main/assembly/bin.xml +++ b/products/autoscaler/modules/distribution/src/main/assembly/bin.xml @@ -41,10 +41,12 @@ <exclude>**/README.txt</exclude> <exclude>**/INSTALL.txt</exclude> <exclude>**/release-notes.html</exclude> - <exclude>**/carbon.xml</exclude> <exclude>**/repository/conf/security/cipher-tool.properties</exclude> <exclude>**/repository/conf/security/cipher-text.properties</exclude> <exclude>**/repository/components/**</exclude> + <!-- Excluding kernel patch config files --> + <exclude>**/dbscripts/mysql.sql</exclude> + <exclude>**/repository/conf/carbon.xml</exclude> </excludes> </fileSet> <!-- Copying p2 profile and osgi bundles--> @@ -322,11 +324,51 @@ <filtered>true</filtered> <fileMode>644</fileMode> </file> - <file> + <!--<file> <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml</source> <outputDirectory>apache-stratos-autoscaler-${pom.version}/repository/conf/</outputDirectory> <filtered>true</filtered> + </file>--> + + <!--Copying config files from kernel patches --> + + <file> + <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0001/dbscripts/mysql.sql</source> + <outputDirectory>apache-stratos-autoscaler-${pom.version}/dbscripts</outputDirectory> + <filtered>true</filtered> + </file> + + <!-- <file> + <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/axis2/axis2_client.xml</source> + <outputDirectory>apache-stratos-autoscaler-${pom.version}/repository/conf/axis2/</outputDirectory> + <filtered>true</filtered> + </file> + <file> + <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/axis2/axis2.xml</source> + <outputDirectory>apache-stratos-autoscaler-${pom.version}/repository/conf/axis2/</outputDirectory> + <filtered>true</filtered> + </file> + <file> + <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/axis2/tenant-axis2.xml</source> + <outputDirectory>apache-stratos-autoscaler-${pom.version}/repository/conf/axis2/</outputDirectory> + <filtered>true</filtered> + </file>--> + <file> + <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-text.properties</source> + <outputDirectory>apache-stratos-autoscaler-${pom.version}/repository/conf/security/</outputDirectory> + <filtered>true</filtered> + </file> + <file> + <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-tool.properties</source> + <outputDirectory>apache-stratos-autoscaler-${pom.version}/repository/conf/security/</outputDirectory> + <filtered>true</filtered> </file> + + <file> + <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0004/repository/conf/carbon.xml</source> + <outputDirectory>apache-stratos-autoscaler-${pom.version}/repository/conf/</outputDirectory> + <filtered>true</filtered> + </file> </files> </assembly> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bd292492/products/autoscaler/modules/distribution/src/main/conf/jndi.properties ---------------------------------------------------------------------- diff --git a/products/autoscaler/modules/distribution/src/main/conf/jndi.properties b/products/autoscaler/modules/distribution/src/main/conf/jndi.properties index 0ef176f..0cfb977 100644 --- a/products/autoscaler/modules/distribution/src/main/conf/jndi.properties +++ b/products/autoscaler/modules/distribution/src/main/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://localhost:5677'&reconnect='true' -java.naming.provider.url=repository/conf/jndi.properties http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bd292492/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml b/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml index 9d56cf0..096c8d9 100644 --- a/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml +++ b/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml @@ -30,7 +30,7 @@ <outputDirectory>/bin</outputDirectory> <fileMode>0755</fileMode> <includes> - <include>cartridge-agent.sh</include> + <include>stratos.sh</include> </includes> </fileSet> <fileSet> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bd292492/products/cartridge-agent/modules/distribution/src/main/bin/cartridge-agent.sh ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/modules/distribution/src/main/bin/cartridge-agent.sh b/products/cartridge-agent/modules/distribution/src/main/bin/cartridge-agent.sh deleted file mode 100644 index a3cc4b4..0000000 --- a/products/cartridge-agent/modules/distribution/src/main/bin/cartridge-agent.sh +++ /dev/null @@ -1,43 +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 "Starting cartridge agent..." -script_path="$( cd -P "$( dirname "$SOURCE" )" && pwd )/`dirname $0`" -lib_path=${script_path}/../lib/ -class_path=`echo ${lib_path}/*.jar | tr ' ' ':'` -properties="-Dmb.ip=MB-IP - -Dmb.port=MB-PORT - -Dthrift.receiver.ip=CEP-IP - -Dthrift.receiver.port=CEP-PORT - -Djndi.properties.template.file.path=${script_path}/../conf/templates/jndi.properties.template - -Djndi.properties.dir=${script_path}/../conf - -Dlog4j.properties.file.path=${script_path}/../conf/log4j.properties - -Dparam.file.path=/opt/apache-stratos-cartridge-agent/payload/launch-params - -Dextensions.dir=${script_path}/../extensions - -Dcep.stats.publisher.enabled=true - -Djavax.net.ssl.trustStore=CERT-TRUSTSTORE - -Djavax.net.ssl.trustStorePassword=TRUSTSTORE-PASSWORD" - -# Uncomment below line to enable remote debugging -#debug="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005" - -java -cp "${class_path}" ${properties} ${debug} org.apache.stratos.cartridge.agent.Main \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bd292492/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh b/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh new file mode 100644 index 0000000..a3cc4b4 --- /dev/null +++ b/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh @@ -0,0 +1,43 @@ +#!/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 "Starting cartridge agent..." +script_path="$( cd -P "$( dirname "$SOURCE" )" && pwd )/`dirname $0`" +lib_path=${script_path}/../lib/ +class_path=`echo ${lib_path}/*.jar | tr ' ' ':'` +properties="-Dmb.ip=MB-IP + -Dmb.port=MB-PORT + -Dthrift.receiver.ip=CEP-IP + -Dthrift.receiver.port=CEP-PORT + -Djndi.properties.template.file.path=${script_path}/../conf/templates/jndi.properties.template + -Djndi.properties.dir=${script_path}/../conf + -Dlog4j.properties.file.path=${script_path}/../conf/log4j.properties + -Dparam.file.path=/opt/apache-stratos-cartridge-agent/payload/launch-params + -Dextensions.dir=${script_path}/../extensions + -Dcep.stats.publisher.enabled=true + -Djavax.net.ssl.trustStore=CERT-TRUSTSTORE + -Djavax.net.ssl.trustStorePassword=TRUSTSTORE-PASSWORD" + +# Uncomment below line to enable remote debugging +#debug="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005" + +java -cp "${class_path}" ${properties} ${debug} org.apache.stratos.cartridge.agent.Main \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bd292492/products/cartridge-agent/modules/distribution/src/main/resources/jndi.properties ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/modules/distribution/src/main/resources/jndi.properties b/products/cartridge-agent/modules/distribution/src/main/resources/jndi.properties index c928585..d3b29bc 100644 --- a/products/cartridge-agent/modules/distribution/src/main/resources/jndi.properties +++ b/products/cartridge-agent/modules/distribution/src/main/resources/jndi.properties @@ -20,4 +20,3 @@ connectionfactoryName=topicConnectionfactory connectionfactory.topicConnectionfactory=amqp://admin:admin@carbon/carbon?brokerlist='tcp://MB-IP-ADDRESS:MB-PORT' java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory -java.naming.provider.url=repository/conf/jndi.properties http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bd292492/products/cloud-controller/modules/distribution/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/products/cloud-controller/modules/distribution/src/main/assembly/bin.xml b/products/cloud-controller/modules/distribution/src/main/assembly/bin.xml index 5845fa4..132876d 100644 --- a/products/cloud-controller/modules/distribution/src/main/assembly/bin.xml +++ b/products/cloud-controller/modules/distribution/src/main/assembly/bin.xml @@ -45,6 +45,7 @@ <exclude>**/repository/conf/security/cipher-tool.properties</exclude> <exclude>**/repository/conf/security/cipher-text.properties</exclude> <exclude>**/repository/components/**</exclude> + <exclude>**/dbscripts/mysql.sql</exclude> </excludes> </fileSet> <!-- Copying p2 profile and osgi bundles--> @@ -276,19 +277,6 @@ <destName>synapse.properties</destName> <filtered>true</filtered> </file> - <file> - <source>src/main/conf/cipher-text.properties</source> - <outputDirectory>apache-stratos-cc-${pom.version}/repository/conf/security/</outputDirectory> - <destName>cipher-text.properties</destName> - <filtered>true</filtered> - </file> - <file> - <source>src/main/conf/cipher-tool.properties</source> - <outputDirectory>apache-stratos-cc-${pom.version}/repository/conf/security</outputDirectory> - <destName>cipher-tool.properties</destName> - <filtered>true</filtered> - </file> - <file> <source>src/main/resources/stratos.bat</source> <outputDirectory>apache-stratos-cc-${pom.version}/bin/</outputDirectory> @@ -338,11 +326,6 @@ <filtered>true</filtered> <fileMode>644</fileMode> </file> - <file> - <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml</source> - <outputDirectory>apache-stratos-cc-${pom.version}/repository/conf/</outputDirectory> - <filtered>true</filtered> - </file> <!--file> <source> ../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/authenticators.xml @@ -380,5 +363,46 @@ <source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/coordination-client-config.xml</source> <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory> </file--> + + <!--Copying config files from kernel patches --> + + <file> + <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0001/dbscripts/mysql.sql</source> + <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts</outputDirectory> + <filtered>true</filtered> + </file> + + <!-- <file> + <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/axis2/axis2_client.xml</source> + <outputDirectory>apache-stratos-autoscaler-${pom.version}/repository/conf/axis2/</outputDirectory> + <filtered>true</filtered> + </file> + <file> + <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/axis2/axis2.xml</source> + <outputDirectory>apache-stratos-autoscaler-${pom.version}/repository/conf/axis2/</outputDirectory> + <filtered>true</filtered> + </file> + <file> + <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/axis2/tenant-axis2.xml</source> + <outputDirectory>apache-stratos-autoscaler-${pom.version}/repository/conf/axis2/</outputDirectory> + <filtered>true</filtered> + </file>--> + <file> + <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-text.properties</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security/</outputDirectory> + <filtered>true</filtered> + </file> + <file> + <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-tool.properties</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security/</outputDirectory> + <filtered>true</filtered> + </file> + + + <file> + <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0004/repository/conf/carbon.xml</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory> + <filtered>true</filtered> + </file> </files> </assembly> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bd292492/products/cloud-controller/modules/distribution/src/main/conf/jndi.properties ---------------------------------------------------------------------- diff --git a/products/cloud-controller/modules/distribution/src/main/conf/jndi.properties b/products/cloud-controller/modules/distribution/src/main/conf/jndi.properties index 137079f..046c8f5 100644 --- a/products/cloud-controller/modules/distribution/src/main/conf/jndi.properties +++ b/products/cloud-controller/modules/distribution/src/main/conf/jndi.properties @@ -1,4 +1,3 @@ connectionfactoryName=topicConnectionfactory connectionfactory.topicConnectionfactory=amqp://admin:admin@carbon/carbon?brokerlist='tcp://localhost:5677' java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory -java.naming.provider.url=repository/conf/jndi.properties http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bd292492/products/load-balancer/modules/distribution/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/products/load-balancer/modules/distribution/src/main/assembly/bin.xml b/products/load-balancer/modules/distribution/src/main/assembly/bin.xml index 0940d0d..431a2bc 100755 --- a/products/load-balancer/modules/distribution/src/main/assembly/bin.xml +++ b/products/load-balancer/modules/distribution/src/main/assembly/bin.xml @@ -226,12 +226,6 @@ <filtered>true</filtered> </file> <file> - <source>src/main/conf/cipher-text.properties</source> - <outputDirectory>apache-stratos-load-balancer-${pom.version}/lib</outputDirectory> - <destName>cipher-text.properties</destName> - <filtered>true</filtered> - </file> - <file> <source>src/main/conf/nhttp.properties</source> <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory> <destName>nhttp.properties</destName> @@ -296,12 +290,47 @@ <outputDirectory>apache-stratos-load-balancer-${pom.version}/bin/</outputDirectory> <filtered>true</filtered> </file--> + + <!--Copying config files from kernel patches --> + <file> - <source> - target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml - </source> + <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0001/dbscripts/mysql.sql</source> + <outputDirectory>apache-stratos-load-balancer-${pom.version}/dbscripts</outputDirectory> + <filtered>true</filtered> + </file> + + <!-- <file> + <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/axis2/axis2_client.xml</source> + <outputDirectory>apache-stratos-autoscaler-${pom.version}/repository/conf/axis2/</outputDirectory> + <filtered>true</filtered> + </file> + <file> + <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/axis2/axis2.xml</source> + <outputDirectory>apache-stratos-autoscaler-${pom.version}/repository/conf/axis2/</outputDirectory> + <filtered>true</filtered> + </file> + <file> + <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/axis2/tenant-axis2.xml</source> + <outputDirectory>apache-stratos-autoscaler-${pom.version}/repository/conf/axis2/</outputDirectory> + <filtered>true</filtered> + </file>--> + <file> + <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-text.properties</source> + <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf/security/</outputDirectory> + <filtered>true</filtered> + </file> + <file> + <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-tool.properties</source> + <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf/security/</outputDirectory> + <filtered>true</filtered> + </file> + + + <file> + <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0004/repository/conf/carbon.xml</source> <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf/</outputDirectory> <filtered>true</filtered> </file> + </files> </assembly> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bd292492/products/stratos-manager/conf/jndi.properties ---------------------------------------------------------------------- diff --git a/products/stratos-manager/conf/jndi.properties b/products/stratos-manager/conf/jndi.properties index 425c2b7..046c8f5 100644 --- a/products/stratos-manager/conf/jndi.properties +++ b/products/stratos-manager/conf/jndi.properties @@ -1,4 +1,3 @@ connectionfactoryName=topicConnectionfactory connectionfactory.topicConnectionfactory=amqp://admin:admin@carbon/carbon?brokerlist='tcp://localhost:5677' java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory -#java.naming.provider.url=repository/conf/jndi.properties http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bd292492/products/stratos-manager/modules/distribution/src/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/products/stratos-manager/modules/distribution/src/assembly/bin.xml b/products/stratos-manager/modules/distribution/src/assembly/bin.xml index 4761fd1..8fc16a3 100755 --- a/products/stratos-manager/modules/distribution/src/assembly/bin.xml +++ b/products/stratos-manager/modules/distribution/src/assembly/bin.xml @@ -48,7 +48,10 @@ <exclude>**/org.wso2.carbon.roles.mgt.ui_4.1.0-SNAPSHOT.jar</exclude> <exclude>**/org.wso2.carbon.roles.mgt.stub_4.1.0-SNAPSHOT.jar</exclude> <exclude>**/log4j.properties</exclude> - <exclude>**/repository/components/**</exclude> + <exclude>**/repository/components/**</exclude> + <exclude>**/dbscripts/mysql.sql</exclude> + <exclude>**/repository/conf/security/cipher-tool.properties</exclude> + <exclude>**/repository/conf/security/cipher-text.properties</exclude> </excludes> </fileSet> <!-- Copying p2 profile and osgi bundles--> @@ -524,11 +527,6 @@ <fileMode>644</fileMode> </file> <file> - <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory> - <filtered>true</filtered> - </file> - <file> <source>target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt</source> <outputDirectory>${pom.artifactId}-${pom.version}/bin/</outputDirectory> @@ -669,5 +667,46 @@ <fileMode>644</fileMode> </file> <!-- End of REST endpoint webapp --> + + <!--Copying config files from kernel patches --> + <file> + <source>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0001/dbscripts/mysql.sql</source> + <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts</outputDirectory> + <filtered>true</filtered> + </file> + + <!-- <file> + <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/axis2/axis2_client.xml</source> + <outputDirectory>apache-stratos-autoscaler-${pom.version}/repository/conf/axis2/</outputDirectory> + <filtered>true</filtered> + </file> + <file> + <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/axis2/axis2.xml</source> + <outputDirectory>apache-stratos-autoscaler-${pom.version}/repository/conf/axis2/</outputDirectory> + <filtered>true</filtered> + </file> + <file> + <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/axis2/tenant-axis2.xml</source> + <outputDirectory>apache-stratos-autoscaler-${pom.version}/repository/conf/axis2/</outputDirectory> + <filtered>true</filtered> + </file>--> + <file> + <source>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-text.properties</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security/</outputDirectory> + <filtered>true</filtered> + </file> + <file> + <source>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-tool.properties</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security/</outputDirectory> + <filtered>true</filtered> + </file> + + + <file> + <source>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0004/repository/conf/carbon.xml</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory> + <filtered>true</filtered> + </file> + </files> </assembly>
