brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [3/8] incubator-brooklyn git commit: Merge branch 'master' into relationships
Date Tue, 27 Oct 2015 14:48:25 GMT
Merge branch 'master' into relationships


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/1b71134a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/1b71134a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/1b71134a

Branch: refs/heads/master
Commit: 1b71134a4001a7d27a2b7ef1e13ae3a296ce681a
Parents: 772e707 8457515
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Tue Oct 27 09:51:05 2015 +0000
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Tue Oct 27 09:51:05 2015 +0000

----------------------------------------------------------------------
 core/pom.xml                                    |  52 ++-
 .../apache/brooklyn/core/BrooklynVersion.java   | 188 +++++---
 .../brooklyn/core/mgmt/ha/OsgiManager.java      |  16 +-
 .../core/mgmt/persist/XmlMementoSerializer.java |  35 +-
 .../core/objs/AbstractEntityAdjunct.java        |  21 +-
 .../util/core/BrooklynLanguageExtensions.java   |   2 -
 .../brooklyn/util/core/ResourceUtils.java       |  32 +-
 .../brooklyn/util/core/internal/Repeater.java   |   3 -
 .../apache/brooklyn/util/core/osgi/Osgis.java   | 389 +++--------------
 .../brooklyn/util/core/task/DynamicTasks.java   |  17 +
 core/src/test/dependencies/osgi/README.md       |  33 --
 .../src/test/dependencies/osgi/entities/pom.xml |  84 ----
 .../test/osgi/entities/SimpleApplication.java   |  28 --
 .../osgi/entities/SimpleApplicationImpl.java    |  27 --
 .../test/osgi/entities/SimpleEntity.java        |  28 --
 .../test/osgi/entities/SimpleEntityImpl.java    |  26 --
 .../test/osgi/entities/SimpleLocation.java      |  35 --
 .../test/osgi/entities/SimplePolicy.java        |  36 --
 .../apache/brooklyn/test/osgi/entities/icon.gif | Bin 43 -> 0 bytes
 .../dependencies/osgi/more-entities-v1/pom.xml  |  82 ----
 .../test/osgi/entities/more/MoreEntity.java     |  37 --
 .../test/osgi/entities/more/MoreEntityImpl.java |  43 --
 .../test/osgi/entities/more/MoreLocation.java   |  24 --
 .../test/osgi/entities/more/MorePolicy.java     |  25 --
 .../test/osgi/entities/more/MoreTemplate.java   |  24 --
 .../osgi/more-entities-v2-evil-twin/pom.xml     |  88 ----
 .../test/osgi/entities/more/MoreEntity.java     |  37 --
 .../test/osgi/entities/more/MoreEntityImpl.java |  46 --
 .../dependencies/osgi/more-entities-v2/pom.xml  |  88 ----
 .../test/osgi/entities/more/MoreEntity.java     |  40 --
 .../test/osgi/entities/more/MoreEntityImpl.java |  46 --
 .../test/osgi/entities/more/MoreLocation.java   |  26 --
 .../test/osgi/entities/more/MorePolicy.java     |  29 --
 .../test/osgi/entities/more/MoreTemplate.java   |  26 --
 .../policy/basic/AbstractEntityAdjunctTest.java |  52 +++
 .../brooklyn/core/BrooklynVersionTest.java      |   2 +-
 .../core/mgmt/osgi/OsgiStandaloneTest.java      |  75 +---
 .../core/mgmt/osgi/OsgiTestResources.java       |  74 ----
 .../mgmt/osgi/OsgiVersionMoreEntityTest.java    |   6 +-
 .../mgmt/persist/XmlMementoSerializerTest.java  |   2 +-
 ...stomAggregatingEnricherDeprecatedTest.groovy | 368 ----------------
 ...CustomAggregatingEnricherDeprecatedTest.java | 405 ++++++++++++++++++
 .../TransformingEnricherDeprecatedTest.groovy   |  83 ----
 .../TransformingEnricherDeprecatedTest.java     |  92 ++++
 .../util/core/internal/RepeaterTest.groovy      | 256 -----------
 .../util/core/internal/RepeaterTest.java        | 251 +++++++++++
 .../brooklyn/util/core/osgi/OsgiTestBase.java   |  56 +++
 .../brooklyn/util/core/osgi/OsgisTest.java      |  41 --
 core/src/test/resources/brooklyn/osgi/README.md |  25 --
 .../osgi/brooklyn-osgi-test-a_0.1.0.jar         | Bin 2055 -> 0 bytes
 .../osgi/brooklyn-osgi-test-a_0.1.0.txt         |  26 --
 .../osgi/brooklyn-test-osgi-entities.jar        | Bin 14454 -> 0 bytes
 .../osgi/brooklyn-test-osgi-entities.txt        |  26 --
 .../brooklyn-test-osgi-more-entities_0.1.0.jar  | Bin 14964 -> 0 bytes
 .../brooklyn-test-osgi-more-entities_0.1.0.txt  |  26 --
 .../brooklyn-test-osgi-more-entities_0.2.0.jar  | Bin 15622 -> 0 bytes
 .../brooklyn-test-osgi-more-entities_0.2.0.txt  |  26 --
 ...-test-osgi-more-entities_evil-twin_0.2.0.jar | Bin 13922 -> 0 bytes
 ...-test-osgi-more-entities_evil-twin_0.2.0.txt |  26 --
 .../guide/ops/catalog/images/add-to-catalog.png | Bin 0 -> 4919 bytes
 docs/guide/ops/catalog/index.md                 |  13 +-
 docs/guide/ops/locations/index.md               |  33 +-
 docs/guide/ops/locations/vpc-issues.md          |  32 ++
 docs/guide/start/managing.md                    |   3 +
 docs/guide/yaml/winrm/index.md                  |   7 +-
 examples/simple-web-cluster/pom.xml             |   4 -
 .../demo/WebClusterDatabaseExampleGroovy.groovy |  92 ----
 karaf/apache-brooklyn/pom.xml                   | 124 ++++++
 .../filtered-resources/etc/branding.properties  |  35 ++
 .../src/main/resources/etc/custom.properties    | 120 ++++++
 .../resources/etc/org.ops4j.pax.logging.cfg     |  46 ++
 .../src/main/resources/etc/system.properties    | 133 ++++++
 karaf/commands/pom.xml                          |  77 ++++
 .../apache/brooklyn/karaf/commands/Catalog.java |  44 ++
 karaf/feature.xml                               |  51 +++
 karaf/features/pom.xml                          |  64 +++
 karaf/features/src/main/feature/feature.xml     |  89 ++++
 .../features/src/main/history/dependencies.xml  |  47 ++
 karaf/itest/pom.xml                             | 188 ++++++++
 .../java/org/apache/brooklyn/AssemblyTest.java  | 117 +++++
 karaf/itest/src/test/resources/exam.properties  |  21 +
 karaf/itest/src/test/resources/logback.xml      |  43 ++
 karaf/pom.xml                                   | 143 +++++++
 locations/jclouds/pom.xml                       |  21 -
 .../location/jclouds/JcloudsLocation.java       |  25 +-
 .../location/jclouds/JcloudsSuseLiveTest.java   | 102 +++++
 .../AwsEc2LocationWindowsLiveTest.groovy        |  94 ----
 .../provider/AwsEc2LocationWindowsLiveTest.java |  95 +++++
 .../provider/CarrenzaLocationLiveTest.groovy    | 132 ------
 .../provider/CarrenzaLocationLiveTest.java      | 135 ++++++
 .../provider/GoGridLocationLiveTest.groovy      |  52 ---
 .../provider/GoGridLocationLiveTest.java        |  52 +++
 parent/pom.xml                                  | 189 ++------
 policy/pom.xml                                  |  25 +-
 .../policy/enricher/DeltaEnrichersTests.groovy  | 123 ------
 .../policy/enricher/DeltaEnrichersTests.java    | 144 +++++++
 .../enricher/RollingMeanEnricherTest.groovy     | 105 -----
 .../enricher/RollingMeanEnricherTest.java       | 106 +++++
 .../RollingTimeWindowMeanEnricherTest.groovy    | 155 -------
 .../RollingTimeWindowMeanEnricherTest.java      | 156 +++++++
 pom.xml                                         | 118 ++++-
 sandbox/database/pom.xml                        |  17 -
 .../brooklyn/entity/database/Database.groovy    |  53 ---
 .../brooklyn/entity/database/Database.java      |  42 ++
 .../apache/brooklyn/entity/database/Schema.java |  37 ++
 sandbox/nosql/pom.xml                           |  12 -
 .../Infinispan5ServerIntegrationTest.groovy     | 103 -----
 .../Infinispan5ServerIntegrationTest.java       | 104 +++++
 software/base/pom.xml                           |   9 -
 .../entity/machine/SetHostnameCustomizer.java   |  48 ++-
 .../system_service/SystemServiceEnricher.java   |  12 +-
 .../machine/SetHostnameCustomizerTest.java      |  92 +++-
 software/database/pom.xml                       |  23 -
 .../entity/database/DatastoreMixins.java        |   5 +-
 .../database/mysql/InitSlaveTaskBody.java       | 426 +++++++++++++++++++
 .../entity/database/mysql/MySqlCluster.java     |  38 +-
 .../entity/database/mysql/MySqlClusterImpl.java | 225 ++++------
 .../database/mysql/MySqlClusterUtils.java       |  52 +++
 .../entity/database/mysql/MySqlDriver.java      |   7 +-
 .../entity/database/mysql/MySqlNode.java        |  43 +-
 .../database/mysql/MySqlNodeEffectors.java      |  87 ++++
 .../entity/database/mysql/MySqlNodeImpl.java    |   7 +-
 .../entity/database/mysql/MySqlSshDriver.java   |  67 ++-
 .../database/mysql/ReplicationSnapshot.java     |  58 +++
 .../entity/database/mysql/mysql_slave.conf      |  25 +-
 .../entity/database/VogellaExampleAccess.java   |  63 ++-
 .../mysql/MySqlClusterIntegrationTest.java      | 162 ++++++-
 .../database/mysql/MySqlClusterTestHelper.java  |  64 ++-
 software/messaging/pom.xml                      |   9 -
 software/nosql/pom.xml                          |   9 -
 .../nosql/couchdb/AbstractCouchDBNodeTest.java  |   5 -
 software/osgi/pom.xml                           |   4 -
 software/webapp/pom.xml                         |  18 -
 .../webapp/WebAppLiveIntegrationTest.groovy     | 101 -----
 .../webapp/WebAppLiveIntegrationTest.java       |  91 ++++
 ...namicWebAppClusterRebindIntegrationTest.java |   3 -
 usage/camp/pom.xml                              |   7 +
 .../catalog/AbstractCatalogXmlTest.java         |   2 +-
 .../brooklyn/catalog/CatalogYamlEntityTest.java |   2 +-
 .../brooklyn/catalog/CatalogYamlRebindTest.java |  24 +-
 .../catalog/CatalogYamlTemplateTest.java        |   2 +-
 usage/cli/pom.xml                               |  16 -
 usage/downstream-parent/pom.xml                 |   1 -
 usage/launcher/pom.xml                          |   4 -
 usage/qa/pom.xml                                |   4 -
 usage/rest-server/pom.xml                       |   4 -
 usage/test-support/pom.xml                      |   5 -
 .../org/apache/brooklyn/util/GenericTypes.java  |  37 ++
 .../brooklyn/util/exceptions/Exceptions.java    |   5 +
 .../brooklyn/util/text/StringEscapes.java       |  14 +-
 .../util/exceptions/ExceptionsTest.java         |  97 ++++-
 utils/groovy/pom.xml                            |  12 -
 .../util/groovy/FromCallableClosure.java        |  38 ++
 .../util/groovy/FromFunctionClosure.java        |  39 ++
 .../util/groovy/FromRunnableClosure.java        |  46 ++
 .../util/groovy/GroovyJavaMethods.groovy        | 146 -------
 .../brooklyn/util/groovy/GroovyJavaMethods.java | 200 +++++++++
 .../brooklyn/util/groovy/JavadocDummy.java      |  30 --
 .../brooklyn/util/groovy/LanguageUtils.groovy   | 383 -----------------
 .../brooklyn/util/groovy/TimeExtras.groovy      |  83 ----
 .../util/groovy/LanguageUtilsTest.groovy        | 152 -------
 .../brooklyn/util/groovy/TimeExtrasTest.groovy  |  49 ---
 utils/rt-felix/pom.xml                          |  61 +++
 .../rt/felix/EmbeddedFelixFramework.java        | 258 +++++++++++
 .../brooklyn/rt/felix/ManifestHelper.java       | 103 +++++
 .../rt/felix/EmbeddedFelixFrameworkTest.java    | 101 +++++
 utils/rt-osgi/pom.xml                           |  53 +++
 .../apache/brooklyn/util/osgi/OsgiUtils.java    | 101 +++++
 .../brooklyn/util/osgi/VersionedName.java       |  76 ++++
 .../brooklyn/util/osgi/OsgiTestResources.java   |  74 ++++
 .../apache/brooklyn/util/osgi/OsgisTest.java    |  39 ++
 .../src/test/resources/brooklyn/osgi/README.md  |  25 ++
 .../osgi/brooklyn-osgi-test-a_0.1.0.jar         | Bin 0 -> 2055 bytes
 .../osgi/brooklyn-osgi-test-a_0.1.0.txt         |  26 ++
 .../osgi/brooklyn-test-osgi-entities.jar        | Bin 0 -> 14454 bytes
 .../osgi/brooklyn-test-osgi-entities.txt        |  26 ++
 .../brooklyn-test-osgi-more-entities_0.1.0.jar  | Bin 0 -> 14964 bytes
 .../brooklyn-test-osgi-more-entities_0.1.0.txt  |  26 ++
 .../brooklyn-test-osgi-more-entities_0.2.0.jar  | Bin 0 -> 15622 bytes
 .../brooklyn-test-osgi-more-entities_0.2.0.txt  |  26 ++
 ...-test-osgi-more-entities_evil-twin_0.2.0.jar | Bin 0 -> 13922 bytes
 ...-test-osgi-more-entities_evil-twin_0.2.0.txt |  26 ++
 .../test/resources/dependencies/osgi/README.md  |  33 ++
 .../dependencies/osgi/entities/pom.xml          |  84 ++++
 .../test/osgi/entities/SimpleApplication.java   |  28 ++
 .../osgi/entities/SimpleApplicationImpl.java    |  27 ++
 .../test/osgi/entities/SimpleEntity.java        |  28 ++
 .../test/osgi/entities/SimpleEntityImpl.java    |  26 ++
 .../test/osgi/entities/SimpleLocation.java      |  35 ++
 .../test/osgi/entities/SimplePolicy.java        |  36 ++
 .../apache/brooklyn/test/osgi/entities/icon.gif | Bin 0 -> 43 bytes
 .../dependencies/osgi/more-entities-v1/pom.xml  |  82 ++++
 .../test/osgi/entities/more/MoreEntity.java     |  37 ++
 .../test/osgi/entities/more/MoreEntityImpl.java |  43 ++
 .../test/osgi/entities/more/MoreLocation.java   |  24 ++
 .../test/osgi/entities/more/MorePolicy.java     |  25 ++
 .../test/osgi/entities/more/MoreTemplate.java   |  24 ++
 .../osgi/more-entities-v2-evil-twin/pom.xml     |  88 ++++
 .../test/osgi/entities/more/MoreEntity.java     |  37 ++
 .../test/osgi/entities/more/MoreEntityImpl.java |  46 ++
 .../dependencies/osgi/more-entities-v2/pom.xml  |  88 ++++
 .../test/osgi/entities/more/MoreEntity.java     |  40 ++
 .../test/osgi/entities/more/MoreEntityImpl.java |  46 ++
 .../test/osgi/entities/more/MoreLocation.java   |  26 ++
 .../test/osgi/entities/more/MorePolicy.java     |  29 ++
 .../test/osgi/entities/more/MoreTemplate.java   |  26 ++
 206 files changed, 7482 insertions(+), 5006 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1b71134a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java
----------------------------------------------------------------------


Mime
View raw message