portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r376108 - in /portals/jetspeed-2/trunk: components/deploy-tool/pom.xml components/pom.xml components/portal/src/test/org/apache/jetspeed/tools/pamanager/TestPortletDescriptor.java layout-portlets/pom.xml pom.xml
Date Wed, 08 Feb 2006 23:04:15 GMT
Author: rwatler
Date: Wed Feb  8 15:04:12 2006
New Revision: 376108

URL: http://svn.apache.org/viewcvs?rev=376108&view=rev
Log:
yet another better checkpoint

Added:
    portals/jetspeed-2/trunk/layout-portlets/pom.xml   (with props)
Modified:
    portals/jetspeed-2/trunk/components/deploy-tool/pom.xml
    portals/jetspeed-2/trunk/components/pom.xml
    portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/tools/pamanager/TestPortletDescriptor.java
    portals/jetspeed-2/trunk/pom.xml

Modified: portals/jetspeed-2/trunk/components/deploy-tool/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/deploy-tool/pom.xml?rev=376108&r1=376107&r2=376108&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/pom.xml Wed Feb  8 15:04:12 2006
@@ -49,6 +49,18 @@
             <artifactId>jdom</artifactId>
         </dependency>
 
+        <!-- Runtime Dependencies -->
+        <dependency>
+            <groupId>jaxen</groupId>
+            <artifactId>jaxen</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>saxpath</groupId>
+            <artifactId>saxpath</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
     </dependencies>
 
     <!-- Project Information -->

Modified: portals/jetspeed-2/trunk/components/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/pom.xml?rev=376108&r1=376107&r2=376108&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/pom.xml Wed Feb  8 15:04:12 2006
@@ -73,6 +73,95 @@
         <module>web-content</module>
     </modules>
 
