[GitHub] brooklyn-server issue #690: External ip config for winrm byon location

2017-08-07 Thread iyovcheva
Github user iyovcheva commented on the issue:

https://github.com/apache/brooklyn-server/pull/690
  
Failing with "cannot create temporary folders in parent /tmp after 1000 
attempts" which is not related to the PR


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-server issue #690: External ip config for winrm byon location

2017-08-07 Thread iyovcheva
Github user iyovcheva commented on the issue:

https://github.com/apache/brooklyn-server/pull/690
  
retest this please


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-server issue #690: External ip config for winrm byon location

2017-08-01 Thread iyovcheva
Github user iyovcheva commented on the issue:

https://github.com/apache/brooklyn-server/pull/690
  
@geomacy yep, I'm currently working on it


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-server pull request #759: Revert PolicyConfigResource changes from ...

2017-07-10 Thread iyovcheva
GitHub user iyovcheva opened a pull request:

https://github.com/apache/brooklyn-server/pull/759

Revert PolicyConfigResource changes from the REST API response fix.

Those changes require more careful testing and updates.
We need to revert them from master and reopen in a separate PR.

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/iyovcheva/brooklyn-server 
revert-policy-config-api

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/brooklyn-server/pull/759.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #759


commit d4c4195042cb0745e57a107f2a8c1934eda24fa3
Author: Ivana Yovcheva <ivana.yovch...@gmail.com>
Date:   2017-07-10T14:21:21Z

Revert PolicyConfigResource changes from the REST API response fix.




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-server issue #754: Fix REST API response of methods with String ret...

2017-07-05 Thread iyovcheva
Github user iyovcheva commented on the issue:

https://github.com/apache/brooklyn-server/pull/754
  
@ahgittin This is a list of the GET requests the change impacts:
```
/activities/{task}/stream/{streamId}
/applications/{application}/entities/{entity}/policies/{policy}/config

/applications/{application}/entities/{entity}/policies/{policy}/config/current-state
/server/user
```

