geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r982351 - in /geronimo/server/trunk: framework/configs/karaf-framework/src/main/filtered-resources/etc/ plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/webfragment/
Date Wed, 04 Aug 2010 18:31:33 GMT
Author: gawor
Date: Wed Aug  4 18:31:33 2010
New Revision: 982351

URL: http://svn.apache.org/viewvc?rev=982351&view=rev
Log:
missed some updates

Modified:
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
    geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/webfragment/SecurityConstraintMergeHandler.java

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties?rev=982351&r1=982350&r2=982351&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
Wed Aug  4 18:31:33 2010
@@ -67,7 +67,7 @@ org/apache/servicemix/bundles/org.apache
 org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-lang/2.4_3/org.apache.servicemix.bundles.commons-lang-2.4_3.jar=40
 org/apache/geronimo/bundles/jaxb-impl/2.2_1/jaxb-impl-2.2_1.jar=40
 org/apache/geronimo/specs/geronimo-activation_1.1_spec/1.1/geronimo-activation_1.1_spec-1.1.jar=40
-org/apache/geronimo/specs/geronimo-jaxb_2.2_spec/1.0/geronimo-jaxb_2.2_spec-1.0.jar=40
+org/apache/geronimo/specs/geronimo-jaxb_2.2_spec/1.1-SNAPSHOT/geronimo-jaxb_2.2_spec-1.1-SNAPSHOT.jar=40
 org/apache/geronimo/specs/geronimo-stax-api_1.2_spec/1.0/geronimo-stax-api_1.2_spec-1.0.jar=40
 org/apache/geronimo/bundles/woodstox/${woodstoxVersion}/woodstox-${woodstoxVersion}.jar=40
 asm/asm-all/3.2/asm-all-3.2.jar=40

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/webfragment/SecurityConstraintMergeHandler.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/SecurityConstraintMergeHandler.java?rev=982351&r1=982350&r2=982351&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/webfragment/SecurityConstraintMergeHandler.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/webfragment/SecurityConstraintMergeHandler.java
Wed Aug  4 18:31:33 2010
@@ -36,7 +36,7 @@ public class SecurityConstraintMergeHand
 
     @Override
     public void merge(WebFragment webFragment, WebApp webApp, MergeContext mergeContext)
throws DeploymentException {
-        for (SecurityConstraint securityConstraint : webApp.getSecurityConstraint()) {
+        for (SecurityConstraint securityConstraint : webFragment.getSecurityConstraint())
{
             for (WebResourceCollection webResourceCollection : securityConstraint.getWebResourceCollection())
{
                 for (String urlPattern : webResourceCollection.getUrlPattern()) {
                     if (!WebDeploymentValidationUtils.isValidUrlPattern(urlPattern)) {



Mime
View raw message