+    <!-- Global Build Configuration -->
+
+    <build>
+
+        <!-- Test Resources -->
+        <testResources>
+            <testResource>
+                <directory>src/java</directory>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                    <exclude>**/JETSPEED-INF/**</exclude>
+                </excludes>
+            </testResource>
+            <testResource>
+                <directory>src/test</directory>
+            </testResource>
+            <testResource>
+                <directory>../../etc/log4j</directory>
+            </testResource>
+            <testResource>
+                <directory>../../etc/db-ojb</directory>
+            </testResource>
+            <testResource>
+                <directory>../../src/webapp/WEB-INF/assembly</directory>
+            </testResource>
+        </testResources>
+
+        <!-- Plugin Configuration -->
+        <pluginManagement>    
+            <plugins>
+
+                <!-- Tests -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <systemProperties>
+
+                            <!-- Runtime Database Properties -->
+                            <property>
+                                <name>org.apache.jetspeed.database.url</name>
+                                <value>${org.apache.jetspeed.test.database.url}</value>
+                            </property>
+                            <property>
+                                <name>org.apache.jetspeed.database.driver</name>
+                                <value>${org.apache.jetspeed.test.database.driver}</value>
+                            </property>
+                            <property>
+                                <name>org.apache.jetspeed.database.user</name>
+                                <value>${org.apache.jetspeed.test.database.user}</value>
+                            </property>
+                            <property>
+                                <name>org.apache.jetspeed.database.password</name>
+                                <value>${org.apache.jetspeed.test.database.password}</value>
+                            </property>
+
+                            <!-- Test Database Properties -->
+                            <property>
+                                <name>org.apache.jetspeed.test.database.url</name>
+                                <value>${org.apache.jetspeed.test.database.url}</value>
+                            </property>
+                            <property>
+                                <name>org.apache.jetspeed.test.database.driver</name>
+                                <value>${org.apache.jetspeed.test.database.driver}</value>
+                            </property>
+                            <property>
+                                <name>org.apache.jetspeed.test.database.user</name>
+                                <value>${org.apache.jetspeed.test.database.user}</value>
+                            </property>
+                            <property>
+                                <name>org.apache.jetspeed.test.database.password</name>
+                                <value>${org.apache.jetspeed.test.database.password}</value>
+                            </property>
+
+                        </systemProperties>
+                        <!--
+                            Note: using forking to prevent module test case connection
+                            pools and spring crosstalk via surefire isolation class
+                            loaders when multipe modules are built, (e.g. components/registry).

+                        -->
+                        <forkMode>once</forkMode>
+                    </configuration>
+                </plugin>
+
+            </plugins>
+        </pluginManagement>    
+
+    </build>
+
     <!-- Component Dependencies -->
 
     <dependencies>

Modified: portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/tools/pamanager/TestPortletDescriptor.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/tools/pamanager/TestPortletDescriptor.java?rev=376108&r1=376107&r2=376108&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/tools/pamanager/TestPortletDescriptor.java
(original)
+++ portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/tools/pamanager/TestPortletDescriptor.java
Wed Feb  8 15:04:12 2006
@@ -405,11 +405,17 @@
         {
             srcReader.close();
             paWar.close();
-            targetReader.close();
+            if (targetReader != null)
+            {
+                targetReader.close();
+            }
             File warFile2 = new File("./target/webapp");
-            DirectoryHelper dirHelper = new DirectoryHelper(warFile2);
-            dirHelper.remove();
-            dirHelper.close();
+            if (warFile2.exists())
+            {
+                DirectoryHelper dirHelper = new DirectoryHelper(warFile2);
+                dirHelper.remove();
+                dirHelper.close();
+            }
         }
 
     }

Added: portals/jetspeed-2/trunk/layout-portlets/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/layout-portlets/pom.xml?rev=376108&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/pom.xml (added)
+++ portals/jetspeed-2/trunk/layout-portlets/pom.xml Wed Feb  8 15:04:12 2006
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2006 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+  $Id:$
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <!-- POM Identification -->
+
+    <groupId>org.apache.portals.jetspeed-2</groupId>
+    <version>2.1-dev</version>
+    <artifactId>jetspeed-layouts</artifactId>
+    <parent>
+        <groupId>org.apache.portals.jetspeed-2</groupId>
+        <version>2.1-dev</version>
+        <artifactId>pom</artifactId>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <packaging>war</packaging>
+    <name>Jetspeed-2 Layout Portlets</name>
+    <description>
+        Layout Portlets
+    </description>
+
+    <!-- Dependencies -->
+
+    <dependencies>
+
+        <!-- Build Dependencies -->
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-commons</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!--
+            Note: layouts are deployed in the portal context, so
+            the entire portal component is provided.
+        -->
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-portal</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-configuration</groupId>
+            <artifactId>commons-configuration</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
+
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>jmock</groupId>
+            <artifactId>jmock</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <!-- Project Information -->
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/layout-portlets</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/layout-portlets</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/layout-portlets/</url>
+    </scm>
+
+</project>

Propchange: portals/jetspeed-2/trunk/layout-portlets/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/pom.xml?rev=376108&r1=376107&r2=376108&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/pom.xml (original)
+++ portals/jetspeed-2/trunk/pom.xml Wed Feb  8 15:04:12 2006
@@ -398,6 +398,46 @@
                 <version>${commons-configuration.version}</version>
                 <exclusions>
                     <exclusion>
+                        <groupId>junit-addons</groupId>
+                        <artifactId>junit-addons</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>junit</groupId>
+                        <artifactId>junit</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>dbunit</groupId>
+                        <artifactId>dbunit</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>hsqldb</groupId>
+                        <artifactId>hsqldb</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>spice</groupId>
+                        <artifactId>spice-jndikit</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>dom4j</groupId>
+                        <artifactId>dom4j</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-pool</groupId>
+                        <artifactId>commons-pool</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-dbcp</groupId>
+                        <artifactId>commons-dbcp</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>xerces</groupId>
+                        <artifactId>xerces</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>xml-apis</groupId>
+                        <artifactId>xml-apis</artifactId>
+                    </exclusion>
+                    <exclusion>
                         <groupId>resources</groupId>
                         <artifactId>resources</artifactId>
                     </exclusion>
@@ -670,7 +710,7 @@
 
     <build>
 
-        <!-- Standard Directories -->
+        <!-- J2 Standard Directories -->
         <sourceDirectory>src/java</sourceDirectory>
         <scriptSourceDirectory>src/scripts</scriptSourceDirectory>
         <testSourceDirectory>src/test</testSourceDirectory>
@@ -695,80 +735,12 @@
                     <exclude>**/JETSPEED-INF/**</exclude>
                 </excludes>
             </testResource>
-            <testResource>
-                <directory>src/test</directory>
-            </testResource>
-            <testResource>
-                <directory>../../etc/log4j</directory>
-            </testResource>
-            <testResource>
-                <directory>../../etc/db-ojb</directory>
-            </testResource>
-            <testResource>
-                <directory>../../src/webapp/WEB-INF/assembly</directory>
-            </testResource>
         </testResources>
 
         <!-- Plugin Configuration -->
         <pluginManagement>    
             <plugins>
 
-                <!-- Tests -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <configuration>
-                        <includes>
-                            <include>**/Test*.java</include>
-                        </includes>
-                        <systemProperties>
-
-                            <!-- Runtime Database Properties -->
-                            <property>
-                                <name>org.apache.jetspeed.database.url</name>
-                                <value>${org.apache.jetspeed.test.database.url}</value>
-                            </property>
-                            <property>
-                                <name>org.apache.jetspeed.database.driver</name>
-                                <value>${org.apache.jetspeed.test.database.driver}</value>
-                            </property>
-                            <property>
-                                <name>org.apache.jetspeed.database.user</name>
-                                <value>${org.apache.jetspeed.test.database.user}</value>
-                            </property>
-                            <property>
-                                <name>org.apache.jetspeed.database.password</name>
-                                <value>${org.apache.jetspeed.test.database.password}</value>
-                            </property>
-
-                            <!-- Test Database Properties -->
-                            <property>
-                                <name>org.apache.jetspeed.test.database.url</name>
-                                <value>${org.apache.jetspeed.test.database.url}</value>
-                            </property>
-                            <property>
-                                <name>org.apache.jetspeed.test.database.driver</name>
-                                <value>${org.apache.jetspeed.test.database.driver}</value>
-                            </property>
-                            <property>
-                                <name>org.apache.jetspeed.test.database.user</name>
-                                <value>${org.apache.jetspeed.test.database.user}</value>
-                            </property>
-                            <property>
-                                <name>org.apache.jetspeed.test.database.password</name>
-                                <value>${org.apache.jetspeed.test.database.password}</value>
-                            </property>
-
-                        </systemProperties>
-                        <!--
-                            Note: using forking to prevent module test case connection
-                            pools and spring crosstalk via surefire isolation class
-                            loaders when multipe modules are built, (e.g. components/registry).

-                        -->
-                        <forkMode>once</forkMode>
-                    </configuration>
-                </plugin>
-
                 <!-- Compiler -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -783,12 +755,25 @@
                     </configuration>
                 </plugin>
 
-                <!-- LDAP -->
+                <!-- Tests -->
                 <plugin>
-                    <groupId>directory</groupId>
-                    <artifactId>maven-directory-plugin</artifactId>
-                    <version>${directory.version}</version>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <includes>
+                            <include>**/Test*.java</include>
+                        </includes>
+                    </configuration>
                 </plugin>
+
+                <!-- WAR plugin -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <configuration>
+                        <warSourceDirectory>src/webapp</warSourceDirectory>
+                    </configuration>
+                </plugin> 
 
             </plugins>
         </pluginManagement>    



---------------------------------------------------------------------
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