You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2014/09/16 12:58:47 UTC
[3/3] git commit: Merge branch '4.0.0-grouping' of
https://github.com/gayangunarathne/stratos into grouping
Merge branch '4.0.0-grouping' of https://github.com/gayangunarathne/stratos into grouping
Conflicts:
components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/CarbonRegistry.java
components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/GRegRegistry.java
This closes #39
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d59ddee7
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d59ddee7
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d59ddee7
Branch: refs/heads/4.0.0-grouping
Commit: d59ddee7a454df32898ea41158f3c57c16fc7730
Parents: 26cab41 3463763
Author: Udara Liyanage <ud...@wso2.com>
Authored: Tue Sep 16 16:27:22 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Tue Sep 16 16:27:22 2014 +0530
----------------------------------------------------------------------
.../metadataservice/listener/TopologyAgent.java | 4 ++-
.../listener/TopologyListener.java | 6 +++--
.../registry/CarbonRegistry.java | 25 +++++++++----------
.../metadataservice/registry/GRegRegistry.java | 26 +++++++++++---------
components/pom.xml | 2 ++
features/manager/pom.xml | 1 +
6 files changed, 36 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d59ddee7/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/CarbonRegistry.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/CarbonRegistry.java
index 0ba238a,054db31..71e3b70
--- a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/CarbonRegistry.java
+++ b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/CarbonRegistry.java
@@@ -67,8 -67,8 +67,8 @@@ public class CarbonRegistry extends Abs
@Override
public String addCartridgeMetaDataDetails(String applicationName, String cartridgeType,
CartridgeMetaData cartridgeMetaData) throws Exception {
+ log.debug("Adding meta data details");
-
+
-
Registry tempRegistry = getGovernanceUserRegistry();
try {
@@@ -96,9 -96,11 +96,10 @@@
tempRegistry.put(resourcePath, resource);
- if(log.isDebugEnabled())
- log.debug(String.format("A resource added to: %s", resourcePath));
-
+ if(log.isDebugEnabled()){
+ log.debug("A resource added to: " + resourcePath);
+ }
-
+
Comment comment = new Comment();
comment.setText("Added the " + applicationName + " " + type + " cartridge");
// registry.addComment(resourcePath, comment);
http://git-wip-us.apache.org/repos/asf/stratos/blob/d59ddee7/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/GRegRegistry.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d59ddee7/components/pom.xml
----------------------------------------------------------------------
diff --cc components/pom.xml
index 15d0ee5,0b41eb7..322ccae
--- a/components/pom.xml
+++ b/components/pom.xml
@@@ -102,6 -102,8 +102,8 @@@
<module>org.apache.stratos.rest.endpoint</module>
<!-- Stratos manager styles bundle -->
<module>org.apache.stratos.manager.styles</module>
+
- <module>org.apache.stratos.metadataservice</module>
++ <module>org.apache.stratos.metadataservice</module>
</modules>