portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r545097 - /portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedDeploy.java
Date Thu, 07 Jun 2007 08:11:57 GMT
Author: ate
Date: Thu Jun  7 01:11:56 2007
New Revision: 545097

URL: http://svn.apache.org/viewvc?view=rev&rev=545097
Log:
Fix for JS2-687: jetspeed deployment engine removes WEB-INF/tld/portlet.tld from portlet app
web archive
See: http://issues.apache.org/jira/browse/JS2-687

Modified:
    portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedDeploy.java

Modified: portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedDeploy.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedDeploy.java?view=diff&rev=545097&r1=545096&r2=545097
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedDeploy.java
(original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedDeploy.java
Thu Jun  7 01:11:56 2007
@@ -137,10 +137,6 @@
                         System.out.println("Found META-INF/context.xml");
                         contextXml = parseXml(source);
                     }
-                    else if ("WEB-INF/tld/portlet.tld".equals(target))
-                    {
-                        taglibFound = true;
-                    }
                     else
                     {
                         if ( stripLoggers && target.endsWith(".jar") &&
@@ -149,6 +145,11 @@
                             System.out.println("Stripping logger "+target);
                             continue;
                         }
+                        else if ("WEB-INF/tld/portlet.tld".equals(target))
+                        {
+                            System.out.println("Warning: WEB-INF/tld/portlet.tld already
provided, won't be replaced.");
+                            taglibFound = true;
+                        }
                         addFile(target, source, jout);
                     }
                 }
@@ -181,7 +182,7 @@
             addFile("WEB-INF/portlet.xml", portletXml, jout);
             addFile("META-INF/context.xml", contextXml, jout);
 
-            if (webRewriter.isPortletTaglibAdded() || !taglibFound)
+            if (!taglibFound)
             {
                 System.out.println("Attempting to add portlet.tld to war...");
                 InputStream is = this.getClass().getResourceAsStream("/org/apache/jetspeed/tools/deploy/portlet.tld");



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message