From 0a5ca7025d26ff19a6f3279ec33d02e6d088d7fb Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Mon, 19 Dec 2016 20:51:26 +0000
Subject: [PATCH] CCM NG: Fixed bugs in dispatcher code

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4493 8810af33-2d31-482b-a856-94f89814c4df
---
 .../org/librecms/contentsection/ContentItem.java     | 10 +++++-----
 .../java/com/arsdigita/web/CCMDispatcherServlet.java | 12 +++++++-----
 .../src/main/java/org/libreccm/core/CcmObject.java   |  3 +--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItem.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItem.java
index 3e07aebff..926dd7127 100644
--- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItem.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItem.java
@@ -172,7 +172,7 @@ public class ContentItem extends CcmObject implements Serializable,
                                }
         )
     )
-    @Field
+//    @Field
     private LocalizedString name;
 
     /**
@@ -181,7 +181,7 @@ public class ContentItem extends CcmObject implements Serializable,
     @OneToOne
     @JoinColumn(name = "CONTENT_TYPE_ID")
     @Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED)
-    @Field
+//    @Field
     private ContentType contentType;
 
     /**
@@ -197,7 +197,7 @@ public class ContentItem extends CcmObject implements Serializable,
                                }
         )
     )
-    @Field
+//    @Field
     private LocalizedString title;
 
     /**
@@ -211,7 +211,7 @@ public class ContentItem extends CcmObject implements Serializable,
                                joinColumns = {
                                    @JoinColumn(name = "OBJECT_ID")}
         ))
-    @Field
+//    @Field
     private LocalizedString description;
 
     /**
@@ -219,7 +219,7 @@ public class ContentItem extends CcmObject implements Serializable,
      */
     @Column(name = "VERSION")
     @Enumerated(EnumType.STRING)
-    @Field
+//    @Field
     private ContentItemVersion version;
 
     /**
diff --git a/ccm-core/src/main/java/com/arsdigita/web/CCMDispatcherServlet.java b/ccm-core/src/main/java/com/arsdigita/web/CCMDispatcherServlet.java
index 5dae5f9fa..7b2fb3fbf 100644
--- a/ccm-core/src/main/java/com/arsdigita/web/CCMDispatcherServlet.java
+++ b/ccm-core/src/main/java/com/arsdigita/web/CCMDispatcherServlet.java
@@ -92,7 +92,7 @@ public class CCMDispatcherServlet extends BaseServlet {
 
     private static final String DISPATCHED_ATTRIBUTE
                                 = CCMDispatcherServlet.class
-            .getName() + ".dispatched";
+                    .getName() + ".dispatched";
 
     /**
      * String containing the web context path portion of the WEB application
@@ -431,8 +431,8 @@ public class CCMDispatcherServlet extends BaseServlet {
                                 .urlPatterns()[0]
                                 .substring(0,
                                            servletAnnotation
-                                           .urlPatterns()[0]
-                                           .length() - 1);
+                                                   .urlPatterns()[0]
+                                                   .length() - 1);
                     } else {
                         m_typeURI = servletAnnotation.urlPatterns()[0];
                     }
@@ -495,8 +495,10 @@ public class CCMDispatcherServlet extends BaseServlet {
             final StringBuffer target = new StringBuffer(128);
 
             target.append(m_typeURI);
-            target.append("/");
-            target.append(path.substring(m_instanceURI.length()));
+//            target.append("/");
+            if (path.length() > (m_instanceURI.length() + 1)) {
+                target.append(path.substring(m_instanceURI.length() + 1));
+            }
             target.append("?");
             target.append(BaseApplicationServlet.APPLICATION_ID_PARAMETER);
             target.append("=");
diff --git a/ccm-core/src/main/java/org/libreccm/core/CcmObject.java b/ccm-core/src/main/java/org/libreccm/core/CcmObject.java
index 0a632a1f2..77204186d 100644
--- a/ccm-core/src/main/java/org/libreccm/core/CcmObject.java
+++ b/ccm-core/src/main/java/org/libreccm/core/CcmObject.java
@@ -52,6 +52,7 @@ import static org.libreccm.core.CoreConstants.CORE_XML_NS;
 import static org.libreccm.core.CoreConstants.DB_SCHEMA;
 
 import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.FieldBridge;
 
 /**
  * Root class of all entities in LibreCCM which need categorisation and
@@ -95,7 +96,6 @@ public class CcmObject implements Identifiable, Serializable {
     @Id
     @Column(name = "OBJECT_ID")
     @GeneratedValue(strategy = GenerationType.AUTO)
-    @Field
     @XmlElement(name = "object-id", namespace = CORE_XML_NS)
     private long objectId;
 
@@ -121,7 +121,6 @@ public class CcmObject implements Identifiable, Serializable {
      * Permissions granted on this object.
      */
     @OneToMany(mappedBy = "object")
-    @Field
     @XmlElementWrapper(name = "permissions", namespace = CORE_XML_NS)
     @XmlElement(name = "permission", namespace = CORE_XML_NS)
     @JsonBackReference(value = "permission-object")