You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2017/03/15 14:05:03 UTC
[1/3] brooklyn-server git commit: Move
WindowsPerformanceCounterPollConfig in the package where it is used
Repository: brooklyn-server
Updated Branches:
refs/heads/master 5a3a6b694 -> 37c37477b
Move WindowsPerformanceCounterPollConfig in the package where it is used
Fixed OSGi Export-Packages
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d195219f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d195219f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d195219f
Branch: refs/heads/master
Commit: d195219fc3c5a82e660f10bc50de6e20305908d2
Parents: bb1da12
Author: Valentin Aitken <bo...@gmail.com>
Authored: Wed Mar 15 14:14:02 2017 +0200
Committer: Valentin Aitken <bo...@gmail.com>
Committed: Wed Mar 15 15:31:34 2017 +0200
----------------------------------------------------------------------
.../WindowsPerformanceCounterPollConfig.java | 61 --------------------
.../WindowsPerformanceCounterPollConfig.java | 61 ++++++++++++++++++++
2 files changed, 61 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d195219f/core/src/main/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterPollConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterPollConfig.java b/core/src/main/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterPollConfig.java
deleted file mode 100644
index 2dd97b6..0000000
--- a/core/src/main/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterPollConfig.java
+++ /dev/null
@@ -1,61 +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.brooklyn.feed.windows;
-
-import com.google.common.base.Function;
-import com.google.common.base.Functions;
-
-import org.apache.brooklyn.api.sensor.AttributeSensor;
-import org.apache.brooklyn.core.feed.PollConfig;
-
-public class WindowsPerformanceCounterPollConfig<T> extends PollConfig<Object, T, WindowsPerformanceCounterPollConfig<T>>{
-
- private String performanceCounterName;
-
- public static <T> WindowsPerformanceCounterPollConfig<T> forSensor(AttributeSensor<T> sensor) {
- return new WindowsPerformanceCounterPollConfig<T>(sensor);
- }
-
- public static WindowsPerformanceCounterPollConfig<Void> forMultiple() {
- return new WindowsPerformanceCounterPollConfig<Void>(PollConfig.NO_SENSOR);
- }
-
- @SuppressWarnings({ "unchecked", "rawtypes" })
- public WindowsPerformanceCounterPollConfig(AttributeSensor<T> sensor) {
- super(sensor);
- description(sensor.getDescription());
- onSuccess((Function)Functions.identity());
- }
-
- public WindowsPerformanceCounterPollConfig(WindowsPerformanceCounterPollConfig<T> other) {
- super(other);
- this.performanceCounterName = other.performanceCounterName;
- }
-
- public String getPerformanceCounterName() {
- return performanceCounterName;
- }
-
- public WindowsPerformanceCounterPollConfig<T> performanceCounterName(String val) {
- this.performanceCounterName = val; return this;
- }
-
- @Override protected String toStringPollSource() { return performanceCounterName; }
-
-}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d195219f/software/winrm/src/main/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterPollConfig.java
----------------------------------------------------------------------
diff --git a/software/winrm/src/main/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterPollConfig.java b/software/winrm/src/main/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterPollConfig.java
new file mode 100644
index 0000000..2dd97b6
--- /dev/null
+++ b/software/winrm/src/main/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterPollConfig.java
@@ -0,0 +1,61 @@
+/*
+ * 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.brooklyn.feed.windows;
+
+import com.google.common.base.Function;
+import com.google.common.base.Functions;
+
+import org.apache.brooklyn.api.sensor.AttributeSensor;
+import org.apache.brooklyn.core.feed.PollConfig;
+
+public class WindowsPerformanceCounterPollConfig<T> extends PollConfig<Object, T, WindowsPerformanceCounterPollConfig<T>>{
+
+ private String performanceCounterName;
+
+ public static <T> WindowsPerformanceCounterPollConfig<T> forSensor(AttributeSensor<T> sensor) {
+ return new WindowsPerformanceCounterPollConfig<T>(sensor);
+ }
+
+ public static WindowsPerformanceCounterPollConfig<Void> forMultiple() {
+ return new WindowsPerformanceCounterPollConfig<Void>(PollConfig.NO_SENSOR);
+ }
+
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ public WindowsPerformanceCounterPollConfig(AttributeSensor<T> sensor) {
+ super(sensor);
+ description(sensor.getDescription());
+ onSuccess((Function)Functions.identity());
+ }
+
+ public WindowsPerformanceCounterPollConfig(WindowsPerformanceCounterPollConfig<T> other) {
+ super(other);
+ this.performanceCounterName = other.performanceCounterName;
+ }
+
+ public String getPerformanceCounterName() {
+ return performanceCounterName;
+ }
+
+ public WindowsPerformanceCounterPollConfig<T> performanceCounterName(String val) {
+ this.performanceCounterName = val; return this;
+ }
+
+ @Override protected String toStringPollSource() { return performanceCounterName; }
+
+}
[3/3] brooklyn-server git commit: This closes #595
Posted by al...@apache.org.
This closes #595
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/37c37477
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/37c37477
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/37c37477
Branch: refs/heads/master
Commit: 37c37477b121cdf99d84802de4d742fdee8bcbc1
Parents: 5a3a6b6 1cbfb8d
Author: Aled Sage <al...@gmail.com>
Authored: Wed Mar 15 14:04:34 2017 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Mar 15 14:04:34 2017 +0000
----------------------------------------------------------------------
.../WindowsPerformanceCounterPollConfig.java | 61 --------------------
.../core/sensor/windows/WinRmCommandSensor.java | 6 --
.../WindowsPerformanceCounterPollConfig.java | 61 ++++++++++++++++++++
3 files changed, 61 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
[2/3] brooklyn-server git commit: WinRmCommandSensor executing in
directory
Posted by al...@apache.org.
WinRmCommandSensor executing in directory
Remove isAbsolutish sugar so dir like %USERPROFILE% works
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/1cbfb8d8
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/1cbfb8d8
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/1cbfb8d8
Branch: refs/heads/master
Commit: 1cbfb8d8420ff00ca6798e5a0e122c305143c792
Parents: d195219
Author: Valentin Aitken <bo...@gmail.com>
Authored: Wed Mar 15 14:15:06 2017 +0200
Committer: Valentin Aitken <bo...@gmail.com>
Committed: Wed Mar 15 15:31:39 2017 +0200
----------------------------------------------------------------------
.../brooklyn/core/sensor/windows/WinRmCommandSensor.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1cbfb8d8/software/winrm/src/main/java/org/apache/brooklyn/core/sensor/windows/WinRmCommandSensor.java
----------------------------------------------------------------------
diff --git a/software/winrm/src/main/java/org/apache/brooklyn/core/sensor/windows/WinRmCommandSensor.java b/software/winrm/src/main/java/org/apache/brooklyn/core/sensor/windows/WinRmCommandSensor.java
index e3e3ec1..18fd0ea 100644
--- a/software/winrm/src/main/java/org/apache/brooklyn/core/sensor/windows/WinRmCommandSensor.java
+++ b/software/winrm/src/main/java/org/apache/brooklyn/core/sensor/windows/WinRmCommandSensor.java
@@ -151,12 +151,6 @@ public final class WinRmCommandSensor<T> extends AddSensor<T> {
if (Strings.isBlank(execDir)) {
execDir = "%USERPROFILE%";
}
- } else if (!Os.isAbsolutish(execDir)) {
- // relative paths taken wrt run dir
- String runDir = entity.getAttribute(BrooklynConfigKeys.RUN_DIR);
- if (!Strings.isBlank(runDir)) {
- execDir = Os.mergePaths(runDir, execDir);
- }
}
if (!"~".equals(execDir)) {
finalCommand = "(if exist \"" + execDir + "\" (rundll32) else (mkdir \""+execDir+"\")) && cd \""+execDir+"\" && "+finalCommand;