Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LPS-53571 Add metatype annotation processor to wiki-api BND so that ConfigAdmin files are bundled in the JAR #24133

Closed
wants to merge 9 commits into from
Closed

LPS-53571 Add metatype annotation processor to wiki-api BND so that ConfigAdmin files are bundled in the JAR #24133

wants to merge 9 commits into from

Conversation

izaera
Copy link

@izaera izaera commented Feb 18, 2015

No description provided.

adolfopa and others added 8 commits February 18, 2015 11:01
@adolfopa
LPS-53571 move settings into API module
490ec32
@adolfopa
LPS-53571 move properties into service configuration
f5b3b5a 
Note that for `entriesPerPage` and `foldersPerPage` I'm hardcoding the
value of `search.container.page.default.delta`. This is a temporal hack
so that everything works as expected.

In LPS-53401 an new LocationVariableResolver will be added to the
settings framework to reference portal properties from the service
configuration. Once that gets merged, I'll update the service
configuration to reference the correct portal property.
@adolfopa
LPS-53571 cleanup fallback keys and expose settings keys
ddba2a3 
  - Remove all the fallback keys that were in
    `portlet.properties`. They'll be handled by the service
    configuration now.

  - Expose the multivalue and fallback keys. We'll need that to
    implement the settings provider (see next commit).
@adolfopa
LPS-53571 create settings provider
b1a2d50 
This new class will be responsible of instantiating bookmarks settings
for a group.
@adolfopa
LPS-53571 update bnd and ivy dependencies
881cc41
@izaera
LPS-53571 Move resource files from wiki-service to wiki-api
92064c2
@izaera
LPS-53571 Add missing method and rename others, as well as SF.
5fdc884
@izaera
LPS-53571 Add metatype annotation processor to wiki-api BND so that C…
a0c872d 
…onfigAdmin files are bundled in the JAR
@izaera
Copy link
Author

izaera commented Feb 18, 2015

/CC @adolfopa

@liferay-continuous-integration
Copy link
Collaborator

Some tests FAILED!

Build Time: 25 minutes 17 seconds

See the following links for more information.

1 Failure.

  • com.liferay.portal.tools.sourceformatter.SourceFormatterTest.testSourceFormatter
    modules/apps/bookmarks/bookmarks-api/src/com/liferay/bookmarks/configuration/BookmarksServiceConfiguration.java expected:<...
    	@Meta.AD(deflt = "[true", required = false)
    	public boolean enableRelatedAssets();

    	@Meta.AD(deflt = "20", required = false)
    	public int entriesPerPage();

    	@Meta.AD(deflt = "name|url|visits|modified-date|action", required = false)
    	public String[] entryColumns();

    	@Meta.AD(
    		deflt = "folder|num-of-folders|num-of-entries|action", required = false
    	)
    	public String[] folderColumns();

    	@Meta.AD(deflt = "20", required = false)
    	public int foldersPerPage();

    	@Meta.AD(deflt = "true", required = false)
    	public boolean showFoldersSearch]();

    	@Meta.AD(deflt...> but was:<...
    	@Meta.AD(deflt = "[20", required = false)
    	public int entriesPerPage();

    	@Meta.AD(deflt = "name|url|visits|modified-date|action", required = false)
    	public String[] entryColumns();

    	@Meta.AD(
    		deflt = "folder|num-of-folders|num-of-entries|action", required = false
    	)
    	public String[] folderColumns();

    	@Meta.AD(deflt = "20", required = false)
    	public int foldersPerPage();

    	@Meta.AD(deflt = "true", required = false)
    	public boolean showFoldersSearch();

    	@Meta.AD(deflt = "true", required = false)
    	public boolean enableRelatedAssets]();

    	@Meta.AD(deflt...>

    junit.framework.AssertionFailedError: modules/apps/bookmarks/bookmarks-api/src/com/liferay/bookmarks/configuration/BookmarksServiceConfiguration.java expected:<...
    	@Meta.AD(deflt = "[true", required = false)
    	public boolean enableRelatedAssets();

    	@Meta.AD(deflt = "20", required = false)
    	public int entriesPerPage();

    	@Meta.AD(deflt = "name|url|visits|modified-date|action", required = false)
    	public String[] entryColumns();

    	@Meta.AD(
    		deflt = "folder|num-of-folders|num-of-entries|action", required = false
    	)
    	public String[] folderColumns();

    	@Meta.AD(deflt = "20", required = false)
    	public int foldersPerPage();

    	@Meta.AD(deflt = "true", required = false)
    	public boolean showFoldersSearch]();

    	@Meta.AD(deflt...> but was:<...
    	@Meta.AD(deflt = "[20", required = false)
    	public int entriesPerPage();

    	@Meta.AD(deflt = "name|url|visits|modified-date|action", required = false)
    	public String[] entryColumns();

    	@Meta.AD(
    		deflt = "folder|num-of-folders|num-of-entries|action", required = false
    	)
    	public String[] folderColumns();

    	@Meta.AD(deflt = "20", required = false)
    	public int foldersPerPage();

    	@Meta.AD(deflt = "true", required = false)
    	public boolean showFoldersSearch();

    	@Meta.AD(deflt = "true", required = false)
    	public boolean enableRelatedAssets]();

    	@Meta.AD(deflt...>
    	at com.liferay.portal.tools.sourceformatter.SourceFormatterTest.testSourceFormatter(SourceFormatterTest.java:50)

@michaelhashimoto
Copy link

ci:retest

@liferay-continuous-integration
Copy link
Collaborator

All tests PASSED!

Build Time: 25 minutes 53 seconds

See the following links for more information.

@brianchandotcom
Copy link
Owner

Merged. Thank you.
View total diff: d718e62...182bf1c

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@izaera @liferay-continuous-integration @michaelhashimoto @brianchandotcom @adolfopa