multi-page post-merge fixes

tallence · Jan 18, 2023 · 26f24ff · 26f24ff
1 parent f39dbd8
commit 26f24ff
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 0 deletions.
diff --git a/form-editor-cae/pom.xml b/form-editor-cae/pom.xml
@@ -75,6 +75,14 @@
       <groupId>com.coremedia.cms</groupId>
       <artifactId>coremedia-cache</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.coremedia.cms</groupId>
+      <artifactId>cae-viewservices</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.coremedia.cms</groupId>
+      <artifactId>coremedia-xml</artifactId>
+    </dependency>
 
     <!-- Spring -->
     <dependency>

diff --git a/form-editor-shared/pom.xml b/form-editor-shared/pom.xml
@@ -37,6 +37,10 @@
       <groupId>com.coremedia.cms</groupId>
       <artifactId>cap-multisite</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.coremedia.cms</groupId>
+      <artifactId>coremedia-xml</artifactId>
+    </dependency>
 
     <!-- Spring -->
     <dependency>
@@ -63,6 +67,11 @@
       <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>

diff --git a/form-editor-studio-lib/pom.xml b/form-editor-studio-lib/pom.xml
@@ -88,6 +88,13 @@
       <artifactId>spring-context</artifactId>
     </dependency>
 
+    <!-- Other -->
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
     <!-- Testing -->
     <dependency>
       <groupId>com.coremedia.cms</groupId>
@@ -119,6 +126,11 @@
       <artifactId>cap-client-xml</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <scope>test</scope>
+    </dependency>
 
 
   </dependencies>

diff --git a/...o-lib/src/test/java/com/tallence/formeditor/studio/validator/FormEditorValidatorTest.java b/...o-lib/src/test/java/com/tallence/formeditor/studio/validator/FormEditorValidatorTest.java
@@ -26,6 +26,7 @@
 import com.coremedia.springframework.xml.ResourceAwareXmlBeanDefinitionReader;
 import com.tallence.formeditor.FormEditorConfiguration;
 import com.tallence.formeditor.FormEditorHelper;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,8 +36,11 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.ImportResource;
 import org.springframework.context.annotation.Scope;
+import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -58,6 +62,11 @@ public class FormEditorValidatorTest {
   @Autowired
   private FormEditorValidator formEditorValidator;
 
+  @Before
+  public void setUp() {
+    RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(new MockHttpServletRequest()));
+  }
+
   @Test
   public void testValidDoc() {
     Content testContent = contentRepository.getContent("2");

diff --git a/form-editor-test-util/src/main/resources/com/tallence/formeditor/testdata/content.xml b/form-editor-test-util/src/main/resources/com/tallence/formeditor/testdata/content.xml
@@ -42,6 +42,7 @@
           <stringProperty name="formAction" value="mailAction"/>
           <stringProperty name="adminMails" value="admin@example.com"/>
           <markupProperty name="formData" url="20formElements.xml" grammar="coremedia-struct-2008"/>
+          <intProperty name="pageableFormEnabled" value="1"/>
         </version>
       </document>
       <document id="8" type="CMChannel" name="NavContext" modificationDate="2009-06-01T20:59:42.000+01:00">