This closes #873
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/fd624194 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/fd624194 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/fd624194 Branch: refs/heads/master Commit: fd62419413ff89214650e313533ba342f1042b5e Parents: 27036aa c4c0e34 Author: Alex Heneveld <[email protected]> Authored: Tue Sep 1 16:15:32 2015 +0100 Committer: Alex Heneveld <[email protected]> Committed: Tue Sep 1 16:15:32 2015 +0100 ---------------------------------------------------------------------- .../brooklyn/api/catalog/BrooklynCatalog.java | 8 +- .../apache/brooklyn/api/location/Location.java | 4 - .../apache/brooklyn/camp/spi/pdp/Service.java | 3 +- .../brooklyn/core/catalog/CatalogLoadMode.java | 3 +- .../catalog/internal/CatalogInitialization.java | 8 +- .../catalog/internal/CatalogXmlSerializer.java | 3 + .../factory/BasicConfigurableEntityFactory.java | 3 +- .../core/entity/lifecycle/Lifecycle.java | 8 +- .../brooklyn/core/location/geo/HostGeoInfo.java | 11 + .../JavaBrooklynClassLoadingContext.java | 2 + .../OsgiBrooklynClassLoadingContext.java | 1 - .../core/mgmt/entitlement/Entitlements.java | 7 +- .../DeserializingClassRenamesProvider.java | 81 + .../core/mgmt/persist/XmlMementoSerializer.java | 14 +- .../core/mgmt/rebind/RebindIteration.java | 11 +- .../rebind/transformer/CompoundTransformer.java | 2 +- .../core/objs/proxy/InternalEntityFactory.java | 2 +- .../brooklyn/core/plan/PlanToSpecFactory.java | 3 +- .../core/sensor/DependentConfiguration.java | 2 +- .../util/core/xstream/ClassRenamingMapper.java | 53 + .../util/core/xstream/XmlSerializer.java | 52 +- .../deserializingClassRenames.properties | 1419 ++++++++++++++++++ .../core/catalog/CatalogPredicatesTest.java | 22 +- .../core/effector/EffectorBasicTest.java | 14 +- .../core/entity/EntityPreManagementTest.java | 6 +- .../core/entity/PolicyRegistrationTest.java | 7 +- .../mgmt/osgi/OsgiVersionMoreEntityTest.java | 3 +- .../mgmt/persist/XmlMementoSerializerTest.java | 167 ++- ...stomAggregatingEnricherDeprecatedTest.groovy | 14 +- .../TransformingEnricherDeprecatedTest.groovy | 4 +- .../entity/group/DynamicClusterTest.java | 2 +- .../entity/group/DynamicFabricTest.java | 4 +- docs/README.md | 9 +- docs/_build/make-javadoc.sh | 2 +- .../_extra/big_examples/before-begin.include.md | 2 +- .../big_examples/global-web-fabric/index.md | 8 +- docs/_includes/fields.md | 26 +- docs/_includes/java_link.html | 4 +- docs/_plugins/brooklyn_metadata.rb | 14 +- docs/guide/dev/code/tests.md | 4 +- docs/guide/java/entitlements.md | 6 +- docs/guide/java/index.md | 2 +- docs/guide/java/policies.md | 64 +- docs/guide/java/policy.md | 37 +- docs/guide/misc/download.md | 79 +- docs/guide/misc/index.md | 2 +- docs/guide/misc/migrate-to-0.8.0-regexes.sed | 1394 +++++++++++++++++ docs/guide/misc/migrate-to-0.8.0.md | 32 + docs/guide/misc/release-notes.md | 108 +- docs/guide/ops/brooklyn_properties.md | 4 +- docs/guide/ops/catalog/index.md | 10 +- docs/guide/ops/locations/index.md | 8 +- docs/guide/ops/locations/more-locations.md | 4 +- docs/guide/ops/persistence/index.md | 2 +- docs/guide/ops/troubleshooting/deployment.md | 2 +- .../going-deep-in-java-and-logs.md | 175 ++- .../ops/troubleshooting/softwareprocess.md | 3 +- docs/guide/start/_my-web-cluster.yaml | 2 +- docs/guide/yaml/chef/creating-blueprints.md | 2 +- docs/guide/yaml/custom-entities.md | 4 +- .../example_yaml/appserver-clustered-w-db.yaml | 4 +- .../appserver-configured-in-config.yaml | 2 +- .../yaml/example_yaml/appserver-configured.yaml | 2 +- .../appserver-w-db-other-flavor.yaml | 2 +- .../guide/yaml/example_yaml/appserver-w-db.yaml | 2 +- .../yaml/example_yaml/appserver-w-policy.yaml | 4 +- docs/guide/yaml/example_yaml/cluster-vm.yaml | 2 +- .../simple-appserver-with-location-byon.yaml | 2 +- .../simple-appserver-with-location.yaml | 2 +- .../yaml/example_yaml/simple-appserver.yaml | 2 +- ...est-app-with-enrichers-slightly-simpler.yaml | 18 +- docs/guide/yaml/index.md | 1 + docs/guide/yaml/winrm/about-winrm.md | 0 docs/guide/yaml/winrm/index.md | 4 +- docs/guide/yaml/yaml-reference.md | 12 +- docs/style/css/catalog_items.css | 1 - docs/style/js/catalog/common.js | 11 +- .../release-process/verify-release-artifacts.md | 2 +- docs/website/documentation/index.md | 6 +- docs/website/download/index.md | 31 +- docs/website/index.md | 3 +- docs/website/learnmore/blueprint-tour.md | 4 +- .../website/learnmore/catalog/catalog-item.html | 18 +- docs/website/learnmore/catalog/index.html | 11 +- ...brooklyn.entity.pool.ServerPoolLocation.html | 62 - .../brooklyn.location.AddressableLocation.html | 62 - .../brooklyn.location.MachineLocation.html | 62 - ...tMixins$RichMachineProvisioningLocation.html | 62 - ...yn.location.MachineProvisioningLocation.html | 62 - ...rooklyn.location.basic.AbstractLocation.html | 62 - ....AggregatingMachineProvisioningLocation.html | 62 - ...ic.FixedListMachineProvisioningLocation.html | 62 - ...neProvisioningLocation$LocalhostMachine.html | 62 - ...ic.LocalhostMachineProvisioningLocation.html | 62 - ...rooklyn.location.basic.LocationInternal.html | 62 - .../brooklyn.location.basic.MultiLocation.html | 62 - ...ooklyn.location.basic.SimulatedLocation.html | 62 - ...basic.SingleMachineProvisioningLocation.html | 62 - ...oklyn.location.basic.SshMachineLocation.html | 62 - ...bstractCloudMachineProvisioningLocation.html | 62 - ...AbstractJcloudsSubnetSshMachineLocation.html | 62 - ...ooklyn.location.jclouds.JcloudsLocation.html | 62 - ...ation.jclouds.JcloudsSshMachineLocation.html | 62 - ...followthesun.DefaultFollowTheSunModel$1.html | 62 - docs/website/meta/versions.md | 24 +- .../brooklyn/location/jclouds/JcloudsUtil.java | 6 +- .../JcloudsPortForwarderExtension.java | 3 +- .../policy/enricher/HttpLatencyDetector.java | 5 +- .../apache/brooklyn/feed/jmx/JmxFeedTest.java | 15 +- .../apache/brooklyn/feed/jmx/JmxHelperTest.java | 3 +- .../entity/nosql/couchbase/pillowfight.yaml | 2 +- .../entity/proxy/nginx/NginxSshDriver.java | 3 +- .../entity/webapp/jboss/JBoss6SshDriver.java | 3 +- .../entity/webapp/jboss/JBoss7SshDriver.java | 3 +- .../entity/webapp/tomcat/TomcatSshDriver.java | 3 +- .../webapp/WebAppLiveIntegrationTest.groovy | 9 - .../brooklyn/spi/creation/CampCatalogUtils.java | 2 +- .../service/BrooklynServiceTypeResolver.java | 24 +- .../main/resources/brooklyn/default.catalog.bom | 20 +- .../apache/brooklyn/cli/CliIntegrationTest.java | 4 +- .../javascript/specs/model/application-spec.js | 2 +- .../test/javascript/specs/model/entity-spec.js | 4 +- ...lynLauncherRebindToCloudObjectStoreTest.java | 6 +- .../src/test/resources/mongo-sharded.yaml | 2 +- .../qa/load/SimulatedJBoss7ServerImpl.java | 3 +- .../SoftlayerObtainPrivateLiveTest.java | 3 +- .../rest/domain/ApplicationSpecTest.java | 2 +- .../brooklyn/rest/domain/EntitySpecTest.java | 2 +- .../resources/fixtures/application-list.json | 2 +- .../resources/fixtures/application-spec.json | 4 +- .../test/resources/fixtures/application.json | 4 +- .../resources/fixtures/entity-only-type.json | 4 +- .../src/test/resources/fixtures/entity.json | 2 +- .../brooklyn/rest/domain/ApplicationTest.java | 2 +- .../org/apache/brooklyn/test/TestUtils.groovy | 538 ------- .../org/apache/brooklyn/test/TestUtils.java | 79 + .../java/org/apache/brooklyn/test/Asserts.java | 17 +- .../brooklyn/util/exceptions/Exceptions.java | 47 +- .../util/internal/BrooklynSystemProperties.java | 5 +- .../brooklyn/util/javalang/Reflections.java | 41 + .../util/javalang/StackTraceSimplifier.java | 6 +- 141 files changed, 3872 insertions(+), 2370 deletions(-) ----------------------------------------------------------------------
