Skip to main content

Source code revision

svn

summary: http://java.net/jira/browse/JAVASERVERFACES-2744 http://java.net/jira/browse/JAVASERVERFACES-2854
revision: 11957
author: edburns
date: 2013-05-10 21:42:41 UTC (1 year)
message: http://java.net/jira/browse/JAVASERVERFACES-2744 http://java.net/jira/browse/JAVASERVERFACES-2854


SECTION: Modified Files
----------------------------
M jsf-ri/src/main/java/com/sun/faces/application/resource/ResourceHelper.java
M jsf-ri/src/main/java/com/sun/faces/application/resource/FaceletWebappResourceHelper.java

- add getBasePath() method that takes into account whether or not
contracts are in play or not. In the common case, when they are not,
it just returns the result of calling getBaseResourcePath().

- add "contract" parameter to findLibrary().

M jsf-ri/src/main/java/com/sun/faces/application/resource/LibraryInfo.java
M jsf-ri/src/main/java/com/sun/faces/application/resource/FaceletLibraryInfo.java

- Add "contract" ivar.

M jsf-ri/src/main/java/com/sun/faces/application/resource/ResourceHandlerImpl.java
M jsf-ri/src/main/java/com/sun/faces/application/resource/WebappResourceHelper.java
M jsf-ri/src/main/java/com/sun/faces/application/resource/ClasspathResourceHelper.java

- Honor the new findLibrary() signature.

M jsf-ri/src/main/java/com/sun/faces/application/resource/ResourceManager.java

- Honor the additional requirement to consider contracts.

M jsf-ri/test/com/sun/faces/application/resource/TestResourceImpl.java
M test/agnostic/vdl/facelets/contracts/vhosts/src/test/java/com/sun/faces/test/agnostic/vdl/facelets/contracts/vhosts/Issue2511IT.java
M test/agnostic/vdl/facelets/contracts/vhosts/src/main/webapp/contracts/host1/header.xhtml
M test/agnostic/vdl/facelets/contracts/vhosts/src/main/webapp/contracts/host1/lib/cc.xhtml
M test/agnostic/vdl/facelets/contracts/vhosts/src/main/webapp/header.xhtml
M test/agnostic/vdl/facelets/contracts/vhosts/src/main/webapp/template.xhtml
M test/agnostic/vdl/facelets/contracts/vhosts/src/main/webapp/resources/lib/2_3/cc.xhtml
M test/agnostic/vdl/facelets/contracts/vhosts/src/main/webapp/resources/lib/2_3/template.xhtml

- Test changes.

Change Path Actions
M branches/MOJARRA_2_2X_ROLLING/jsf-ri/src/main/java/com/sun/faces/application/resource/ClasspathResourceHelper.java
M branches/MOJARRA_2_2X_ROLLING/jsf-ri/src/main/java/com/sun/faces/application/resource/FaceletLibraryInfo.java
M branches/MOJARRA_2_2X_ROLLING/jsf-ri/src/main/java/com/sun/faces/application/resource/FaceletWebappResourceHelper.java
M branches/MOJARRA_2_2X_ROLLING/jsf-ri/src/main/java/com/sun/faces/application/resource/LibraryInfo.java
M branches/MOJARRA_2_2X_ROLLING/jsf-ri/src/main/java/com/sun/faces/application/resource/ResourceHandlerImpl.java
M branches/MOJARRA_2_2X_ROLLING/jsf-ri/src/main/java/com/sun/faces/application/resource/ResourceHelper.java
M branches/MOJARRA_2_2X_ROLLING/jsf-ri/src/main/java/com/sun/faces/application/resource/ResourceManager.java
M branches/MOJARRA_2_2X_ROLLING/jsf-ri/src/main/java/com/sun/faces/application/resource/WebappResourceHelper.java
M branches/MOJARRA_2_2X_ROLLING/jsf-ri/test/com/sun/faces/application/resource/TestResourceImpl.java
M branches/MOJARRA_2_2X_ROLLING/test/agnostic/vdl/facelets/contracts/vhosts/src/main/webapp/contracts/host1/header.xhtml
M branches/MOJARRA_2_2X_ROLLING/test/agnostic/vdl/facelets/contracts/vhosts/src/main/webapp/contracts/host1/lib/cc.xhtml
M branches/MOJARRA_2_2X_ROLLING/test/agnostic/vdl/facelets/contracts/vhosts/src/main/webapp/header.xhtml
M branches/MOJARRA_2_2X_ROLLING/test/agnostic/vdl/facelets/contracts/vhosts/src/main/webapp/resources/lib/2_3/cc.xhtml
M branches/MOJARRA_2_2X_ROLLING/test/agnostic/vdl/facelets/contracts/vhosts/src/main/webapp/resources/lib/2_3/template.xhtml
M branches/MOJARRA_2_2X_ROLLING/test/agnostic/vdl/facelets/contracts/vhosts/src/main/webapp/template.xhtml
M branches/MOJARRA_2_2X_ROLLING/test/agnostic/vdl/facelets/contracts/vhosts/src/test/java/com/sun/faces/test/agnostic/vdl/facelets/contracts/vhosts/Issue2511IT.java
 
 
Close
loading
Please Confirm
Close