Commit 58288efc authored by Canh Ngo's avatar Canh Ngo

HIPPLUG-1315 Reintegrate bugfix/HIPPLUG-1315

parents 89c9b886 d325630f
......@@ -3,3 +3,4 @@
.project/
.settings
target/
demo/storage/
......@@ -99,6 +99,19 @@
<defaultGoal>package</defaultGoal>
<finalName>cms</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Hippo-Release-Version>${hippo.release.version}</Hippo-Release-Version>
<Project-Version>${project.version}</Project-Version>
<Project-Build>${buildNumber}</Project-Build>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
......
......@@ -119,6 +119,29 @@
<listener-class>org.hippoecm.frontend.plugins.login.ConcurrentLoginListener</listener-class>
</listener>
<servlet>
<servlet-name>AngularResourceServlet</servlet-name>
<servlet-class>org.onehippo.cms7.utilities.servlet.ResourceServlet</servlet-class>
<init-param>
<param-name>jarPathPrefix</param-name>
<param-value>/angular</param-value>
</init-param>
<init-param>
<param-name>allowedResourcePaths</param-name>
<param-value>
^/.*\..*
</param-value>
</init-param>
<init-param>
<!--
Cache timeout in seconds. Make sure to increase it in production environments,
for example to one day (cacheTimeout = 86400)
-->
<param-name>cacheTimeout</param-name>
<param-value>0</param-value>
</init-param>
</servlet>
<servlet>
<servlet-name>CKEditorResourceServlet</servlet-name>
<servlet-class>org.onehippo.cms7.utilities.servlet.ResourceServlet</servlet-class>
......@@ -199,6 +222,11 @@
<url-pattern>/ping/</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>AngularResourceServlet</servlet-name>
<url-pattern>/angular/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>CKEditorResourceServlet</servlet-name>
<url-pattern>/ckeditor/*</url-pattern>
......
......@@ -25,4 +25,26 @@
</sv:property>
</sv:node>
</sv:node>
<sv:node sv:name="selectiondemo-nl">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>hst:channel</sv:value>
</sv:property>
<sv:property sv:name="hst:channelinfoclass" sv:type="String">
<sv:value>org.onehippo.forge.selectiondemo.channels.WebsiteInfo</sv:value>
</sv:property>
<sv:property sv:name="hst:name" sv:type="String">
<sv:value>Selection Demo NL</sv:value>
</sv:property>
<sv:property sv:name="hst:type" sv:type="String">
<sv:value>website</sv:value>
</sv:property>
<sv:node sv:name="hst:channelinfo">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>hst:channelinfo</sv:value>
</sv:property>
<sv:property sv:name="headerName" sv:type="String">
<sv:value>HST Website</sv:value>
</sv:property>
</sv:node>
</sv:node>
</sv:node>
......@@ -576,4 +576,27 @@
<sv:value>translations.json</sv:value>
</sv:property>
</sv:node>
<!-- Remove autoreload and webfiles modules since webfiles are not used in this demo -->
<sv:node sv:name="selections-remove-autoreload-module">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>hippo:initializeitem</sv:value>
</sv:property>
<sv:property sv:name="hippo:sequence" sv:type="Double">
<sv:value>32060</sv:value>
</sv:property>
<sv:property sv:name="hippo:contentdelete" sv:type="String">
<sv:value>/hippo:configuration/hippo:modules/autoreload</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="selections-remove-webfiles-module">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>hippo:initializeitem</sv:value>
</sv:property>
<sv:property sv:name="hippo:sequence" sv:type="Double">
<sv:value>32060</sv:value>
</sv:property>
<sv:property sv:name="hippo:contentdelete" sv:type="String">
<sv:value>/hippo:configuration/hippo:modules/webfiles</sv:value>
</sv:property>
</sv:node>
</sv:node>
......@@ -64,6 +64,9 @@
<sv:property sv:name="hst:locale" sv:type="String">
<sv:value>nl_NL</sv:value>
</sv:property>
<sv:property sv:name="hst:channelpath" sv:type="String">
<sv:value>/hst:hst/hst:channels/selectiondemo-nl</sv:value>
</sv:property>
<sv:property sv:name="hst:mountpoint" sv:type="String">
<sv:value>/hst:hst/hst:sites/selectiondemo-nl</sv:value>
</sv:property>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment