Skip to content

Commit

Permalink
SAK-41072 Cleanup help tool (unused files/JavaDoc). (sakaiproject#6382)
Browse files Browse the repository at this point in the history
* EhCache isn’t needed here.

EhCache isn't used in this project and it's config file can be removed
and the pom.xml section can be removed.

* Fix for broken JavaDoc.

Correct JavaDoc references that got broken in a rename of packages.

* Remove unused files

These files aren't used in the current codebase.

* Move GlossaryEntryBean.

* Add dependency so validation of beans can happen.

This allows validation of the spring beans.xml file.

* Remove commented out dependencies.
  • Loading branch information
buckett authored and ern committed Dec 12, 2018
1 parent ea5aac8 commit 71f14cf
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 279 deletions.
15 changes: 0 additions & 15 deletions help/help-component-shared/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,5 @@
<groupId>org.sakaiproject</groupId>
<artifactId>sakai-help-api</artifactId>
</dependency>
<!--org.sakaiprojectsakai-component-api${sakai.version}-->
<!--org.sakaiprojectsakai-tool-api${sakai.version}-->
</dependencies>
<build>
<resources>
<resource>
<directory>src/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<excludes>
<exclude>ehcache.xml</exclude>
</excludes>
</resource>
</resources>
</build>
</project>
52 changes: 0 additions & 52 deletions help/help-component-shared/src/java/ehcache.xml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@

import org.sakaiproject.api.app.help.Glossary;
import org.sakaiproject.api.app.help.GlossaryEntry;
import org.sakaiproject.component.app.help.model.GlossaryEntryBean;

/**
* default glossary
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
**********************************************************************************/

package org.sakaiproject.component.app.help.model;
package org.sakaiproject.component.app.help;

import org.sakaiproject.api.app.help.GlossaryEntry;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ public ServerConfigurationService getServerConfigurationService()
}

/**
* @see org.sakaiproject.api.app.help.HelpManager#setServerConfigurationService(org.sakaiproject.service.framework.config.ServerConfigurationService)
* @see org.sakaiproject.api.app.help.HelpManager#setServerConfigurationService(org.sakaiproject.component.api.ServerConfigurationService)
*/
public void setServerConfigurationService(ServerConfigurationService s)
{
Expand Down Expand Up @@ -229,7 +229,7 @@ public Set<Resource> getResources(Long contextId)

/**
* Store resource
* @see org.sakaiproject.api.app.help.HelpManager#storeResource(org.sakaiproject.api.help.Entity)
* @see org.sakaiproject.api.app.help.HelpManager#storeResource(org.sakaiproject.api.app.help.Resource)
*/
public void storeResource(Resource resource)
{
Expand Down Expand Up @@ -272,7 +272,7 @@ public Source getSource(Long id)
}

/**
* @see org.sakaiproject.api.app.help.HelpManager#storeSource(org.sakaiproject.api.help.Source)
* @see org.sakaiproject.api.app.help.HelpManager#storeSource(org.sakaiproject.api.app.help.Source)
*/
public void storeSource(Source source)
{
Expand Down Expand Up @@ -307,7 +307,7 @@ public Context getContext(Long id)
}

/**
* @see org.sakaiproject.api.app.help.HelpManager#storeContext(org.sakaiproject.api.help.Context)
* @see org.sakaiproject.api.app.help.HelpManager#storeContext(org.sakaiproject.api.app.help.Context)
*/
public void storeContext(Context context)
{
Expand Down Expand Up @@ -380,7 +380,7 @@ public TableOfContents getTableOfContents()
}

/**
* @see org.sakaiproject.api.app.help.HelpManager#setTableOfContents(org.sakaiproject.api.help.TableOfContents)
* @see org.sakaiproject.api.app.help.HelpManager#setTableOfContents(org.sakaiproject.api.app.help.TableOfContents)
*/
public void setTableOfContents(TableOfContents toc)
{
Expand Down Expand Up @@ -681,7 +681,7 @@ public void setGlossary(Glossary glossary)
}

/**
* @see org.sakaiproject.api.app.help.HelpManager#storeCategory(org.sakaiproject.api.help.Category)
* @see org.sakaiproject.api.app.help.HelpManager#storeCategory(org.sakaiproject.api.app.help.Category)
*/
public void storeCategory(Category category)
{
Expand Down Expand Up @@ -980,8 +980,6 @@ public Object doInTransaction(TransactionStatus status)

/**
* Returns the user locale
* @param prefLocales
* The prefLocales to set.
*/
private Locale getSelectedLocale() {

Expand Down Expand Up @@ -1060,7 +1058,7 @@ private void registerHelpContent()
/**
* register external help content
* build document from external reg file
* @param externalHelpReg
* @param helpFile The helpfile to register
*/
public void registerExternalHelpContent(String helpFile)
{
Expand Down
7 changes: 6 additions & 1 deletion help/help/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@
<properties>
<deploy.target>shared</deploy.target>
</properties>
<dependencies />
<dependencies>
<dependency>
<groupId>org.sakaiproject</groupId>
<artifactId>sakai-comp-shared-help</artifactId>
</dependency>
</dependencies>
<build>
<resources>
<resource>
Expand Down

0 comments on commit 71f14cf

Please sign in to comment.