You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ma...@apache.org on 2012/08/30 22:35:13 UTC
svn commit: r1379126 - in /rave/sandbox/content-services:
rave-jcr-utils/src/test/java/org/apache/rave/jcr/utils/
rave-jcr-utils/src/test/resources/
rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/resource/
Author: marijan
Date: Thu Aug 30 20:35:13 2012
New Revision: 1379126
URL: http://svn.apache.org/viewvc?rev=1379126&view=rev
Log:
RAVE-695 Create new rave-jcr-ocm module providing JCR based Object Content Mapping (OCM) support
- fix compile error
- fix junit test
Added:
rave/sandbox/content-services/rave-jcr-utils/src/test/resources/
rave/sandbox/content-services/rave-jcr-utils/src/test/resources/one-pixel-image.png (with props)
Modified:
rave/sandbox/content-services/rave-jcr-utils/src/test/java/org/apache/rave/jcr/utils/JcrUtilsTest.java
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/resource/BinaryRepositoryController.java
Modified: rave/sandbox/content-services/rave-jcr-utils/src/test/java/org/apache/rave/jcr/utils/JcrUtilsTest.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-utils/src/test/java/org/apache/rave/jcr/utils/JcrUtilsTest.java?rev=1379126&r1=1379125&r2=1379126&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-jcr-utils/src/test/java/org/apache/rave/jcr/utils/JcrUtilsTest.java (original)
+++ rave/sandbox/content-services/rave-jcr-utils/src/test/java/org/apache/rave/jcr/utils/JcrUtilsTest.java Thu Aug 30 20:35:13 2012
@@ -37,12 +37,14 @@ public class JcrUtilsTest {
@Test
public void testParseMimeType() throws Exception {
- final InputStream resourceAsStream = getClass().getResourceAsStream("/one-pixel-image.png");
+ final InputStream stream = getClass().getResourceAsStream("/one-pixel-image.png");
try {
- final String mimeType = JcrUtils.parseMimeType(resourceAsStream);
+ final String mimeType = JcrUtils.parseMimeType(stream);
assertEquals("image/png", mimeType);
} finally {
- resourceAsStream.close();
+ if (stream != null) {
+ stream.close();
+ }
}
}
}
Added: rave/sandbox/content-services/rave-jcr-utils/src/test/resources/one-pixel-image.png
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-utils/src/test/resources/one-pixel-image.png?rev=1379126&view=auto
==============================================================================
Binary file - no diff available.
Propchange: rave/sandbox/content-services/rave-jcr-utils/src/test/resources/one-pixel-image.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/resource/BinaryRepositoryController.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/resource/BinaryRepositoryController.java?rev=1379126&r1=1379125&r2=1379126&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/resource/BinaryRepositoryController.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/resource/BinaryRepositoryController.java Thu Aug 30 20:35:13 2012
@@ -40,7 +40,7 @@ public class BinaryRepositoryController
private static final Logger log = LoggerFactory.getLogger(BinaryRepositoryController.class);
public ModelAndView render(HttpServletRequest request, HttpServletResponse response) {
- final BinaryResourceView view = new BinaryResourceView();
+ final BinaryResourceView view = new BinaryResourceView(request.getRequestURI());
final Map<String, Object> model = new HashMap<String, Object>();
return new ModelAndView(view, model);
}