You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/03/17 16:41:51 UTC
git commit: reverting introduction of agent-flow.conf file
Repository: incubator-stratos
Updated Branches:
refs/heads/master 61ac53dc8 -> dcfc765f5
reverting introduction of agent-flow.conf file
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/dcfc765f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/dcfc765f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/dcfc765f
Branch: refs/heads/master
Commit: dcfc765f51653024db3ccb02d173d74eafec5a6b
Parents: 61ac53d
Author: Nirmal Fernando <ni...@apache.org>
Authored: Mon Mar 17 21:11:28 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Mon Mar 17 21:11:28 2014 +0530
----------------------------------------------------------------------
.../modules/distribution/src/main/assembly/bin.xml | 8 --------
.../modules/distribution/src/main/bin/stratos.sh | 1 -
.../distribution/src/main/conf/agent-flow.conf | 14 --------------
3 files changed, 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/dcfc765f/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 434b8ee..91067b2 100644
--- a/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml
+++ b/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml
@@ -41,14 +41,6 @@
<include>log4j.properties</include>
</includes>
</fileSet>
- <fileSet>
- <directory>${project.basedir}/src/main/conf</directory>
- <outputDirectory>/conf</outputDirectory>
- <fileMode>0600</fileMode>
- <includes>
- <include>agent-flow.conf</include>
- </includes>
- </fileSet>
<fileSet>
<directory>${project.basedir}/src/main/extensions</directory>
<outputDirectory>/extensions</outputDirectory>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/dcfc765f/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
index 7f4e55e..71c23c7 100644
--- a/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh
+++ b/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh
@@ -31,7 +31,6 @@ properties="-Dmb.ip=MB-IP
-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
- -Dagent.flow.file.path=${script_path}/../conf/agent-flow.conf
-Dparam.file.path=/opt/apache-stratos-cartridge-agent/payload/launch-params
-Dextensions.dir=${script_path}/../extensions
-Dcep.stats.publisher.enabled=true
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/dcfc765f/products/cartridge-agent/modules/distribution/src/main/conf/agent-flow.conf
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/distribution/src/main/conf/agent-flow.conf b/products/cartridge-agent/modules/distribution/src/main/conf/agent-flow.conf
deleted file mode 100644
index f9ccb19..0000000
--- a/products/cartridge-agent/modules/distribution/src/main/conf/agent-flow.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[Initializing]=org.apache.stratos.cartridge.agent.phase.impl.InitializingPhase
-org.apache.stratos.cartridge.agent.executor.impl.StartListenersExtensionExecutor
-org.apache.stratos.cartridge.agent.executor.impl.ScriptExtensionExecutor=instance-started.sh
-
-[Starting]=org.apache.stratos.cartridge.agent.phase.impl.StartingPhase
-org.apache.stratos.cartridge.agent.executor.impl.ScriptExtensionExecutor=start-servers.sh
-org.apache.stratos.cartridge.agent.executor.impl.WaitTillActivateExtensionExecutor
-org.apache.stratos.cartridge.agent.executor.impl.PersistenceVolumeExtensionExecutor
-
-[WorkingPhase]=org.apache.stratos.cartridge.agent.phase.impl.WorkingPhase
-org.apache.stratos.cartridge.agent.executor.impl.LogPublisherExtensionExecutor
-org.apache.stratos.cartridge.agent.executor.impl.KeepAgentLiveExtensionExecutor
-
-[CleanUpPhase]=org.apache.stratos.cartridge.agent.phase.impl.CleanUpPhase