portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r384995 - in /portals/jetspeed-2/trunk: ./ applications/rss/rss-jar/ layout-portlets/ layout-portlets/layout-portlets-jar/ layout-portlets/layout-portlets-war/
Date Sat, 11 Mar 2006 02:53:56 GMT
Author: rwatler
Date: Fri Mar 10 18:53:51 2006
New Revision: 384995

URL: http://svn.apache.org/viewcvs?rev=384995&view=rev
Log:
support generation of jetspeed-layout-portlets.jar, (note name change from maven1 build).

Added:
    portals/jetspeed-2/trunk/layout-portlets/layout-portlets-jar/
    portals/jetspeed-2/trunk/layout-portlets/layout-portlets-jar/pom.xml
    portals/jetspeed-2/trunk/layout-portlets/layout-portlets-war/
    portals/jetspeed-2/trunk/layout-portlets/layout-portlets-war/pom.xml
Modified:
    portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml
    portals/jetspeed-2/trunk/layout-portlets/pom.xml
    portals/jetspeed-2/trunk/pom.xml

Modified: portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml?rev=384995&r1=384994&r2=384995&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml Fri Mar 10 18:53:51 2006
@@ -42,6 +42,8 @@
 
         <!-- Standard Directories -->
         <sourceDirectory>../src/java</sourceDirectory>
+        <scriptSourceDirectory>../src/scripts</scriptSourceDirectory>
+        <testSourceDirectory>../src/test</testSourceDirectory>
 
         <!-- Resources -->
         <resources>
@@ -49,6 +51,16 @@
                 <directory>../src/java</directory>
             </resource>
         </resources>
+
+        <!-- Test Resources -->
+        <testResources>
+            <testResource>
+                <directory>../src/java</directory>
+            </testResource>
+            <testResource>
+                <directory>../src/test</directory>
+            </testResource>
+        </testResources>
 
     </build>
 

Added: portals/jetspeed-2/trunk/layout-portlets/layout-portlets-jar/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/layout-portlets/layout-portlets-jar/pom.xml?rev=384995&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/layout-portlets-jar/pom.xml (added)
+++ portals/jetspeed-2/trunk/layout-portlets/layout-portlets-jar/pom.xml Fri Mar 10 18:53:51
2006
@@ -0,0 +1,109 @@
+<?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-layout-portlets</artifactId>
+    <parent>
+        <groupId>org.apache.portals.jetspeed-2</groupId>
+        <version>2.1-dev</version>
+        <artifactId>layout-portlets</artifactId>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <packaging>jar</packaging>
+    <name>Jetspeed-2 Layout Portlets JAR</name>
+
+    <!-- Build Configuration -->
+
+    <build>
+
+        <!-- Standard Directories -->
+        <sourceDirectory>../src/java</sourceDirectory>
+        <scriptSourceDirectory>../src/scripts</scriptSourceDirectory>
+        <testSourceDirectory>../src/test</testSourceDirectory>
+
+        <!-- Resources -->
+        <resources>
+            <resource>
+                <directory>../src/java</directory>
+            </resource>
+        </resources>
+
+        <!-- Test Resources -->
+        <testResources>
+            <testResource>
+                <directory>../src/java</directory>
+            </testResource>
+            <testResource>
+                <directory>../src/test</directory>
+            </testResource>
+        </testResources>
+
+    </build>
+
+    <!-- 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>
+
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>jmock</groupId>
+            <artifactId>jmock</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+</project>

Added: portals/jetspeed-2/trunk/layout-portlets/layout-portlets-war/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/layout-portlets/layout-portlets-war/pom.xml?rev=384995&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/layout-portlets-war/pom.xml (added)
+++ portals/jetspeed-2/trunk/layout-portlets/layout-portlets-war/pom.xml Fri Mar 10 18:53:51
2006
@@ -0,0 +1,79 @@
+<?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>layout-portlets</artifactId>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <packaging>war</packaging>
+    <name>Jetspeed-2 Layout Portlets WAR</name>
+
+    <!-- Build Configuration -->
+
+    <build>
+
+        <!-- Plugin Configuration -->
+        <pluginManagement>    
+            <plugins>
+
+                <!-- WAR plugin -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <configuration>
+                        <warSourceDirectory>../src/webapp</warSourceDirectory>
+                    </configuration>
+                </plugin> 
+
+            </plugins>
+        </pluginManagement>    
+
+    </build>
+
+    <!-- Dependencies -->
+
+    <dependencies>
+
+        <!-- Runtime Dependencies -->
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-layout-portlets</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+    </dependencies>
+
+</project>

Modified: portals/jetspeed-2/trunk/layout-portlets/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/layout-portlets/pom.xml?rev=384995&r1=384994&r2=384995&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/pom.xml (original)
+++ portals/jetspeed-2/trunk/layout-portlets/pom.xml Fri Mar 10 18:53:51 2006
@@ -26,67 +26,25 @@
 
     <groupId>org.apache.portals.jetspeed-2</groupId>
     <version>2.1-dev</version>
-    <artifactId>jetspeed-layouts</artifactId>
+    <artifactId>layout-portlets</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <version>2.1-dev</version>
         <artifactId>jetspeed-2</artifactId>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <packaging>war</packaging>
+    <packaging>pom</packaging>
     <name>Jetspeed-2 Layout Portlets</name>
     <description>
         Layout Portlets
     </description>
 
-    <!-- Dependencies -->
+    <!-- Application Modules -->
 
-    <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>
-
-        <!-- Test Dependencies -->
-        <dependency>
-            <groupId>jmock</groupId>
-            <artifactId>jmock</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Runtime Dependencies -->
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
+    <modules>
+        <module>layout-portlets-jar</module>
+        <module>layout-portlets-war</module>
+    </modules>
 
     <!-- Project Information -->
 

Modified: portals/jetspeed-2/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/pom.xml?rev=384995&r1=384994&r2=384995&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/pom.xml (original)
+++ portals/jetspeed-2/trunk/pom.xml Fri Mar 10 18:53:51 2006
@@ -363,6 +363,11 @@
                 <artifactId>portals-gems</artifactId>
                 <version>${pom.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${pom.groupId}</groupId>
+                <artifactId>jetspeed-layout-portlets</artifactId>
+                <version>${pom.version}</version>
+            </dependency>
 
             <!-- Portals Applications -->
             <dependency>
@@ -853,6 +858,9 @@
                     <exclude>**/*.java</exclude>
                     <exclude>**/JETSPEED-INF/**</exclude>
                 </excludes>
+            </testResource>
+            <testResource>
+                <directory>src/test</directory>
             </testResource>
         </testResources>
 



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