The one that was broken in the UI was `/server/user`. In this case we 
always expect a single username, which makes the change not harmful in this 
case (if you have an example that shows the opposite, it's well appreciated). 
The other option here is to change it to `text/plain`.

For `/activities/{task}/stream/{streamId}` `text/plain` is always the 
logical option and we ensure that json will never be expected in this case.

The  controversial options IMO are the two `policies` requests. In this 
case the returned string is already in json, so we may not need any changes.

What do you think about:
* Keep the change for `/activities/{task}/stream/{streamId}`
* Change `/server/user` to `text/plain`
* Remove `policies` changes, as this was working properly before and can be 
risky now?




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-server issue #754: Fix REST API response of methods with String ret...

2017-07-05 Thread iyovcheva
Github user iyovcheva commented on the issue:

https://github.com/apache/brooklyn-server/pull/754
  
Thanks @geomacy , I updated the test. "retest this please" triggers a 
rebuild.



---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-server issue #754: Fix REST API response of methods with String ret...

2017-07-04 Thread iyovcheva
Github user iyovcheva commented on the issue:

https://github.com/apache/brooklyn-server/pull/754
  
retest this please


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-server pull request #754: Fix REST API response of methods with Str...

2017-07-04 Thread iyovcheva
GitHub user iyovcheva opened a pull request:

https://github.com/apache/brooklyn-server/pull/754

Fix REST API response of methods with String return type



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/iyovcheva/brooklyn-server 
fix/rest-api-empty-response

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/brooklyn-server/pull/754.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #754






---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-server pull request #690: External ip config for winrm byon locatio...

2017-05-23 Thread iyovcheva
Github user iyovcheva commented on a diff in the pull request:

https://github.com/apache/brooklyn-server/pull/690#discussion_r117935379
  
--- Diff: 
core/src/main/java/org/apache/brooklyn/location/byon/ByonLocationResolver.java 
---
@@ -152,49 +153,54 @@ protected ConfigBag extractConfig(Map 
locationFlags, String spec, LocationR
 
 String osFamily = (String) 
machineConfig.remove(OS_FAMILY.getName());
 String ssh = (String) machineConfig.remove("ssh");
-String winrm = (String) machineConfig.remove("winrm");
-Map<Integer, String> tcpPortMappings = (Map<Integer, String>) 
machineConfig.get("tcpPortMappings");
-
-checkArgument(ssh != null ^ winrm != null, "Must specify exactly 
one of 'ssh' or 'winrm' for machine: %s", valSanitized);
-
-UserAndHostAndPort userAndHostAndPort;
-String host;
-int port;
-if (ssh != null) {
-userAndHostAndPort = parseUserAndHostAndPort(ssh, 22);
+if (machineConfig.containsKey("winrm") && 
!(machineConfig.get("winrm") instanceof String)) {
--- End diff --

External config is not supported for ssh. If we implement it, it's good to 
go in separate PR.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-server pull request #690: External ip config for winrm byon locatio...

2017-05-22 Thread iyovcheva
Github user iyovcheva commented on a diff in the pull request:

https://github.com/apache/brooklyn-server/pull/690#discussion_r117683610
  
--- Diff: 
core/src/main/java/org/apache/brooklyn/location/byon/ByonLocationResolver.java 
---
@@ -152,49 +153,54 @@ protected ConfigBag extractConfig(Map 
locationFlags, String spec, LocationR
 
 String osFamily = (String) 
machineConfig.remove(OS_FAMILY.getName());
 String ssh = (String) machineConfig.remove("ssh");
-String winrm = (String) machineConfig.remove("winrm");
-Map<Integer, String> tcpPortMappings = (Map<Integer, String>) 
machineConfig.get("tcpPortMappings");
-
-checkArgument(ssh != null ^ winrm != null, "Must specify exactly 
one of 'ssh' or 'winrm' for machine: %s", valSanitized);
-
-UserAndHostAndPort userAndHostAndPort;
-String host;
-int port;
-if (ssh != null) {
-userAndHostAndPort = parseUserAndHostAndPort(ssh, 22);
+if (machineConfig.containsKey("winrm") && 
!(machineConfig.get("winrm") instanceof String)) {
--- End diff --

@bostko I agree. Will need to test it.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-server pull request #690: External ip config for winrm byon locatio...

2017-05-21 Thread iyovcheva
GitHub user iyovcheva opened a pull request:

https://github.com/apache/brooklyn-server/pull/690

External ip config for winrm byon location



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/iyovcheva/brooklyn-server feature/external-ip

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/brooklyn-server/pull/690.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #690


commit f0c9dd676cc4afac76b1c79f00d84f8183800b62
Author: Ivana Yovcheva <ivana.yovch...@gmail.com>
Date:   2017-05-18T00:11:55Z

External ip config for winrm byon location




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-server pull request #675: DynamicCluster.CLUSTER_ONE_AND_ALL_MEMBER...

2017-05-10 Thread iyovcheva
GitHub user iyovcheva opened a pull request:

https://github.com/apache/brooklyn-server/pull/675

DynamicCluster.CLUSTER_ONE_AND_ALL_MEMBERS_UP clarification

Updating DynamicCluster.CLUSTER_ONE_AND_ALL_MEMBERS_UP description as it 
might be ambiguous at the moment.

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/iyovcheva/brooklyn-server 
cluster-one-and-all-members-up

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/brooklyn-server/pull/675.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #675


commit fe54896b59390c53c87554feb55bb233ed9d74a1
Author: Ivana Yovcheva <ivana.yovch...@gmail.com>
Date:   2017-05-10T08:26:49Z

DynamicCluster.CLUSTER_ONE_AND_ALL_MEMBERS_UP clarification




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-docs issue #152: Docs for SharedLocationSecurityGroupCustomizer

2017-03-10 Thread iyovcheva
Github user iyovcheva commented on the issue:

https://github.com/apache/brooklyn-docs/pull/152
  
Thanks @drigodwin, added a note for that.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-docs pull request #152: Docs for SharedLocationSecurityGroupCustomi...

2017-03-07 Thread iyovcheva
GitHub user iyovcheva opened a pull request:

https://github.com/apache/brooklyn-docs/pull/152

Docs for SharedLocationSecurityGroupCustomizer



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/iyovcheva/brooklyn-docs nsg-customizer-docs

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/brooklyn-docs/pull/152.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #152


commit b92f0c47c7f7ce220ac4252ba7aa248ad4362e15
Author: Ivana Yovcheva <ivana.yovch...@gmail.com>
Date:   2017-03-07T10:07:51Z

Docs for SharedLocationSecurityGroupCustomizer




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-server issue #522: Class renames for advanced-networking vcloud-dir...

2017-01-17 Thread iyovcheva
Github user iyovcheva commented on the issue:

https://github.com/apache/brooklyn-server/pull/522
  
Looks good


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-server pull request #465: Change SetHostnameCustomizer to check if ...

2016-11-25 Thread iyovcheva
Github user iyovcheva closed the pull request at:

https://github.com/apache/brooklyn-server/pull/465


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-server pull request #465: Change SetHostnameCustomizer to check if ...

2016-11-25 Thread iyovcheva
GitHub user iyovcheva opened a pull request:

https://github.com/apache/brooklyn-server/pull/465

Change SetHostnameCustomizer to check if /etc/sysconfig/network exist…

…s on machine and create it if not

In some rare situations it's possible `/etc/sysconfig/network` to be 
missing on the VM on CentOS 6.
Changed the behavior of `SetHostnameCustomizer` to check and create the 
file.

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/iyovcheva/brooklyn-server 
set-hostname-customizer

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/brooklyn-server/pull/465.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #465


commit 68fd4d17d44ff9f16a59d8dd18f48fba3b5b38a5
Author: Ivana Yovcheva <ivana.yovch...@gmail.com>
Date:   2016-11-25T12:48:43Z

Change SetHostnameCustomizer to check if /etc/sysconfig/network exists on 
machine and create it if not




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-server issue #435: BROOKLYN-325: alert if provisioning/termination ...

2016-11-16 Thread iyovcheva
Github user iyovcheva commented on the issue:

https://github.com/apache/brooklyn-server/pull/435
  
Looks good. Tested all the cases and seems to work well.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-server pull request #435: BROOKLYN-325: alert if provisioning/termi...

2016-11-15 Thread iyovcheva
Github user iyovcheva commented on a diff in the pull request:

https://github.com/apache/brooklyn-server/pull/435#discussion_r88055510
  
--- Diff: 
core/src/main/java/org/apache/brooklyn/core/entity/internal/AttributesInternal.java
 ---
@@ -0,0 +1,52 @@
+/*
+ * or more contributor license agreements.  See the NOTICE file
--- End diff --

First line is missing from the Licence


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-server pull request #373: Attach configurable effector to SoftwareP...

2016-10-07 Thread iyovcheva
Github user iyovcheva closed the pull request at:

https://github.com/apache/brooklyn-server/pull/373


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-server pull request #373: Attach configurable effector to SoftwareP...

2016-10-07 Thread iyovcheva
Github user iyovcheva commented on a diff in the pull request:

https://github.com/apache/brooklyn-server/pull/373#discussion_r82384694
  
--- Diff: 
software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java
 ---
@@ -268,6 +272,36 @@ protected void onUpdated() {
  * Called before driver.start; guarantees the driver will exist, and 
locations will have been set.
  */
 protected void preStart() {
+if (!getLocations().isEmpty() && getLocations().iterator().next() 
instanceof JcloudsMachineLocation) {
+JcloudsMachineLocation location = (JcloudsMachineLocation) 
getLocations().iterator().next();
+if (location.getParent().getProvider().equals("aws-ec2")
--- End diff --

@aledsage @neykov I agree. Will close the PR.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-server issue #364: Rebind when entity starting: report notUpIndicat...

2016-10-03 Thread iyovcheva
Github user iyovcheva commented on the issue:

https://github.com/apache/brooklyn-server/pull/364
  
Looks good


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-server pull request #356: BROOKLYN-325 Rebind entity starting

2016-09-30 Thread iyovcheva
Github user iyovcheva commented on a diff in the pull request:

https://github.com/apache/brooklyn-server/pull/356#discussion_r81292615
  
--- Diff: 
core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/BasicEntityRebindSupport.java
 ---
@@ -237,13 +239,21 @@ protected void addLocations(RebindContext 
rebindContext, EntityMemento memento)
 }
 }
 }
-
+
+@Override
 protected void instanceRebind(AbstractBrooklynObject instance) {
 Preconditions.checkState(instance == entity, "Expected %s and %s 
to match, but different objects", instance, entity);
 Lifecycle expectedState = 
ServiceStateLogic.getExpectedState(entity);
 if (expectedState == Lifecycle.STARTING || expectedState == 
Lifecycle.STOPPING) {
-LOG.warn("Entity "+entity);
+LOG.warn("Entity {} goes on-fire because it was in state {} on 
rebind",
+entity, ServiceStateLogic.getExpectedState(entity));
--- End diff --

For some reason this is not showing outdated.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-server pull request #356: BROOKLYN-325 Rebind entity starting (init...

2016-09-28 Thread iyovcheva
Github user iyovcheva commented on a diff in the pull request:

https://github.com/apache/brooklyn-server/pull/356#discussion_r80962988
  
--- Diff: 
software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java
 ---
@@ -440,12 +441,20 @@ public void rebind() {
 //Only if the expected state is ON_FIRE then the entity has 
permanently failed.
 Transition expectedState = getAttribute(SERVICE_STATE_EXPECTED);
 if (expectedState == null || expectedState.getState() != 
Lifecycle.RUNNING) {
+//FIXME does not set on fire root application
+if (expectedState.getState() == Lifecycle.STARTING || 
expectedState.getState() == Lifecycle.STOPPING) {
+setAttribute(SERVICE_STATE_EXPECTED, new 
Lifecycle.Transition(Lifecycle.ON_FIRE, new Date()));
+setAttribute(SERVICE_STATE_ACTUAL, Lifecycle.ON_FIRE);
+}
 LOG.warn("On rebind of {}, not calling software process rebind 
hooks because expected state is {}", this, expectedState);
 return;
 }
 
 Lifecycle actualState = getAttribute(SERVICE_STATE_ACTUAL);
 if (actualState == null || actualState != Lifecycle.RUNNING) {
+if (expectedState.getState() == Lifecycle.STARTING || 
expectedState.getState() == Lifecycle.STOPPING) {
+setAttribute(SERVICE_STATE_ACTUAL, Lifecycle.ON_FIRE);
+}
--- End diff --

This is fixed in a separate commit, so the comment will not show as 
outdated.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-server issue #309: Do not inherit entity config defaultDisplayName

2016-08-29 Thread iyovcheva
Github user iyovcheva commented on the issue:

https://github.com/apache/brooklyn-server/pull/309
  
Looks good


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-server pull request #285: Adding HttpExecutor to be used for interc...

2016-08-25 Thread iyovcheva
Github user iyovcheva commented on a diff in the pull request:

https://github.com/apache/brooklyn-server/pull/285#discussion_r76260732
  
--- Diff: core/src/main/java/org/apache/brooklyn/feed/http/HttpFeed.java ---
@@ -331,52 +365,45 @@ protected void preStart() {
 }
 
 Callable pollJob;
-
-if (pollInfo.method.equals("get")) {
-pollJob = new Callable() {
-public HttpToolResponse call() throws Exception {
-if (log.isTraceEnabled()) log.trace("http polling 
for {} sensors at {}", entity, pollInfo);
-return HttpTool.httpGet(httpClient, 
pollInfo.uriProvider.get(), pollInfo.headers);
-}};
-} else if (pollInfo.method.equals("post")) {
-pollJob = new Callable() {
-public HttpToolResponse call() throws Exception {
-if (log.isTraceEnabled()) log.trace("http polling 
for {} sensors at {}", entity, pollInfo);
-return HttpTool.httpPost(httpClient, 
pollInfo.uriProvider.get(), pollInfo.headers, pollInfo.body);
-}};
-} else if (pollInfo.method.equals("head")) {
-pollJob = new Callable() {
-public HttpToolResponse call() throws Exception {
-if (log.isTraceEnabled()) log.trace("http polling 
for {} sensors at {}", entity, pollInfo);
-return HttpTool.httpHead(httpClient, 
pollInfo.uriProvider.get(), pollInfo.headers);
-}};
-} else {
-throw new IllegalStateException("Unexpected http method: 
"+pollInfo.method);
-}
-
-getPoller().scheduleAtFixedRate(pollJob, new 
DelegatingPollHandler(handlers), minPeriod);
-}
-}
+pollJob = new Callable() {
+public HttpToolResponse call() throws Exception {
+if (log.isTraceEnabled()) log.trace("http polling for 
{} sensors at {}", entity, pollInfo);
 
-// TODO Should we really trustAll for https? Make configurable?
-private HttpClient createHttpClient(HttpPollIdentifier pollIdentifier) 
{
-URI uri = pollIdentifier.uriProvider.get();
-HttpClientBuilder builder = HttpTool.httpClientBuilder()
-.trustAll()
-.laxRedirect(true);
-if (uri != null) builder.uri(uri);
-if (uri != null) builder.credential(pollIdentifier.credentials);
-if (pollIdentifier.connectionTimeout != null) {
-builder.connectionTimeout(pollIdentifier.connectionTimeout);
-}
-if (pollIdentifier.socketTimeout != null) {
-builder.socketTimeout(pollIdentifier.socketTimeout);
+BasicAuth creds = null;
+if (pollInfo.credentials.isPresent()) {
+creds =  
org.apache.brooklyn.util.http.executor.Credentials.basic(
+
pollInfo.credentials.get().getUserPrincipal().getName(),
+pollInfo.credentials.get().getPassword());
+}
+
+HttpResponse response =  
pollInfo.httpExecutor.execute(new HttpRequest.Builder()
+.headers(pollInfo.headers)
+.uri(pollInfo.uriProvider.get())
+.credentials(creds)
+.method(pollInfo.method)
+.body(pollInfo.body)
+.build());
+return createHttpToolRespose(response);
+}};
+getPoller().scheduleAtFixedRate(pollJob, new 
DelegatingPollHandler(handlers), minPeriod);
 }
-return builder.build();
 }
 
 @SuppressWarnings("unchecked")
 protected Poller getPoller() {
-return (Poller) super.getPoller();
+return  (Poller) super.getPoller();
+}
+
+private HttpToolResponse createHttpToolRespose(HttpResponse response) 
throws IOException {
--- End diff --

very minor -  error in syntax - "response"


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-server pull request #272: orphaned-state deletion: keep PortForward...

2016-07-22 Thread iyovcheva
Github user iyovcheva commented on a diff in the pull request:

https://github.com/apache/brooklyn-server/pull/272#discussion_r71928836
  
--- Diff: 
core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/transformer/impl/DeleteOrphanedStateTransformer.java
 ---
@@ -91,93 +107,219 @@ public BrooklynMementoRawData 
transform(BrooklynMementoRawData input) {
 .build();
 }
 
-protected Set 
findAllReferencedEnrichers(BrooklynMementoRawData input) {
-return findAllReferencedAdjuncts(input.getEntities(), "entity" + 
"/enrichers/string");
-}
-
-protected Set findAllReferencedPolicies(BrooklynMementoRawData 
input) {
-return findAllReferencedAdjuncts(input.getEntities(), "entity" + 
"/policies/string");
-}
-
-protected Set findAllReferencedFeeds(BrooklynMementoRawData 
input) {
-return findAllReferencedAdjuncts(input.getEntities(), "entity" + 
"/feeds/string");
-}
-
-protected Set findAllReferencedAdjuncts(Map<String, String> 
items, String xpath) {
-Set result = Sets.newLinkedHashSet();
-
-for(Map.Entry<String, String> entry : items.entrySet()) {
-result.addAll(getAllNodesFromXpath((org.w3c.dom.NodeList) 
XmlUtil.xpath(entry.getValue(), xpath, XPathConstants.NODESET)));
+/**
+ * Searches the state, based on using xpath to find references, 
starting at the roots of
+ * reachability. 
+ * 
+ * For locations, we find all locations referenced by entities, 
enrichers, policies or feeds 
+ * (looking at the xpath for the locations or location refs in the 
persisted state). We then 
+ * search through those locations for other locations reachable by 
them, and so on.
+ * 
+ * We also keep any location that is of type {@link 
PortForwardManager}.
+ */
+protected static class ReachabilityXpathInspector {
+public ReferencedState inspect(BrooklynMementoRawData input) {
+return new ReferencedState()
+.locations(findAllReferencedLocations(input))
+.enrichers(findAllReferencedEnrichers(input))
+.policies(findAllReferencedPolicies(input))
+.feeds(findAllReferencedFeeds(input));
 }
 
-return result;
-}
-
-@VisibleForTesting
-public Map<String, String> findLocationsToKeep(BrooklynMementoRawData 
input) {
-Set allReferencedLocations = 
findAllReferencedLocations(input);
-return copyRetainingKeys(input.getLocations(), 
allReferencedLocations);
-}
-
-@VisibleForTesting
-public Set findAllReferencedLocations(BrooklynMementoRawData 
input) {
-Set result = Sets.newLinkedHashSet();
-
-result.addAll(searchLocationsToKeep(input.getEntities(), 
"/entity"));
-result.addAll(searchLocationsToKeep(input.getPolicies(), 
"/policy"));
-result.addAll(searchLocationsToKeep(input.getEnrichers(), 
"/enricher"));
-result.addAll(searchLocationsToKeep(input.getFeeds(), "/feed"));
-
result.addAll(searchLocationsToKeepInLocations(input.getLocations(), result));
-
-return result;
-}
-
-protected Set searchLocationsToKeep(Map<String, String> items, 
String searchInTypePrefix) {
-String locationsXpath = searchInTypePrefix+"/locations/string";
-String locationProxyXpath = searchInTypePrefix+"//locationProxy";
-
-Set result = Sets.newLinkedHashSet();
-
-for(Map.Entry<String, String> entry : items.entrySet()) {
-result.addAll(getAllNodesFromXpath((org.w3c.dom.NodeList) 
XmlUtil.xpath(entry.getValue(), locationsXpath, XPathConstants.NODESET)));
-result.addAll(getAllNodesFromXpath((org.w3c.dom.NodeList) 
XmlUtil.xpath(entry.getValue(), locationProxyXpath, XPathConstants.NODESET)));
+protected Set 
findAllReferencedEnrichers(BrooklynMementoRawData input) {
+return findAllReferencedAdjuncts(input.getEntities(), "entity" 
+ "/enrichers/string");
+}
+
+protected Set 
findAllReferencedPolicies(BrooklynMementoRawData input) {
+return findAllReferencedAdjuncts(input.getEntities(), "entity" 
+ "/policies/string");
+}
+
+protected Set 
findAllReferencedFeeds(BrooklynMementoRawData input) {
+return findAllReferencedAdjuncts(input.getEntities(), "entity" 
+ "/feeds/string");
+}
+
+protecte

[GitHub] brooklyn-docs pull request #96: Added docs for Cleaning Orphaned State

2016-07-22 Thread iyovcheva
GitHub user iyovcheva opened a pull request:

https://github.com/apache/brooklyn-docs/pull/96

Added docs for Cleaning Orphaned State



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/iyovcheva/brooklyn-docs 
clean-orphaned-state-docs

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/brooklyn-docs/pull/96.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #96


commit c298c28e454c2672aa93a978d78a1430b5c0a8bc
Author: Ivana Yovcheva <ivana.yovch...@gmail.com>
Date:   2016-07-22T15:18:57Z

Added docs for Cleaning Orphaned State




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-server issue #268: cleanOrphanedState: minor tidies

2016-07-21 Thread iyovcheva
Github user iyovcheva commented on the issue:

https://github.com/apache/brooklyn-server/pull/268
  
Looks good


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-server pull request #264: [DO NOT MERGE] Dangling references cleane...

2016-07-19 Thread iyovcheva
Github user iyovcheva commented on a diff in the pull request:

https://github.com/apache/brooklyn-server/pull/264#discussion_r71283685
  
--- Diff: 
core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/transformer/impl/DeleteOrphanedLocationsTransformer.java
 ---
@@ -94,6 +126,86 @@ public boolean containsAny(Collection container, 
Iterable contenders) {
 }
 return result;
 }
+
+public Map<String, String> findLocationsToKeep(BrooklynMementoRawData 
input) {
+Map<String, String> locationsToKeep = MutableMap.of();
+Set allReferencedLocations = 
findAllReferencedLocations(input);
+
+for (Map.Entry location: input.getLocations().entrySet()) {
+if (allReferencedLocations.contains(location.getKey())) {
+locationsToKeep.put((String) location.getKey(), (String) 
location.getValue());
+}
+}
+return locationsToKeep;
+}
+
+public Set findAllReferencedLocations(BrooklynMementoRawData 
input) {
+Set allReferencedLocations = MutableSet.of();
+
+
allReferencedLocations.addAll(searchLocationsToKeepInEntities(input.getEntities()));
+
allReferencedLocations.addAll(searchLocationsToKeepInPolicies(input.getPolicies()));
+
allReferencedLocations.addAll(searchLocationsToKeepInEnrichers(input.getEnrichers()));
+
allReferencedLocations.addAll(searchLocationsToKeepInLocations(input.getLocations(),
 allReferencedLocations));
+
+return allReferencedLocations;
+}
+
+private Set searchLocationsToKeepInEntities(Map<String, 
String> entities) {
+Set result = MutableSet.of();
+
+for(Map.Entry entity: entities.entrySet()) {
+
+String locationProxyPrefix = "";
+String locationProxySuffix = "";
+String locationPrefix = "\n" +
+"";
+String locationSuffix = "\n" +
+"  ";
+String locationPrefixWinEOF = "\r\n" +
+"";
+String locationSuffixWinEOF = "\r\n" +
+"  ";
+
+String entityString = (String) entity.getValue();
+result.addAll(Strings.getAllOccurrencesBetween(entityString, 
locationProxyPrefix, locationProxySuffix));
+result.addAll(Strings.getAllOccurrencesBetween(entityString, 
locationPrefix, locationSuffix));
+result.addAll(Strings.getAllOccurrencesBetween(entityString, 
locationPrefixWinEOF, locationSuffixWinEOF));
+}
+
+return result;
+}
+
+private Set searchLocationsToKeepInLocations(Map<String, 
String> locations, Set alreadyReferencedLocations) {
--- End diff --

Added them as well, but the comment won't show as outdated.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-library issue #48: Fix NodeJsWebAppSshDriver to obtain properly MAI...

2016-07-08 Thread iyovcheva
Github user iyovcheva commented on the issue:

https://github.com/apache/brooklyn-library/pull/48
  
LGTM, minor comment only


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-library pull request #48: Fix NodeJsWebAppSshDriver to obtain prope...

2016-07-08 Thread iyovcheva
Github user iyovcheva commented on a diff in the pull request:

https://github.com/apache/brooklyn-library/pull/48#discussion_r70067818
  
--- Diff: 
software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceMethods.java
 ---
@@ -73,17 +73,26 @@ public static boolean isProtocolEnabled(Entity entity, 
String protocol) {
 
 public static String inferBrooklynAccessibleRootUrl(Entity entity) {
 if (isProtocolEnabled(entity, "https")) {
-Integer rawPort = entity.getAttribute(HTTPS_PORT);
-checkNotNull(rawPort, "HTTPS_PORT sensors not set for %s; is 
an acceptable port available?", entity);
-HostAndPort hp = 
BrooklynAccessUtils.getBrooklynAccessibleAddress(entity, rawPort);
-return String.format("https://%s:%s/;, hp.getHostText(), 
hp.getPort());
+return inferBrooklynAccessibleRootUrl(entity, HTTPS_PORT);
 } else if (isProtocolEnabled(entity, "http")) {
-Integer rawPort = entity.getAttribute(HTTP_PORT);
-checkNotNull(rawPort, "HTTP_PORT sensors not set for %s; is an 
acceptable port available?", entity);
-HostAndPort hp = 
BrooklynAccessUtils.getBrooklynAccessibleAddress(entity, rawPort);
-return String.format("http://%s:%s/;, hp.getHostText(), 
hp.getPort());
+return inferBrooklynAccessibleRootUrl(entity, HTTP_PORT);
 } else {
 throw new IllegalStateException("HTTP and HTTPS protocols not 
enabled for "+entity+"; enabled protocols are "+getEnabledProtocols(entity));
 }
 }
+
+public static String inferBrooklynAccessibleRootUrl(Entity entity, 
AttributeSensor sensor) {
--- End diff --

I don't think we need inferBrooklynAccessibleRootUrl(Entity entity, 
AttributeSensor sensor) signature as there are not defined other 
protocols yet and there is double check once in 
inferBrooklynAccessibleRootUrl(Entity entity) and once here. A sensor can be 
set in the first method instead and this would simplify the code.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-library pull request #42: Refactoring test dependencies

2016-06-07 Thread iyovcheva
GitHub user iyovcheva opened a pull request:

https://github.com/apache/brooklyn-library/pull/42

Refactoring test dependencies



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/iyovcheva/brooklyn-library 
software-database-test-dependencies

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/brooklyn-library/pull/42.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #42


commit 0ae2cce7330ac33d3ee31c6c4fad26ea53398422
Author: Ivana Yovcheva <ivana.yovch...@gmail.com>
Date:   2016-06-07T14:48:11Z

Refactoring test dependencies




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-library issue #33: Allow creating roles for PostgreSQL

2016-06-07 Thread iyovcheva
Github user iyovcheva commented on the issue:

https://github.com/apache/brooklyn-library/pull/33
  
retest this please


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-library issue #33: Allow creating roles for PostgreSQL

2016-06-06 Thread iyovcheva
Github user iyovcheva commented on the issue:

https://github.com/apache/brooklyn-library/pull/33
  
@aledsage are you ok with merging this?
I couldn't run the tests and after I resolve my issue with them, can make 
changes to `PostgreSqlInitializeDatabaseLiveTest` in another PR if needed.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-library pull request: Allow creating roles for PostgreSQL

2016-05-05 Thread iyovcheva
Github user iyovcheva commented on the pull request:

https://github.com/apache/brooklyn-library/pull/33#issuecomment-217200840
  
Thanks @geomacy 


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-library pull request: Allow creating roles for PostgreSQL

2016-05-05 Thread iyovcheva
Github user iyovcheva commented on a diff in the pull request:

https://github.com/apache/brooklyn-library/pull/33#discussion_r62208621
  
--- Diff: 
software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java
 ---
@@ -328,9 +340,39 @@ private void initializeNewDatabase() {
 " --command="+ createUserCommand),
 sudoAsUser("postgres", getInstallDir() + "/bin/psql -p " + 
entity.getAttribute(PostgreSqlNode.POSTGRESQL_PORT) + 
 " --command="+ createDatabaseCommand),
+createRolesAdditionalCommand,
 callPgctl("stop", true))
 .failOnNonZeroResultCode().execute();
 }
+
+private String buildCreateRolesQuery() {
+Map<String, Object> roles = entity.getConfig(PostgreSqlNode.ROLES);
+String createRolesQuery = "\"";
+
+for (Map.Entry role: roles.entrySet()) {
+createRolesQuery = 
createRolesQuery.concat(String.format("CREATE ROLE %s", role.getKey()));
+if (((Map) role.getValue()).containsKey("properties")) {
+createRolesQuery = createRolesQuery.concat(String.format(" 
WITH %s; ", ((Map) role.getValue()).get("properties")));
+} else {
+createRolesQuery = createRolesQuery.concat(";");
+}
+
+if (((Map) role.getValue()).containsKey("privilages")) {
--- End diff --

Thanks @geomacy 
Do you think the roles defaults are fine to be in brooklyn as they look 
pretty standard, not specific?


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-library pull request: Allow creating roles for PostgreSQL

2016-05-05 Thread iyovcheva
GitHub user iyovcheva opened a pull request:

https://github.com/apache/brooklyn-library/pull/33

Allow creating roles for PostgreSQL



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/iyovcheva/brooklyn-library postgresql-roles

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/brooklyn-library/pull/33.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #33


commit d266a85cc4fc716d62e67a4231e67850475ac82b
Author: Ivana Yovcheva <ivana.yovch...@gmail.com>
Date:   2016-05-04T16:13:38Z

Allow creating roles for PostgreSQL




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] incubator-brooklyn pull request: Generate config/effector descript...

2016-02-01 Thread iyovcheva
Github user iyovcheva closed the pull request at:

https://github.com/apache/incubator-brooklyn/pull/1176


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] incubator-brooklyn pull request: Generate config/effector descript...

2016-02-01 Thread iyovcheva
GitHub user iyovcheva reopened a pull request:

https://github.com/apache/incubator-brooklyn/pull/1176

 Generate config/effector descriptions for yaml-only blueprints



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/iyovcheva/incubator-brooklyn 
generate-config-from-yaml

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-brooklyn/pull/1176.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #1176


commit aab2fc9df56e4f333ff7a284384c080347a843ac
Author: Ivana Yovcheva <ivana.yovch...@gmail.com>
Date:   2016-01-26T16:57:08Z

 Generate config/effector descriptions for yaml-only blueprints




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] incubator-brooklyn pull request: Generate config/effector descript...

2016-02-01 Thread iyovcheva
Github user iyovcheva closed the pull request at:

https://github.com/apache/incubator-brooklyn/pull/1176


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] incubator-brooklyn pull request: Generate config/effector descript...

2016-02-01 Thread iyovcheva
GitHub user iyovcheva reopened a pull request:

https://github.com/apache/incubator-brooklyn/pull/1176

 Generate config/effector descriptions for yaml-only blueprints



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/iyovcheva/incubator-brooklyn 
generate-config-from-yaml

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-brooklyn/pull/1176.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #1176


commit 7774e46d81a18a17f315de599360888fbba50c10
Author: Ivana Yovcheva <ivana.yovch...@gmail.com>
Date:   2016-01-26T16:57:08Z

 Generate config/effector descriptions for yaml-only blueprints




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] incubator-brooklyn pull request: Generate config/effector descript...

2016-01-29 Thread iyovcheva
Github user iyovcheva commented on a diff in the pull request:

https://github.com/apache/incubator-brooklyn/pull/1176#discussion_r51270639
  
--- Diff: 
brooklyn-server/server-cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java
 ---
@@ -98,88 +115,150 @@ public Void call() throws Exception {
 List urls = getUrls();
 LOG.info("Retrieving objects from "+urls);
 
-// TODO Remove duplication from separate ListPolicyCommand etc
-List<Class> entityTypes = getTypes(urls, 
Entity.class);
-List<Class> policyTypes = getTypes(urls, 
Policy.class);
-List<Class> enricherTypes = getTypes(urls, 
Enricher.class);
-List<Class> locationTypes = getTypes(urls, 
Location.class, Boolean.FALSE);
+Map<String, Object> result = MutableMap.of();
+List jsonList = new ArrayList<>();
 
-Map<String, Object> result = ImmutableMap.<String, 
Object>builder()
-.put("entities", 
ItemDescriptors.toItemDescriptors(entityTypes, headingsOnly, "name"))
-.put("policies", 
ItemDescriptors.toItemDescriptors(policyTypes, headingsOnly, "name"))
-.put("enrichers", 
ItemDescriptors.toItemDescriptors(enricherTypes, headingsOnly, "name"))
-.put("locations", 
ItemDescriptors.toItemDescriptors(locationTypes, headingsOnly, "type"))
-.put("locationResolvers", 
ItemDescriptors.toItemDescriptors(ImmutableList.copyOf(ServiceLoader.load(LocationResolver.class)),
 true))
-.build();
+if (!jars.isEmpty()) {
+// TODO Remove duplication from separate ListPolicyCommand 
etc
+List<Class> entityTypes = getTypes(urls, 
Entity.class);
+List<Class> policyTypes = getTypes(urls, 
Policy.class);
+List<Class> enricherTypes = 
getTypes(urls, Enricher.class);
+List<Class> locationTypes = 
getTypes(urls, Location.class, Boolean.FALSE);
 
-String json = toJson(result);
+result = ImmutableMap.<String, Object>builder()
+.put("entities", 
ItemDescriptors.toItemDescriptors(entityTypes, headingsOnly, "name"))
+.put("policies", 
ItemDescriptors.toItemDescriptors(policyTypes, headingsOnly, "name"))
+.put("enrichers", 
ItemDescriptors.toItemDescriptors(enricherTypes, headingsOnly, "name"))
+.put("locations", 
ItemDescriptors.toItemDescriptors(locationTypes, headingsOnly, "type"))
+.put("locationResolvers", 
ItemDescriptors.toItemDescriptors(ImmutableList.copyOf(ServiceLoader.load(LocationResolver.class)),
 true))
+.build();
+jsonList.add(toJson(result));
+} else if (!yaml.isEmpty()) {
+LocalManagementContext lmgmt = new 
LocalManagementContext();
+BrooklynCampPlatform platform = new BrooklynCampPlatform(
+PlatformRootSummary.builder().name("Brooklyn CAMP 
Platform").build(),lmgmt)
+.setConfigKeyAtManagmentContext();
+BrooklynCatalog catalog = lmgmt.getCatalog();
 
-if (outputFolder == null) {
-System.out.println(json);
-} else {
-LOG.info("Outputting item list (size "+itemCount+") to " + 
outputFolder);
-String outputPath = Os.mergePaths(outputFolder, 
"index.html");
-String parentDir = (new 
File(outputPath).getParentFile()).getAbsolutePath();
-mkdir(parentDir, "entities");
-mkdir(parentDir, "policies");
-mkdir(parentDir, "enrichers");
-mkdir(parentDir, "locations");
-mkdir(parentDir, "locationResolvers"); //TODO nothing 
written here yet...
-
-mkdir(parentDir, "style");
-mkdir(Os.mergePaths(parentDir, "style"), "js");
-mkdir(Os.mergePaths(parentDir, "style", "js"), "catalog");
-
-Files.write("var items = " + json, new 
File(Os.mergePaths(outputFolder, "items.js")), Charsets.UTF_8);
-  

[GitHub] incubator-brooklyn pull request: Generate config/effector descript...

2016-01-28 Thread iyovcheva
Github user iyovcheva commented on the pull request:


https://github.com/apache/incubator-brooklyn/pull/1176#issuecomment-176244738
  
Jenkins fails due to `DynamicSequentialTaskTest.testCancelled` which I 
think is not related to the issue.  The test is successful locally.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] incubator-brooklyn pull request: Generate config/effector descript...

2016-01-28 Thread iyovcheva
Github user iyovcheva commented on a diff in the pull request:

https://github.com/apache/incubator-brooklyn/pull/1176#discussion_r51100940
  
--- Diff: 
brooklyn-server/server-cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java
 ---
@@ -198,17 +277,36 @@ private void mkdir(String rootDir, String dirName) {
 
 protected List getUrls() throws MalformedURLException {
 List urls = Lists.newArrayList();
-if (jars.isEmpty()) {
-String classpath = System.getenv("INITIAL_CLASSPATH");
-if (Strings.isNonBlank(classpath)) {
-List entries = 
Splitter.on(":").omitEmptyStrings().trimResults().splitToList(classpath);
-for (String entry : entries) {
-if (entry.endsWith(".jar") || 
entry.endsWith("/*")) {
-
urls.addAll(ClassFinder.toJarUrls(entry.replace("/*", "")));
+if (jars.isEmpty()) { //TODO: where is `jars` value write - 
AbstractMain.execCli(Cli parser, String ...args):line 250 
BrooklynCommand command = parser.parse(args)
--- End diff --

It is not allowed now to parse jars and yaml at the same time. The idea was 
to prevent it and `jars` to have higher priority. Do you think it's better to 
throw exception after parsing the arguments, instead of making it impossible 
from the code?


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] incubator-brooklyn pull request: Mysql config

2016-01-18 Thread iyovcheva
GitHub user iyovcheva opened a pull request:

https://github.com/apache/incubator-brooklyn/pull/1156

Mysql config

Added general and error log to the `mysql.conf` template

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/iyovcheva/incubator-brooklyn mysql_config

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-brooklyn/pull/1156.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #1156


commit d66d90f7c58cf5ea481b731f1db55d88db410b52
Author: Valentin Aitken <valentin.ait...@cloudsoftcorp.com>
Date:   2016-01-18T13:04:18Z

Set error logging for MySqlNode

commit f3c12cdcbe37216d3c1481714e9f618629f0eb2f
Author: Ivana Yovcheva <ivana.yovch...@gmail.com>
Date:   2016-01-18T13:23:37Z

General log for MySqlNode




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] incubator-brooklyn pull request: [WIP] Parameterize the start effe...

2016-01-13 Thread iyovcheva
Github user iyovcheva commented on the pull request:


https://github.com/apache/incubator-brooklyn/pull/1128#issuecomment-171376821
  
LGTM


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] incubator-brooklyn pull request: Fix cassandra on aws

2015-12-20 Thread iyovcheva
Github user iyovcheva commented on the pull request:


https://github.com/apache/incubator-brooklyn/pull/1117#issuecomment-166151800
  
Looks good, small comment only.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---