svn commit: r1680302 - in /felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto: RuntimeDTOBuilder.java ServletContextDTOBuilder.java ServletDTOBuilder.java

[cz...@apache.org]

Author: cziegeler
Date: Tue May 19 14:22:27 2015
New Revision: 1680302

URL: http://svn.apache.org/r1680302
Log:
FELIX-4888 : ServletHandler's are not sorted by longest matching path. DTO handling (WiP)

Modified:
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/RuntimeDTOBuilder.java
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ServletContextDTOBuilder.java
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ServletDTOBuilder.java

Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/RuntimeDTOBuilder.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/RuntimeDTOBuilder.java?rev=1680302&r1=1680301&r2=1680302&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/RuntimeDTOBuilder.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/RuntimeDTOBuilder.java Tue May 19 14:22:27 2015
@@ -52,13 +52,15 @@ public final class RuntimeDTOBuilder
     {
         final RuntimeDTO runtimeDTO = new RuntimeDTO();
         runtimeDTO.serviceDTO = createServiceDTO();
+        runtimeDTO.servletContextDTOs = createContextDTOs();
+
         runtimeDTO.failedErrorPageDTOs = registry.getFailedDTOHolder().failedErrorPageDTOs.toArray(new FailedErrorPageDTO[registry.getFailedDTOHolder().failedErrorPageDTOs.size()]);
         runtimeDTO.failedFilterDTOs = registry.getFailedDTOHolder().failedFilterDTOs.toArray(new FailedFilterDTO[registry.getFailedDTOHolder().failedFilterDTOs.size()]);
         runtimeDTO.failedListenerDTOs = registry.getFailedDTOHolder().failedListenerDTOs.toArray(new FailedListenerDTO[registry.getFailedDTOHolder().failedListenerDTOs.size()]);
         runtimeDTO.failedResourceDTOs = registry.getFailedDTOHolder().failedResourceDTOs.toArray(new FailedResourceDTO[registry.getFailedDTOHolder().failedResourceDTOs.size()]);
         runtimeDTO.failedServletContextDTOs = registry.getFailedDTOHolder().failedServletContextDTO.toArray(new FailedServletContextDTO[registry.getFailedDTOHolder().failedServletContextDTO.size()]);
         runtimeDTO.failedServletDTOs = registry.getFailedDTOHolder().failedServletDTOs.toArray(new FailedServletDTO[registry.getFailedDTOHolder().failedServletDTOs.size()]);
-        runtimeDTO.servletContextDTOs = createContextDTOs();
+
         return runtimeDTO;
     }
 

Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ServletContextDTOBuilder.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ServletContextDTOBuilder.java?rev=1680302&r1=1680301&r2=1680302&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ServletContextDTOBuilder.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ServletContextDTOBuilder.java Tue May 19 14:22:27 2015
@@ -44,6 +44,12 @@ public final class ServletContextDTOBuil
         dto.name = info.getName();
         dto.serviceId = info.getServiceId();
 
+        dto.errorPageDTOs = BuilderConstants.ERROR_PAGE_DTO_ARRAY;
+        dto.filterDTOs = BuilderConstants.FILTER_FAILURE_DTO_ARRAY;
+        dto.listenerDTOs = BuilderConstants.LISTENER_DTO_ARRAY;
+        dto.resourceDTOs = BuilderConstants.RESOURCE_DTO_ARRAY;
+        dto.servletDTOs = BuilderConstants.SERVLET_DTO_ARRAY;
+
         if ( reason != -1 )
         {
             ((FailedServletContextDTO)dto).failureReason = reason;

Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ServletDTOBuilder.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ServletDTOBuilder.java?rev=1680302&r1=1680301&r2=1680302&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ServletDTOBuilder.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ServletDTOBuilder.java Tue May 19 14:22:27 2015
@@ -56,6 +56,8 @@ public final class ServletDTOBuilder ext
 
         BaseServletDTOBuilder.fill(dto, info);
 
+        dto.patterns = BuilderConstants.EMPTY_STRING_ARRAY;
+
         return dto;
     }
 }