Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
X
xwiki-platform
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
XWiki
xwiki-platform
Commits
b8115dbc
Commit
b8115dbc
authored
8 years ago
by
Thomas Mortagne
Browse files
Options
Downloads
Patches
Plain Diff
[misc] Apply codestyle and fix javadoc
parent
05882c80
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
xwiki-platform-core/xwiki-platform-velocity/xwiki-platform-velocity-webapp/src/main/java/org/xwiki/velocity/XWikiWebappResourceLoader.java
+5
-6
5 additions, 6 deletions
...in/java/org/xwiki/velocity/XWikiWebappResourceLoader.java
with
5 additions
and
6 deletions
xwiki-platform-core/xwiki-platform-velocity/xwiki-platform-velocity-webapp/src/main/java/org/xwiki/velocity/XWikiWebappResourceLoader.java
+
5
−
6
View file @
b8115dbc
...
@@ -27,10 +27,10 @@
...
@@ -27,10 +27,10 @@
import
org.xwiki.environment.internal.ServletEnvironment
;
import
org.xwiki.environment.internal.ServletEnvironment
;
/**
/**
* Extends the Velocity Tool's {@link WebappLoader} by adding the ServletContext to the Velocity Engine's
Application
* Extends the Velocity Tool's {@link Webapp
Resource
Loader} by adding the ServletContext to the Velocity Engine's
* Attributes since this is a prerequisite for {@link WebappLoader} to work correctly. This resource
loader depends on
*
Application
Attributes since this is a prerequisite for {@link Webapp
Resource
Loader} to work correctly. This resource
* the fact that the XWiki Component Manager has been set in Velocity Engine's Application Attribute
prior to its
*
loader depends on
the fact that the XWiki Component Manager has been set in Velocity Engine's Application Attribute
* initialization.
*
prior to its
initialization.
*
*
* @version $Id$
* @version $Id$
* @since 3.0M3
* @since 3.0M3
...
@@ -67,8 +67,7 @@ private Environment getEnvironment()
...
@@ -67,8 +67,7 @@ private Environment getEnvironment()
*/
*/
private
ComponentManager
getComponentManager
()
private
ComponentManager
getComponentManager
()
{
{
ComponentManager
cm
=
ComponentManager
cm
=
(
ComponentManager
)
this
.
rsvc
.
getApplicationAttribute
(
ComponentManager
.
class
.
getName
());
(
ComponentManager
)
this
.
rsvc
.
getApplicationAttribute
(
ComponentManager
.
class
.
getName
());
if
(
cm
==
null
)
{
if
(
cm
==
null
)
{
throw
new
RuntimeException
(
throw
new
RuntimeException
(
"Cannot initialize Velocity subsystem: missing Component Manager in Velocity Application Attribute"
);
"Cannot initialize Velocity subsystem: missing Component Manager in Velocity Application Attribute"
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment