NOJIRA Change overlay pom to include META-INF/context.xml

vertein · Aug 27, 2013 · ff1123e · ff1123e
1 parent 560faf7
commit ff1123e
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 45 deletions.
diff --git a/uportal-portlets-overlay/AnnouncementsPortlet/pom.xml b/uportal-portlets-overlay/AnnouncementsPortlet/pom.xml
@@ -49,6 +49,7 @@
                     <filters>
                         <filter>${basedir}/../../${filters.file}</filter>
                     </filters>
+                    <!-- A side effect of this exclude is we'll retain META-INF/context.xml (META-INF is excluded by default) -->
                     <dependentWarExcludes>
                         WEB-INF/lib/hsqldb-*.jar
                     </dependentWarExcludes>

diff --git a/uportal-portlets-overlay/CalendarPortlet/pom.xml b/uportal-portlets-overlay/CalendarPortlet/pom.xml
@@ -66,6 +66,7 @@
                     <filters>
                         <filter>${basedir}/../../${filters.file}</filter>
                     </filters>
+                    <!-- A side effect of this exclude is we'll retain META-INF/context.xml (META-INF is excluded by default) -->
                     <dependentWarExcludes>
                         WEB-INF/lib/hsqldb-*.jar
                     </dependentWarExcludes>

diff --git a/uportal-portlets-overlay/NewsReaderPortlet/pom.xml b/uportal-portlets-overlay/NewsReaderPortlet/pom.xml
@@ -62,6 +62,7 @@
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
+                    <!-- A side effect of this exclude is we'll retain META-INF/context.xml (META-INF is excluded by default) -->
                     <dependentWarExcludes>
                         WEB-INF/lib/hsqldb-*.jar
                     </dependentWarExcludes>

diff --git a/uportal-portlets-overlay/NotificationPortlet/pom.xml b/uportal-portlets-overlay/NotificationPortlet/pom.xml
@@ -58,6 +58,16 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <!-- Define an exclude to insure we retain META-INF/context.xml (META-INF is excluded by default) -->
+                    <dependentWarExcludes>
+                        WEB-INF/lib/hsqldb-*.jar
+                    </dependentWarExcludes>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.portals.pluto</groupId>
                 <artifactId>maven-pluto-plugin</artifactId>

diff --git a/uportal-portlets-overlay/NotificationPortlet/src/main/webapp/META-INF/context.xml b/uportal-portlets-overlay/NotificationPortlet/src/main/webapp/META-INF/context.xml
diff --git a/uportal-portlets-overlay/SimpleContentPortlet/pom.xml b/uportal-portlets-overlay/SimpleContentPortlet/pom.xml
@@ -36,6 +36,15 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <!-- A side effect of this exclude is we'll retain META-INF/context.xml (META-INF is excluded by default) -->
+                    <dependentWarExcludes>
+                        WEB-INF/lib/hsqldb-*.jar
+                    </dependentWarExcludes>
+                </configuration>
+            </plugin>
            <plugin>
                 <groupId>org.apache.portals.pluto</groupId>
                 <artifactId>maven-pluto-plugin</artifactId>

diff --git a/uportal-portlets-overlay/WeatherPortlet/pom.xml b/uportal-portlets-overlay/WeatherPortlet/pom.xml
@@ -41,7 +41,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
-                    <!-- Define an exclude to insure we retain META-INF/context.xml -->
+                    <!-- Define an exclude to insure we retain META-INF/context.xml (META-INF is excluded by default) -->
                     <dependentWarExcludes>
                         WEB-INF/lib/hsqldb-*.jar
                     </dependentWarExcludes>

diff --git a/uportal-portlets-overlay/WebProxyPortlet/pom.xml b/uportal-portlets-overlay/WebProxyPortlet/pom.xml
@@ -49,6 +49,7 @@
                     <filters>
                         <filter>${basedir}/../../${filters.file}</filter>
                     </filters>
+                    <!-- A side effect of this exclude is we'll retain META-INF/context.xml (META-INF is excluded by default) -->
                     <dependentWarExcludes>
                         WEB-INF/lib/hsqldb-*.jar
                     </dependentWarExcludes>

diff --git a/uportal-portlets-overlay/email-preview/pom.xml b/uportal-portlets-overlay/email-preview/pom.xml
@@ -37,6 +37,15 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <!-- A side effect of this exclude is we'll retain META-INF/context.xml (META-INF is excluded by default) -->
+                    <dependentWarExcludes>
+                        WEB-INF/lib/hsqldb-*.jar
+                    </dependentWarExcludes>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.portals.pluto</groupId>
                 <artifactId>maven-pluto-plugin</artifactId>

diff --git a/uportal-portlets-overlay/jasig-widget-portlets/pom.xml b/uportal-portlets-overlay/jasig-widget-portlets/pom.xml
@@ -51,6 +51,10 @@
                     <filters>
                         <filter>${basedir}/../../${filters.file}</filter>
                     </filters>
+                    <!-- Define an exclude to insure we retain META-INF/context.xml (META-INF is excluded by default) -->
+                    <dependentWarExcludes>
+                        WEB-INF/lib/hsqldb-*.jar
+                    </dependentWarExcludes>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/uportal-portlets-overlay/jasig-widget-portlets/src/main/webapp/META-INF/context.xml b/uportal-portlets-overlay/jasig-widget-portlets/src/main/webapp/META-INF/context.xml