You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/12/20 09:03:45 UTC
[1/2] git commit: Fixed cartridge agent issues (misc)
Updated Branches:
refs/heads/master cc572dbb8 -> d95128548
Fixed cartridge agent issues (misc)
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/baa3d810
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/baa3d810
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/baa3d810
Branch: refs/heads/master
Commit: baa3d8106661999d09aa4b52c81f29e104ce2870
Parents: 752676a
Author: Imesh Gunaratne <im...@apache.org>
Authored: Fri Dec 20 13:33:24 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Dec 20 13:33:24 2013 +0530
----------------------------------------------------------------------
.../stratos/cartridge/agent/CartridgeAgent.java | 10 ++++-----
.../apache/stratos/cartridge/agent/Main.java | 3 +++
.../config/CartridgeAgentConfiguration.java | 4 ++--
.../config/configurator/JndiConfigurator.java | 18 ++++++++-------
.../publisher/CartridgeAgentEventPublisher.java | 16 +++++++-------
.../distribution/src/main/assembly/bin.xml | 1 -
.../distribution/src/main/conf/jndi.properties | 23 --------------------
.../conf/templates/jndi.properties.template | 2 +-
8 files changed, 29 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/baa3d810/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
index 807e950..919de44 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
@@ -76,7 +76,7 @@ public class CartridgeAgent implements Runnable {
String repoUrl = CartridgeAgentConfiguration.getInstance().getRepoUrl();
if ("null".equals(repoUrl) || StringUtils.isBlank(repoUrl)) {
if(log.isInfoEnabled()) {
- log.info("No repo url found");
+ log.info("No artifact repository found");
}
// Publish instance activated event
@@ -94,8 +94,8 @@ public class CartridgeAgent implements Runnable {
private void onArtifactUpdateEvent(ArtifactUpdatedEvent event) {
ArtifactUpdatedEvent artifactUpdatedEvent = (ArtifactUpdatedEvent) event;
- if(log.isDebugEnabled()) {
- log.debug(String.format("Artifact update event received: $s", artifactUpdatedEvent.toString()));
+ if(log.isInfoEnabled()) {
+ log.info(String.format("Artifact update event received: %s", artifactUpdatedEvent.toString()));
}
String clusterIdInPayload = CartridgeAgentConfiguration.getInstance().getClusterId();
@@ -107,8 +107,8 @@ public class CartridgeAgent implements Runnable {
String tenantId = artifactUpdatedEvent.getTenantId();
if(StringUtils.isNotEmpty(repoURL) && (clusterIdInPayload != null) && clusterIdInPayload.equals(clusterIdInMessage)) {
- if(log.isDebugEnabled()) {
- log.debug("Executing git checkout");
+ if(log.isInfoEnabled()) {
+ log.info("Executing git checkout");
}
RepositoryInformation repoInformation = new RepositoryInformation();
repoInformation.setRepoUsername(repoUsername);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/baa3d810/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/Main.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/Main.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/Main.java
index 0506dd2..873868b 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/Main.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/Main.java
@@ -36,6 +36,9 @@ public class Main {
public static void main(String[] args) {
try {
// Configure log4j properties
+ if(log.isDebugEnabled()) {
+ log.debug("Configuring log4j.properties file path");
+ }
PropertyConfigurator.configure(System.getProperty("log4j.properties.file.path"));
// Generate jndi.properties file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/baa3d810/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/CartridgeAgentConfiguration.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/CartridgeAgentConfiguration.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/CartridgeAgentConfiguration.java
index f5e9dc7..65c3408 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/CartridgeAgentConfiguration.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/CartridgeAgentConfiguration.java
@@ -103,8 +103,8 @@ public class CartridgeAgentConfiguration {
List<Integer> ports = new ArrayList<Integer>();
String portsStr = readParameterValue(CartridgeAgentConstants.PORTS);
List<String> portsStrList = CartridgeAgentUtils.splitUsingTokenizer(portsStr, "|");
- for(String portStr : portsStrList) {
- ports.add(Integer.parseInt(portsStr));
+ for(String port : portsStrList) {
+ ports.add(Integer.parseInt(port));
}
return ports;
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/baa3d810/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/configurator/JndiConfigurator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/configurator/JndiConfigurator.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/configurator/JndiConfigurator.java
index 1b48743..072734d 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/configurator/JndiConfigurator.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/configurator/JndiConfigurator.java
@@ -21,6 +21,8 @@ package org.apache.stratos.cartridge.agent.config.configurator;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cartridge.agent.config.CartridgeAgentConfiguration;
import org.wso2.carbon.utils.CarbonUtils;
@@ -33,12 +35,13 @@ import java.io.IOException;
* Jndi configurator to configure message broker related settings and generate jndi.properties file.
*/
public class JndiConfigurator {
-
- private static boolean configured;
+ private static final Log log = LogFactory.getLog(JndiConfigurator.class);
public static void configure() {
+ if(log.isDebugEnabled()) {
+ log.debug("Configuring jndi.properties file");
+ }
generateJndiPropertiesFile();
- configured = true;
}
private static void generateJndiPropertiesFile() {
@@ -63,7 +66,7 @@ public class JndiConfigurator {
jndiFilePath = jndiFileDir + "jndi.properties";
}
else {
- jndiFilePath = jndiFileDir = "/" + "jndi.properties";
+ jndiFilePath = jndiFileDir + "/" + "jndi.properties";
}
File templateFile = new File(templateFilePath);
@@ -80,6 +83,9 @@ public class JndiConfigurator {
// Write jndi.properties file
writeFileContent(content, jndiFilePath);
+ if(log.isDebugEnabled()) {
+ log.debug(String.format("jndi.properties file written to: %s", jndiFilePath));
+ }
} catch (Exception e) {
throw new RuntimeException("Could not write jndi.properties file", e);
}
@@ -98,8 +104,4 @@ public class JndiConfigurator {
FileOutputStream outputStream = new FileOutputStream(filePath);
IOUtils.write(content, outputStream);
}
-
- public static boolean isConfigured() {
- return configured;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/baa3d810/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java
index 97bf23b..a576a3a 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java
@@ -15,8 +15,8 @@ public class CartridgeAgentEventPublisher {
private static final Log log = LogFactory.getLog(CartridgeAgentEventPublisher.class);
public static void publishInstanceStartedEvent() {
- if(log.isDebugEnabled()) {
- log.debug("Publishing instance started event");
+ if(log.isInfoEnabled()) {
+ log.info("Publishing instance started event");
}
InstanceStartedEvent event = new InstanceStartedEvent(
CartridgeAgentConfiguration.getInstance().getServiceName(),
@@ -27,14 +27,14 @@ public class CartridgeAgentEventPublisher {
EventPublisher eventPublisher = new EventPublisher(Constants.INSTANCE_STATUS_TOPIC);
eventPublisher.publish(event);
- if(log.isDebugEnabled()) {
- log.debug("Instance started event published");
+ if(log.isInfoEnabled()) {
+ log.info("Instance started event published");
}
}
public static void publishInstanceActivatedEvent() {
- if(log.isDebugEnabled()) {
- log.debug("Publishing instance activated event");
+ if(log.isInfoEnabled()) {
+ log.info("Publishing instance activated event");
}
InstanceActivatedEvent event = new InstanceActivatedEvent(
CartridgeAgentConfiguration.getInstance().getServiceName(),
@@ -45,8 +45,8 @@ public class CartridgeAgentEventPublisher {
EventPublisher eventPublisher = new EventPublisher(Constants.INSTANCE_STATUS_TOPIC);
eventPublisher.publish(event);
- if(log.isDebugEnabled()) {
- log.debug("Instance activated event published");
+ if(log.isInfoEnabled()) {
+ log.info("Instance activated event published");
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/baa3d810/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 4aa54f2..b61c0df 100644
--- a/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml
+++ b/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml
@@ -38,7 +38,6 @@
<outputDirectory>/conf</outputDirectory>
<fileMode>0600</fileMode>
<includes>
- <include>jndi.properties</include>
<include>log4j.properties</include>
</includes>
</fileSet>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/baa3d810/products/cartridge-agent/modules/distribution/src/main/conf/jndi.properties
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/distribution/src/main/conf/jndi.properties b/products/cartridge-agent/modules/distribution/src/main/conf/jndi.properties
deleted file mode 100644
index c88ec1d..0000000
--- a/products/cartridge-agent/modules/distribution/src/main/conf/jndi.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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.
-#
-
-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/baa3d810/products/cartridge-agent/modules/distribution/src/main/conf/templates/jndi.properties.template
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/distribution/src/main/conf/templates/jndi.properties.template b/products/cartridge-agent/modules/distribution/src/main/conf/templates/jndi.properties.template
index 9ccf044..8ca6b34 100644
--- a/products/cartridge-agent/modules/distribution/src/main/conf/templates/jndi.properties.template
+++ b/products/cartridge-agent/modules/distribution/src/main/conf/templates/jndi.properties.template
@@ -23,6 +23,6 @@
connectionfactoryName=topicConnectionfactory
connectionfactory.topicConnectionfactory=amqp://admin:admin@carbon/carbon?brokerlist='tcp://$mb_ip:$mb_port'
java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory
-java.naming.provider.url=repository/conf/jndi.properties
+java.naming.provider.url=conf/jndi.properties
[2/2] git commit: Merge remote-tracking branch 'origin/master'
Posted by im...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d9512854
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d9512854
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d9512854
Branch: refs/heads/master
Commit: d951285486169d7c92a99969d116ba80da42539c
Parents: baa3d81 cc572db
Author: Imesh Gunaratne <im...@apache.org>
Authored: Fri Dec 20 13:33:37 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Dec 20 13:33:37 2013 +0530
----------------------------------------------------------------------
.../apache/stratos/cli/GenericRestClient.java | 6 +-
.../java/org/apache/stratos/cli/RestClient.java | 8 +-
.../stratos/cli/RestCommandLineService.java | 78 ++++++++++++++++----
.../modules/distribution/src/assembly/bin.xml | 16 ++++
4 files changed, 86 insertions(+), 22 deletions(-)
----------------------------------------------------------------------