geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r982380 - in /geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge: MergeHelper.java webfragment/FilterMergeHandler.java
Date Wed, 04 Aug 2010 19:43:45 GMT
Author: gawor
Date: Wed Aug  4 19:43:44 2010
New Revision: 982380

URL: http://svn.apache.org/viewvc?rev=982380&view=rev
Log:
a bunch of minor fixes for servlet 3.0 merge code

Modified:
    geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/MergeHelper.java
    geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/webfragment/FilterMergeHandler.java

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/MergeHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/MergeHelper.java?rev=982380&r1=982379&r2=982380&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/MergeHelper.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/MergeHelper.java
Wed Aug  4 19:43:44 2010
@@ -258,11 +258,11 @@ public class MergeHelper {
                         BufferedReader bufferedReader = null;
                         try {
                             bufferedReader = new BufferedReader(new InputStreamReader(in,
"UTF-8"));
-                            String servletContainerInitializer = null;
-                            while ((servletContainerInitializer = bufferedReader.readLine())
!= null) {
-                                servletContainerInitializer = servletContainerInitializer.trim();
-                                if (!servletContainerInitializer.isEmpty()) {
-                                    servletContainerInitializers.add(servletContainerInitializer);
+                            String line = null;
+                            while ((line = bufferedReader.readLine()) != null) {
+                                line = line.trim();                                
+                                if (!line.isEmpty() && !line.startsWith("#")) {
+                                    servletContainerInitializers.add(line);
                                 }
                             }
                         } catch (IOException e) {
@@ -343,7 +343,7 @@ public class MergeHelper {
                     ZipEntry entry;
                     while ((entry = in.getNextEntry()) != null) {
                         if (entry.getName().equals("META-INF/web-fragment.xml")) {
-                            webFragment = (WebFragment) JaxbJavaee.unmarshal(WebFragment.class,
in, true);
+                            webFragment = (WebFragment) JaxbJavaee.unmarshalJavaee(WebFragment.class,
in);
                             break;
                         }
                     }

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/webfragment/FilterMergeHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/webfragment/FilterMergeHandler.java?rev=982380&r1=982379&r2=982380&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/webfragment/FilterMergeHandler.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/webfragment/FilterMergeHandler.java
Wed Aug  4 19:43:44 2010
@@ -45,9 +45,9 @@ public class FilterMergeHandler implemen
             Filter targetFilter = (Filter) mergeContext.getAttribute(createFilterKey(filterName));
             if (targetFilter == null) {
                 webApp.getFilter().add(srcFilter);
-                mergeContext.setAttribute(createFilterKey(filterName), targetFilter);
+                mergeContext.setAttribute(createFilterKey(filterName), srcFilter);
                 for (SubMergeHandler<Filter, Filter> subMergeHandler : subMergeHandlers)
{
-                    subMergeHandler.add(targetFilter, mergeContext);
+                    subMergeHandler.add(srcFilter, mergeContext);
                 }
             } else {
                 for (SubMergeHandler<Filter, Filter> subMergeHandler : subMergeHandlers)
{



Mime
View raw message