Modified: rave/sandbox/content-services/rave-web-jcr/src/test/resources/initial-data.json URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/test/resources/initial-data.json?rev=1387872&r1=1387871&r2=1387872&view=diff ============================================================================== --- rave/sandbox/content-services/rave-web-jcr/src/test/resources/initial-data.json (original) +++ rave/sandbox/content-services/rave-web-jcr/src/test/resources/initial-data.json Thu Sep 20 06:40:01 2012 @@ -1,15 +1,12 @@ { "jcr:primaryType":"ravedata:folder", "mypage.ftl":{ - "jcr:primaryType":"ravedata:binary", + "jcr:primaryType":"ravedata:resource", "id":"freemarker", - "resource":{ - "jcr:primaryType":"ravedata:resource", - "jcr:lastModifiedBy":"admin", - "jcr:binary:jcr:data":"PCNpbXBvcnQgIi9zcHJpbmcuZnRsIiBhcyBzcHJpbmcgLz4KPCNhc3NpZ24gcmF2ZT1Kc3BUYWdsaWJzWyJodHRwOi8vd3d3LmFwYWNoZS1yYXZlLm9yZy9qc3AvY29yZSJdIC8+CjxodG1sPgoKPGJvZHk+CjxoMT5teSBmcmVlbWFya2VyIHBhZ2UgZnJvbSBKQ1I8L2gxPgo8dGFibGUgYm9yZGVyPSIxIj4KICAgIDx0cj4KICAgICAgICA8dGQ+aGVhZAogICAgICAgIDxAcmF2ZS5pbmNsdWRlIHJlZj0iaGVhZCIvPgogICAgICAgIDwvdGQ+CiAgICA8L3RyPgogICAgPHRyPgogICAgICAgIDx0ZD5ib2R5CiAgICAgICAgPEByYXZlLmluY2x1ZGUgcmVmPSJib2R5Ii8+CiAgICAgICAgPC90ZD4KICAgIDwvdHI+CiAgICA8dHI+CiAgICAgICAgPHRkPiBmb290ZXIKICAgICAgICA8QHJhdmUuaW5jbHVkZSByZWY9ImZvb3RlciIvPgogICAgICAgIDwvdGQ+CiAgICA8L3RyPgo8L3RhYmxlPgo8L2JvZHk+CjwvaHRtbD4KCg==", - "jcr:encoding":"test", - "jcr:mimeType":"image/png", - "jcr:lastModified":"2012-08-30T10:48:40.534+0200" - } + "jcr:lastModifiedBy":"admin", + "jcr:binary:jcr:data":"PCNpbXBvcnQgIi9zcHJpbmcuZnRsIiBhcyBzcHJpbmcgLz4KPCNhc3NpZ24gcmF2ZT1Kc3BUYWdsaWJzWyJodHRwOi8vd3d3LmFwYWNoZS1yYXZlLm9yZy9qc3AvY29yZSJdIC8+CjxodG1sPgoKPGJvZHk+CjxoMT5teSBmcmVlbWFya2VyIHBhZ2UgZnJvbSBKQ1I8L2gxPgo8dGFibGUgYm9yZGVyPSIxIj4KICAgIDx0cj4KICAgICAgICA8dGQ+aGVhZAogICAgICAgIDxAcmF2ZS5pbmNsdWRlIHJlZj0iaGVhZCIvPgogICAgICAgIDwvdGQ+CiAgICA8L3RyPgogICAgPHRyPgogICAgICAgIDx0ZD5ib2R5CiAgICAgICAgPEByYXZlLmluY2x1ZGUgcmVmPSJib2R5Ii8+CiAgICAgICAgPC90ZD4KICAgIDwvdHI+CiAgICA8dHI+CiAgICAgICAgPHRkPiBmb290ZXIKICAgICAgICA8QHJhdmUuaW5jbHVkZSByZWY9ImZvb3RlciIvPgogICAgICAgIDwvdGQ+CiAgICA8L3RyPgo8L3RhYmxlPgo8L2JvZHk+CjwvaHRtbD4KCg==", + "jcr:encoding":"test", + "jcr:mimeType":"image/png", + "jcr:lastModified":"2012-08-30T10:48:40.534+0200" } } \ No newline at end of file
Modified: rave/sandbox/content-services/rave-web-jcr/src/test/resources/log4j.xml URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/test/resources/log4j.xml?rev=1387872&r1=1387871&r2=1387872&view=diff ============================================================================== --- rave/sandbox/content-services/rave-web-jcr/src/test/resources/log4j.xml (original) +++ rave/sandbox/content-services/rave-web-jcr/src/test/resources/log4j.xml Thu Sep 20 06:40:01 2012 @@ -44,7 +44,7 @@ </category> <root> - <level value="debug"/> + <level value="warn"/> <appender-ref ref="console"/> </root> Modified: rave/sandbox/content-services/rave-web-jcr/src/test/resources/org/apache/rave/jcr/jackrabbit/repository.xml URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/test/resources/org/apache/rave/jcr/jackrabbit/repository.xml?rev=1387872&r1=1387871&r2=1387872&view=diff ============================================================================== --- rave/sandbox/content-services/rave-web-jcr/src/test/resources/org/apache/rave/jcr/jackrabbit/repository.xml (original) +++ rave/sandbox/content-services/rave-web-jcr/src/test/resources/org/apache/rave/jcr/jackrabbit/repository.xml Thu Sep 20 06:40:01 2012 @@ -34,6 +34,13 @@ <Workspace name="${wsp.name}"> <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"/> <PersistenceManager class="org.apache.jackrabbit.core.persistence.mem.InMemBundlePersistenceManager"/> + <!-- + Search index and the file system it uses. + class: FQN of class implementing the QueryHandler interface + --> + <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex"> + <param name="path" value="${wsp.home}/index"/> + </SearchIndex> </Workspace> <Versioning rootPath="${rep.home}/version"> Modified: rave/sandbox/content-services/rave-web-jcr/src/test/resources/page-config.json URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/test/resources/page-config.json?rev=1387872&r1=1387871&r2=1387872&view=diff ============================================================================== --- rave/sandbox/content-services/rave-web-jcr/src/test/resources/page-config.json (original) +++ rave/sandbox/content-services/rave-web-jcr/src/test/resources/page-config.json Thu Sep 20 06:40:01 2012 @@ -1,4 +1,5 @@ { + "jcr:primaryType":"ravedata:folder", "myRoutes":{ "jcr:primaryType":"raveconfig:routes", "name":"myRoutes", @@ -15,6 +16,12 @@ "path":"/mypage2", "target":"/mypage", "action": "action2" + }, + "routeBinaries":{ + "jcr:primaryType":"raveconfig:route", + "name":"binaries", + "path":"/binaries", + "target":"org.apache.rave.portal.web.mvc.view.BinaryRepositoryController" } }, "myPages":{ @@ -43,3 +50,4 @@ } } } + Modified: rave/sandbox/content-services/rave-web-jcr/src/test/resources/test-config.xml URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/test/resources/test-config.xml?rev=1387872&r1=1387871&r2=1387872&view=diff ============================================================================== --- rave/sandbox/content-services/rave-web-jcr/src/test/resources/test-config.xml (original) +++ rave/sandbox/content-services/rave-web-jcr/src/test/resources/test-config.xml Thu Sep 20 06:40:01 2012 @@ -37,27 +37,15 @@ //************************************************************************************* --> - - <bean id="repository" class="org.apache.rave.jcr.utils.TransientBaseRepositoryFactoryBean"> - <property name="homeDirectory" value="file:./target/repository"/> - <property name="repositoryFile" value="org/apache/rave/jcr/jackrabbit/repository.xml"/> - - </bean> - - <bean id="jcrSessionFactory" class="org.apache.rave.jcr.utils.JcrSessionFactory"> - <property name="repository" ref="repository"/> - <property name="credentials" ref="javax.jcr.SimpleCredentials"/> - </bean> - <bean id="password" class="java.lang.String"> - <constructor-arg index="0" value="admin"/> - </bean> - - <bean class="javax.jcr.SimpleCredentials"> - <constructor-arg index="0" value="admin"/> - <constructor-arg index="1"> - <bean factory-bean="password" factory-method="toCharArray"/> + <bean id="repository" class="org.apache.jackrabbit.core.RepositoryImpl" destroy-method="shutdown"> + <constructor-arg index="0"> + <bean class="org.apache.jackrabbit.core.config.RepositoryConfig" factory-method="create"> + <constructor-arg index="0" type="java.io.InputStream" value="classpath:org/apache/rave/jcr/jackrabbit/repository.xml"/> + <constructor-arg index="1" value="./target/repository" /> + </bean> </constructor-arg> </bean> + <!-- //############################################ // INJECT FOR TESTING @@ -91,10 +79,9 @@ </bean> <!-- FILE LOADING --> - <bean name="routedHandlerMapping" class="org.apache.rave.portal.web.mvc.RoutedRequestMappingHandlerMapping"> + <bean name="nestedHandlerMethodHandlerMapping" class="org.apache.rave.portal.web.mvc.NestedHandlerMethodHandlerMapping"> <property name="order" value="-1"/> <property name="configManager" ref="pagesConfigManager"/> - </bean> <bean id="pagesConfigManager" class="org.apache.rave.portal.web.mvc.config.jcr.JcrPagesConfigManager"> @@ -110,31 +97,6 @@ <property name="order" value="0"/> </bean> - - <!-- - //############################################ - // BINARY MAPPING - //############################################ - --> - <bean id="org.springframework.web.servlet.config.viewControllerHandlerMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping"> - <property name="order" value="1"/> - <property name="urlMap"> - <map> - <!-- Forwards requests to the "/" resource to the "page" view --> - <entry key="/"> - <bean class="org.springframework.web.servlet.mvc.ParameterizableViewController"> - <property name="viewName" value="page"/> - </bean> - </entry> - <entry key="/binaries/**" value="binaryViewController"/> - </map> - </property> - </bean> - - <bean id="beanNameHandlerMapping" class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping"> - <property name="order" value="2"/> - </bean> - <bean name="nestedHandlerMethodHandlerAdapter" class="org.apache.rave.portal.web.mvc.NestedHandlerMethodHandlerAdapterAdapter"> <constructor-arg> <bean class="org.apache.rave.portal.web.mvc.NestedHandlerMethodHandlerAdapter"> @@ -206,23 +168,18 @@ --> - <bean id="documentManager" class="org.apache.rave.portal.web.mvc.data.mapping.DefaultDocumentManager" destroy-method="shutdown"> - <constructor-arg value="#{servletContext}"/> - <constructor-arg ref="lazyRepositoryFactory"/> - <constructor-arg ref="jcrCredentials"/> - <constructor-arg value="default"/> - </bean> - - <bean id="jcrResourceLoader" class="org.apache.rave.portal.web.mvc.view.JcrRepositoryResourceLoader"> - <constructor-arg ref="documentManager"/> + <bean id="contentManager" class="org.apache.rave.portal.web.mvc.data.mapping.DefaultContentManager" destroy-method="shutdown"> + <constructor-arg index="0" ref="lazyRepositoryFactory"/> + <constructor-arg index="1" ref="jcrCredentials"/> + <constructor-arg index="2" value="default"/> </bean> <bean id="freemarkerConfig" class="org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer"> - <property name="templateLoaderPath" value="/WEB-INF/freemarker/"/> + <property name="templateLoaderPath" value="/"/> <property name="preTemplateLoaders"> <list> - <bean class="org.apache.rave.portal.web.mvc.view.FreeMarkerTemplateLoader"> - <property name="loader" ref="jcrResourceLoader"/> + <bean class="org.apache.rave.portal.web.mvc.view.JcrFreeMarkerTemplateLoader"> + <property name="contentManager" ref="contentManager"/> </bean> </list> </property> @@ -242,24 +199,5 @@ <property name="suffix" value=".ftl"/> </bean> - <!-- - //************************************************************************************* - // BINARY CONTROLLER AND RESOLVERS - // see also: org.springframework.web.servlet.config.viewControllerHandlerMapping - //************************************************************************************* - --> - <bean id="binaryViewController" class="org.apache.rave.portal.web.mvc.view.BinaryRepositoryController"> - <property name="methodNameResolver" ref="binaryNameResolver"/> - <property name="documentManager" ref="documentManager"/> - </bean> - - <bean id="binaryNameResolver" class="org.springframework.web.servlet.mvc.multiaction.PropertiesMethodNameResolver"> - <property name="mappings"> - <props> - <prop key="/binaries/**">render</prop> - </props> - </property> - </bean> - </beans> Modified: rave/sandbox/content-services/rave-web-jcr/src/test/resources/test-data.json URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/test/resources/test-data.json?rev=1387872&r1=1387871&r2=1387872&view=diff ============================================================================== --- rave/sandbox/content-services/rave-web-jcr/src/test/resources/test-data.json (original) +++ rave/sandbox/content-services/rave-web-jcr/src/test/resources/test-data.json Thu Sep 20 06:40:01 2012 @@ -1,28 +1,24 @@ { + "jcr:primaryType":"ravedata:folder", "binaries":{ + "jcr:primaryType":"ravedata:folder", "css":{ - "jcr:primaryType":"ravedata:binary", + "jcr:primaryType":"ravedata:script", "id":"css", - "resource":{ - "jcr:primaryType":"ravedata:resource", - "jcr:lastModifiedBy":"admin", - "jcr:binary:jcr:data":"LmZvb3sKICAgIGJhY2tncm91bmQtY29sb3I6IHJlZDsKfQ==", - "jcr:encoding":"test", - "jcr:mimeType":"text/plain", - "jcr:lastModified":"2012-08-30T11:21:52.247+0200" - } + "title":"cssTitle", + "jcr:lastModifiedBy":"admin", + "ravedata:src":"h1 {\n font-size: 30px;\n line-height: 36px;\n}", + "ravedata:type":"css", + "jcr:lastModified":"2012-08-30T11:21:52.247+0200" }, "img":{ - "jcr:primaryType":"ravedata:binary", + "jcr:primaryType":"ravedata:resource", "id":"image", - "resource":{ - "jcr:primaryType":"ravedata:resource", - "jcr:lastModifiedBy":"admin", - "jcr:binary:jcr:data":"iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAABHNCSVQICAgIfAhkiAAAAA1JREFUCJljYGBg+A8AAQQBAH2yyN8AAAAASUVORK5CYII=", - "jcr:encoding":"test", - "jcr:mimeType":"image/png", - "jcr:lastModified":"2012-08-30T10:48:40.534+0200" - } + "jcr:lastModifiedBy":"admin", + "jcr:binary:jcr:data":"iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAABHNCSVQICAgIfAhkiAAAAA1JREFUCJljYGBg+A8AAQQBAH2yyN8AAAAASUVORK5CYII=", + "jcr:encoding":"test", + "jcr:mimeType":"image/png", + "jcr:lastModified":"2012-08-30T10:48:40.534+0200" } } }
