You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/11/24 07:58:25 UTC
[1/3] stratos git commit: Updating log message
Repository: stratos
Updated Branches:
refs/heads/stratos-4.1.x 9514aef53 -> 428f58c60
Updating log message
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e3f8bad1
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e3f8bad1
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e3f8bad1
Branch: refs/heads/stratos-4.1.x
Commit: e3f8bad1f7ebb3f110f072790387ac304d055209
Parents: fbf5980
Author: Thanuja <th...@wso2.com>
Authored: Mon Nov 23 22:48:13 2015 +0530
Committer: Thanuja <th...@wso2.com>
Committed: Mon Nov 23 22:48:13 2015 +0530
----------------------------------------------------------------------
.../cloud/controller/messaging/topology/TopologyBuilder.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/e3f8bad1/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
index 6a3417b..d0a21d1 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
@@ -438,7 +438,7 @@ public class TopologyBuilder {
if (memInfoPublisher.isEnabled()) {
if (log.isInfoEnabled()) {
- log.info("Publishing member information to DAS...");
+ log.info("Publishing member information to DAS");
}
String scalingDecisionId = memberContext.getProperties()
.getProperty(StratosConstants.SCALING_DECISION_ID).getValue();
@@ -447,7 +447,7 @@ public class TopologyBuilder {
}
if (memStatusPublisher.isEnabled()) {
if (log.isInfoEnabled()) {
- log.info("Publishing member status to DAS...");
+ log.info("Publishing member status to DAS");
}
memStatusPublisher.publish(timestamp, applicationId, memberContext.getClusterId(), clusterAlias,
memberContext.getClusterInstanceId(), memberContext.getCartridgeType(),
[2/3] stratos git commit: Restructuring das extension folder structure
Posted by ra...@apache.org.
Restructuring das extension folder structure
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/41761afb
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/41761afb
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/41761afb
Branch: refs/heads/stratos-4.1.x
Commit: 41761afb230ecc7647dd037a53239a26afcb53ed
Parents: e3f8bad
Author: Thanuja <th...@wso2.com>
Authored: Tue Nov 24 12:24:34 2015 +0530
Committer: Thanuja <th...@wso2.com>
Committed: Tue Nov 24 12:24:34 2015 +0530
----------------------------------------------------------------------
.../apache/stratos/das/extension/TimeUDF.java | 49 ++++++++++++++++++++
.../das/extension/spark/udf/TimeUDF.java | 49 --------------------
2 files changed, 49 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/41761afb/extensions/das/modules/stratos-das-extension/src/main/java/org/apache/stratos/das/extension/TimeUDF.java
----------------------------------------------------------------------
diff --git a/extensions/das/modules/stratos-das-extension/src/main/java/org/apache/stratos/das/extension/TimeUDF.java b/extensions/das/modules/stratos-das-extension/src/main/java/org/apache/stratos/das/extension/TimeUDF.java
new file mode 100644
index 0000000..b9846de
--- /dev/null
+++ b/extensions/das/modules/stratos-das-extension/src/main/java/org/apache/stratos/das/extension/TimeUDF.java
@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+package org.apache.stratos.das.extension;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * Implementing UDF for implementing spark sql query related to time.
+ */
+public class TimeUDF {
+ /**
+ * Convert time(ms) to DateFormat
+ *
+ * @param timeStamp time in ms
+ * @return date as String
+ */
+ public String time(Long timeStamp) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ Date date = new Date(timeStamp.longValue());
+ return sdf.format(date);
+ }
+
+ /**
+ * Get the current time in ms
+ *
+ * @param param
+ * @return
+ */
+ public long current_time(Integer param) {
+ return System.currentTimeMillis();
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/41761afb/extensions/das/modules/stratos-das-extension/src/main/java/org/apache/stratos/das/extension/spark/udf/TimeUDF.java
----------------------------------------------------------------------
diff --git a/extensions/das/modules/stratos-das-extension/src/main/java/org/apache/stratos/das/extension/spark/udf/TimeUDF.java b/extensions/das/modules/stratos-das-extension/src/main/java/org/apache/stratos/das/extension/spark/udf/TimeUDF.java
deleted file mode 100644
index 0b8f408..0000000
--- a/extensions/das/modules/stratos-das-extension/src/main/java/org/apache/stratos/das/extension/spark/udf/TimeUDF.java
+++ /dev/null
@@ -1,49 +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.
- */
-package org.apache.stratos.das.extension.spark.udf;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * Implementing UDF for implementing spark sql query related to time.
- */
-public class TimeUDF {
- /**
- * Convert time(ms) to DateFormat
- *
- * @param timeStamp time in ms
- * @return date as String
- */
- public String time(Long timeStamp) {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
- Date date = new Date(timeStamp.longValue());
- return sdf.format(date);
- }
-
- /**
- * Get the current time in ms
- *
- * @param param
- * @return
- */
- public long current_time(Integer param) {
- return System.currentTimeMillis();
- }
-}
\ No newline at end of file
[3/3] stratos git commit: This closes #495
Posted by ra...@apache.org.
This closes #495
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/428f58c6
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/428f58c6
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/428f58c6
Branch: refs/heads/stratos-4.1.x
Commit: 428f58c6092ca1b6b7e81b2269c7ce9206068802
Parents: 9514aef 41761af
Author: rajkumar <rr...@gmail.com>
Authored: Tue Nov 24 12:27:11 2015 +0530
Committer: rajkumar <rr...@gmail.com>
Committed: Tue Nov 24 12:27:11 2015 +0530
----------------------------------------------------------------------
.../messaging/topology/TopologyBuilder.java | 4 +-
.../apache/stratos/das/extension/TimeUDF.java | 49 ++++++++++++++++++++
.../das/extension/spark/udf/TimeUDF.java | 49 --------------------
3 files changed, 51 insertions(+), 51 deletions(-)
----------------------------------------------------------------------