Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
9e905d5
Osgi loader change
geomacy Sep 14, 2016
5918da5
Add nested catalog item ids to AbstractBrooklynObjectSpec.
geomacy Sep 19, 2016
f9fe7b8
Add catalog item super id support.
geomacy Sep 20, 2016
ce4df3f
Fixes to get CatalogYamlEntityTest.testCatalogItemIdInReferencedItems…
geomacy Sep 20, 2016
e34468e
Test with a 'catalog sandwich'.
geomacy Sep 21, 2016
eb71ef2
Do resource lookup from nested catalog ids.
geomacy Sep 21, 2016
e59a9f2
Use entity classloader as well as specified libraries.
geomacy Sep 23, 2016
d449455
Implement getCatalogItemSuperIds in CatalogItemDtoAbstract.
geomacy Sep 26, 2016
2faf1bc
Add (disabled) rebind test for deep catalog item nesting.
geomacy Sep 26, 2016
d1fdccd
Add support for catalogItemSuperIds to rebind.
geomacy Sep 27, 2016
66efeb5
Fix ActivePartialRebindVersionTest breakage from previous change.
geomacy Sep 29, 2016
6ece325
Fix testRebindWithCatalogAndApp with mode == DELETE_CATALOG.
geomacy Sep 29, 2016
f5360af
Fix testRebindWithCatalogAndApp with mode == REPLACE_CATALOG_WITH_NEW…
geomacy Sep 29, 2016
97831b8
Add (some) tests of rebind of previously persisted state.
geomacy Oct 3, 2016
2c52500
Some code tidy-up.
geomacy Oct 3, 2016
00be1fc
Warning on primaries not needed.
geomacy Oct 5, 2016
738435f
catalogItemIdIfNotNull is no longer used
geomacy Oct 5, 2016
16c9f9e
Add start of a test framework test for the catalog behaviour.
geomacy Oct 5, 2016
e414b39
Fix mistake in merge with master
geomacy Dec 13, 2016
851ce25
Fix tests after rebase with master
geomacy Feb 20, 2017
d0cc8e0
Updates for the following review comments.
geomacy Feb 20, 2017
55a2568
Updates for the following review comments.
geomacy Feb 21, 2017
dc0eaa8
Fall through only if loader fails with the available catalog items.
geomacy Feb 21, 2017
934ae5f
Address the following review comments.
geomacy Feb 21, 2017
9e7950b
Review comment. Remove confusing default value.
geomacy Feb 21, 2017
22c36a6
Delete original change from 0ab9b37b55fce9eaf3eef319ea2fc77e41e7ba8e
geomacy Feb 22, 2017
59f0cba
Use newClassLoadingContextForCatalogItems where possible.
geomacy Mar 8, 2017
8a1255c
Return a generic context from newClassLoadingContextForCatalogItems
geomacy Mar 8, 2017
d61aff7
Changes to move to catalogItemId + search path.
geomacy Mar 10, 2017
86d7a57
Correct testRebindWithCatalogAndAppRebindCatalogItemIds
geomacy Mar 18, 2017
4e883cf
XPathHelper.getStringList fix and formatting, hashcode/equals fixes.
geomacy Mar 18, 2017
0383e10
Add searchPath to Entities.dumpInfo.
geomacy Mar 21, 2017
2ce534a
Set searchPath in JavaCatalogToSpecTransformer.
geomacy Mar 21, 2017
8f37ac5
Update comments on catalogItemId().
geomacy Mar 21, 2017
d351bd5
Do setCatalogItemIdAndSearchPath instead of just set search path.
geomacy Mar 21, 2017
a5cdc19
Make initial changes as suggested by Alex in #573.
geomacy Mar 21, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* 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.api.catalog;

import java.util.List;

public class CatalogItemIdAndSearchPath {
private String catalogItemId;
private List<String> searchPath;

public CatalogItemIdAndSearchPath(String catalogItemId, List<String> searchPath) {
this.catalogItemId = catalogItemId;
this.searchPath = searchPath;
}
public String getCatalogItemId() { return catalogItemId; }
public List<String> getSearchPath() { return searchPath; }
}
Loading